From 27521df744159fb0d983490a8251daee41a9962f Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 5 Nov 2009 03:08:41 +0000
Subject: [PATCH 001/483] MINOR Changed silverstripe.com references to
 silverstripe.org

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@90887 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 29f349c2..9b5d69cd 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -111,7 +111,7 @@ class LeftAndMain extends Controller {
 		CMSMenu::add_link(
 			'Help', 
 			_t('LeftAndMain.HELP', 'Help', PR_HIGH, 'Menu title'), 
-			'http://userhelp.silverstripe.com'
+			'http://userhelp.silverstripe.org'
 		);
 		
 		// set reading lang

From 9b49ebf8b495c6f0fc1b26e6025d4cbcaa24bdea Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Thu, 5 Nov 2009 22:54:17 +0000
Subject: [PATCH 002/483] BUGFIX Fixed pages not being manipulated properly in
 the CMS because of a PHP error in CMSBatchAction

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@90936 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSBatchAction.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/CMSBatchAction.php b/code/CMSBatchAction.php
index 185e7334..e44e0147 100644
--- a/code/CMSBatchAction.php
+++ b/code/CMSBatchAction.php
@@ -172,9 +172,6 @@ class CMSBatchAction_DeleteFromLive extends CMSBatchAction {
 				FormResponse::add("if(node && node.parentTreeNode)	node.parentTreeNode.removeTreeNode(node);");
 				FormResponse::add("$('Form_EditForm').reloadIfSetTo($id);");
 			}
-
-			$page->destroy();
-			unset($page);
 		}
 
 		$message = sprintf(_t('CMSBatchActions.DELETED_PAGES', 'Deleted %d pages from the published site'), $pages->Count());

From e4d9e265d24de7c7a434d16f33ed5801b9f6ec2b Mon Sep 17 00:00:00 2001
From: Andrew O'Neil <andy@andyofniall.net>
Date: Tue, 10 Nov 2009 21:27:42 +0000
Subject: [PATCH 003/483] BUGFIX: Fix concurrent editing message always being
 displayed on page version history.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91203 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/LeftAndMain.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index 4771989b..573faef1 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -874,7 +874,7 @@ var CurrentPage = {
 }
 
 setInterval(function() {
-	if ($('Form_EditForm_ID')) {
+	if ($('Form_EditForm_ID') && !($('Form_EditForm_ArchiveURL'))) {
     	new Ajax.Request("admin/pageStatus?ID="+CurrentPage.id()+'&Version='+CurrentPage.version(), {
 			onSuccess: function(t) {
 				var data = eval('('+t.responseText+')');

From d6a2e66c891e3aa71ac5e54076612977173b1216 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 10 Nov 2009 21:37:11 +0000
Subject: [PATCH 004/483] MINOR removed concurrent editing (merged from r91198)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91205 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSBatchAction.php   |  2 +-
 code/LeftAndMain.php      | 46 +---------------------------
 javascript/LeftAndMain.js | 63 ++-------------------------------------
 3 files changed, 4 insertions(+), 107 deletions(-)

diff --git a/code/CMSBatchAction.php b/code/CMSBatchAction.php
index e44e0147..d060b61a 100644
--- a/code/CMSBatchAction.php
+++ b/code/CMSBatchAction.php
@@ -138,7 +138,7 @@ class CMSBatchAction_Delete extends CMSBatchAction {
 }
 
 /**
- * Delete items batch action.
+ * Unpublish (delete from live site) items batch action.
  * 
  * @package cms
  * @subpackage batchaction
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 9b5d69cd..903e3d6c 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -32,8 +32,6 @@ class LeftAndMain extends Controller {
 
 	static $tree_class = null;
 	
-	static $edit_timeout = 180;
-	
 	static $ForceReload;
 
 	static $allowed_actions = array(
@@ -51,7 +49,6 @@ class LeftAndMain extends Controller {
 		'Member_ProfileForm',
 		'EditorToolbar',
 		'EditForm',
-		'pageStatus',
 	);
 	
 	/**
@@ -719,9 +716,6 @@ JS;
 				FormResponse::add("\$('Form_EditForm_StageURLSegment').value = \"{$record->URLSegment}\";");
 			}
 
-			$newVersion = ((int)$record->Version) + 1;
-			FormResponse::add("if(\$('Form_EditForm_Version')) \$('Form_EditForm_Version').value = {$newVersion};");
-			
 			// If the 'Save & Publish' button was clicked, also publish the page
 			if (isset($urlParams['publish']) && $urlParams['publish'] == 1) {
 				$this->extend('onAfterSave', $record);
@@ -751,7 +745,7 @@ JS;
 				$result .= $this->getActionUpdateJS($record);
 				FormResponse::status_message($message, "good");
 				FormResponse::update_status($record->Status);
-				
+
 				$this->extend('onAfterSave', $record);
 				
 				return FormResponse::respond();
@@ -1062,44 +1056,6 @@ JS;
 	 * when multiple users are editing a single page. It echoes a json
 	 * encoded string to the UA.
 	 */
-	public function pageStatus() {
-		// If no ID is set, we're merely keeping the session alive
-		if (!isset($_REQUEST['ID'])) return 1;
-		
-		$page = $this->getRecord($_REQUEST['ID']);
-		if (!$page) {
-			// Page has not been found
-			$return = array('status' => 'not_found');
-		} elseif ($page->getIsDeletedFromStage()) {
-			// Page has been deleted from stage
-			$return = array('status' => 'deleted');
-		} else {
-			// Mark me as editing if I'm not already
-			$page->UsersCurrentlyEditing()->add(Member::currentUser());
-			DB::query("UPDATE SiteTree_UsersCurrentlyEditing SET LastPing = '".date('Y-m-d H:i:s')."'
-				WHERE MemberID = ".Member::currentUserID()." AND SiteTreeID = {$page->ID}");
-			
-			// Page exists, who else is editing it?
-			$names = array();
-			foreach($page->UsersCurrentlyEditing() as $user) {
-				if ($user->ID == Member::currentUserId()) continue;
-				$names[] = trim($user->FirstName . ' ' . $user->Surname);
-			}
-			$return = array('status' => 'editing', 'names' => $names);
-			
-			// Has it been published since the CMS first loaded it?
-			$usersCurrentVersion = isset($_REQUEST['Version']) ? $_REQUEST['Version'] : $page->Version;
-			if ($usersCurrentVersion < $page->Version) {
-				$return = array('status' => 'not_current_version');
-			}
-		}
-		
-		// Delete pings older than 3 minutes from the cache...
-		DB::query("DELETE FROM SiteTree_UsersCurrentlyEditing WHERE LastPing < '".date('Y-m-d H:i:s', time()-self::$edit_timeout)."'");
-		
-		echo Convert::array2json($return);
-		return;
-	}
 
 	/**
 	 * Return the CMS's HTML-editor toolbar
diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index 573faef1..5a1d2d82 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -1,5 +1,4 @@
 var _AJAX_LOADING = false;
-var pagePingInterval = 15;
 
 // Resize the tabs once the document is properly loaded
 // @todo most of this file needs to be tidied up using jQuery
@@ -866,67 +865,9 @@ function hideIndicator(id) {
 	Effect.Fade(id, {duration: 0.3});
 }
 
-var CurrentPage = {
-           id: function() { if($('Form_EditForm_ID')) return $('Form_EditForm_ID').value; },
-      version: function() { if($('Form_EditForm_Version')) return parseInt($('Form_EditForm_Version').value, 10); },
-   setVersion: function(version) { $('Form_EditForm_Version').value = version; },
-    isDeleted: function() { if($('SiteTree_Alert')) return $('SiteTree_Alert').getAttribute('deletedfromstage'); }
-}
-
 setInterval(function() {
-	if ($('Form_EditForm_ID') && !($('Form_EditForm_ArchiveURL'))) {
-    	new Ajax.Request("admin/pageStatus?ID="+CurrentPage.id()+'&Version='+CurrentPage.version(), {
-			onSuccess: function(t) {
-				var data = eval('('+t.responseText+')');
-				var hasAlert = false;
-				
-				switch(data.status) {
-					case 'editing':
-						$('SiteTree_Alert').style.border = '2px solid #B5D4FE';
-						$('SiteTree_Alert').style.backgroundColor = '#F8FAFC';
-						if (data.names.length) {
-							hasAlert = true;
-							$('SiteTree_Alert').innerHTML = "This page is also being edited by: "+data.names.join(', ');
-						}
-						break;
-					case 'deleted':
-						// handle deletion by another user (but not us, or if we're already looking at a deleted version)
-						if (CurrentPage.isDeleted() == 0) {
-							$('SiteTree_Alert').style.border = '2px solid #ffd324';
-							$('SiteTree_Alert').style.backgroundColor = '#fff6bf';
-							$('SiteTree_Alert').innerHTML = "This page has been deleted since you opened it.";
-							hasAlert = true;
-						}
-						break;
-					case 'not_current_version':
-						// handle another user publishing
-						$('SiteTree_Alert').style.border = '2px solid #FFD324';
-						$('SiteTree_Alert').style.backgroundColor = '#fff6bf';
-						$('SiteTree_Alert').innerHTML = "This page has been saved since you opened it. You may want to reload it, or risk overwriting changes.";
-						hasAlert = true;
-						break;
-					case 'not_found':
-						break;
-				}
-				
-				if (hasAlert) {
-					$('SiteTree_Alert').style.padding = '5px';
-					$('SiteTree_Alert').style.marginBottom = '5px';
-					$('SiteTree_Alert').style.display = 'block';
-				} else {
-					$('SiteTree_Alert').innerHTML = '';
-					$('SiteTree_Alert').style.padding = '0px';
-					$('SiteTree_Alert').style.marginBottom = '0px';
-					if ($('SiteTree_Alert').style.display != 'none') $('SiteTree_Alert').style.display = 'none';
-				}
-			}
-		});
-	} else {
-		// We're not looking at a page, so at this stage, we're just
-		// pinging to keep the session alive.
-		new Ajax.Request("admin/pageStatus");
-	}
-}, pagePingInterval*1000);
+		new Ajax.Request("Security/ping");
+}, 180*1000);
 
 /**
  * Find and enable TinyMCE on all htmleditor fields

From 3e7990d9417c180a46d4d4719d50cade5b258d15 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Thu, 12 Nov 2009 10:42:37 +0000
Subject: [PATCH 005/483] BUGFIX Fixed PageComment boolean operators in WHERE
 SQL clauses that break MSSQL

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91444 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CommentAdmin.php                      | 8 ++++----
 code/sitefeatures/PageComment.php          | 2 +-
 code/sitefeatures/PageCommentInterface.php | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/CommentAdmin.php b/code/CommentAdmin.php
index ed0b13c9..3e7b4df5 100644
--- a/code/CommentAdmin.php
+++ b/code/CommentAdmin.php
@@ -56,13 +56,13 @@ class CommentAdmin extends LeftAndMain {
 		$section = $this->Section();
 
 		if($section == 'approved') {
-			$filter = "\"IsSpam\"=0 AND \"NeedsModeration\"=0";
+			$filter = "\"IsSpam\" = 0 AND \"NeedsModeration\" = 0";
 			$title = "<h2>". _t('CommentAdmin.APPROVEDCOMMENTS', 'Approved Comments')."</h2>";
 		} else if($section == 'unmoderated') {
-			$filter = '"NeedsModeration"';
+			$filter = '"NeedsModeration" = 1';
 			$title = "<h2>"._t('CommentAdmin.COMMENTSAWAITINGMODERATION', 'Comments Awaiting Moderation')."</h2>";
 		} else {
-			$filter = '"IsSpam"';
+			$filter = '"IsSpam" = 1';
 			$title = "<h2>"._t('CommentAdmin.SPAM', 'Spam')."</h2>";
 		}
 
@@ -147,7 +147,7 @@ JS;
 
 	function deleteall() {
 		$numComments = 0;
-		$spam = DataObject::get('PageComment', '"PageComment"."IsSpam"');
+		$spam = DataObject::get('PageComment', '"PageComment"."IsSpam" = 1');
 
 		if($spam) {
 			$numComments = $spam->Count();
diff --git a/code/sitefeatures/PageComment.php b/code/sitefeatures/PageComment.php
index bfe2524c..907ea432 100755
--- a/code/sitefeatures/PageComment.php
+++ b/code/sitefeatures/PageComment.php
@@ -166,7 +166,7 @@ class PageComment extends DataObject {
 class PageComment_Controller extends Controller {
 	function rss() {
 		$parentcheck = isset($_REQUEST['pageid']) ? "\"ParentID\" = " . (int) $_REQUEST['pageid'] : "\"ParentID\" > 0";
-		$unmoderatedfilter = Permission::check('ADMIN') ? '' : "AND NOT \"NeedsModeration\"";
+		$unmoderatedfilter = Permission::check('ADMIN') ? '' : "AND \"NeedsModeration\" = 0";
 		$comments = DataObject::get("PageComment", "$parentcheck AND \"IsSpam\" = 0 $unmoderatedfilter", "\"Created\" DESC", "", 10);
 		if(!isset($comments)) {
 			$comments = new DataObjectSet();
diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index a8602a6e..c34d82bc 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -210,8 +210,8 @@ class PageCommentInterface extends RequestHandler {
 		$limit['start'] = isset($_GET['commentStart']) ? (int)$_GET['commentStart'] : 0;
 		$limit['limit'] = PageComment::$comments_per_page;
 		
-		$spamfilter = isset($_GET['showspam']) ? '' : "AND \"IsSpam\"=0";
-		$unmoderatedfilter = Permission::check('ADMIN') ? '' : "AND \"NeedsModeration\"=0";
+		$spamfilter = isset($_GET['showspam']) ? '' : "AND \"IsSpam\" = 0";
+		$unmoderatedfilter = Permission::check('ADMIN') ? '' : "AND \"NeedsModeration\" = 0";
 		$comments =  DataObject::get("PageComment", "\"ParentID\" = '" . Convert::raw2sql($this->page->ID) . "' $spamfilter $unmoderatedfilter", '"Created" DESC', "", $limit);
 		
 		if(is_null($comments)) {

From a9427422c0cc99170ee0ace0e60abb4ea89c1a5a Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Fri, 13 Nov 2009 00:19:55 +0000
Subject: [PATCH 006/483] FEATURE: added ability to upload images from site
 content pane. Merged via r9130, r91347, r91350, r91480

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91496 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php                   |  34 +++++---
 images/swf-upload-button-small.jpg    | Bin 0 -> 1916 bytes
 javascript/CMSMain_upload.js          |   9 ---
 javascript/TinyMCEImageEnhancement.js | 107 +++++++++-----------------
 javascript/Upload.js                  |  45 ++++++++---
 5 files changed, 94 insertions(+), 101 deletions(-)
 create mode 100644 images/swf-upload-button-small.jpg

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 71e13d3c..c2c0dc0f 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -86,7 +86,7 @@ class AssetAdmin extends LeftAndMain {
 
 		Requirements::javascript(CMS_DIR . "/javascript/CMSMain_upload.js");
 		Requirements::javascript(CMS_DIR . "/javascript/Upload.js");
-		Requirements::javascript(THIRDPARTY_DIR . "/SWFUpload/SWFUpload.js");
+		Requirements::javascript(THIRDPARTY_DIR . "/SWFUpload/swfupload.js");
 		
 		Requirements::javascript(THIRDPARTY_DIR . "/greybox/AmiJS.js");
 		Requirements::javascript(THIRDPARTY_DIR . "/greybox/greybox.js");
@@ -165,23 +165,37 @@ JS
 	 * It will save the uploaded files to /assets/ and create new File objects as required.
 	 */
 	function doUpload($data, $form) {
-		foreach($data['Files'] as $param => $files) {
-			if(!is_array($files)) $files = array($files);
-			foreach($files as $key => $value) {
-				$processedFiles[$key][$param] = $value;
+		$processedFiles = array();
+		
+		if(!isset($data['Files'])) return Director::set_status_code("404");
+		
+		if(is_array($data['Files'])) {
+			foreach($data['Files'] as $param => $files) {
+				if(!is_array($files)) $files = array($files);
+				foreach($files as $key => $value) {
+					$processedFiles[$key][$param] = $value;
+				}
 			}
 		}
+		else {
+			$proccessedFiles[] = $data['Files'];
+		}
+		
+		// get the folder to upload to.
+		if(isset($data['FolderID']) && $data['FolderID'] != "root") {
+			$folder = DataObject::get_by_id('Folder', $data['FolderID']);
+		}
+		else {
+			$folder = DataObject::get_one('Folder');
+		}
 		
-		if($data['ID'] && $data['ID'] != 'root') $folder = DataObject::get_by_id("Folder", $data['ID']);
-		else $folder = singleton('Folder');
-
 		$newFiles = array();
 		$fileSizeWarnings = '';
 		$uploadErrors = '';
 		$jsErrors = '';
 		$status = '';
 		$statusMessage = '';
-		
+
 		foreach($processedFiles as $tmpFile) {
 			if($tmpFile['error'] == UPLOAD_ERR_NO_TMP_DIR) {
 				$status = 'bad';
@@ -226,7 +240,7 @@ JS
 			$statusMessage = _t('AssetAdmin.NOTHINGTOUPLOAD','There was nothing to upload');
 			$status = "";
 		}
-		
+
 		$fileIDs = array();
 		$fileNames = array();
 		foreach($newFiles as $newFile) {
diff --git a/images/swf-upload-button-small.jpg b/images/swf-upload-button-small.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8655b8afebb4101a55e0892d83eb8c3f822fc184
GIT binary patch
literal 1916
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

literal 0
HcmV?d00001

diff --git a/javascript/CMSMain_upload.js b/javascript/CMSMain_upload.js
index a086add2..1960ae17 100644
--- a/javascript/CMSMain_upload.js
+++ b/javascript/CMSMain_upload.js
@@ -6,15 +6,6 @@
 CMSMain_upload = Class.create();
 CMSMain_upload.prototype = {
 	initialize: function() {
-		// This is disabled until we get it working reliably
-		return;
-	
-		// We require flash 9
-		pv = getFlashPlayerVersion();
-		if(pv.major < 9) return;
-	
-		// Due to a bug in the flash plugin on Linux and Mac, we need at least version 9.0.64 to use SWFUpload
-		if(pv.major == 9 && pv.minor == 0 && pv.rev < 64) return;
 
 		// If those 2 checks pass, we can provide upload capabilities to the user
 		this.iframe = window.top.document.getElementById('AssetAdmin_upload');
diff --git a/javascript/TinyMCEImageEnhancement.js b/javascript/TinyMCEImageEnhancement.js
index ea6dc96f..d5a43cad 100644
--- a/javascript/TinyMCEImageEnhancement.js
+++ b/javascript/TinyMCEImageEnhancement.js
@@ -7,21 +7,29 @@ TinyMCEImageEnhancement.prototype = {
     initialize: function() {
         this.filesUploaded = 0;
         this.processInProgress = false;
-        Event.observe(window,'load',this.onWindowLoad.bind(this));
-    },
-    
-    addListeners: function() {
-        $('Form_EditorToolbarImageForm_FolderID').value = "";
+
         Event.observe($('AddFolder'),'click',this.onAddFolder.bind(this));
         Event.observe($('FolderOk'),'click',this.onFolderOk.bind(this));
-        Event.observe($('FolderCancel'),'click',this.onFolderCancel.bind(this)); 
-        Event.observe($('UploadFiles'),'click',this.onUpload.bind(this));
+        Event.observe($('FolderCancel'),'click',this.onFolderCancel.bind(this));
+
+		this.onLoad();
     },   
-    
-    /**
+	
+	onLoad: function() {
+		this.upload = new Upload({
+			fileUploadLimit : '6',
+			button_image_url : 'cms/images/swf-upload-button-small.jpg',
+			button_width : 59,
+			button_height: 18,
+			fileQueued: this.uploadFileQueuedCallback.bind(this),
+			fileComplete: this.uploadFileCompleteCallback.bind(this),
+			queueComplete: this.uploadQueueCompleteCallback.bind(this)
+		});
+	},
+	
+	/**
      * Method creates HTML element, only reason for this method is DRY. 
     */
-    
     addElement: function(tag, className, parent, properties) {
         var e = document.createElement(tag);
         Element.addClassName(e,className);
@@ -30,17 +38,6 @@ TinyMCEImageEnhancement.prototype = {
         return e;
     },
         
-    onUpload: function(event) {
-        Event.stop(event);
-        if(!this.processInProgress) {
-	        if(this.getParentID() != 'root') {
-	            this.upload.browse();
-	        } else {
-	            statusMessage("Please choose folder","bad");                                                
-	        }
-	    }
-    },
-    
     /**
      * Called when user clicks "add folder" anchor. 
     */
@@ -115,60 +112,31 @@ TinyMCEImageEnhancement.prototype = {
 		return false;
     },
     
-    /**
-     * Called on window.onload
-    */
-    
-    onWindowLoad: function() {
-        // Due to a bug in the flash plugin on Linux and Mac, 
-		 //we need at least version 9.0.64 to use SWFUpload
-		// see http://open.silverstripe.com/ticket/3023
-	   pv = getFlashPlayerVersion();
-	   if(pv.major < 9 || pv.major > 9 || (pv.major == 9 && pv.minor == 0 && pv.rev < 64)) {
-		  if($('AddFolderGroup')) $('AddFolderGroup').style.display = 'none';
-		  if($('PipeSeparator')) $('PipeSeparator').style.display = 'none';
-		  if($('UploadGroup')) $('UploadGroup').style.display = 'none';
-		  return;
-	   }
-	
-		if($('FolderID') != null) {
-			if($('SecurityID')) var securityid=$('SecurityID').value;
-			else var securityid=null;
-			this.upload = new Upload(
-				{
-				   fileTypes : '*.jpeg;*.jpg;*.jpe;*.png;*.gif;',
-				   fileTypesDescription : 'Image files',
-				   fileUploadLimit : '100',
-				   securityID : securityid,
-				   beginUploadOnQueue : true,
-				   buildUI : this.addListeners.bind(this),
-				   fileQueued : this.uploadFileQueuedCallback.bind(this),
-				   fileComplete : this.uploadFileCompleteCallback.bind(this),
-				   queueComplete : this.uploadQueueCompleteCallback.bind(this)
-				}		
-			);
-		}
-	},
-	
 	uploadFileQueuedCallback: function(file,queueLength) {
-		this.processInProgress = true;
-		this.upload.setFolderID(this.getParentID()); 
-		$('UploadFiles').innerHTML = "Uploading ... 1/" + this.upload.getFilesToUpload();	
-		this.upload.startUpload();
+		if(this.getParentID() == "root") {
+			statusMessage("Please choose folder","bad");	
+		}
+		else {
+			this.processInProgress = true;
+			this.upload.swfu.addPostParam('FolderID', this.getParentID());
+			this.upload.swfu.addFileParam(file.id,'ID',this.folderID);
+			this.upload.swfu.addFileParam(file.id,'Files',file.name);
+			$('UploadFiles').innerHTML = "Uploading Files...("+ this.filesUploaded +")";	
+			this.upload.swfu.startUpload(file.id);		
+		}
 	},
 	
 	uploadFileCompleteCallback: function(file,serverData) {
-		Element.addClassName($('UploadFiles'),'link');//Safari hack
-		$('UploadFiles').innerHTML = 'Uploading ... ' + this.upload.getFilesUploaded() + "/" + this.upload.getFilesToUpload();
+		this.filesUploaded++;
+		$('UploadFiles').innerHTML = 'Uploading Files..... ('+ this.filesUploaded +")";
 	},
 	
-	uploadQueueCompleteCallback: function() {
+	uploadQueueCompleteCallback: function(serverData) {
 		this.filesUploaded = this.upload.getFilesUploaded();
-		$('UploadFiles').innerHTML = "upload";
-		statusMessage('Uploaded ' + this.upload.getFilesUploaded() + ' files','good');
-		if(this.getParentID() != 'root') {
-			$('Image').ajaxGetFiles(this.getParentID(), null, this.insertImages.bind(this));	
-		}
+		$('UploadFiles').innerHTML = "";
+		statusMessage('Uploaded Files Successfully','good');
+		
+		$('FolderImages').ajaxGetFiles(this.getParentID(), null);	
 	},
 	
 	/**
@@ -187,8 +155,7 @@ TinyMCEImageEnhancement.prototype = {
         $('Image').reapplyBehaviour();
 
         this.addToTinyMCE = this.addToTinyMCE.bind(this);
-
-			this.processInProgress = false;
+		this.processInProgress = false;
     },
     
     /**
diff --git a/javascript/Upload.js b/javascript/Upload.js
index 75300928..88227c49 100644
--- a/javascript/Upload.js
+++ b/javascript/Upload.js
@@ -14,23 +14,33 @@ Upload.prototype = {
 	 * @param params object contains all configuration data for upload.
 	*/
 	initialize: function(params) {
+		
 		this.filesUploaded = 0;
 		this.filesToUpload = 0;
 		this.folderID = 'root';
 		this.uploadInProgress = false;
 		this.uploadMessage = '';
+		this.queueComplete = this.uploadQueueCompleteCallback.bind(this);
+		this.fileComplete = this.uploadFileCompleteCallback.bind(this);
+		this.fileQueued = this.uploadFileQueuedCallback;
+		
 		if(typeof params.fileSizeLimit != 'undefined') this.setFileSizeLimit = params.fileSizeLimit; else this.fileSizeLimit = '30720';
 		if(typeof params.fileTypes != 'undefined') this.fileTypes = params.fileTypes; else this.fileTypes = '*.*';
 		if(typeof params.fileTypesDescription != 'undefined') this.fileTypesDescription = params.fileTypesDescription; else this.fileTypesDescription = 'All Files';
 		if(typeof params.fileUploadLimit != 'undefined') this.fileUploadLimit = params.fileUploadLimit; else this.fileUploadLimit = '6';
-		if(typeof params.beginUploadOnQueue != 'undefined') this.beginUploadOnQueue = params.beginUploadOnQueue; else this.beginUploadOnQueue = false;
+		if(typeof params.beginUploadOnQueue != 'undefined') this.beginUploadOnQueue = params.beginUploadOnQueue; else this.beginUploadOnQueue = true;
 		if(typeof params.fileQueued != 'undefined') this.fileQueued = params.fileQueued; 
+		
 		if(typeof params.fileProgress != 'undefined') this.fileProgress = params.fileProgress; else this.fileProgress = Prototype.emptyFunction;
 		if(typeof params.fileCancelled != 'undefined') this.fileCancelled  = params.fileCancelled;
-		if(typeof params.fileComplete != 'undefined') this.fileComplete = params.fileComplete ;
+		if(typeof params.fileComplete != 'undefined') this.fileComplete = params.fileComplete;
 		if(typeof params.queueComplete != 'undefined') this.queueComplete = params.queueComplete;
 		if(typeof params.buildUI != 'undefined') this.customBuildUI = params.buildUI;
 		if(typeof params.securityID != 'undefined') this.securityID = params.securityID;
+		if(typeof params.button_image_url != 'undefined') this.buttonImageURL = params.button_image_url;
+		if(typeof params.button_width != 'undefined') this.buttonWidth = params.button_width;
+		if(typeof params.button_height != 'undefined') this.buttonHeight = params.button_height;
+		
 		this.onLoad();
 	},
 	
@@ -39,10 +49,11 @@ Upload.prototype = {
 	 * 
 	*/
 	onLoad: function() {
+		
 		path = this.getBasePath();
 		sessId = this.getSessionId();//Because flash doesn't send proper cookies, we need to set session id in URL. 
 		this.swfu = new SWFUpload({
-				upload_url: path + 'admin/assets/UploadForm?SecurityID=' + this.securityID +  '&PHPSESSID=' + sessId,   // Relative to the SWF file
+				upload_url: path + 'admin/assets/UploadForm?action_doUpload=1&PHPSESSID=' + sessId,   // Relative to the SWF file
 				file_post_name: 'Files',
 				file_size_limit : this.fileSizeLimit,
 				file_types : this.fileTypes,
@@ -51,19 +62,25 @@ Upload.prototype = {
 				begin_upload_on_queue : this.beginUploadOnQueue,
 				use_server_data_event : true,
 				validate_files: false,
-
-				file_queued_handler : this.uploadFileQueuedCallback.bind(this),
-				upload_success_handler : this.uploadFileCompleteCallback.bind(this),
+				button_placeholder_id: "SWFUploadButton",
+				file_queued_handler : this.fileQueued,
+				upload_success_handler : this.queueComplete,
+				file_dialog_complete_handler : this.fileCompleted,
 				upload_progress_handler: this.uploadFileProgressCallback.bind(this),
 				error_handler : this.uploadErrorCallback.bind(this),
 				file_validation_handler : Prototype.emptyFunction,
 				file_cancelled_handler: Prototype.emptyFunction,
-				
-				flash_url : 'jsparty/SWFUpload/swfupload_f9.swf',	// Relative to this file
+				button_image_url : this.buttonImageURL,
+				button_window_mode : "transparent",
+				button_width : this.buttonWidth,
+				button_height : this.buttonHeight,
+				flash_url : 'jsparty/SWFUpload/swfupload.swf',	// Relative to this file
 				swfupload_loaded_handler: this.buildUI.bind(this),
-				debug: false
+				debug: false,
+				preserve_relative_urls: true
 			});
-	},
+
+	},	
 	
 	/**
 	 * Retrieves base path from URL.
@@ -95,7 +112,7 @@ Upload.prototype = {
 	*/
 	
 	buildUI: function() {
-		this.customBuildUI();			
+		return;
 	},
 	
 	/**
@@ -107,7 +124,7 @@ Upload.prototype = {
 	
 	uploadFileQueuedCallback: function(file,queueLength) {
 		this.filesToUpload++;
-		this.fileQueued(file, queueLength);
+//		this.swfu.fileQueued(file, queueLength);
 		this.addFileParam(file);
 	},
 	
@@ -151,6 +168,10 @@ Upload.prototype = {
 		this.fileProgress(file, bytes_complete);
 	},
 		
+	uploadQueueCompleteCallback: function(event) {
+		
+	},
+	
 	/**
 	 * Called on error.
 	 * @param error_code int

From dcd6c53ca53df6128d6cb6f462532d54a1d8c0d2 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Fri, 13 Nov 2009 02:49:07 +0000
Subject: [PATCH 007/483] MINOR: fixed typo with path

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91541 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 903e3d6c..1f0590da 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -254,7 +254,7 @@ class LeftAndMain extends Controller {
 				'jsparty/tree/tree.js',
 				'jsparty/tabstrip/tabstrip.js',
 				'cms/javascript/TinyMCEImageEnhancement.js',
-				'jsparty/SWFUpload/SWFUpload.js',
+				'jsparty/SWFUpload/swfupload.js',
 				'cms/javascript/Upload.js',
 				'sapphire/javascript/TreeSelectorField.js',
 		 		'cms/javascript/ThumbnailStripField.js',

From d59b2ad5cfc8705127a07d8e1e58e900f05bd376 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Fri, 13 Nov 2009 02:51:25 +0000
Subject: [PATCH 008/483] BUGFIX: fixed order inclusion of js

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91542 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 2 +-
 javascript/Upload.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 1f0590da..0ce67833 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -253,9 +253,9 @@ class LeftAndMain extends Controller {
 				'cms/javascript/LeftAndMain_right.js',
 				'jsparty/tree/tree.js',
 				'jsparty/tabstrip/tabstrip.js',
-				'cms/javascript/TinyMCEImageEnhancement.js',
 				'jsparty/SWFUpload/swfupload.js',
 				'cms/javascript/Upload.js',
+				'cms/javascript/TinyMCEImageEnhancement.js',
 				'sapphire/javascript/TreeSelectorField.js',
 		 		'cms/javascript/ThumbnailStripField.js',
 			)
diff --git a/javascript/Upload.js b/javascript/Upload.js
index 88227c49..578ed88e 100644
--- a/javascript/Upload.js
+++ b/javascript/Upload.js
@@ -76,7 +76,7 @@ Upload.prototype = {
 				button_height : this.buttonHeight,
 				flash_url : 'jsparty/SWFUpload/swfupload.swf',	// Relative to this file
 				swfupload_loaded_handler: this.buildUI.bind(this),
-				debug: false,
+				debug: true,
 				preserve_relative_urls: true
 			});
 

From c35ad8c3e0484d331992c8a865042996120c17b9 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Fri, 13 Nov 2009 02:52:03 +0000
Subject: [PATCH 009/483] MINOR: removed debug statements

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91543 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/Upload.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/Upload.js b/javascript/Upload.js
index 578ed88e..88227c49 100644
--- a/javascript/Upload.js
+++ b/javascript/Upload.js
@@ -76,7 +76,7 @@ Upload.prototype = {
 				button_height : this.buttonHeight,
 				flash_url : 'jsparty/SWFUpload/swfupload.swf',	// Relative to this file
 				swfupload_loaded_handler: this.buildUI.bind(this),
-				debug: true,
+				debug: false,
 				preserve_relative_urls: true
 			});
 

From 5c8628e7d40c494991d5fe921bc6476d50fb677a Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Tue, 17 Nov 2009 00:16:29 +0000
Subject: [PATCH 010/483] MINOR added stubs to allow widgets to use
 treedropdown fields

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91850 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/WidgetAreaEditor.php      |  8 ++++++--
 javascript/WidgetAreaEditor.js | 13 +++++++++++++
 templates/WidgetAreaEditor.ss  |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/code/WidgetAreaEditor.php b/code/WidgetAreaEditor.php
index dd4a6d1a..c862df48 100644
--- a/code/WidgetAreaEditor.php
+++ b/code/WidgetAreaEditor.php
@@ -5,6 +5,10 @@
  * @subpackage content
  */
 class WidgetAreaEditor extends FormField {
+	function __construct($name) {
+		parent::__construct($name);
+	}
+	
 	function FieldHolder() {
 		Requirements::css(CMS_DIR . '/css/WidgetAreaEditor.css');
 		Requirements::javascript(CMS_DIR . '/javascript/WidgetAreaEditor.js');
@@ -26,7 +30,7 @@ class WidgetAreaEditor extends FormField {
 	
 	function UsedWidgets() {
 		$relationName = $this->name;
-		$widgets = $this->form->getRecord()->getComponent($relationName)->Widgets();
+		$widgets = $this->form->getRecord()->getComponent($relationName)->Items();
 		return $widgets;
 	}
 	
@@ -48,7 +52,7 @@ class WidgetAreaEditor extends FormField {
 		
 		$record->$idName = $widgetarea->ID;
 	
-		$widgets = $widgetarea->Widgets();
+		$widgets = $widgetarea->Items();
 	
 		// store the field IDs and delete the missing fields
 		// alternatively, we could delete all the fields and re add them
diff --git a/javascript/WidgetAreaEditor.js b/javascript/WidgetAreaEditor.js
index 02e2deb1..213acdf3 100644
--- a/javascript/WidgetAreaEditor.js
+++ b/javascript/WidgetAreaEditor.js
@@ -160,6 +160,10 @@ WidgetAreaEditorClass.prototype = {
 		$('usedWidgets-'+this.name).parentNode.parentNode.rewriteWidgetAreaAttributes();
 		UsedWidget.applyToChildren($('usedWidgets-'+this.name), 'div.Widget');
 		
+		// Repply some common form controls
+		WidgetTreeDropdownField.applyTo('div.usedWidgets .TreeDropdownField');
+		
+		
 		Sortable.create('usedWidgets-SideBar', {
 			tag: 'div',
 			handle: 'handle',
@@ -231,6 +235,15 @@ UsedWidget.prototype = {
 	}
 }
 
+WidgetTreeDropdownField = Class.extend('TreeDropdownField');
+WidgetTreeDropdownField.prototype = {
+	getName: function() {
+		return 'Widget_TDF_Endpoint';
+	}
+}
+
+WidgetTreeDropdownField.applyTo('div.usedWidgets .TreeDropdownField');
+
 // Loop over all WidgetAreas and fire 'em up
 var wAs = $$('.WidgetAreaEditor');
 for(var i = 0; i < wAs.length; i++) {
diff --git a/templates/WidgetAreaEditor.ss b/templates/WidgetAreaEditor.ss
index 187e33e4..6b1989f6 100644
--- a/templates/WidgetAreaEditor.ss
+++ b/templates/WidgetAreaEditor.ss
@@ -17,7 +17,7 @@
 	</div>
 	<div class="usedWidgetsHolder">
 		<h2><% _t('INUSE', 'Widgets currently used') %></h2>
-		<p><% _t('TOADD', 'To add widgets, drag them from the left area to here.') %></p>
+		<p><% _t('TOADD', 'To add widgets, click on the purple header on the left') %></p>
 		
 		<div class="usedWidgets" id="usedWidgets-$Name">
 			<% if UsedWidgets %>

From a3a70c85ebddf038ba7a462deb7f54001ade8d52 Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Tue, 17 Nov 2009 20:30:27 +0000
Subject: [PATCH 011/483] BUGFIX FolderID was not present in post, so file
 would not be uploaded to the correct place.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91958 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index c2c0dc0f..30846a4e 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -141,6 +141,7 @@ JS
 		// see r54952 (originally committed in r42014)
 		$form = new Form($this,'UploadForm', new FieldSet(
 			new HiddenField("ID", "", $this->currentPageID()),
+			new HiddenField("FolderID", "", $this->currentPageID()),
 			// needed because the button-action is triggered outside the iframe
 			new HiddenField("action_doUpload", "", "1"), 
 			new FileField("Files[0]" , _t('AssetAdmin.CHOOSEFILE','Choose file: ')),

From 9433580f952d4ff241de30b5b3c7e802f04a7e36 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Wed, 18 Nov 2009 23:54:43 +0000
Subject: [PATCH 012/483] MINOR Removed MemberTableField::setController() -
 this is now redundant from r92134

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@92135 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberTableField.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index 78f63657..5191dc0c 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -278,10 +278,6 @@ class MemberTableField extends ComplexTableField {
 		$this->group = $group;
 	}
 	
-	function setController($controller) {
-		$this->controller = $controller;
-	}
-
 	function GetControllerName() {
 		return $this->controller->class;
 	}

From 73681b0afa62bba0a938e41416b5019b4f4cbee8 Mon Sep 17 00:00:00 2001
From: Normann Lou <normann@silverstripe.com>
Date: Fri, 20 Nov 2009 03:49:57 +0000
Subject: [PATCH 013/483] APICHANGE: add the ability to remove some permissions
 specified by their code in the rendered field html of
 PermissionChecksetBoxField and full-covered unit tests of this ability.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@92428 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SecurityAdmin.php      | 12 ++++++++++++
 tests/SecurityAdminTest.php | 10 ++++++++++
 2 files changed, 22 insertions(+)

diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index bdce356f..f54fc3fc 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -276,6 +276,18 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 			)
 		);
 	}
+	
+	/**
+	 * the permissions represented in the $codes will not appearing in the form
+	 * containning {@link PermissionCheckboxSetField} so as not to be checked / unchecked.
+	 * @param $codes array of permission code
+	 * @return void
+	 */
+	static function hide_permissions($codes){
+		foreach($codes as $code){
+			Permission::add_to_hidden_permissions($code);
+		}
+	}
 }
 
 ?>
diff --git a/tests/SecurityAdminTest.php b/tests/SecurityAdminTest.php
index 4522c7eb..035c9a5e 100644
--- a/tests/SecurityAdminTest.php
+++ b/tests/SecurityAdminTest.php
@@ -36,6 +36,16 @@ class SecurityAdminTest extends FunctionalTest {
 		$this->assertEquals($lines[1], '', "Empty export only has no content row");
 	}
 	
+	function testHidePermissions() {
+		$permissionCheckboxSet = new PermissionCheckboxSetField('Permissions','Permissions','Permission','GroupID');
+		$this->assertContains('CMS_ACCESS_CMSMain', $permissionCheckboxSet->Field());
+		$this->assertContains('CMS_ACCESS_AssetAdmin', $permissionCheckboxSet->Field());
+		
+		SecurityAdmin::hide_permissions(array('CMS_ACCESS_CMSMain','CMS_ACCESS_AssetAdmin'));
+		$this->assertNotContains('CMS_ACCESS_CMSMain', $permissionCheckboxSet->Field());
+		$this->assertNotContains('CMS_ACCESS_AssetAdmin', $permissionCheckboxSet->Field());
+	}
+	
 }
 
 ?>
\ No newline at end of file

From b261d3cadc111bd33fee108974594db21f69d9b1 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sat, 21 Nov 2009 11:11:26 +0000
Subject: [PATCH 014/483] ENHANCEMENT Allowing to hide certain permission from
 showing in SecurityAdmin? through add_hidden_permission() (refactored from
 r92428) (from r92866)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@92879 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SecurityAdmin.php      | 46 ++++++++++++++++++++++++++++------
 tests/SecurityAdminTest.php | 49 +++++++++++++++++++++++++++++++------
 2 files changed, 80 insertions(+), 15 deletions(-)

diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index f54fc3fc..cb374f7a 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -27,6 +27,11 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		'EditForm'
 	);
 
+	/**
+	 * @var Array
+	 */
+	static $hidden_permissions = array();
+
 	public function init() {
 		parent::init();
 
@@ -73,6 +78,10 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 			$form->setFields($readonlyFields);
 		}
 		
+		// Filter permissions
+		$permissionField = $form->Fields()->dataFieldByName('Permissions');
+		if($permissionField) $permissionField->setHiddenPermissions(self::$hidden_permissions);
+		
 		return $form;
 	}
 
@@ -278,15 +287,36 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 	}
 	
 	/**
-	 * the permissions represented in the $codes will not appearing in the form
-	 * containning {@link PermissionCheckboxSetField} so as not to be checked / unchecked.
-	 * @param $codes array of permission code
-	 * @return void
+	 * The permissions represented in the $codes will not appearing in the form
+	 * containing {@link PermissionCheckboxSetField} so as not to be checked / unchecked.
+	 * 
+	 * @param $codes String|Array
 	 */
-	static function hide_permissions($codes){
-		foreach($codes as $code){
-			Permission::add_to_hidden_permissions($code);
-		}
+	static function add_hidden_permission($codes){
+		if(is_string($codes)) $codes = array($codes);
+		self::$hidden_permissions += $codes;
+	}
+	
+	/**
+	 * @param $codes String|Array
+	 */
+	static function remove_hidden_permission($codes){
+		if(is_string($codes)) $codes = array($codes);
+		self::$hidden_permissions = array_diff(self::$hidden_permissions, $codes);
+	}
+	
+	/**
+	 * @return Array
+	 */
+	static function get_hidden_permissions(){
+		return self::$hidden_permissions;
+	}
+	
+	/**
+	 * Clear all permissions previously hidden with {@link add_hidden_permission}
+	 */
+	static function clear_hidden_permissions(){
+		self::$hidden_permissions = array();
 	}
 }
 
diff --git a/tests/SecurityAdminTest.php b/tests/SecurityAdminTest.php
index 035c9a5e..086c5b22 100644
--- a/tests/SecurityAdminTest.php
+++ b/tests/SecurityAdminTest.php
@@ -36,16 +36,51 @@ class SecurityAdminTest extends FunctionalTest {
 		$this->assertEquals($lines[1], '', "Empty export only has no content row");
 	}
 	
-	function testHidePermissions() {
-		$permissionCheckboxSet = new PermissionCheckboxSetField('Permissions','Permissions','Permission','GroupID');
-		$this->assertContains('CMS_ACCESS_CMSMain', $permissionCheckboxSet->Field());
-		$this->assertContains('CMS_ACCESS_AssetAdmin', $permissionCheckboxSet->Field());
+	function testAddHiddenPermission() {
+		SecurityAdmin::add_hidden_permission('CMS_ACCESS_ReportAdmin');
+		$this->assertContains('CMS_ACCESS_ReportAdmin', SecurityAdmin::get_hidden_permissions());
 		
-		SecurityAdmin::hide_permissions(array('CMS_ACCESS_CMSMain','CMS_ACCESS_AssetAdmin'));
-		$this->assertNotContains('CMS_ACCESS_CMSMain', $permissionCheckboxSet->Field());
-		$this->assertNotContains('CMS_ACCESS_AssetAdmin', $permissionCheckboxSet->Field());
+		// reset to defaults
+		SecurityAdmin::clear_hidden_permissions();
 	}
 	
+	function testRemoveHiddenPermission() {
+		SecurityAdmin::add_hidden_permission('CMS_ACCESS_ReportAdmin');
+		$this->assertContains('CMS_ACCESS_ReportAdmin', SecurityAdmin::get_hidden_permissions());
+		SecurityAdmin::remove_hidden_permission('CMS_ACCESS_ReportAdmin');
+		$this->assertNotContains('CMS_ACCESS_ReportAdmin', SecurityAdmin::get_hidden_permissions());
+		
+		// reset to defaults
+		SecurityAdmin::clear_hidden_permissions();
+	}
+	
+	function testClearHiddenPermission() {
+		SecurityAdmin::add_hidden_permission('CMS_ACCESS_ReportAdmin');
+		$this->assertContains('CMS_ACCESS_ReportAdmin', SecurityAdmin::get_hidden_permissions());
+		SecurityAdmin::clear_hidden_permissions('CMS_ACCESS_ReportAdmin');
+		$this->assertNotContains('CMS_ACCESS_ReportAdmin', SecurityAdmin::get_hidden_permissions());
+	}
+	
+	function testPermissionFieldRespectsHiddenPermissions() {
+		$this->session()->inst_set('loggedInAs', $this->idFromFixture('Member', 'admin'));
+		
+		$group = $this->objFromFixture('Group', 'admin');
+		
+		SecurityAdmin::add_hidden_permission('CMS_ACCESS_ReportAdmin');
+		$response = $this->get('admin/security/show/' . $group->ID);
+		
+		$this->assertContains(
+			'CMS_ACCESS_CMSMain',
+			$response->getBody()
+		);
+		$this->assertNotContains(
+			'CMS_ACCESS_ReportAdmin',
+			$response->getBody()
+		);
+		
+		// reset to defaults
+		SecurityAdmin::clear_hidden_permissions();
+	}
 }
 
 ?>
\ No newline at end of file

From e7f61e1aa4aaf02374b97708f730f0032dd25fb3 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 26 Nov 2009 03:16:26 +0000
Subject: [PATCH 015/483] MINOR Copied jsparty/multifile to
 cms/thirdparty/multifile

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93557 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 thirdparty/multifile/example.html  |  26 ++++
 thirdparty/multifile/multifile.css |  82 +++++++++++++
 thirdparty/multifile/multifile.js  | 189 +++++++++++++++++++++++++++++
 3 files changed, 297 insertions(+)
 create mode 100755 thirdparty/multifile/example.html
 create mode 100755 thirdparty/multifile/multifile.css
 create mode 100755 thirdparty/multifile/multifile.js

diff --git a/thirdparty/multifile/example.html b/thirdparty/multifile/example.html
new file mode 100755
index 00000000..b1111702
--- /dev/null
+++ b/thirdparty/multifile/example.html
@@ -0,0 +1,26 @@
+<html>
+
+<head>
+	<!-- Include the javascript -->
+	<script src="multifile_compressed.js"></script>
+</head>
+
+<body>
+
+<!-- This is the form -->
+<form enctype="multipart/form-data" action="your_script_here.script" method = "post">
+	<!-- The file element -- NOTE: it has an ID -->
+	<input id="my_file_element" type="file" name="file_1" >
+	<input type="submit">
+</form>
+Files:
+<!-- This is where the output will appear -->
+<div id="files_list"></div>
+<script>
+	<!-- Create an instance of the multiSelector class, pass it the output target and the max number of files -->
+	var multi_selector = new MultiSelector( document.getElementById( 'files_list' ), 3 );
+	<!-- Pass in the file element -->
+	multi_selector.addElement( document.getElementById( 'my_file_element' ) );
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/thirdparty/multifile/multifile.css b/thirdparty/multifile/multifile.css
new file mode 100755
index 00000000..03536d07
--- /dev/null
+++ b/thirdparty/multifile/multifile.css
@@ -0,0 +1,82 @@
+#Form_UploadForm {
+	padding: 5px; 
+	line-height: 1.4em;
+}
+	
+#Form_UploadForm a {  
+	font-weight: bold;
+}
+	
+#Form_UploadForm ol li {
+	list-style: decimal outside;
+}
+	
+#Form_UploadForm ul li {	
+	list-style-type: square;
+}
+	
+#Form_UploadForm form { 
+	text-align: left;
+}
+
+#Form_UploadForm label {
+	font-size: 1.2em;
+}
+	
+#Form_UploadForm input.delete { 
+	margin: 2px auto;
+	padding: 0px;
+	background-color: #FFFFFF;
+	border:1px solid #D6D3CE;
+}
+
+#Form_UploadForm input[value="Submit"] {
+	cursor: pointer;
+}
+
+#Form_UploadForm input[value="Submit"]:hover{
+	background-color: #F6F6E8;
+}
+
+#Form_UploadForm #Form_UploadForm_FilesList div {
+	font-size: 1.2em;
+	vertical-align: middle;
+}
+
+#Form_UploadForm #Form_UploadForm_FilesList input {
+	margin-left: 10px;
+}
+
+#Form_UploadForm #Form_UploadForm_FilesList .clear {
+	height: 0;
+	line-height: 0;
+}
+
+#Form_UploadForm div.file {
+	display: inline;
+}
+
+#Form_UploadForm #Form_UploadForm_action_upload {
+	display: inline;
+	margin: 5px 0;
+}
+
+#Form_UploadForm p {
+	margin-top: 5px;
+}
+
+#Form_UploadForm_FilesList {
+	margin-top: 5px;
+}
+
+#Form_UploadForm_FilesList div {
+	width: auto;
+	border: 1px solid #F1EFE2;
+	padding: 5px;
+	margin-bottom: 5px;
+}
+
+#Form_UploadForm_FilesList div .delete:hover {
+	background: red;
+	font-weight: bold;
+}
diff --git a/thirdparty/multifile/multifile.js b/thirdparty/multifile/multifile.js
new file mode 100755
index 00000000..99a68a81
--- /dev/null
+++ b/thirdparty/multifile/multifile.js
@@ -0,0 +1,189 @@
+/**
+ * Convert a single file-input element into a 'multiple' input list
+ * 
+ * Modified 2006-11-06 by Silverstripe Ltd.
+ *
+ * Usage:
+ *
+ *   1. Create a file input element (no name)
+ *      eg. <input type="file" id="first_file_element">
+ *
+ *   2. Create a DIV for the output to be written to
+ *      eg. <div id="files_list"></div>
+ *
+ *   3. Instantiate a MultiSelector object, passing in the DIV and an (optional) maximum number of files
+ *      eg. var multi_selector = new MultiSelector( document.getElementById( 'files_list' ), 3 );
+ *
+ *   4. Add the first element
+ *      eg. multi_selector.addElement( document.getElementById( 'first_file_element' ) );
+ *
+ *   5. That's it.
+ *
+ *   You might (will) want to play around with the addListRow() method to make the output prettier.
+ *
+ *   You might also want to change the line 
+ *       element.name = 'file_' + this.count;
+ *   ...to a naming convention that makes more sense to you.
+ * 
+ * Licence:
+ *   Use this however/wherever you like, just don't blame me if it breaks anything.
+ *
+ * Credit:
+ *   If you're nice, you'll leave this bit:
+ *  
+ *   Class by Stickman -- http://www.the-stickman.com
+ *      with thanks to:
+ *      [for Safari fixes]
+ *         Luis Torrefranca -- http://www.law.pitt.edu
+ *         and
+ *         Shawn Parker & John Pennypacker -- http://www.fuzzycoconut.com
+ *      [for duplicate name bug]
+ *         'neal'
+ */
+ 
+// Modified by: Silverstripe Ltd. (changed naming of file-input-elements) 
+
+function MultiSelector( list_target, max, upload_button ){
+	
+	this.upload_button = upload_button;
+	this.upload_button.setAttribute("disabled", "disabled"); 
+
+	// Where to write the list
+	this.list_target = list_target;
+	// How many elements?
+	this.count = -1; 
+	// How many elements?
+	this.id = 0;
+	// Is there a maximum?
+	if( max ){
+		this.max = max;
+	} else {
+		this.max = -1;
+	};
+	
+	/**
+	 * Add a new file input element
+	 */
+	this.addElement = function( element ){
+
+		// Make sure it's a file input element
+		if( element.tagName == 'INPUT' && element.type == 'file' ){
+
+			// Element name -- what number am I?
+			// Modified by: Silverstripe Ltd. (changed naming of file-input-elements)
+			element.name = 'Files[' + this.id++ + ']'
+
+			// If we've reached maximum number, disable input element
+			if( this.max != -1 && this.count >= this.max ){
+				element.disabled = true;
+			};
+
+			// File element counter
+			this.count++;
+
+			// Add reference to this object
+			element.__scope = this;
+			element.multi_selector = this;
+
+			// What to do when a file is selected
+			element.onchange = function(){
+
+				// New file input
+				var new_element = document.createElement( 'input' );
+				new_element.type = 'file';
+
+				// Add new element
+				this.parentNode.insertBefore( new_element, this );
+
+				// Apply 'update' to element
+				this.multi_selector.addElement( new_element );
+
+				// Update list
+				this.multi_selector.addListRow( this );
+
+				// Hide this: we can't use display:none because Safari doesn't like it
+				this.style.position = 'absolute';
+				this.style.left = '-1000px';
+				
+				element.__scope.toggleUploadButton();
+			};
+			
+			// Most recent element
+			this.current_element = element;
+			
+		} else {
+			// This can only be applied to file input elements!
+			alert( 'Error: not a file input element' );
+		};
+
+	};
+	
+	this.toggleUploadButton = function() {
+		if(this.count > 0) {
+			this.upload_button.removeAttribute("disabled"); 
+		} else {
+			this.upload_button.setAttribute("disabled", "disabled"); 
+		}
+	}
+
+	/**
+	 * Add a new row to the list of files
+	 */
+	this.addListRow = function( element ){
+
+		// Modified 2006-11-06 by Silverstripe Ltd.
+		var filenameMatches = element.value.match(/([^\/\\]+)$/);
+		var filename = filenameMatches[1];
+		
+		// Row div
+		var new_row = document.createElement('div');
+
+		// Delete button
+		var new_row_button = document.createElement('input');
+		new_row_button.type = 'button';
+		new_row_button.value = 'Delete';
+		new_row_button.setAttribute('class', 'delete');
+
+		// References
+		new_row.element = element;
+		element.__scope = this,		
+
+		// Delete function
+		new_row_button.onclick= function(){
+
+			// Remove element from form
+			this.parentNode.element.parentNode.removeChild( this.parentNode.element );
+
+			// Remove this row from the list
+			this.parentNode.parentNode.removeChild( this.parentNode );
+
+			// Decrement counter
+			this.parentNode.element.multi_selector.count--;
+
+			// Re-enable input element (if it's disabled)
+			this.parentNode.element.multi_selector.current_element.disabled = false;
+			
+			element.__scope.toggleUploadButton();
+
+			// Appease Safari
+			//    without it Safari wants to reload the browser window
+			//    which nixes your already queued uploads
+			return false;
+		};
+
+		// Set row value
+		// Modified 2006-11-06 by Silverstripe Ltd.
+		new_row.innerHTML = filename;
+
+		// Add button
+		new_row.appendChild( new_row_button );
+
+		// Add it to the list
+		this.list_target.appendChild( new_row );
+		
+		// Modified 2006-11-06 by Silverstripe Ltd.
+		window.ontabschanged();
+		
+	};
+
+};
\ No newline at end of file

From bcb48ddb18b5372bc1e0237e47c810d0d26ee07b Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 26 Nov 2009 03:17:27 +0000
Subject: [PATCH 016/483] MINOR Moved jsparty/SWFUpload to
 cms/thirdparty/swfupload

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93559 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 thirdparty/swfupload/license.txt        |   11 +
 thirdparty/swfupload/swfupload.js       | 1052 +++++++++++++++++++++++
 thirdparty/swfupload/swfupload.queue.js |   98 +++
 thirdparty/swfupload/swfupload.swf      |  Bin 0 -> 33328 bytes
 4 files changed, 1161 insertions(+)
 create mode 100644 thirdparty/swfupload/license.txt
 create mode 100755 thirdparty/swfupload/swfupload.js
 create mode 100755 thirdparty/swfupload/swfupload.queue.js
 create mode 100755 thirdparty/swfupload/swfupload.swf

diff --git a/thirdparty/swfupload/license.txt b/thirdparty/swfupload/license.txt
new file mode 100644
index 00000000..dd26171a
--- /dev/null
+++ b/thirdparty/swfupload/license.txt
@@ -0,0 +1,11 @@
+/**
+ * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/
+ *
+ * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilz�n and Mammon Media and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ *
+ * SWFUpload Revision 7.0 is (c) 2007 Jake Roberts and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ */
\ No newline at end of file
diff --git a/thirdparty/swfupload/swfupload.js b/thirdparty/swfupload/swfupload.js
new file mode 100755
index 00000000..e1aaa3f7
--- /dev/null
+++ b/thirdparty/swfupload/swfupload.js
@@ -0,0 +1,1052 @@
+/**
+ * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
+ *
+ * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/,  http://www.vinterwebb.se/
+ *
+ * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilz�n and Mammon Media and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ */
+
+
+/* ******************* */
+/* Constructor & Init  */
+/* ******************* */
+var SWFUpload;
+
+if (SWFUpload == undefined) {
+	SWFUpload = function (settings) {
+		this.initSWFUpload(settings);
+	};
+}
+
+SWFUpload.prototype.initSWFUpload = function (userSettings) {
+	try {
+		this.customSettings = {};	// A container where developers can place their own settings associated with this instance.
+		this.settings = {};
+		this.eventQueue = [];
+		this.movieName = "SWFUpload_" + SWFUpload.movieCount++;
+		this.movieElement = null;
+
+
+		// Setup global control tracking
+		SWFUpload.instances[this.movieName] = this;
+
+		// Load the settings.  Load the Flash movie.
+		this.initSettings(userSettings);
+		this.loadFlash();
+		this.displayDebugInfo();
+	} catch (ex) {
+		delete SWFUpload.instances[this.movieName];
+		throw ex;
+	}
+};
+
+/* *************** */
+/* Static Members  */
+/* *************** */
+SWFUpload.instances = {};
+SWFUpload.movieCount = 0;
+SWFUpload.version = "2.5.0 2009-11-04 Alpha";
+SWFUpload.QUEUE_ERROR = {
+	QUEUE_LIMIT_EXCEEDED            : -100,
+	FILE_EXCEEDS_SIZE_LIMIT         : -110,
+	ZERO_BYTE_FILE                  : -120,
+	INVALID_FILETYPE                : -130
+};
+SWFUpload.UPLOAD_ERROR = {
+	HTTP_ERROR                      : -200,
+	MISSING_UPLOAD_URL              : -210,
+	IO_ERROR                        : -220,
+	SECURITY_ERROR                  : -230,
+	UPLOAD_LIMIT_EXCEEDED           : -240,
+	UPLOAD_FAILED                   : -250,
+	SPECIFIED_FILE_ID_NOT_FOUND     : -260,
+	FILE_VALIDATION_FAILED          : -270,
+	FILE_CANCELLED                  : -280,
+	UPLOAD_STOPPED                  : -290,
+	RESIZE_ERROR                    : -300
+};
+SWFUpload.FILE_STATUS = {
+	QUEUED       : -1,
+	IN_PROGRESS  : -2,
+	ERROR        : -3,
+	COMPLETE     : -4,
+	CANCELLED    : -5
+};
+SWFUpload.UPLOAD_TYPE = {
+	NORMAL       : -1,
+	RESIZED      : -2
+};
+
+SWFUpload.BUTTON_ACTION = {
+	SELECT_FILE             : -100,
+	SELECT_FILES            : -110,
+	START_UPLOAD            : -120,
+	JAVASCRIPT              : -130
+};
+SWFUpload.CURSOR = {
+	ARROW : -1,
+	HAND  : -2
+};
+SWFUpload.WINDOW_MODE = {
+	WINDOW       : "window",
+	TRANSPARENT  : "transparent",
+	OPAQUE       : "opaque"
+};
+
+SWFUpload.RESIZE_ENCODING = {
+	JPEG  : -1,
+	PNG   : -2
+};
+
+// Private: takes a URL, determines if it is relative and converts to an absolute URL
+// using the current site. Only processes the URL if it can, otherwise returns the URL untouched
+SWFUpload.completeURL = function (url) {
+	try {
+		var path = "", indexSlash = -1;
+		if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//) || url === "") {
+			return url;
+		}
+		
+		indexSlash = window.location.pathname.lastIndexOf("/");
+		if (indexSlash <= 0) {
+			path = "/";
+		} else {
+			path = window.location.pathname.substr(0, indexSlash) + "/";
+		}
+		
+		return path + url;
+	} catch (ex) {
+		return url;
+	}
+};
+
+
+/* ******************** */
+/* Instance Members  */
+/* ******************** */
+
+// Private: initSettings ensures that all the
+// settings are set, getting a default value if one was not assigned.
+SWFUpload.prototype.initSettings = function (userSettings) {
+	this.ensureDefault = function (settingName, defaultValue) {
+		var setting = userSettings[settingName];
+		if (setting != undefined) {
+			this.settings[settingName] = setting;
+		} else {
+			this.settings[settingName] = defaultValue;
+		}
+	};
+	
+	// Upload backend settings
+	this.ensureDefault("upload_url", "");
+	
+	this.ensureDefault("preserve_relative_urls", false);
+	this.ensureDefault("file_post_name", "Filedata");
+	this.ensureDefault("post_params", {});
+	this.ensureDefault("use_query_string", false);
+	this.ensureDefault("requeue_on_error", false);
+	this.ensureDefault("http_success", []);
+	this.ensureDefault("assume_success_timeout", 0);
+	
+	// File Settings
+	this.ensureDefault("file_types", "*.*");
+	this.ensureDefault("file_types_description", "All Files");
+	this.ensureDefault("file_size_limit", 0);	// Default zero means "unlimited"
+	this.ensureDefault("file_upload_limit", 0);
+	this.ensureDefault("file_queue_limit", 0);
+
+	// Flash Settings
+	this.ensureDefault("flash_url", "swfupload.swf");
+	this.ensureDefault("prevent_swf_caching", true);
+	
+	// Button Settings
+	this.ensureDefault("button_image_url", "");
+	this.ensureDefault("button_width", 1);
+	this.ensureDefault("button_height", 1);
+	this.ensureDefault("button_text", "");
+	this.ensureDefault("button_text_style", "color: #000000; font-size: 16pt;");
+	this.ensureDefault("button_text_top_padding", 0);
+	this.ensureDefault("button_text_left_padding", 0);
+	this.ensureDefault("button_action", SWFUpload.BUTTON_ACTION.SELECT_FILES);
+	this.ensureDefault("button_disabled", false);
+	this.ensureDefault("button_placeholder_id", "");
+	this.ensureDefault("button_placeholder", null);
+	this.ensureDefault("button_cursor", SWFUpload.CURSOR.ARROW);
+	this.ensureDefault("button_window_mode", SWFUpload.WINDOW_MODE.WINDOW);
+	
+	// Debug Settings
+	this.ensureDefault("debug", false);
+	this.settings.debug_enabled = this.settings.debug;	// Here to maintain v2 API
+	
+	// Event Handlers
+	this.settings.return_upload_start_handler = this.returnUploadStart;
+	this.ensureDefault("swfupload_loaded_handler", null);
+	this.ensureDefault("file_dialog_start_handler", null);
+	this.ensureDefault("file_queued_handler", null);
+	this.ensureDefault("file_queue_error_handler", null);
+	this.ensureDefault("file_dialog_complete_handler", null);
+	
+	this.ensureDefault("upload_start_handler", null);
+	this.ensureDefault("upload_progress_handler", null);
+	this.ensureDefault("upload_error_handler", null);
+	this.ensureDefault("upload_success_handler", null);
+	this.ensureDefault("upload_complete_handler", null);
+	
+	this.ensureDefault("button_action_handler", null);
+	
+	this.ensureDefault("debug_handler", this.debugMessage);
+
+	this.ensureDefault("custom_settings", {});
+
+	// Other settings
+	this.customSettings = this.settings.custom_settings;
+	
+	// Update the flash url if needed
+	if (!!this.settings.prevent_swf_caching) {
+		this.settings.flash_url = this.settings.flash_url + (this.settings.flash_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
+	}
+	
+	if (!this.settings.preserve_relative_urls) {
+		this.settings.upload_url = SWFUpload.completeURL(this.settings.upload_url);
+		this.settings.button_image_url = SWFUpload.completeURL(this.settings.button_image_url);
+	}
+	
+	delete this.ensureDefault;
+};
+
+// Private: loadFlash replaces the button_placeholder element with the flash movie.
+SWFUpload.prototype.loadFlash = function () {
+	var targetElement, tempParent, wrapperType;
+
+	// Make sure an element with the ID we are going to use doesn't already exist
+	if (document.getElementById(this.movieName) !== null) {
+		throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
+	}
+
+	// Get the element where we will be placing the flash movie
+	targetElement = document.getElementById(this.settings.button_placeholder_id) || this.settings.button_placeholder;
+
+	if (targetElement == undefined) {
+		throw "Could not find the placeholder element: " + this.settings.button_placeholder_id;
+	}
+
+	wrapperType = (targetElement.currentStyle && targetElement.currentStyle["display"] || window.getComputedStyle && document.defaultView.getComputedStyle(targetElement, null).getPropertyValue("display")) !== "block" ? "span" : "div";
+	
+	// Append the container and load the flash
+	tempParent = document.createElement(wrapperType);
+	tempParent.innerHTML = this.getFlashHTML();	// Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
+	
+	// Experiment -- try to get the movie element immediately
+	var els = tempParent.getElementsByTagName("object");	// FIXME - JSLint if this works
+	if (!els || els.length > 1 || els.length === 0) {
+		// Oh crap...bail
+	} else if (els.length === 1) {
+		this.movieElement = els[0];
+		this.debug("Got the movie. WOOT!");
+	}
+	
+	targetElement.parentNode.replaceChild(tempParent.firstChild, targetElement);
+
+	// Fix IE Flash/Form bug
+	if (window[this.movieName] == undefined) {
+		window[this.movieName] = this.getMovieElement();
+	}
+	
+};
+
+// Private: getFlashHTML generates the object tag needed to embed the flash in to the document
+SWFUpload.prototype.getFlashHTML = function () {
+	// Flash Satay object syntax: http://www.alistapart.com/articles/flashsatay
+	return ['<object id="', this.movieName, '" type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
+				'<param name="wmode" value="', this.settings.button_window_mode, '" />',
+				'<param name="movie" value="', this.settings.flash_url, '" />',
+				'<param name="quality" value="high" />',
+				'<param name="menu" value="false" />',
+				'<param name="allowScriptAccess" value="always" />',
+				'<param name="flashvars" value="' + this.getFlashVars() + '" />',
+				'</object>'].join("");
+};
+
+// Private: getFlashVars builds the parameter string that will be passed
+// to flash in the flashvars param.
+SWFUpload.prototype.getFlashVars = function () {
+	// Build a string from the post param object
+	var httpSuccessString, paramString;
+	
+	paramString = this.buildParamString();
+	httpSuccessString = this.settings.http_success.join(",");
+
+	// Build the parameter string
+	return ["movieName=", encodeURIComponent(this.movieName),
+			"&amp;uploadURL=", encodeURIComponent(this.settings.upload_url),
+			"&amp;useQueryString=", encodeURIComponent(this.settings.use_query_string),
+			"&amp;requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
+			"&amp;httpSuccess=", encodeURIComponent(httpSuccessString),
+			"&amp;assumeSuccessTimeout=", encodeURIComponent(this.settings.assume_success_timeout),
+			"&amp;params=", encodeURIComponent(paramString),
+			"&amp;filePostName=", encodeURIComponent(this.settings.file_post_name),
+			"&amp;fileTypes=", encodeURIComponent(this.settings.file_types),
+			"&amp;fileTypesDescription=", encodeURIComponent(this.settings.file_types_description),
+			"&amp;fileSizeLimit=", encodeURIComponent(this.settings.file_size_limit),
+			"&amp;fileUploadLimit=", encodeURIComponent(this.settings.file_upload_limit),
+			"&amp;fileQueueLimit=", encodeURIComponent(this.settings.file_queue_limit),
+			"&amp;debugEnabled=", encodeURIComponent(this.settings.debug_enabled),
+			"&amp;buttonImageURL=", encodeURIComponent(this.settings.button_image_url),
+			"&amp;buttonWidth=", encodeURIComponent(this.settings.button_width),
+			"&amp;buttonHeight=", encodeURIComponent(this.settings.button_height),
+			"&amp;buttonText=", encodeURIComponent(this.settings.button_text),
+			"&amp;buttonTextTopPadding=", encodeURIComponent(this.settings.button_text_top_padding),
+			"&amp;buttonTextLeftPadding=", encodeURIComponent(this.settings.button_text_left_padding),
+			"&amp;buttonTextStyle=", encodeURIComponent(this.settings.button_text_style),
+			"&amp;buttonAction=", encodeURIComponent(this.settings.button_action),
+			"&amp;buttonDisabled=", encodeURIComponent(this.settings.button_disabled),
+			"&amp;buttonCursor=", encodeURIComponent(this.settings.button_cursor)
+		].join("");
+};
+
+// Public: get retrieves the DOM reference to the Flash element added by SWFUpload
+// The element is cached after the first lookup
+SWFUpload.prototype.getMovieElement = function () {
+	if (this.movieElement == undefined) {
+		this.movieElement = document.getElementById(this.movieName);
+	}
+
+	if (this.movieElement === null) {
+		throw "Could not find Flash element";
+	}
+	
+	return this.movieElement;
+};
+
+// Private: buildParamString takes the name/value pairs in the post_params setting object
+// and joins them up in to a string formatted "name=value&amp;name=value"
+SWFUpload.prototype.buildParamString = function () {
+	var name, postParams, paramStringPairs = [];
+	
+	postParams = this.settings.post_params; 
+
+	if (typeof(postParams) === "object") {
+		for (name in postParams) {
+			if (postParams.hasOwnProperty(name)) {
+				paramStringPairs.push(encodeURIComponent(name.toString()) + "=" + encodeURIComponent(postParams[name].toString()));
+			}
+		}
+	}
+
+	return paramStringPairs.join("&amp;");
+};
+
+// Public: Used to remove a SWFUpload instance from the page. This method strives to remove
+// all references to the SWF, and other objects so memory is properly freed.
+// Returns true if everything was destroyed. Returns a false if a failure occurs leaving SWFUpload in an inconsistant state.
+// Credits: Major improvements provided by steffen
+SWFUpload.prototype.destroy = function () {
+	var movieElement;
+	
+	try {
+		// Make sure Flash is done before we try to remove it
+		this.cancelUpload(null, false);
+		
+		// Stop the external interface check from running
+		this.callFlash("StopExternalInterfaceCheck");
+		
+		movieElement = this.cleanUp();
+
+		// Remove the SWFUpload DOM nodes
+		if (movieElement) {
+			// Remove the Movie Element from the page
+			try {
+				movieElement.parentNode.removeChild(movieElement);
+			} catch (ex) {}
+		}
+
+		// Remove IE form fix reference
+		window[this.movieName] = null;
+
+		// Destroy other references
+		SWFUpload.instances[this.movieName] = null;
+		delete SWFUpload.instances[this.movieName];
+
+		this.movieElement = null;
+		this.settings = null;
+		this.customSettings = null;
+		this.eventQueue = null;
+		this.movieName = null;
+		
+		
+		return true;
+	} catch (ex2) {
+		return false;
+	}
+};
+
+
+// Public: displayDebugInfo prints out settings and configuration
+// information about this SWFUpload instance.
+// This function (and any references to it) can be deleted when placing
+// SWFUpload in production.
+SWFUpload.prototype.displayDebugInfo = function () {
+	this.debug(
+		[
+			"---SWFUpload Instance Info---\n",
+			"Version: ", SWFUpload.version, "\n",
+			"Movie Name: ", this.movieName, "\n",
+			"Settings:\n",
+			"\t", "upload_url:               ", this.settings.upload_url, "\n",
+			"\t", "flash_url:                ", this.settings.flash_url, "\n",
+			"\t", "use_query_string:         ", this.settings.use_query_string.toString(), "\n",
+			"\t", "requeue_on_error:         ", this.settings.requeue_on_error.toString(), "\n",
+			"\t", "http_success:             ", this.settings.http_success.join(", "), "\n",
+			"\t", "assume_success_timeout:   ", this.settings.assume_success_timeout, "\n",
+			"\t", "file_post_name:           ", this.settings.file_post_name, "\n",
+			"\t", "post_params:              ", this.settings.post_params.toString(), "\n",
+			"\t", "file_types:               ", this.settings.file_types, "\n",
+			"\t", "file_types_description:   ", this.settings.file_types_description, "\n",
+			"\t", "file_size_limit:          ", this.settings.file_size_limit, "\n",
+			"\t", "file_upload_limit:        ", this.settings.file_upload_limit, "\n",
+			"\t", "file_queue_limit:         ", this.settings.file_queue_limit, "\n",
+			"\t", "debug:                    ", this.settings.debug.toString(), "\n",
+
+			"\t", "prevent_swf_caching:      ", this.settings.prevent_swf_caching.toString(), "\n",
+
+			"\t", "button_placeholder_id:    ", this.settings.button_placeholder_id.toString(), "\n",
+			"\t", "button_placeholder:       ", (this.settings.button_placeholder ? "Set" : "Not Set"), "\n",
+			"\t", "button_image_url:         ", this.settings.button_image_url.toString(), "\n",
+			"\t", "button_width:             ", this.settings.button_width.toString(), "\n",
+			"\t", "button_height:            ", this.settings.button_height.toString(), "\n",
+			"\t", "button_text:              ", this.settings.button_text.toString(), "\n",
+			"\t", "button_text_style:        ", this.settings.button_text_style.toString(), "\n",
+			"\t", "button_text_top_padding:  ", this.settings.button_text_top_padding.toString(), "\n",
+			"\t", "button_text_left_padding: ", this.settings.button_text_left_padding.toString(), "\n",
+			"\t", "button_action:            ", this.settings.button_action.toString(), "\n",
+			"\t", "button_disabled:          ", this.settings.button_disabled.toString(), "\n",
+
+			"\t", "custom_settings:          ", this.settings.custom_settings.toString(), "\n",
+			"Event Handlers:\n",
+			"\t", "swfupload_loaded_handler assigned:  ", (typeof this.settings.swfupload_loaded_handler === "function").toString(), "\n",
+			"\t", "file_dialog_start_handler assigned: ", (typeof this.settings.file_dialog_start_handler === "function").toString(), "\n",
+			"\t", "file_queued_handler assigned:       ", (typeof this.settings.file_queued_handler === "function").toString(), "\n",
+			"\t", "file_queue_error_handler assigned:  ", (typeof this.settings.file_queue_error_handler === "function").toString(), "\n",
+			"\t", "upload_start_handler assigned:      ", (typeof this.settings.upload_start_handler === "function").toString(), "\n",
+			"\t", "upload_progress_handler assigned:   ", (typeof this.settings.upload_progress_handler === "function").toString(), "\n",
+			"\t", "upload_error_handler assigned:      ", (typeof this.settings.upload_error_handler === "function").toString(), "\n",
+			"\t", "upload_success_handler assigned:    ", (typeof this.settings.upload_success_handler === "function").toString(), "\n",
+			"\t", "upload_complete_handler assigned:   ", (typeof this.settings.upload_complete_handler === "function").toString(), "\n",
+			"\t", "debug_handler assigned:             ", (typeof this.settings.debug_handler === "function").toString(), "\n"
+		].join("")
+	);
+};
+
+/* Note: addSetting and getSetting are no longer used by SWFUpload but are included
+	the maintain v2 API compatibility
+*/
+// Public: (Deprecated) addSetting adds a setting value. If the value given is undefined or null then the default_value is used.
+SWFUpload.prototype.addSetting = function (name, value, default_value) {
+    if (value == undefined) {
+        return (this.settings[name] = default_value);
+    } else {
+        return (this.settings[name] = value);
+	}
+};
+
+// Public: (Deprecated) getSetting gets a setting. Returns an empty string if the setting was not found.
+SWFUpload.prototype.getSetting = function (name) {
+    if (this.settings[name] != undefined) {
+        return this.settings[name];
+	}
+
+    return "";
+};
+
+
+
+// Private: callFlash handles function calls made to the Flash element.
+// Calls are made with a setTimeout for some functions to work around
+// bugs in the ExternalInterface library.
+SWFUpload.prototype.callFlash = function (functionName, argumentArray) {
+	var movieElement, returnValue, returnString;
+	
+	argumentArray = argumentArray || [];
+	movieElement = this.getMovieElement();
+
+	// Flash's method if calling ExternalInterface methods (code adapted from MooTools).
+	try {
+		if (movieElement && movieElement.CallFunction) {
+			returnString = movieElement.CallFunction('<invoke name="' + functionName + '" returntype="javascript">' + __flash__argumentsToXML(argumentArray, 0) + '</invoke>');
+			returnValue = eval(returnString);
+		} else {
+			this.debug("Can't call flash because the movie wasn't found.");
+		}
+	} catch (ex) {
+		this.debug("Exception calling flash: " + ex.message);
+	}
+	
+	// Unescape file post param values
+	if (returnValue != undefined && typeof returnValue.post === "object") {
+		returnValue = this.unescapeFilePostParams(returnValue);
+	}
+	
+	return returnValue;
+};
+
+/* *****************************
+	-- Flash control methods --
+	Your UI should use these
+	to operate SWFUpload
+   ***************************** */
+
+// WARNING: this function does not work in Flash Player 10
+// Public: selectFile causes a File Selection Dialog window to appear.  This
+// dialog only allows 1 file to be selected.
+SWFUpload.prototype.selectFile = function () {
+	this.callFlash("SelectFile");
+};
+
+// WARNING: this function does not work in Flash Player 10
+// Public: selectFiles causes a File Selection Dialog window to appear/ This
+// dialog allows the user to select any number of files
+// Flash Bug Warning: Flash limits the number of selectable files based on the combined length of the file names.
+// If the selection name length is too long the dialog will fail in an unpredictable manner.  There is no work-around
+// for this bug.
+SWFUpload.prototype.selectFiles = function () {
+	this.callFlash("SelectFiles");
+};
+
+
+// Public: startUpload starts uploading the first file in the queue unless
+// the optional parameter 'fileID' specifies the ID 
+SWFUpload.prototype.startUpload = function (fileID) {
+	this.callFlash("StartUpload", [fileID]);
+};
+
+// Public: startUpload starts uploading the first file in the queue unless
+// the optional parameter 'fileID' specifies the ID 
+SWFUpload.prototype.startResizedUpload = function (fileID, width, height, encoding, quality) {
+	this.callFlash("StartUpload", [fileID, { "width": width, "height" : height, "encoding" : encoding, "quality" : quality }]);
+};
+
+// Public: cancelUpload cancels any queued file.  The fileID parameter may be the file ID or index.
+// If you do not specify a fileID the current uploading file or first file in the queue is cancelled.
+// If you do not want the uploadError event to trigger you can specify false for the triggerErrorEvent parameter.
+SWFUpload.prototype.cancelUpload = function (fileID, triggerErrorEvent) {
+	if (triggerErrorEvent !== false) {
+		triggerErrorEvent = true;
+	}
+	this.callFlash("CancelUpload", [fileID, triggerErrorEvent]);
+};
+
+// Public: stopUpload stops the current upload and requeues the file at the beginning of the queue.
+// If nothing is currently uploading then nothing happens.
+SWFUpload.prototype.stopUpload = function () {
+	this.callFlash("StopUpload");
+};
+
+
+// Public: requeueUpload requeues any file. If the file is requeued or already queued true is returned.
+// If the file is not found or is currently uploading false is returned.  Requeuing a file bypasses the
+// file size, queue size, upload limit and other queue checks.  Certain files can't be requeued (e.g, invalid or zero bytes files).
+SWFUpload.prototype.requeueUpload = function (indexOrFileID) {
+	return this.callFlash("RequeueUpload", [indexOrFileID]);
+};
+
+
+/* ************************
+ * Settings methods
+ *   These methods change the SWFUpload settings.
+ *   SWFUpload settings should not be changed directly on the settings object
+ *   since many of the settings need to be passed to Flash in order to take
+ *   effect.
+ * *********************** */
+
+// Public: getStats gets the file statistics object.
+SWFUpload.prototype.getStats = function () {
+	return this.callFlash("GetStats");
+};
+
+// Public: setStats changes the SWFUpload statistics.  You shouldn't need to 
+// change the statistics but you can.  Changing the statistics does not
+// affect SWFUpload accept for the successful_uploads count which is used
+// by the upload_limit setting to determine how many files the user may upload.
+SWFUpload.prototype.setStats = function (statsObject) {
+	this.callFlash("SetStats", [statsObject]);
+};
+
+// Public: getFile retrieves a File object by ID or Index.  If the file is
+// not found then 'null' is returned.
+SWFUpload.prototype.getFile = function (fileID) {
+	if (typeof(fileID) === "number") {
+		return this.callFlash("GetFileByIndex", [fileID]);
+	} else {
+		return this.callFlash("GetFile", [fileID]);
+	}
+};
+
+// Public: getFileFromQueue retrieves a File object by ID or Index.  If the file is
+// not found then 'null' is returned.
+SWFUpload.prototype.getQueueFile = function (fileID) {
+	if (typeof(fileID) === "number") {
+		return this.callFlash("GetFileByQueueIndex", [fileID]);
+	} else {
+		return this.callFlash("GetFile", [fileID]);
+	}
+};
+
+
+// Public: addFileParam sets a name/value pair that will be posted with the
+// file specified by the Files ID.  If the name already exists then the
+// exiting value will be overwritten.
+SWFUpload.prototype.addFileParam = function (fileID, name, value) {
+	return this.callFlash("AddFileParam", [fileID, name, value]);
+};
+
+// Public: removeFileParam removes a previously set (by addFileParam) name/value
+// pair from the specified file.
+SWFUpload.prototype.removeFileParam = function (fileID, name) {
+	this.callFlash("RemoveFileParam", [fileID, name]);
+};
+
+// Public: setUploadUrl changes the upload_url setting.
+SWFUpload.prototype.setUploadURL = function (url) {
+	this.settings.upload_url = url.toString();
+	this.callFlash("SetUploadURL", [url]);
+};
+
+// Public: setPostParams changes the post_params setting
+SWFUpload.prototype.setPostParams = function (paramsObject) {
+	this.settings.post_params = paramsObject;
+	this.callFlash("SetPostParams", [paramsObject]);
+};
+
+// Public: addPostParam adds post name/value pair.  Each name can have only one value.
+SWFUpload.prototype.addPostParam = function (name, value) {
+	this.settings.post_params[name] = value;
+	this.callFlash("SetPostParams", [this.settings.post_params]);
+};
+
+// Public: removePostParam deletes post name/value pair.
+SWFUpload.prototype.removePostParam = function (name) {
+	delete this.settings.post_params[name];
+	this.callFlash("SetPostParams", [this.settings.post_params]);
+};
+
+// Public: setFileTypes changes the file_types setting and the file_types_description setting
+SWFUpload.prototype.setFileTypes = function (types, description) {
+	this.settings.file_types = types;
+	this.settings.file_types_description = description;
+	this.callFlash("SetFileTypes", [types, description]);
+};
+
+// Public: setFileSizeLimit changes the file_size_limit setting
+SWFUpload.prototype.setFileSizeLimit = function (fileSizeLimit) {
+	this.settings.file_size_limit = fileSizeLimit;
+	this.callFlash("SetFileSizeLimit", [fileSizeLimit]);
+};
+
+// Public: setFileUploadLimit changes the file_upload_limit setting
+SWFUpload.prototype.setFileUploadLimit = function (fileUploadLimit) {
+	this.settings.file_upload_limit = fileUploadLimit;
+	this.callFlash("SetFileUploadLimit", [fileUploadLimit]);
+};
+
+// Public: setFileQueueLimit changes the file_queue_limit setting
+SWFUpload.prototype.setFileQueueLimit = function (fileQueueLimit) {
+	this.settings.file_queue_limit = fileQueueLimit;
+	this.callFlash("SetFileQueueLimit", [fileQueueLimit]);
+};
+
+// Public: setFilePostName changes the file_post_name setting
+SWFUpload.prototype.setFilePostName = function (filePostName) {
+	this.settings.file_post_name = filePostName;
+	this.callFlash("SetFilePostName", [filePostName]);
+};
+
+// Public: setUseQueryString changes the use_query_string setting
+SWFUpload.prototype.setUseQueryString = function (useQueryString) {
+	this.settings.use_query_string = useQueryString;
+	this.callFlash("SetUseQueryString", [useQueryString]);
+};
+
+// Public: setRequeueOnError changes the requeue_on_error setting
+SWFUpload.prototype.setRequeueOnError = function (requeueOnError) {
+	this.settings.requeue_on_error = requeueOnError;
+	this.callFlash("SetRequeueOnError", [requeueOnError]);
+};
+
+// Public: setHTTPSuccess changes the http_success setting
+SWFUpload.prototype.setHTTPSuccess = function (http_status_codes) {
+	if (typeof http_status_codes === "string") {
+		http_status_codes = http_status_codes.replace(" ", "").split(",");
+	}
+	
+	this.settings.http_success = http_status_codes;
+	this.callFlash("SetHTTPSuccess", [http_status_codes]);
+};
+
+// Public: setHTTPSuccess changes the http_success setting
+SWFUpload.prototype.setAssumeSuccessTimeout = function (timeout_seconds) {
+	this.settings.assume_success_timeout = timeout_seconds;
+	this.callFlash("SetAssumeSuccessTimeout", [timeout_seconds]);
+};
+
+// Public: setDebugEnabled changes the debug_enabled setting
+SWFUpload.prototype.setDebugEnabled = function (debugEnabled) {
+	this.settings.debug_enabled = debugEnabled;
+	this.callFlash("SetDebugEnabled", [debugEnabled]);
+};
+
+// Public: setButtonImageURL loads a button image sprite
+SWFUpload.prototype.setButtonImageURL = function (buttonImageURL) {
+	if (buttonImageURL == undefined) {
+		buttonImageURL = "";
+	}
+	
+	this.settings.button_image_url = buttonImageURL;
+	this.callFlash("SetButtonImageURL", [buttonImageURL]);
+};
+
+// Public: setButtonDimensions resizes the Flash Movie and button
+SWFUpload.prototype.setButtonDimensions = function (width, height) {
+	this.settings.button_width = width;
+	this.settings.button_height = height;
+	
+	var movie = this.getMovieElement();
+	if (movie != undefined) {
+		movie.style.width = width + "px";
+		movie.style.height = height + "px";
+	}
+	
+	this.callFlash("SetButtonDimensions", [width, height]);
+};
+// Public: setButtonText Changes the text overlaid on the button
+SWFUpload.prototype.setButtonText = function (html) {
+	this.settings.button_text = html;
+	this.callFlash("SetButtonText", [html]);
+};
+// Public: setButtonTextPadding changes the top and left padding of the text overlay
+SWFUpload.prototype.setButtonTextPadding = function (left, top) {
+	this.settings.button_text_top_padding = top;
+	this.settings.button_text_left_padding = left;
+	this.callFlash("SetButtonTextPadding", [left, top]);
+};
+
+// Public: setButtonTextStyle changes the CSS used to style the HTML/Text overlaid on the button
+SWFUpload.prototype.setButtonTextStyle = function (css) {
+	this.settings.button_text_style = css;
+	this.callFlash("SetButtonTextStyle", [css]);
+};
+// Public: setButtonDisabled disables/enables the button
+SWFUpload.prototype.setButtonDisabled = function (isDisabled) {
+	this.settings.button_disabled = isDisabled;
+	this.callFlash("SetButtonDisabled", [isDisabled]);
+};
+// Public: setButtonAction sets the action that occurs when the button is clicked
+SWFUpload.prototype.setButtonAction = function (buttonAction) {
+	this.settings.button_action = buttonAction;
+	this.callFlash("SetButtonAction", [buttonAction]);
+};
+
+// Public: setButtonCursor changes the mouse cursor displayed when hovering over the button
+SWFUpload.prototype.setButtonCursor = function (cursor) {
+	this.settings.button_cursor = cursor;
+	this.callFlash("SetButtonCursor", [cursor]);
+};
+
+
+/* *******************************
+	Flash Event Interfaces
+	These functions are used by Flash to trigger the various
+	events.
+	
+	All these functions a Private.
+	
+	Because the ExternalInterface library is buggy the event calls
+	are added to a queue and the queue then executed by a setTimeout.
+	This ensures that events are executed in a determinate order and that
+	the ExternalInterface bugs are avoided.
+******************************* */
+
+SWFUpload.prototype.queueEvent = function (handlerName, argumentArray) {
+	// Warning: Don't call this.debug inside here or you'll create an infinite loop
+	var self = this;
+	
+	if (argumentArray == undefined) {
+		argumentArray = [];
+	} else if (!(argumentArray instanceof Array)) {
+		argumentArray = [argumentArray];
+	}
+	
+	if (typeof this.settings[handlerName] === "function") {
+		// Queue the event
+		this.eventQueue.push(function () {
+			this.settings[handlerName].apply(this, argumentArray);
+		});
+		
+		// Execute the next queued event
+		setTimeout(function () {
+			self.executeNextEvent();
+		}, 0);
+		
+	} else if (this.settings[handlerName] !== null) {
+		throw "Event handler " + handlerName + " is unknown or is not a function";
+	}
+};
+
+// Private: Causes the next event in the queue to be executed.  Since events are queued using a setTimeout
+// we must queue them in order to garentee that they are executed in order.
+SWFUpload.prototype.executeNextEvent = function () {
+	// Warning: Don't call this.debug inside here or you'll create an infinite loop
+
+	var  f = this.eventQueue ? this.eventQueue.shift() : null;
+	if (typeof(f) === "function") {
+		f.apply(this);
+	}
+};
+
+// Private: unescapeFileParams is part of a workaround for a flash bug where objects passed through ExternalInterface cannot have
+// properties that contain characters that are not valid for JavaScript identifiers. To work around this
+// the Flash Component escapes the parameter names and we must unescape again before passing them along.
+SWFUpload.prototype.unescapeFilePostParams = function (file) {
+	var reg = /[$]([0-9a-f]{4})/i, unescapedPost = {}, uk, k, match;
+
+	if (file != undefined) {
+		for (k in file.post) {
+			if (file.post.hasOwnProperty(k)) {
+				uk = k;
+				while ((match = reg.exec(uk)) !== null) {
+					uk = uk.replace(match[0], String.fromCharCode(parseInt("0x" + match[1], 16)));
+				}
+				unescapedPost[uk] = file.post[k];
+			}
+		}
+
+		file.post = unescapedPost;
+	}
+
+	return file;
+};
+
+// Private: Called by Flash to see if JS can call in to Flash (test if External Interface is working)
+SWFUpload.prototype.testExternalInterface = function () {
+	try {
+		return this.callFlash("TestExternalInterface");
+	} catch (ex) {
+		return false;
+	}
+};
+
+// Private: This event is called by Flash when it has finished loading. Don't modify this.
+// Use the swfupload_loaded_handler event setting to execute custom code when SWFUpload has loaded.
+SWFUpload.prototype.flashReady = function () {
+	// Check that the movie element is loaded correctly with its ExternalInterface methods defined
+	var movieElement = this.getMovieElement();
+
+	if (!movieElement) {
+		this.debug("Flash called back ready but the flash movie can't be found.");
+		return;
+	}
+
+	this.cleanUp();
+	
+	this.queueEvent("swfupload_loaded_handler");
+};
+
+// Private: removes Flash added fuctions to the DOM node to prevent memory leaks in IE.
+// This function is called by Flash each time the ExternalInterface functions are created.
+SWFUpload.prototype.cleanUp = function () {
+	var key, movieElement = this.getMovieElement();
+	
+	// Pro-actively unhook all the Flash functions
+	try {
+		if (movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
+			this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");
+			for (key in movieElement) {
+				try {
+					if (typeof(movieElement[key]) === "function") {
+						movieElement[key] = null;
+					}
+				} catch (ex) {
+				}
+			}
+		}
+	} catch (ex1) {
+	
+	}
+
+	// Fix Flashes own cleanup code so if the SWF Movie was removed from the page
+	// it doesn't display errors.
+	window["__flash__removeCallback"] = function (instance, name) {
+		try {
+			if (instance) {
+				instance[name] = null;
+			}
+		} catch (flashEx) {
+		
+		}
+	};
+	
+	return movieElement;
+};
+
+/* When the button_action is set to JavaScript this event gets fired and executes the button_action_handler */
+SWFUpload.prototype.buttonAction = function () {
+	this.queueEvent("button_action_handler");
+};
+
+/* This is a chance to do something before the browse window opens */
+SWFUpload.prototype.fileDialogStart = function () {
+	this.queueEvent("file_dialog_start_handler");
+};
+
+
+/* Called when a file is successfully added to the queue. */
+SWFUpload.prototype.fileQueued = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queued_handler", file);
+};
+
+
+/* Handle errors that occur when an attempt to queue a file fails. */
+SWFUpload.prototype.fileQueueError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queue_error_handler", [file, errorCode, message]);
+};
+
+/* Called after the file dialog has closed and the selected files have been queued.
+	You could call startUpload here if you want the queued files to begin uploading immediately. */
+SWFUpload.prototype.fileDialogComplete = function (numFilesSelected, numFilesQueued, numFilesInQueue) {
+	this.queueEvent("file_dialog_complete_handler", [numFilesSelected, numFilesQueued, numFilesInQueue]);
+};
+
+SWFUpload.prototype.uploadStart = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("return_upload_start_handler", file);
+};
+
+SWFUpload.prototype.returnUploadStart = function (file) {
+	var returnValue;
+	if (typeof this.settings.upload_start_handler === "function") {
+		file = this.unescapeFilePostParams(file);
+		returnValue = this.settings.upload_start_handler.call(this, file);
+	} else if (this.settings.upload_start_handler != undefined) {
+		throw "upload_start_handler must be a function";
+	}
+
+	// Convert undefined to true so if nothing is returned from the upload_start_handler it is
+	// interpretted as 'true'.
+	if (returnValue === undefined) {
+		returnValue = true;
+	}
+	
+	returnValue = !!returnValue;
+	
+	this.callFlash("ReturnUploadStart", [returnValue]);
+};
+
+
+
+SWFUpload.prototype.uploadProgress = function (file, bytesComplete, bytesTotal) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_progress_handler", [file, bytesComplete, bytesTotal]);
+};
+
+SWFUpload.prototype.uploadError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_error_handler", [file, errorCode, message]);
+};
+
+SWFUpload.prototype.uploadSuccess = function (file, serverData, responseReceived) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_success_handler", [file, serverData, responseReceived]);
+};
+
+SWFUpload.prototype.uploadComplete = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_complete_handler", file);
+};
+
+/* Called by SWFUpload JavaScript and Flash functions when debug is enabled. By default it writes messages to the
+   internal debug console.  You can override this event and have messages written where you want. */
+SWFUpload.prototype.debug = function (message) {
+	this.queueEvent("debug_handler", message);
+};
+
+
+/* **********************************
+	Debug Console
+	The debug console is a self contained, in page location
+	for debug message to be sent.  The Debug Console adds
+	itself to the body if necessary.
+
+	The console is automatically scrolled as messages appear.
+	
+	If you are using your own debug handler or when you deploy to production and
+	have debug disabled you can remove these functions to reduce the file size
+	and complexity.
+********************************** */
+   
+// Private: debugMessage is the default debug_handler.  If you want to print debug messages
+// call the debug() function.  When overriding the function your own function should
+// check to see if the debug setting is true before outputting debug information.
+SWFUpload.prototype.debugMessage = function (message) {
+	var exceptionMessage, exceptionValues, key;
+
+	if (this.settings.debug) {
+		exceptionValues = [];
+
+		// Check for an exception object and print it nicely
+		if (typeof message === "object" && typeof message.name === "string" && typeof message.message === "string") {
+			for (key in message) {
+				if (message.hasOwnProperty(key)) {
+					exceptionValues.push(key + ": " + message[key]);
+				}
+			}
+			exceptionMessage = exceptionValues.join("\n") || "";
+			exceptionValues = exceptionMessage.split("\n");
+			exceptionMessage = "EXCEPTION: " + exceptionValues.join("\nEXCEPTION: ");
+			SWFUpload.Console.writeLine(exceptionMessage);
+		} else {
+			SWFUpload.Console.writeLine(message);
+		}
+	}
+};
+
+SWFUpload.Console = {};
+SWFUpload.Console.writeLine = function (message) {
+	var console, documentForm;
+
+	try {
+		console = document.getElementById("SWFUpload_Console");
+
+		if (!console) {
+			documentForm = document.createElement("form");
+			document.getElementsByTagName("body")[0].appendChild(documentForm);
+
+			console = document.createElement("textarea");
+			console.id = "SWFUpload_Console";
+			console.style.fontFamily = "monospace";
+			console.setAttribute("wrap", "off");
+			console.wrap = "off";
+			console.style.overflow = "auto";
+			console.style.width = "400px";
+			console.style.height = "450px";
+			
+			// ss fixes
+			console.style.position = "absolute";
+			console.style.top = "5px";
+			console.style.zIndex = "100";
+			
+			documentForm.appendChild(console);
+		}
+
+		console.value += message + "\n";
+
+		console.scrollTop = console.scrollHeight - console.clientHeight;
+	} catch (ex) {
+		alert("Exception: " + ex.name + " Message: " + ex.message);
+	}
+};
diff --git a/thirdparty/swfupload/swfupload.queue.js b/thirdparty/swfupload/swfupload.queue.js
new file mode 100755
index 00000000..69e619da
--- /dev/null
+++ b/thirdparty/swfupload/swfupload.queue.js
@@ -0,0 +1,98 @@
+/*
+	Queue Plug-in
+	
+	Features:
+		*Adds a cancelQueue() method for cancelling the entire queue.
+		*All queued files are uploaded when startUpload() is called.
+		*If false is returned from uploadComplete then the queue upload is stopped.
+		 If false is not returned (strict comparison) then the queue upload is continued.
+		*Adds a QueueComplete event that is fired when all the queued files have finished uploading.
+		 Set the event handler with the queue_complete_handler setting.
+		
+	*/
+
+var SWFUpload;
+if (typeof(SWFUpload) === "function") {
+	SWFUpload.queue = {};
+	
+	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
+		return function () {
+			if (typeof(oldInitSettings) === "function") {
+				oldInitSettings.call(this);
+			}
+			
+			this.queueSettings = {};
+			
+			this.queueSettings.queue_cancelled_flag = false;
+			this.queueSettings.queue_upload_count = 0;
+			
+			this.queueSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
+			this.queueSettings.user_upload_start_handler = this.settings.upload_start_handler;
+			this.settings.upload_complete_handler = SWFUpload.queue.uploadCompleteHandler;
+			this.settings.upload_start_handler = SWFUpload.queue.uploadStartHandler;
+			
+			this.settings.queue_complete_handler = this.settings.queue_complete_handler || null;
+		};
+	})(SWFUpload.prototype.initSettings);
+
+	SWFUpload.prototype.startUpload = function (fileID) {
+		this.queueSettings.queue_cancelled_flag = false;
+		this.callFlash("StartUpload", [fileID]);
+	};
+
+	SWFUpload.prototype.cancelQueue = function () {
+		this.queueSettings.queue_cancelled_flag = true;
+		this.stopUpload();
+		
+		var stats = this.getStats();
+		while (stats.files_queued > 0) {
+			this.cancelUpload();
+			stats = this.getStats();
+		}
+	};
+	
+	SWFUpload.queue.uploadStartHandler = function (file) {
+		var returnValue;
+		if (typeof(this.queueSettings.user_upload_start_handler) === "function") {
+			returnValue = this.queueSettings.user_upload_start_handler.call(this, file);
+		}
+		
+		// To prevent upload a real "FALSE" value must be returned, otherwise default to a real "TRUE" value.
+		returnValue = (returnValue === false) ? false : true;
+		
+		this.queueSettings.queue_cancelled_flag = !returnValue;
+
+		return returnValue;
+	};
+	
+	SWFUpload.queue.uploadCompleteHandler = function (file) {
+		var user_upload_complete_handler = this.queueSettings.user_upload_complete_handler;
+		var continueUpload;
+		
+		if (file.filestatus === SWFUpload.FILE_STATUS.COMPLETE) {
+			this.queueSettings.queue_upload_count++;
+		}
+
+		if (typeof(user_upload_complete_handler) === "function") {
+			continueUpload = (user_upload_complete_handler.call(this, file) === false) ? false : true;
+		} else if (file.filestatus === SWFUpload.FILE_STATUS.QUEUED) {
+			// If the file was stopped and re-queued don't restart the upload
+			continueUpload = false;
+		} else {
+			continueUpload = true;
+		}
+		
+		if (continueUpload) {
+			var stats = this.getStats();
+			if (stats.files_queued > 0 && this.queueSettings.queue_cancelled_flag === false) {
+				this.startUpload();
+			} else if (this.queueSettings.queue_cancelled_flag === false) {
+				this.queueEvent("queue_complete_handler", [this.queueSettings.queue_upload_count]);
+				this.queueSettings.queue_upload_count = 0;
+			} else {
+				this.queueSettings.queue_cancelled_flag = false;
+				this.queueSettings.queue_upload_count = 0;
+			}
+		}
+	};
+}
\ No newline at end of file
diff --git a/thirdparty/swfupload/swfupload.swf b/thirdparty/swfupload/swfupload.swf
new file mode 100755
index 0000000000000000000000000000000000000000..71ff884c33caf257d0d4bc101027d4b0a974d42e
GIT binary patch
literal 33328
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
E+CYH~eE<Le

literal 0
HcmV?d00001


From d7f04ec49b272d8ebf913b6006ffe3b71c3306ef Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 26 Nov 2009 03:22:35 +0000
Subject: [PATCH 017/483] MINOR Moved jsparty/tinymce_ssbuttons to
 cms/javascript/tinymce_ssbuttons

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93563 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 .../tinymce_ssbuttons/editor_plugin_src.js    | 113 ++++++++++++++++++
 javascript/tinymce_ssbuttons/img/flash.gif    | Bin 0 -> 241 bytes
 javascript/tinymce_ssbuttons/langs/de.js      |   5 +
 javascript/tinymce_ssbuttons/langs/en.js      |   5 +
 4 files changed, 123 insertions(+)
 create mode 100644 javascript/tinymce_ssbuttons/editor_plugin_src.js
 create mode 100644 javascript/tinymce_ssbuttons/img/flash.gif
 create mode 100644 javascript/tinymce_ssbuttons/langs/de.js
 create mode 100644 javascript/tinymce_ssbuttons/langs/en.js

diff --git a/javascript/tinymce_ssbuttons/editor_plugin_src.js b/javascript/tinymce_ssbuttons/editor_plugin_src.js
new file mode 100644
index 00000000..c97187f8
--- /dev/null
+++ b/javascript/tinymce_ssbuttons/editor_plugin_src.js
@@ -0,0 +1,113 @@
+(function() {
+	tinymce.PluginManager.requireLangPack("../../tinymce_ssbuttons");
+	var each = tinymce.each;
+
+	tinymce.create('tinymce.plugins.SSButtons', {
+		/**
+		 * Returns information about the plugin as a name/value array.
+		 * The current keys are longname, author, authorurl, infourl and version.
+		 *
+		 * @returns Name/value array containing information about the plugin.
+		 * @type Array 
+		 */
+		getInfo : function() {
+			return {
+				longname : 'Special buttons for SilverStripe CMS',
+				author : 'Sam Minnée',
+				authorurl : 'http://www.siverstripe.com/',
+				infourl : 'http://www.silverstripe.com/',
+				version : "1.0"
+			};
+		},
+
+
+		init : function(ed, url) {
+	    	/**
+	    	 * These map the action buttons to the IDs of the forms that they open/close
+	    	 */
+	    	forms = {
+	    	    'sslink' : 'Form_EditorToolbarLinkForm',
+	    	    'ssimage' : 'Form_EditorToolbarImageForm',
+	    	    'ssflash' : 'Form_EditorToolbarFlashForm'
+	    	};
+
+	        ed.addButton('sslink', {title : ed.getLang('tinymce_ssbuttons.insertlink'), cmd : 'sslink', 'class' : 'mce_link'}); 
+	        ed.addButton('ssimage', {title : ed.getLang('tinymce_ssbuttons.insertimage'), cmd : 'ssimage', 'class' : 'mce_image'}); 
+	        ed.addButton('ssflash', {title : ed.getLang('tinymce_ssbuttons.insertflash'), cmd : 'ssflash', 'class' : 'mce_flash', 'image': url + '/img/flash.gif'}); 
+
+            /**
+             * Show a side panel, hiding others
+             * If showCommand isn't set, then this will simply hide panels
+             */
+	    	function showSidePanel(showCommand, hideCommands) {
+	    	    hideCommands.each(function(command) { 
+	    	        ed.controlManager.setActive(command,false);
+	    	        Element.hide(forms[command]); 
+	    	    });
+
+                var showForm = null;
+                if(forms[showCommand]) {
+                    showForm = $(forms[showCommand]);
+                    showForm.toggle(ed);
+                }
+
+                if(!showForm || showForm.style.display == "none") {
+	        		ed.controlManager.setActive(showCommand, false);
+	        		// Can't use $('contentPanel'), as its in a different window
+	        		window.parent.document.getElementById('contentPanel').style.display = "none";
+	    		} else {
+	        		ed.controlManager.setActive(showCommand, true);
+	        		window.parent.document.getElementById('contentPanel').style.display = "block";
+	    		}
+	    		window.onresize();
+	    	}
+
+            ed.addCommand("ssclosesidepanel", function(ed) {
+                showSidePanel('', [ 'sslink', 'ssimage', 'ssflash' ]);
+            });
+
+		    ed.addCommand("sslink", function(ed) {
+		        showSidePanel('sslink', [ 'ssimage', 'ssflash' ]);
+			});
+
+			ed.addCommand("ssimage", function(ed) {
+		        showSidePanel('ssimage', [ 'sslink', 'ssflash' ]);
+			});
+
+			ed.addCommand("ssflash", function(ed) {
+		        showSidePanel('ssflash', [ 'ssimage', 'sslink' ]);
+			});
+
+			ed.onNodeChange.add(function(ed, o) {
+	    	    $('Form_EditorToolbarLinkForm').updateSelection(ed);
+			    $('Form_EditorToolbarLinkForm').respondToNodeChange(ed);
+	        });
+	        ed.onKeyUp.add(function(ed, o) {
+	    	    $('Form_EditorToolbarLinkForm').updateSelection(ed);
+		    });
+		
+			// resize image containers when the image is resized.
+			if(!tinymce.isOpera && !tinymce.isWebKit) ed.onMouseUp.add(function(ed, o) {
+				var node = ed.selection.getNode();
+				if(node.nodeName == 'IMG' && ed.dom.getParent(node, 'div')) {
+					// we have to delay the resize check here, as this event handler is called before the actual image
+					// resizing is done.
+					setTimeout(function() {
+						var ed        = tinyMCE.activeEditor, // we need to redeclare these for IE.
+							node      = ed.selection.getNode(),
+							container = ed.dom.getParent(node, 'div');
+
+						if(node.width && node.width != parseInt(ed.dom.getStyle(container, 'width'))) {
+							ed.dom.setStyle(container, 'width', parseInt(node.width));
+							ed.execCommand('mceRepaint');
+						}
+					}, 1);
+				}
+			});
+		}
+	});
+
+
+	// Adds the plugin class to the list of available TinyMCE plugins
+	tinymce.PluginManager.add("../../tinymce_ssbuttons", tinymce.plugins.SSButtons);
+})();
\ No newline at end of file
diff --git a/javascript/tinymce_ssbuttons/img/flash.gif b/javascript/tinymce_ssbuttons/img/flash.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cb192e6ceda8d19ad8e7d08dd1cfde0aa72ead2a
GIT binary patch
literal 241
zcmV<N01p30Nk%w1VH5xq0K*9Y0w_vuilWKS*;Z<L?e6iex5E`&f8F2Yf{&g3{rv|x
zTAiq{x5LtEeU6HouK)l5A^8LW000jFEC2ui02BZe000D@@X1N5y*NLz+8E73XoTQ2
zPEnkWFj@rD6vAN(MaR69(A0#W001z^1QkN-Ku9DA3WdRNF!3IR2Gf~vNCURRjDi4i
ziw2sFfuQ^jTm~SjAlw@6+L>OzlLa+Za}7>m0&NpCfJ0FQc3~<M2Q3YA3WR}G4hIzs
r9SQ&qC1C^&3>F7DE)S%o1)Qi1n@vxX46qnD4hRS-NE*Pw!4UvE=#^N(

literal 0
HcmV?d00001

diff --git a/javascript/tinymce_ssbuttons/langs/de.js b/javascript/tinymce_ssbuttons/langs/de.js
new file mode 100644
index 00000000..0948d6ff
--- /dev/null
+++ b/javascript/tinymce_ssbuttons/langs/de.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('de.tinymce_ssbuttons',{
+insertlink: 'Link einfügen',
+insertimage: 'Bild einfügen',
+insertflash: 'Flash Objekt einfügen'
+});
\ No newline at end of file
diff --git a/javascript/tinymce_ssbuttons/langs/en.js b/javascript/tinymce_ssbuttons/langs/en.js
new file mode 100644
index 00000000..91ed8fb0
--- /dev/null
+++ b/javascript/tinymce_ssbuttons/langs/en.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('en.tinymce_ssbuttons', {
+insertlink: 'Insert Link',
+insertimage: 'Insert Image',
+insertflash: 'Insert Flash Object'
+});
\ No newline at end of file

From b18fee9e0dfa8d59ca12d46ee23446827b0a5c75 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 26 Nov 2009 03:23:08 +0000
Subject: [PATCH 018/483] MINOR Moved jsparty/tinymce_ssmacron to
 cms/javascript/tinymce_ssmacron

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93564 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 .../tinymce_ssmacron/editor_plugin_src.js     |  40 ++++++++++
 javascript/tinymce_ssmacron/img/macron.png    | Bin 0 -> 3260 bytes
 javascript/tinymce_ssmacron/js/macron.js      |  71 ++++++++++++++++++
 javascript/tinymce_ssmacron/macron.htm        |  31 ++++++++
 4 files changed, 142 insertions(+)
 create mode 100644 javascript/tinymce_ssmacron/editor_plugin_src.js
 create mode 100644 javascript/tinymce_ssmacron/img/macron.png
 create mode 100644 javascript/tinymce_ssmacron/js/macron.js
 create mode 100644 javascript/tinymce_ssmacron/macron.htm

diff --git a/javascript/tinymce_ssmacron/editor_plugin_src.js b/javascript/tinymce_ssmacron/editor_plugin_src.js
new file mode 100644
index 00000000..2faef38c
--- /dev/null
+++ b/javascript/tinymce_ssmacron/editor_plugin_src.js
@@ -0,0 +1,40 @@
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('tinymce.plugins.InsertMacron', {
+		getInfo : function() {
+			return {
+				longname : 'Button to insert macrons',
+				author : 'Hamish Friedlander. Heavily based on charmap that comes with TinyMCE',
+				authorurl : 'http://www.siverstripe.com/',
+				infourl : 'http://www.silverstripe.com/',
+				version : "1.0"
+			};
+		},
+
+
+		init : function(ed, url) {
+	      // Register commands
+	      ed.addCommand('mceInsertMacron', function() {
+				ed.windowManager.open({
+					file : url + '/macron.htm',
+					width : 350 + parseInt(ed.getLang('advanced.charmap_delta_width', 0)),
+					height : 150 + parseInt(ed.getLang('advanced.charmap_delta_height', 0)),
+					inline : true
+				}, {
+					plugin_url : url
+				});
+			});
+	
+	      // Register buttons
+	      ed.addButton('ssmacron', {
+	        title : 'Insert a Macron',
+	        cmd : 'mceInsertMacron',
+	        image : url + '/img/macron.png'
+	      });
+		}
+	});
+
+	// Adds the plugin class to the list of available TinyMCE plugins
+	tinymce.PluginManager.add("../../tinymce_ssmacron", tinymce.plugins.InsertMacron);
+})();
diff --git a/javascript/tinymce_ssmacron/img/macron.png b/javascript/tinymce_ssmacron/img/macron.png
new file mode 100644
index 0000000000000000000000000000000000000000..80caf6dab1e5b64a1090f34c79faec373177839d
GIT binary patch
literal 3260
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

literal 0
HcmV?d00001

diff --git a/javascript/tinymce_ssmacron/js/macron.js b/javascript/tinymce_ssmacron/js/macron.js
new file mode 100644
index 00000000..d404520d
--- /dev/null
+++ b/javascript/tinymce_ssmacron/js/macron.js
@@ -0,0 +1,71 @@
+tinyMCEPopup.requireLangPack();
+
+var charmap = [
+	['&#256;',    '&#256;',  true, 'A - macron'],
+	['&#274;',    '&#274;',  true, 'E - macron'],
+	['&#298;',    '&#298;',  true, 'I - macron'], 
+	['&#332;',    '&#332;',  true, 'O - macron'], 
+	['&#362;',    '&#362;',  true, 'U - macron'], 
+	['&#257;',    '&#257;',  true, 'a - macron'], 
+	['&#275;',    '&#275;',  true, 'e - macron'], 
+	['&#299;',    '&#299;',  true, 'i - macron'], 
+	['&#333;',    '&#333;',  true, 'o - macron'], 
+	['&#363;',    '&#363;',  true, 'u - macron']
+];
+
+tinyMCEPopup.onInit.add(function() {
+	tinyMCEPopup.dom.setHTML('charmapView', renderCharMapHTML());
+});
+
+function renderCharMapHTML() {
+	var charsPerRow = 5, tdWidth=20, tdHeight=20, i;
+	var html = '<table border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth*charsPerRow) + '"><tr height="' + tdHeight + '">';
+	var cols=-1;
+
+	for (i=0; i<charmap.length; i++) {
+		if (charmap[i][2]==true) {
+			cols++;
+			html += ''
+				+ '<td class="charmap">'
+				+ '<a onmouseover="previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');" onfocus="previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');" href="javascript:void(0)" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + '">'
+				+ charmap[i][1]
+				+ '</a></td>';
+			if ((cols+1) % charsPerRow == 0)
+				html += '</tr><tr height="' + tdHeight + '">';
+		}
+	 }
+
+	if (cols % charsPerRow > 0) {
+		var padd = charsPerRow - (cols % charsPerRow);
+		for (var i=0; i<padd-1; i++)
+			html += '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap">&nbsp;</td>';
+	}
+
+	html += '</tr></table>';
+
+	return html;
+}
+
+function insertChar(chr) {
+	tinyMCEPopup.execCommand('mceInsertContent', false, '&#' + chr + ';');
+
+	// Refocus in window
+	if (tinyMCEPopup.isWindow)
+		window.focus();
+
+	tinyMCEPopup.editor.focus();
+	tinyMCEPopup.close();
+}
+
+function previewChar(codeA, codeB, codeN) {
+	var elmV = document.getElementById('codeV');
+	var elmN = document.getElementById('codeN');
+
+	if (codeA=='#160;') {
+		elmV.innerHTML = '__';
+	} else {
+		elmV.innerHTML = '&' + codeA;
+	}
+
+	elmN.innerHTML = codeN;
+}
diff --git a/javascript/tinymce_ssmacron/macron.htm b/javascript/tinymce_ssmacron/macron.htm
new file mode 100644
index 00000000..1fc769e5
--- /dev/null
+++ b/javascript/tinymce_ssmacron/macron.htm
@@ -0,0 +1,31 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>Insert a Macron</title>
+   <script type="text/javascript" src="../tiny_mce/tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/macron.js"></script>
+</head>
+<body id="charmap" style="display:none">
+<table align="center" border="0" cellspacing="0" cellpadding="2">
+    <tr>
+        <td colspan="2" class="title">Insert a Macron</td>
+    </tr>
+    <tr>
+        <td id="charmapView" align="left" valign="top">
+			<!-- Chars will be rendered here -->
+        </td>
+        <td width="100" align="center" valign="top">
+            <table border="0" cellpadding="0" cellspacing="0" width="100" style="height:100px">
+                <tr>
+                    <td id="codeV">&nbsp;</td>
+                </tr>
+                <tr>
+                    <td id="codeN">&nbsp;</td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>
+
+</body>
+</html>

From 1c28f6588249701d4f56bbae23cbe2683e7ce0f5 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 26 Nov 2009 03:26:45 +0000
Subject: [PATCH 019/483] MINOR Moved jsparty/highlight.js to
 cms/javascript/highlight.js

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93568 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/highlight.js | 236 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 236 insertions(+)
 create mode 100755 javascript/highlight.js

diff --git a/javascript/highlight.js b/javascript/highlight.js
new file mode 100755
index 00000000..cfc0b0c2
--- /dev/null
+++ b/javascript/highlight.js
@@ -0,0 +1,236 @@
+/*
+highlightImages_over * common/js/highlight.js
+ * Behaviour-abstracted highligher modul
+ *
+ * Usage: 
+ *  - include <script src="/common/js/highlight.js"></script> in the header of your file
+ *  - set the class of the container to "highlight".  The class will have ' over' appended to it on mouseover
+ *  - set the overSrc attribute on any images inside that, if you want them to be changed
+ */
+
+/*
+ * Initialise all items that have a highlight or highlightImages class with the appropriate event handlers
+ */
+ 
+ 
+function onload_init_highlight() {
+	var allElements = getAllElements();
+	var tester,j,overSrc;
+	
+	for(var i = 0;i<allElements.length;i++) {
+		if(allElements[i].className) {
+			tester = ' ' + allElements[i].className + ' ';
+			if(tester.indexOf(' highlight ') != -1) {
+				
+				addEventHandler(allElements[i], 'onmouseover', highlightImages_over);
+				addEventHandler(allElements[i], 'onmouseout', highlightImages_out);
+				addEventHandler(allElements[i], 'onfocus', highlightImages_over);
+				addEventHandler(allElements[i], 'onblur', highlightImages_out);
+				removeClass(allElements[i], 'highlight');
+
+				var allImages = allElements[i].getElementsByTagName('img');
+				for(j=0;j<allImages.length;j++) {
+					if(overSrc = allImages[j].getAttribute('overSrc')) {
+						allImages[j].normSrc = allImages[j].src;
+						allImages[j].overSrc = overSrc;
+						preload(allImages[j].overSrc);
+					
+					} else if(_IMAGE_HIGHLIGHT_REWRITING.length > 0) {
+						overSrc = allImages[j].src;
+						for(k=0;k<_IMAGE_HIGHLIGHT_REWRITING.length;k++)
+							overSrc = overSrc.replace(_IMAGE_HIGHLIGHT_REWRITING[k].norm,_IMAGE_HIGHLIGHT_REWRITING[k].over);
+						if(overSrc != allImages[j].src) {
+							allImages[j].normSrc = allImages[j].src;
+							allImages[j].overSrc = overSrc;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+/*
+ * Highlight handlers
+ */
+function highlightImages_over() {
+	var el = this;
+//	if(el.id) document.getElementById('SearchField').document.getElementById('SearchField').innerHTML += "Over: " + el.id + "<BR>";
+
+	// Reset any timer that may exist
+	if(el.timer != null) {
+		clearTimeout(el.timer);
+		try {
+			delete el.timer; 
+		} catch(er) {}
+	}
+	
+	// Class
+	if(el) {
+		addClass(el, 'over');
+		removeClass(el, 'stale');
+	
+		if(el.parentNode) {
+			el.parentNode.highlightedChild = el;
+			addClass(el.parentNode,'childOver');
+		}
+	}
+	
+	// Images
+	var allImages = el.getElementsByTagName('img');
+	for(var j=0;j<allImages.length;j++) {
+		
+		if(allImages[j].overSrc){ allImages[j].src = allImages[j].overSrc; }
+	}
+	
+	if(el.old_onmouseover) el.old_onmouseover();
+}
+
+var _HIGHLIGHTED_OBJECTS = Array();
+
+var _DEFAULT_UNHIGHLIGHT_DELAY = Array();
+function setUnhighlightDelay(val, classOrId) {
+	if(classOrId == null) classOrId = 'default';
+	_DEFAULT_UNHIGHLIGHT_DELAY[classOrId] = val;
+}
+
+
+function highlightImages_out(idx) {
+	var unhighlightDelay, nextIdx;
+
+	// idx can be passed by a call from setTimeout().  Hurrah for delayed unhighlighting
+	if(parseInt(idx) > 0) {
+		var el = _HIGHLIGHTED_OBJECTS[idx];
+		delete _HIGHLIGHTED_OBJECTS[idx];
+		unhighlightDelay = null;
+		
+	} else {
+		var el = this;
+		if(el && el.getAttribute) {
+			unhighlightDelay = el.getAttribute("unhighlightDelay");
+			if(unhighlightDelay == null) {
+				if(_DEFAULT_UNHIGHLIGHT_DELAY[el.parentNode.className]) unhighlightDelay = _DEFAULT_UNHIGHLIGHT_DELAY[el.parentNode.className];
+				else if(_DEFAULT_UNHIGHLIGHT_DELAY[el.parentNode.id]) unhighlightDelay = _DEFAULT_UNHIGHLIGHT_DELAY[el.parentNode.id];
+				else if(_DEFAULT_UNHIGHLIGHT_DELAY['default']) unhighlightDelay = _DEFAULT_UNHIGHLIGHT_DELAY['default'];
+			}
+		}
+	}
+	
+	if(unhighlightDelay) {
+		nextIdx = _HIGHLIGHTED_OBJECTS.length;
+		if(nextIdx == 0) nextIdx = 1;
+		_HIGHLIGHTED_OBJECTS[nextIdx] = el;
+		el.timer = setTimeout("highlightImages_out(" + nextIdx + ")", unhighlightDelay);		
+		
+	} else {
+		// Class
+		if(el) {
+			removeClass(el, 'over');
+			removeClass(el, 'stale');
+	
+	
+			if(el.parentNode) {
+				if(!el.parentNode.highlightedChild || el == el.parentNode.highlightedChild) {
+					removeClass(el.parentNode,'childOver');
+					el.parentNode.highlightedChild = null;
+				}
+			}
+		
+			// Images
+			var allImages = document.getElementsByTagName('img');
+			for(var j=0;j<allImages.length;j++) {
+				if(allImages[j].normSrc) allImages[j].src = allImages[j].normSrc;
+			}
+			
+			// Stale
+			if(el.getAttribute) {
+				var staleDelay = parseInt(el.getAttribute("staleDelay"));
+				if(staleDelay > 0) {
+					nextIdx = _HIGHLIGHTED_OBJECTS.length;
+					_HIGHLIGHTED_OBJECTS[nextIdx] = el;
+					el.timer = setTimeout("highlightImages_makeStale(" + nextIdx + ")", staleDelay);
+				}
+			}
+
+			if(el.old_onmouseout) el.old_onmouseout();
+
+		}
+	}
+
+}
+
+// Add the stale class to the given item
+function highlightImages_makeStale(idx) {
+	var el = _HIGHLIGHTED_OBJECTS[idx];
+	delete _HIGHLIGHTED_OBJECTS[idx];
+	addClass(el, 'stale');
+}
+
+/*
+ * Preload the given image
+ */
+ 
+var _PRELOADED_IMAGES = Array();
+function preload(filename) {
+	var i = new Image;
+	i.src = filename;
+	_PRELOADED_IMAGES[_PRELOADED_IMAGES.length] = i;
+}
+
+//go to the specified page.
+//Works for nested elements. Always calls the most nested.
+//Includes Bubble hack for mozilla
+
+var pagelocation;
+function go(url){
+	if(pagelocation == null){
+		window.location=url;
+		pagelocation = url;
+     }
+}
+
+
+
+/*
+ * This function will show or hide a div when you 
+ * pass it a element ID
+ * Created by sgow added @ 16-09-2004
+ */
+
+/* variables needed */
+var showDiv;
+var oldDiv = 1;
+
+function toggleDiv( el ){
+	if(oldDiv == 1){
+	//the first time you call this function
+		if(showDiv = document.getElementById(el)) {
+			showDiv.style.display = "block";
+			oldDiv = showDiv;
+		}
+	}
+	else{
+		showDiv = document.getElementById(el);
+		if( showDiv && showDiv == oldDiv ){
+			if(oldDiv.style.display == "none"){	showDiv.style.display = "block";}
+			else { showDiv.style.display = "none";}
+			oldDiv = showDiv;
+			// if its the same div as before, hide the same div, unless its the first time you use the function
+		}else{
+			oldDiv.style.display = "none";
+			showDiv.style.display = "block";
+			oldDiv = showDiv;
+			// if its a different div, hide the first one, and show the second one
+		}
+	}
+}
+
+var _IMAGE_HIGHLIGHT_REWRITING = Array();
+function setImageHighlightRewriting(normVal, overVal) {
+	_IMAGE_HIGHLIGHT_REWRITING[_IMAGE_HIGHLIGHT_REWRITING.length] = {
+		'norm' : normVal, 'over' : overVal
+	}
+}
+
+
+appendLoader(onload_init_highlight);

From 928529d04b5bc859119a30b6e2e1437413ac7584 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 26 Nov 2009 03:27:06 +0000
Subject: [PATCH 020/483] MINOR Moved jsparty/hover.js to
 cms/javascript/hover.js

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93569 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/hover.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100755 javascript/hover.js

diff --git a/javascript/hover.js b/javascript/hover.js
new file mode 100755
index 00000000..6e75349e
--- /dev/null
+++ b/javascript/hover.js
@@ -0,0 +1,12 @@
+function hover_over() {
+	Element.addClassName(this, 'over');
+}
+function hover_out() {
+	Element.removeClassName(this, 'over');
+}
+
+hover_behaviour = {
+	onmouseover : hover_over,
+	onmouseout : hover_out
+}
+

From ce3365d095ad206c48b4c53cd86ab79a0908fc4a Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 26 Nov 2009 05:08:34 +0000
Subject: [PATCH 021/483] MINOR Updated paths from jsparty to
 sapphire/thirdparty, cms/thirdparty and cms/javascript

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93612 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php                        |  22 ++---
 code/CMSMain.php                           |   6 +-
 code/ImageEditor.php                       |   6 +-
 code/LeftAndMain.php                       | 110 ++++++++++-----------
 code/ModelAdmin.php                        |   8 +-
 code/SecurityAdmin.php                     |   2 +-
 code/sitefeatures/PageCommentInterface.php |   4 +-
 css/cms_left.css                           |   4 +-
 css/silverstripe.tabs.css                  |   2 +-
 javascript/Upload.js                       |   2 +-
 javascript/tinymce_ssmacron/macron.htm     |   2 +-
 templates/Includes/ModelAdmin_left.ss      |   4 +-
 12 files changed, 82 insertions(+), 90 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 30846a4e..9c22aa8f 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -86,7 +86,7 @@ class AssetAdmin extends LeftAndMain {
 
 		Requirements::javascript(CMS_DIR . "/javascript/CMSMain_upload.js");
 		Requirements::javascript(CMS_DIR . "/javascript/Upload.js");
-		Requirements::javascript(THIRDPARTY_DIR . "/SWFUpload/swfupload.js");
+		Requirements::javascript(CMS_DIR . "/thirdparty/swfupload/swfupload.js");
 		
 		Requirements::javascript(THIRDPARTY_DIR . "/greybox/AmiJS.js");
 		Requirements::javascript(THIRDPARTY_DIR . "/greybox/greybox.js");
@@ -97,9 +97,9 @@ class AssetAdmin extends LeftAndMain {
 		Requirements::customScript(<<<JS
 			_TREE_ICONS = {};
 			_TREE_ICONS['Folder'] = {
-					fileIcon: 'jsparty/tree/images/page-closedfolder.gif',
-					openFolderIcon: 'jsparty/tree/images/page-openfolder.gif',
-					closedFolderIcon: 'jsparty/tree/images/page-closedfolder.gif'
+					fileIcon: 'sapphire/javascript/tree/images/page-closedfolder.gif',
+					openFolderIcon: 'sapphire/javascript/tree/images/page-openfolder.gif',
+					closedFolderIcon: 'sapphire/javascript/tree/images/page-closedfolder.gif'
 			};
 JS
 		);
@@ -111,14 +111,14 @@ JS
 	function uploadiframe() {
 		Requirements::clear();
 		
-		Requirements::javascript(THIRDPARTY_DIR . "/prototype.js");
-		Requirements::javascript(THIRDPARTY_DIR . "/loader.js");
-		Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js");
-		Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js");
-		Requirements::javascript(THIRDPARTY_DIR . "/layout_helpers.js");
+		Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js");
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.js');
+		Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js");
+		Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js");
+		Requirements::javascript(SAPPHIRE_DIR . "/javascript/layout_helpers.js");
 		Requirements::javascript(CMS_DIR . "/javascript/LeftAndMain.js");
-		Requirements::javascript(THIRDPARTY_DIR . "/multifile/multifile.js");
-		Requirements::css(THIRDPARTY_DIR . "/multifile/multifile.css");
+		Requirements::javascript(CMS_DIR . "/thirdparty/multifile/multifile.js");
+		Requirements::css(CMS_DIR . "/thirdparty/multifile/multifile.css");
 		Requirements::css(CMS_DIR . "/css/typography.css");
 		Requirements::css(CMS_DIR . "/css/layout.css");
 		Requirements::css(CMS_DIR . "/css/cms_left.css");
diff --git a/code/CMSMain.php b/code/CMSMain.php
index 72486c50..0aa78bf7 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -989,9 +989,9 @@ JS;
 	function canceldraftchangesdialog() {
 		Requirements::clear();
 		Requirements::css(CMS_DIR . 'css/dialog.css');
-		Requirements::javascript(THIRDPARTY_DIR . '/prototype.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js');
 		Requirements::javascript(CMS_DIR . '/javascript/dialog.js');
 
 		$message = _t('CMSMain.COPYPUBTOSTAGE',"Do you really want to copy the published content to the stage site?");
diff --git a/code/ImageEditor.php b/code/ImageEditor.php
index b0cdd2ed..4825e6f7 100644
--- a/code/ImageEditor.php
+++ b/code/ImageEditor.php
@@ -22,7 +22,7 @@ class ImageEditor extends Controller {
 	*/ 
 	public function index() {
 		Requirements::clear();
-		Requirements::javascript(THIRDPARTY_DIR . '/prototype.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js');
 		Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/scriptaculous.js');
 		Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/Utils.js');
 		//Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/ImageHistory.js');
@@ -37,8 +37,8 @@ class ImageEditor extends Controller {
 		Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/ImageEditor.js');
 		Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/DocumentBody.js');
 
-		Requirements::javascript(THIRDPARTY_DIR . '/loader.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js');
 		Requirements::javascript(CMS_DIR . '/javascript/LeftAndMain.js');
 		Requirements::css(CMS_DIR . 'css/ImageEditor/ImageEditor.css');
 
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 0ce67833..2edd4724 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -164,23 +164,23 @@ class LeftAndMain extends Controller {
 			// Firebug is a useful console for debugging javascript
 			// Its available as a Firefox extension or a javascript library
 			// for easy inclusion in other browsers (just append ?debug_firebug=1 to the URL)
-			Requirements::javascript(THIRDPARTY_DIR . '/firebug/firebug-lite-compressed.js');
+			Requirements::javascript(THIRDPARTY_DIR . '/firebug-lite/firebug.js');
 		} else {
 			// By default, we include fake-objects for all firebug calls
 			// to avoid javascript errors when referencing console.log() etc in javascript code
-			Requirements::javascript(THIRDPARTY_DIR . '/firebug/firebugx.js');
+			Requirements::javascript(THIRDPARTY_DIR . '/firebug-lite/firebugx.js');
 		}
 		
-		Requirements::javascript(THIRDPARTY_DIR . '/prototype.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js');
 		Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery_improvements.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/livequery/jquery.livequery.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/jquery_improvements.js');
+		Requirements::javascript(THIRDPARTY_DIR . '/behaviour/behaviour.js');
+		Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js');
 		Requirements::javascript(SAPPHIRE_DIR . '/javascript/core/jquery.ondemand.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/loader.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/hover.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/layout_helpers.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.js');
+		Requirements::javascript(CMS_DIR . '/javascript/hover.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/layout_helpers.js');
 		Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang');
 		Requirements::add_i18n_javascript(CMS_DIR . '/javascript/lang');
 		
@@ -192,7 +192,7 @@ class LeftAndMain extends Controller {
 		Requirements::javascript(THIRDPARTY_DIR . '/greybox/AmiJS.js');
 		Requirements::javascript(THIRDPARTY_DIR . '/greybox/greybox.js');
 		
-		Requirements::javascript(THIRDPARTY_DIR . '/tree/tree.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/tree/tree.js');
 		Requirements::css(THIRDPARTY_DIR . '/tree/tree.css');
 		
 		Requirements::javascript(CMS_DIR . '/javascript/LeftAndMain.js');
@@ -224,56 +224,56 @@ class LeftAndMain extends Controller {
 		Requirements::combine_files(
 			'assets/base.js',
 			array(
-				'jsparty/prototype.js',
-				'jsparty/behaviour.js',
-				'jsparty/prototype_improvements.js',
-				'jsparty/jquery/jquery.js',
-				'jsparty/jquery/plugins/livequery/jquery.livequery.js',
-				'jsparty/jquery/plugins/effen/jquery.fn.js',
-				'sapphire/javascript/core/jquery.ondemand.js',
-				'jsparty/jquery/jquery_improvements.js',
-				'jsparty/firebug/firebugx.js',
-				'sapphire/javascript/i18n.js',
+				THIRDPARTY_DIR . '/prototype/prototype.js',
+				THIRDPARTY_DIR . '/behaviour/behaviour.js',
+				SAPPHIRE_DIR . '/javascript/prototype_improvements.js',
+				THIRDPARTY_DIR .'/jquery/jquery.js',
+				THIRDPARTY_DIR .'/jquery-livequery/jquery.livequery.js',
+				THIRDPARTY_DIR . '/jquery-effen/jquery.fn.js',
+				SAPPHIRE_DIR . '/javascript/core/jquery.ondemand.js',
+				SAPPHIRE_DIR . '/javascript/jquery_improvements.js',
+				THIRDPARTY_DIR . '/firebug-lite/firebugx.js',
+				SAPPHIRE_DIR . '/javascript/i18n.js',
 			)
 		);
 
 		Requirements::combine_files(
 			'assets/leftandmain.js',
 			array(
-				'jsparty/loader.js',
-				'jsparty/hover.js',
-				'jsparty/layout_helpers.js',
-				'jsparty/scriptaculous/effects.js',
-				'jsparty/scriptaculous/dragdrop.js',
-				'jsparty/scriptaculous/controls.js',
-				'jsparty/greybox/AmiJS.js',
-				'jsparty/greybox/greybox.js',
-				'cms/javascript/LeftAndMain.js',
-				'cms/javascript/LeftAndMain_left.js',
-				'cms/javascript/LeftAndMain_right.js',
-				'jsparty/tree/tree.js',
-				'jsparty/tabstrip/tabstrip.js',
-				'jsparty/SWFUpload/swfupload.js',
-				'cms/javascript/Upload.js',
-				'cms/javascript/TinyMCEImageEnhancement.js',
-				'sapphire/javascript/TreeSelectorField.js',
-		 		'cms/javascript/ThumbnailStripField.js',
+				SAPPHIRE_DIR . '/javascript/loader.js',
+				CMS_DIR . '/javascript/hover.js',
+				SAPPHIRE_DIR . '/javascript/layout_helpers.js',
+				THIRDPARTY_DIR . '/scriptaculous/effects.js',
+				THIRDPARTY_DIR . '/scriptaculous/dragdrop.js',
+				THIRDPARTY_DIR . '/scriptaculous/controls.js',
+				THIRDPARTY_DIR . '/greybox/AmiJS.js',
+				THIRDPARTY_DIR . '/greybox/greybox.js',
+				CMS_DIR . '/javascript/LeftAndMain.js',
+				CMS_DIR . '/javascript/LeftAndMain_left.js',
+				CMS_DIR . '/javascript/LeftAndMain_right.js',
+				SAPPHIRE_DIR . '/javascript/tree/tree.js',
+				THIRDPARTY_DIR . '/tabstrip/tabstrip.js',
+				CMS_DIR . '/thirdparty/swfupload/swfupload.js',
+				CMS_DIR . '/javascript/Upload.js',
+				CMS_DIR . '/javascript/TinyMCEImageEnhancement.js',
+				SAPPHIRE_DIR . '/javascript/TreeSelectorField.js',
+		 		CMS_DIR . '/javascript/ThumbnailStripField.js',
 			)
 		);
 
 		Requirements::combine_files(
 			'assets/cmsmain.js',
 			array(
-				'cms/javascript/CMSMain.js',
-				'cms/javascript/CMSMain_left.js',
-				'cms/javascript/CMSMain_right.js',
-				'cms/javascript/SideTabs.js',
-				'cms/javascript/SideReports.js',
-				'cms/javascript/LangSelector.js',
-				'cms/javascript/TranslationTab.js',
-				'jsparty/calendar/calendar.js',
-				'jsparty/calendar/lang/calendar-en.js',
-				'jsparty/calendar/calendar-setup.js',
+				CMS_DIR . '/javascript/CMSMain.js',
+				CMS_DIR . '/javascript/CMSMain_left.js',
+				CMS_DIR . '/javascript/CMSMain_right.js',
+				CMS_DIR . '/javascript/SideTabs.js',
+				CMS_DIR . '/javascript/SideReports.js',
+				CMS_DIR . '/javascript/LangSelector.js',
+				CMS_DIR . '/javascript/TranslationTab.js',
+				THIRDPARTY_DIR . '/calendar/calendar.js',
+				THIRDPARTY_DIR . '/calendar/lang/calendar-en.js',
+				THIRDPARTY_DIR . '/calendar/calendar-setup.js',
 			)
 		);
 
@@ -1073,7 +1073,6 @@ JS;
 	 */
 	public function CMSVersion() {
 		$sapphireVersionFile = file_get_contents('../sapphire/silverstripe_version');
-		$jspartyVersionFile = file_get_contents('../jsparty/silverstripe_version');
 		$cmsVersionFile = file_get_contents('../cms/silverstripe_version');
 
 		if(strstr($sapphireVersionFile, "/sapphire/trunk")) {
@@ -1083,13 +1082,6 @@ JS;
 			$sapphireVersion = ($matches) ? $matches[1] : null;
 		}
 
-		if(strstr($jspartyVersionFile, "/jsparty/trunk")) {
-			$jspartyVersion = "trunk";
-		} else {
-			preg_match("/jsparty\/(?:(?:branches)|(?:tags))(?:\/rc)?\/([A-Za-z0-9._-]+)\/silverstripe_version/", $jspartyVersionFile, $matches);
-			$jspartyVersion = ($matches) ? $matches[1] : null;
-		}
-
 		if(strstr($cmsVersionFile, "/cms/trunk")) {
 			$cmsVersion = "trunk";
 		} else {
@@ -1097,10 +1089,10 @@ JS;
 			$cmsVersion = ($matches) ? $matches[1] : null;
 		}
 
-		if($sapphireVersion == $jspartyVersion && $jspartyVersion == $cmsVersion) {
+		if($sapphireVersion == $cmsVersion) {
 			return $sapphireVersion;
 		}	else {
-			return "cms: $cmsVersion, sapphire: $sapphireVersion, jsparty: $jspartyVersion";
+			return "cms: $cmsVersion, sapphire: $sapphireVersion";
 		}
 	}
 
diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index 027dce0d..cd7920f7 100755
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -144,12 +144,12 @@ abstract class ModelAdmin extends LeftAndMain {
 		Requirements::css(CMS_DIR . '/css/silverstripe.tabs.css'); // follows the jQuery UI theme conventions
 		
 		Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/livequery/jquery.livequery.js');
+		Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js');
 		//Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.core.js');
 		//Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.tabs.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/form/jquery.form.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/effen/jquery.fn.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery_improvements.js');
+		Requirements::javascript(THIRDPARTY_DIR . '/jquery-form/jquery.form.js');
+		Requirements::javascript(THIRDPARTY_DIR . '/jquery-effen/jquery.fn.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/jquery_improvements.js');
 		Requirements::javascript(CMS_DIR . '/javascript/ModelAdmin.js');
 	}
 	
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index cb374f7a..0ce89819 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -35,7 +35,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 	public function init() {
 		parent::init();
 
-		Requirements::javascript(THIRDPARTY_DIR . "/hover.js");
+		Requirements::javascript(CMS_DIR . '/javascript/hover.js');
 		Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/controls.js");
 
 		// needed for MemberTableField (Requirements not determined before Ajax-Call)
diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index c34d82bc..127191b2 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -188,8 +188,8 @@ class PageCommentInterface extends RequestHandler {
 		
 		// Shall We use AJAX?
 		if(self::$use_ajax_commenting) {
-			Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js');
-			Requirements::javascript(THIRDPARTY_DIR . '/prototype.js');
+			Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js');
+			Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js');
 			Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js');
 			Requirements::javascript(CMS_DIR . '/javascript/PageCommentInterface.js');
 		}
diff --git a/css/cms_left.css b/css/cms_left.css
index 61421725..a2255c12 100644
--- a/css/cms_left.css
+++ b/css/cms_left.css
@@ -326,7 +326,7 @@ ul.tree span.a.children.Root span.c {
 }
 
 ul.tree span.a.Root span.c {
-	background: url(../../jsparty/tree/images/i-bottom.gif) no-repeat scroll 0 50%;
+	background: url(../../sapphire/javascript/tree/images/i-bottom.gif) no-repeat scroll 0 50%;
 }
 
 ul#sitetree.tree ul {
@@ -334,7 +334,7 @@ ul#sitetree.tree ul {
 }
 ul#sitetree.tree ul ul {
 	padding-left: 16px;
-	background: url(../../jsparty/tree/images/i-repeater.gif) repeat-y scroll 0 50%;
+	background: url(../../sapphire/javascript/tree/images/i-repeater.gif) repeat-y scroll 0 50%;
 }
 
 
diff --git a/css/silverstripe.tabs.css b/css/silverstripe.tabs.css
index 0a5decb9..b3d095d7 100644
--- a/css/silverstripe.tabs.css
+++ b/css/silverstripe.tabs.css
@@ -5,7 +5,7 @@
  * the jQuery theme format
  *
  * @todo move generic tab styles into this file
- * @todo add to silverstripe specific branch of /jsparty/jquery/ui/themes
+ * @todo add to silverstripe specific branch of /sapphire/thirdparty/jquery/ui/themes
  */
  
 /* Caution! Ensure accessibility in print and other media types... */
diff --git a/javascript/Upload.js b/javascript/Upload.js
index 88227c49..a5b51400 100644
--- a/javascript/Upload.js
+++ b/javascript/Upload.js
@@ -74,7 +74,7 @@ Upload.prototype = {
 				button_window_mode : "transparent",
 				button_width : this.buttonWidth,
 				button_height : this.buttonHeight,
-				flash_url : 'jsparty/SWFUpload/swfupload.swf',	// Relative to this file
+				flash_url : 'cms/thirdparty/swfupload/swfupload.swf',	// Relative to this file
 				swfupload_loaded_handler: this.buildUI.bind(this),
 				debug: false,
 				preserve_relative_urls: true
diff --git a/javascript/tinymce_ssmacron/macron.htm b/javascript/tinymce_ssmacron/macron.htm
index 1fc769e5..7c270fd3 100644
--- a/javascript/tinymce_ssmacron/macron.htm
+++ b/javascript/tinymce_ssmacron/macron.htm
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<title>Insert a Macron</title>
-   <script type="text/javascript" src="../tiny_mce/tiny_mce_popup.js"></script>
+   <script type="text/javascript" src="../../thirdparty/tinymce/tiny_mce_popup.js"></script>
 	<script type="text/javascript" src="js/macron.js"></script>
 </head>
 <body id="charmap" style="display:none">
diff --git a/templates/Includes/ModelAdmin_left.ss b/templates/Includes/ModelAdmin_left.ss
index b5450a42..006ba86d 100755
--- a/templates/Includes/ModelAdmin_left.ss
+++ b/templates/Includes/ModelAdmin_left.ss
@@ -1,5 +1,5 @@
-<% require javascript(jsparty/tabstrip/tabstrip.js) %>
-<% require css(jsparty/tabstrip/tabstrip.css) %>
+<% require javascript(sapphire/thirdparty/tabstrip/tabstrip.js) %>
+<% require css(sapphire/thirdparty/tabstrip/tabstrip.css) %>
 
 <div id="LeftPane">
 	<div id="SearchForm_holder" class="leftbottom">		

From 0dfa69146dc5ee5cc9fd77b4b972556055bd7593 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Thu, 26 Nov 2009 22:11:38 +0000
Subject: [PATCH 022/483] MINOR Removed MemberTableField deprecated methods for
 adding fields - this should be done by implementing summary fields on a
 Member decorator instead

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93662 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberTableField.php | 48 ++++++---------------------------------
 1 file changed, 7 insertions(+), 41 deletions(-)

diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index 5191dc0c..2324a336 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -37,50 +37,16 @@ class MemberTableField extends ComplexTableField {
 	 * @var int 
 	 */ 
 	public static $page_size = 20; 
- 	
-	/**
-	 * @deprecated 2.4. See {@link MemberTableField->addPermissions()}
-	 */
-	private static $addedPermissions = array();
-	
-	/**
-	 * @deprecated 2.4: See {@link MemberTableField->addMembershipFields()}
-	 */
-	private static $addedFields = array();
 
 	/**
-	 * @deprecated 2.4: See {@link MemberTableField->addMembershipFields()}
+	 * Constructor method for MemberTableField.
+	 * 
+	 * @param Controller $controller Controller class which created this field
+	 * @param string $name Name of the field (e.g. "Members")
+	 * @param mixed $group Can be the ID of a Group instance, or a Group instance itself
+	 * @param DataObjectSet $members Optional set of Members to set as the source items for this field
+	 * @param boolean $hidePassword Hide the password field or not in the summary?
 	 */
-	private static $addedCsvFields = array();
-
-	/**
-	 * @deprecated 2.4. Set permissions using setPermissions(Array) on
-	 * the MemberTableField object.
-	 */
-	public static function addPermissions($addingPermissionList) {
-		trigger_error('MemberTableField::addPermissions() is deprecated. Please set permissions using setPermissions(Array) on the MemberTableField object.', E_USER_NOTICE);
-		self::$addedPermissions = $addingPermissionList;
-	}
-	
-	/**
-	 * @deprecated 2.4: Please use a DataObjectDecorator, implementing updateSummaryFields
-	 * to alter the table overview fields instead.
-	 */
-	public static function addMembershipFields($addingFieldList, $addingCsvFieldList = null) {
-		trigger_error('MemberTableField::addMembershipFields() is deprecated. Please implement updateSummaryFields() on a Member decorator instead.', E_USER_NOTICE);
-		self::$addedFields = $addingFieldList;
-		$addingCsvFieldList == null ? self::$addedCsvFields = $addingFieldList : self::$addedCsvFields = $addingCsvFieldList;
-  	}
-
-  	/**
-  	 * Constructor method for MemberTableField.
-  	 * 
-  	 * @param Controller $controller Controller class which created this field
-  	 * @param string $name Name of the field (e.g. "Members")
-  	 * @param mixed $group Can be the ID of a Group instance, or a Group instance itself
-  	 * @param DataObjectSet $members Optional set of Members to set as the source items for this field
-  	 * @param boolean $hidePassword Hide the password field or not in the summary?
-  	 */
 	function __construct($controller, $name, $group, $members = null, $hidePassword = true) {
 		$sourceClass = self::$data_class;
 		$SNG_member = singleton($sourceClass);

From 84a591bf2b22b5acaee83e29de98ff86c4883cf2 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Thu, 26 Nov 2009 22:38:04 +0000
Subject: [PATCH 023/483] BUGFIX Removed calls to Translatable::is_enabled()
 since it's deprecated, replaced with Object::has_extension('SiteTree',
 'Translatable') instead

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93676 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php     | 2 +-
 code/LeftAndMain.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 0aa78bf7..7f9b78da 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -384,7 +384,7 @@ JS;
 			}
 
 			// Don't open a page from a different locale
-			if($record && Translatable::is_enabled() && $record->Locale && $record->Locale != Translatable::get_current_locale()) {
+			if($record && Object::has_extension('SiteTree', 'Translatable') && $record->Locale && $record->Locale != Translatable::get_current_locale()) {
 				$record = null;
 			}
 
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 2edd4724..56d210f6 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -112,7 +112,7 @@ class LeftAndMain extends Controller {
 		);
 		
 		// set reading lang
-		if(Translatable::is_enabled() && !Director::is_ajax()) {
+		if(Object::has_extension('SiteTree', 'Translatable') && !Director::is_ajax()) {
 			Translatable::choose_site_locale(array_keys(Translatable::get_existing_content_languages('SiteTree')));
 		}
 

From 5a1a947b9277599faf0bb233a37eed8e3a103d29 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Thu, 26 Nov 2009 22:50:26 +0000
Subject: [PATCH 024/483] MINOR Removed ContentNegotiator::disable() since it's
 disabled by default (in AssetAdmin)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93681 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 9c22aa8f..77197fc2 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -127,9 +127,6 @@ JS
 		if(isset($data['ID']) && $data['ID'] != 'root') $folder = DataObject::get_by_id("Folder", $data['ID']);
 		else $folder = singleton('Folder');
 		
-		// Don't modify the output of the template, or it will become invalid
-		ContentNegotiator::disable();
-		
 		return array( 'CanUpload' => $folder->canEdit());
 	}
 	

From 49b720ffd046f1953d664f8e8ed7470064a4f15b Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Thu, 26 Nov 2009 23:09:05 +0000
Subject: [PATCH 025/483] API CHANGE: removed deprecated extend calls (r93632).
 API CHANGE: removed fieldExists(). Use hasField() (r93633). API CHANGE
 removed listOfFields() (r93647). API CHANGE: removed Tag() and URL() from
 Image. Use getTag() and getURL(). BUGFIX: updated Image.php to use getTag()
 (r93639, r93646). API CHANGE: removed val(). Use XML_val() (r93650). API
 CHANGE: removed $add_action. Use singlar_name or lang tables (r93658). API
 CHANGE: removed ConfirmedFormAction (r93674). API CHANGE: removed ajax_render
 on CTF (r93679).

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93685 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 4 ----
 code/SideReport.php  | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 56d210f6..3a082f0b 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -277,10 +277,6 @@ class LeftAndMain extends Controller {
 			)
 		);
 
-		// DEPRECATED 2.3: Use init()
-		$dummy = null;
-		$this->extend('augmentInit', $dummy);
-		
 		$dummy = null;
 		$this->extend('init', $dummy);
 	}
diff --git a/code/SideReport.php b/code/SideReport.php
index 35c1a1f4..e9edab34 100755
--- a/code/SideReport.php
+++ b/code/SideReport.php
@@ -48,7 +48,7 @@ abstract class SideReport extends Object {
 					if(is_string($fieldSource)) {
 						$val .= Convert::raw2xml($record->$fieldSource);
 					} else {
-						$val .= $record->val($fieldSource[0], $fieldSource[1]);
+						$val .= $record->XML_val($fieldSource[0], $fieldSource[1]);
 					}
 					
 					if(isset($fieldInfo['newline']) && $fieldInfo['newline']) $result .= "<br>";

From a12f9c987f8110e7823406d931343804e29ef22b Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Thu, 26 Nov 2009 23:13:45 +0000
Subject: [PATCH 026/483] API CHANGE: removed deprecated
 LeftAndMain::add_menu_item. Use CMSMenu::add_menu_item()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93687 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 3a082f0b..89932529 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -346,14 +346,6 @@ class LeftAndMain extends Controller {
 		$parts = split('</?form[^>]*>', $html);
 		return $parts[sizeof($parts)-2];
 	}
-	
-	/**
-	 * @deprecated Use CMSMenu::add_menu_item();
-	 */
-	static function add_menu_item($code, $menuTitle, $url, $controllerClass = null, $priority = -1) {
-		user_error("LeftAndMain::add_menu_item is deprecated; use CMSMenu::add_menu_item", E_USER_NOTICE);
-		return CMSMenu::add_menu_item($code, $menuTitle, $url, $controllerClass, $priority);
-	}
 
 	//------------------------------------------------------------------------------------------//
 	// Main UI components

From 4e9d2c3663a925d3b521ef9451f83fe4e68c9e3a Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Thu, 26 Nov 2009 23:56:00 +0000
Subject: [PATCH 027/483] BUGFIX Removed code that relied on deprecated
 functions in MemberTableField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93707 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberTableField.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index 2324a336..7a17292e 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -68,10 +68,6 @@ class MemberTableField extends ComplexTableField {
 			$this->group = DataObject::get_by_id('Group', $_REQUEST['ctf'][$this->Name()]["ID"]);
 		}
 
-		foreach(self::$addedFields as $key => $value) {
-			$fieldList[$key] = $value;
-		}
-
 		if(!$hidePassword) {
 			$fieldList["SetPassword"] = "Password"; 
 		}

From 064aa648861e11fbe20e8ba8563c5a598d699e33 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 27 Nov 2009 01:42:24 +0000
Subject: [PATCH 028/483] MINOR Javascript variable declarations in
 CMSMain_left.js (#4741)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93762 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/CMSMain_left.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js
index 7ea18dcf..136f75a6 100755
--- a/javascript/CMSMain_left.js
+++ b/javascript/CMSMain_left.js
@@ -9,6 +9,7 @@ _NEW_PAGES = new Array();
 /**
  * Add page action
  */
+var addpageclass;
 addpageclass = Class.create();
 addpageclass.applyTo('#addpage');
 addpageclass.prototype = {
@@ -95,11 +96,12 @@ addpageclass.prototype = {
 	showAddPageError: function(response) {
 		errorMessage(ss.i18n._t('CMSMAIN.ERRORADDINGPAGE'), response);
 	}
-}
+};
 
 /**
  * Search button click action
  */
+var searchclass;
 searchclass = Class.create();
 searchclass.applyTo('#search');
 searchclass.prototype = {
@@ -118,7 +120,7 @@ searchclass.prototype = {
 	}
 }
 
-SiteTreeFilter = Class.create();
+var SiteTreeFilter = Class.create();
 SiteTreeFilter.applyTo('#siteTreeFilterList');
 SiteTreeFilter.prototype = {
 	initialize: function () {
@@ -156,7 +158,7 @@ SiteTreeFilter.prototype = {
 /**
  * Control the site tree filter
  */
-SiteTreeFilterForm = Class.create();
+var SiteTreeFilterForm = Class.create();
 SiteTreeFilterForm.applyTo('form#search_options');
 SiteTreeFilterForm.prototype = {
 	initialize: function() {
@@ -230,7 +232,7 @@ SiteTreeFilterForm.prototype = {
 /**
  * Add Criteria Drop-down onchange action which allows more criteria to be shown
  */
-SiteTreeFilterAddCriteria = Class.create();
+var SiteTreeFilterAddCriteria = Class.create();
 SiteTreeFilterAddCriteria.applyTo('#SiteTreeFilterAddCriteria');
 SiteTreeFilterAddCriteria.prototype = {
 	onchange : function() {
@@ -244,7 +246,7 @@ SiteTreeFilterAddCriteria.prototype = {
 /**
  * Batch Actions button click action
  */
-batchactionsclass = Class.create();
+var batchactionsclass = Class.create();
 batchactionsclass.applyTo('#batchactions');
 batchactionsclass.prototype = {
 	
@@ -415,7 +417,7 @@ Behaviour.register({
 /**
  * Publish selected pages action
  */
-publishpage = Class.create();
+var publishpage = Class.create();
 publishpage.applyTo('#batchactions_options');
 publishpage.prototype = {
 	onsubmit : function() {
@@ -457,12 +459,13 @@ publishpage.prototype = {
 
 		return false;
 	}
-}
+};
 
 
 /**
  * Delete selected pages action
  */
+var deletepage;
 deletepage = Class.create();
 deletepage.applyTo('#Form_DeleteItemsForm');
 deletepage.prototype = {
@@ -511,7 +514,7 @@ deletepage.prototype = {
 
 		return false;
 	}
-}
+};
 
 /**
  * Tree context menu

From 8eddb47344d75ed3a6be204550284ad38f30a406 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Fri, 27 Nov 2009 02:11:34 +0000
Subject: [PATCH 029/483] API CHANGE: removed Director::Link(). Use
 Controller::join_links() instead

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93785 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php    | 4 ++--
 code/LeftAndMain.php   | 2 +-
 code/SecurityAdmin.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 77197fc2..8647a040 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -454,7 +454,7 @@ JS;
 		$siteTreeList = $obj->getChildrenAsUL(
 			'',
 			'"<li id=\"record-$child->ID\" class=\"$child->class" . $child->markingClasses() .  ($extraArg->isCurrentPage($child) ? " current" : "") . "\">" . ' .
-			'"<a href=\"" . Director::link(substr($extraArg->Link(),0,-1), "show", $child->ID) . "\" class=\"" . ($child->hasChildFolders() ? " contents" : "") . "\" >" . $child->TreeTitle() . "</a>" ',
+			'"<a href=\"" . Controller::join_links(substr($extraArg->Link(),0,-1), "show", $child->ID) . "\" class=\"" . ($child->hasChildFolders() ? " contents" : "") . "\" >" . $child->TreeTitle() . "</a>" ',
 			$this,
 			true,
 			"ChildFolders"
@@ -482,7 +482,7 @@ JS;
 		$results = $obj->getChildrenAsUL(
 			'',
 			'"<li id=\"record-$child->ID\" class=\"$child->class" . $child->markingClasses() .  ($extraArg->isCurrentPage($child) ? " current" : "") . "\">" . ' .
-			'"<a href=\"" . Director::link(substr($extraArg->Link(),0,-1), "show", $child->ID) . "\" >" . $child->TreeTitle() . "</a>" ',
+			'"<a href=\"" . Controller::join_links(substr($extraArg->Link(),0,-1), "show", $child->ID) . "\" >" . $child->TreeTitle() . "</a>" ',
 			$this,
 			true
 		);
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 89932529..91f67406 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -474,7 +474,7 @@ class LeftAndMain extends Controller {
 		// getChildrenAsUL is a flexible and complex way of traversing the tree
 		$titleEval = '
 					"<li id=\"record-$child->ID\" class=\"" . $child->CMSTreeClasses($extraArg) . "\">" .
-					"<a href=\"" . Director::link(substr($extraArg->Link(),0,-1), "show", $child->ID) . "\" class=\"" . $child->CMSTreeClasses($extraArg) . "\" title=\"' . _t('LeftAndMain.PAGETYPE','Page type: ') . '".$child->class."\" >" . 
+					"<a href=\"" . Controller::join_links(substr($extraArg->Link(),0,-1), "show", $child->ID) . "\" class=\"" . $child->CMSTreeClasses($extraArg) . "\" title=\"' . _t('LeftAndMain.PAGETYPE','Page type: ') . '".$child->class."\" >" . 
 					($child->TreeTitle()) . 
 					"</a>"
 ';
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 0ce89819..c8c0ca0a 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -237,7 +237,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		$siteTreeList = $obj->getChildrenAsUL(
 			'',
 			'"<li id=\"record-$child->ID\" class=\"$child->class " . ($child->Locked ? " nodelete" : "") . $child->markingClasses() . ($extraArg->isCurrentPage($child) ? " current" : "") . "\">" . ' .
-			'"<a href=\"" . Director::link(substr($extraArg->Link(),0,-1), "show", $child->ID) . "\" >" . $child->TreeTitle() . "</a>" ',
+			'"<a href=\"" . Controller::join_links(substr($extraArg->Link(),0,-1), "show", $child->ID) . "\" >" . $child->TreeTitle() . "</a>" ',
 			$this,
 			true
 		);	

From 0b115b27239a56b569316cb1baec654973bc270f Mon Sep 17 00:00:00 2001
From: Normann Lou <normann@silverstripe.com>
Date: Mon, 30 Nov 2009 01:02:10 +0000
Subject: [PATCH 030/483] BUGFIX: fix bug that can't find tinymce_ssbuttons
 under sapphire/thirdpaty. this is a change merged from r92853
 http://open.silverstripe.org/changeset/92853#file3

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93950 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 _config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_config.php b/_config.php
index e3088201..92bf86af 100644
--- a/_config.php
+++ b/_config.php
@@ -42,7 +42,7 @@ HtmlEditorConfig::get('cms')->setOptions(array(
 ));
 
 
-HtmlEditorConfig::get('cms')->enablePlugins('media', '../../tinymce_ssbuttons', 'fullscreen');
+HtmlEditorConfig::get('cms')->enablePlugins('media', '../../../../cms/tinymce_ssbuttons', 'fullscreen');
 			
 HtmlEditorConfig::get('cms')->insertButtonsBefore('formatselect', 'styleselect');
 HtmlEditorConfig::get('cms')->insertButtonsBefore('advcode', 'ssimage', 'ssflash', 'sslink', 'unlink', 'anchor', 'separator' );

From cbda994c675b6be81e4333395f5d21a6cb79b4cd Mon Sep 17 00:00:00 2001
From: Normann Lou <normann@silverstripe.com>
Date: Mon, 30 Nov 2009 01:11:18 +0000
Subject: [PATCH 031/483] BUGFIX: fix bug that can't find tinymce_ssbuttons
 under sapphire/thirdpaty. this is a change merged from r92853
 http://open.silverstripe.org/changeset/92853#file3

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93955 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 _config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_config.php b/_config.php
index 92bf86af..fc4e6a00 100644
--- a/_config.php
+++ b/_config.php
@@ -42,7 +42,7 @@ HtmlEditorConfig::get('cms')->setOptions(array(
 ));
 
 
-HtmlEditorConfig::get('cms')->enablePlugins('media', '../../../../cms/tinymce_ssbuttons', 'fullscreen');
+HtmlEditorConfig::get('cms')->enablePlugins('media', '../../../../cms/javascript/tinymce_ssbuttons', 'fullscreen');
 			
 HtmlEditorConfig::get('cms')->insertButtonsBefore('formatselect', 'styleselect');
 HtmlEditorConfig::get('cms')->insertButtonsBefore('advcode', 'ssimage', 'ssflash', 'sslink', 'unlink', 'anchor', 'separator' );

From 406c4816a49b487346d55947f2cc30aa75a33e4c Mon Sep 17 00:00:00 2001
From: Normann Lou <normann@silverstripe.com>
Date: Mon, 30 Nov 2009 01:28:04 +0000
Subject: [PATCH 032/483] BUGFIX: Changed paths according to moved thirdparty
 dependencies. This bit change is merged from r92613.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93965 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/tinymce_ssbuttons/editor_plugin_src.js | 2 +-
 javascript/tinymce_ssmacron/editor_plugin_src.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/javascript/tinymce_ssbuttons/editor_plugin_src.js b/javascript/tinymce_ssbuttons/editor_plugin_src.js
index c97187f8..df591457 100644
--- a/javascript/tinymce_ssbuttons/editor_plugin_src.js
+++ b/javascript/tinymce_ssbuttons/editor_plugin_src.js
@@ -109,5 +109,5 @@
 
 
 	// Adds the plugin class to the list of available TinyMCE plugins
-	tinymce.PluginManager.add("../../tinymce_ssbuttons", tinymce.plugins.SSButtons);
+	tinymce.PluginManager.add("../../../../cms/javascript/tinymce_ssbuttons", tinymce.plugins.SSButtons);
 })();
\ No newline at end of file
diff --git a/javascript/tinymce_ssmacron/editor_plugin_src.js b/javascript/tinymce_ssmacron/editor_plugin_src.js
index 2faef38c..c6e80dc3 100644
--- a/javascript/tinymce_ssmacron/editor_plugin_src.js
+++ b/javascript/tinymce_ssmacron/editor_plugin_src.js
@@ -36,5 +36,5 @@
 	});
 
 	// Adds the plugin class to the list of available TinyMCE plugins
-	tinymce.PluginManager.add("../../tinymce_ssmacron", tinymce.plugins.InsertMacron);
+	tinymce.PluginManager.add("../../../../cms/javascript/tinymce_ssmacron", tinymce.plugins.InsertMacron);
 })();

From 429de60890eed0ea90fc746caff6bb2e09568857 Mon Sep 17 00:00:00 2001
From: Normann Lou <normann@silverstripe.com>
Date: Mon, 30 Nov 2009 02:19:21 +0000
Subject: [PATCH 033/483] BUGFIX: add proper language link broken

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93984 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/tinymce_ssbuttons/editor_plugin_src.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/tinymce_ssbuttons/editor_plugin_src.js b/javascript/tinymce_ssbuttons/editor_plugin_src.js
index df591457..7abc479b 100644
--- a/javascript/tinymce_ssbuttons/editor_plugin_src.js
+++ b/javascript/tinymce_ssbuttons/editor_plugin_src.js
@@ -1,5 +1,5 @@
 (function() {
-	tinymce.PluginManager.requireLangPack("../../tinymce_ssbuttons");
+	tinymce.PluginManager.requireLangPack("../../../../cms/javascript/tinymce_ssbuttons");
 	var each = tinymce.each;
 
 	tinymce.create('tinymce.plugins.SSButtons', {

From a8fdcbd967c55259b32e49a9790550ad85d64c21 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 30 Nov 2009 21:51:17 +0000
Subject: [PATCH 034/483] ENHANCEMENT Loading of tinymce_ssbuttons plugin via
 relative paths in HtmlEditorConfig rather than using the plugin name as a
 path spec  (see r94060) API CHANGE Changed cms/javascript/tinymce_ssbuttons
 plugin name to "ssbuttons" (see r94060) API CHANGE Changed
 cms/javascript/tinymce_ssmacron plugin name to "ssmacron" (see r94060)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94062 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 _config.php                                       | 3 ++-
 javascript/tinymce_ssbuttons/editor_plugin_src.js | 4 ++--
 javascript/tinymce_ssmacron/editor_plugin_src.js  | 5 ++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/_config.php b/_config.php
index fc4e6a00..962298c6 100644
--- a/_config.php
+++ b/_config.php
@@ -42,7 +42,8 @@ HtmlEditorConfig::get('cms')->setOptions(array(
 ));
 
 
-HtmlEditorConfig::get('cms')->enablePlugins('media', '../../../../cms/javascript/tinymce_ssbuttons', 'fullscreen');
+HtmlEditorConfig::get('cms')->enablePlugins('media', 'fullscreen');
+HtmlEditorConfig::get('cms')->enablePlugins(array('ssbuttons' => '../../../cms/javascript/tinymce_ssbuttons/editor_plugin_src.js'));
 			
 HtmlEditorConfig::get('cms')->insertButtonsBefore('formatselect', 'styleselect');
 HtmlEditorConfig::get('cms')->insertButtonsBefore('advcode', 'ssimage', 'ssflash', 'sslink', 'unlink', 'anchor', 'separator' );
diff --git a/javascript/tinymce_ssbuttons/editor_plugin_src.js b/javascript/tinymce_ssbuttons/editor_plugin_src.js
index 7abc479b..e67bed5f 100644
--- a/javascript/tinymce_ssbuttons/editor_plugin_src.js
+++ b/javascript/tinymce_ssbuttons/editor_plugin_src.js
@@ -1,5 +1,5 @@
 (function() {
-	tinymce.PluginManager.requireLangPack("../../../../cms/javascript/tinymce_ssbuttons");
+	tinymce.PluginManager.requireLangPack("ssbuttons");
 	var each = tinymce.each;
 
 	tinymce.create('tinymce.plugins.SSButtons', {
@@ -109,5 +109,5 @@
 
 
 	// Adds the plugin class to the list of available TinyMCE plugins
-	tinymce.PluginManager.add("../../../../cms/javascript/tinymce_ssbuttons", tinymce.plugins.SSButtons);
+	tinymce.PluginManager.add("ssbuttons", tinymce.plugins.SSButtons);
 })();
\ No newline at end of file
diff --git a/javascript/tinymce_ssmacron/editor_plugin_src.js b/javascript/tinymce_ssmacron/editor_plugin_src.js
index c6e80dc3..9b2a8121 100644
--- a/javascript/tinymce_ssmacron/editor_plugin_src.js
+++ b/javascript/tinymce_ssmacron/editor_plugin_src.js
@@ -1,6 +1,9 @@
 (function() {
 	var each = tinymce.each;
 
+	/**
+	 * Load via: HtmlEditorConfig::get('cms')->enablePlugins(array('ssmacron', '../../../../cms/javascript/tinymce_ssmacron'))
+	 */
 	tinymce.create('tinymce.plugins.InsertMacron', {
 		getInfo : function() {
 			return {
@@ -36,5 +39,5 @@
 	});
 
 	// Adds the plugin class to the list of available TinyMCE plugins
-	tinymce.PluginManager.add("../../../../cms/javascript/tinymce_ssmacron", tinymce.plugins.InsertMacron);
+	tinymce.PluginManager.add("ssmacron", tinymce.plugins.InsertMacron);
 })();

From 6ce7428bdc61459a419dc9285c660f4409bdff24 Mon Sep 17 00:00:00 2001
From: Normann Lou <normann@silverstripe.com>
Date: Tue, 1 Dec 2009 02:57:52 +0000
Subject: [PATCH 035/483] BUGFIX: if SecurityAdmin::add_hidden_permission() is
 called more than once, the later one is never added due two array operator
 "+"

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94100 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SecurityAdmin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index c8c0ca0a..743f8fd1 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -294,7 +294,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 	 */
 	static function add_hidden_permission($codes){
 		if(is_string($codes)) $codes = array($codes);
-		self::$hidden_permissions += $codes;
+		self::$hidden_permissions = array_merge(self::$hidden_permissions, $codes);
 	}
 	
 	/**

From dc76a9535711ea7505254d40b979a775872110da Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Tue, 1 Dec 2009 22:34:23 +0000
Subject: [PATCH 036/483] BUGFIX Fixed IE bug in ReportAdmin_left.js

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94170 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/ReportAdmin_left.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/ReportAdmin_left.js b/javascript/ReportAdmin_left.js
index 2664ac0e..4ca13fbe 100755
--- a/javascript/ReportAdmin_left.js
+++ b/javascript/ReportAdmin_left.js
@@ -50,6 +50,6 @@ function reloadSiteTree() {
 appendLoader(function () {
 	if($('sitetree')) {
 		var selectedNode = $('sitetree').getElementsByTagName('li')[1];
-		selectedNode.onselect();
+		//selectedNode.onselect();
 	}
 });
\ No newline at end of file

From d99445c01bc171b00f6359a577984dde68e737bb Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Wed, 2 Dec 2009 00:23:37 +0000
Subject: [PATCH 037/483] MINOR fixed widget area MINOR added select box
 listing anchors in text

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94198 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/WidgetAreaEditor.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/javascript/WidgetAreaEditor.js b/javascript/WidgetAreaEditor.js
index 213acdf3..35c1d199 100644
--- a/javascript/WidgetAreaEditor.js
+++ b/javascript/WidgetAreaEditor.js
@@ -109,6 +109,17 @@ WidgetAreaEditorClass.prototype = {
 	},
 	
 	addWidget: function(className, holder) {
+		
+		if ($('WidgetAreaEditor-'+holder).getAttribute('maxwidgets')) {
+			var maxCount = $('WidgetAreaEditor-'+holder).getAttribute('maxwidgets');
+			var count = $$('#usedWidgets-'+holder+' .Widget').length;
+			if (count > maxCount) {
+				alert('Sorry, you have reached the maximum number of widgets in this area');
+				return;
+			}
+		}
+		
+		
 		this.name = holder;
 		new Ajax.Request('Widget_Controller/EditableSegment/' + className, {
 			onSuccess : $('usedWidgets-'+holder).parentNode.parentNode.insertWidgetEditor.bind(this)
@@ -164,7 +175,7 @@ WidgetAreaEditorClass.prototype = {
 		WidgetTreeDropdownField.applyTo('div.usedWidgets .TreeDropdownField');
 		
 		
-		Sortable.create('usedWidgets-SideBar', {
+		Sortable.create('usedWidgets-'+this.name, {
 			tag: 'div',
 			handle: 'handle',
 			containment: ['availableWidgets-'+this.name, 'usedWidgets-'+this.name],

From 233690b24dfc5695d7d31928aa2e14f65050bdd2 Mon Sep 17 00:00:00 2001
From: Normann Lou <normann@silverstripe.com>
Date: Wed, 2 Dec 2009 05:20:13 +0000
Subject: [PATCH 038/483] BUGFIX: is tinyMCE is not loaded, we cannot call its
 function. This is specially important in a pop-up of ComplexTableField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94238 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/LeftAndMain.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index 5a1d2d82..687b1f7a 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -881,14 +881,16 @@ function nullConverter(url) {
 Behaviour.register({
     'textarea.htmleditor' : {
         initialize : function() {
-            tinyMCE.execCommand("mceAddControl", true, this.id);
-            this.isChanged = function() {
-                return tinyMCE.getInstanceById(this.id).isDirty();
-            }
-            this.resetChanged = function() {
-                inst = tinyMCE.getInstanceById(this.id);
-                if (inst) inst.startContent = tinymce.trim(inst.getContent({format : 'raw', no_events : 1}));
-            }
+            if(typeof tinyMCE != 'undefined'){
+				tinyMCE.execCommand("mceAddControl", true, this.id);
+	            this.isChanged = function() {
+	                return tinyMCE.getInstanceById(this.id).isDirty();
+	            }
+	            this.resetChanged = function() {
+	                inst = tinyMCE.getInstanceById(this.id);
+	                if (inst) inst.startContent = tinymce.trim(inst.getContent({format : 'raw', no_events : 1}));
+	            }
+			}
         }
     }
 })

From 2eea820daf95f179517919940b65323654c05530 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Thu, 3 Dec 2009 01:31:10 +0000
Subject: [PATCH 039/483] BUGFIX: Cleanup after aborted drag operation in
 Assets (#4735) (from r93071)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94319 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/AssetAdmin.js | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/javascript/AssetAdmin.js b/javascript/AssetAdmin.js
index 0a28abbe..a3f08fbf 100755
--- a/javascript/AssetAdmin.js
+++ b/javascript/AssetAdmin.js
@@ -164,7 +164,7 @@ Object.extend(Class, {
 var SubsDraggable = Class.create();
 
 SubsDraggable.prototype = Object.extend({}, Draggable.prototype);
-Class.superrise(SubsDraggable.prototype, ['initialize', 'startDrag', 'finishDrag'])
+Class.superrise(SubsDraggable.prototype, ['initialize', 'startDrag', 'finishDrag', 'endDrag'])
 Object.extend( SubsDraggable.prototype , {
 	initialize: function(event) {
 		this.super_initialize.apply(this, arguments);
@@ -198,6 +198,15 @@ Object.extend( SubsDraggable.prototype , {
 		}
 		this.super_startDrag(event);
 	},
+	endDrag: function(event) {
+		this.super_endDrag(event);
+		// Remove any remaining orphaned NumFilesIndicator spans
+		// See ticket #4735
+		var elts = $$('.NumFilesIndicator')
+		if (elts) {
+			elts.each(function(x){ Element.remove(x); });
+		}
+	},
 	finishDrag: function(event, success) {
 		this.super_finishDrag(event, success);
 	
@@ -348,7 +357,7 @@ FilesystemSyncClass.prototype = {
 /**
  * Delete folder action
  */
-deletefolder = {
+var deletefolder = {
 	button_onclick : function() {
 		if(treeactions.toggleSelection(this)) {
 			deletefolder.o1 = $('sitetree').observeMethod('SelectionChanged', deletefolder.treeSelectionChanged);
@@ -490,7 +499,15 @@ appendLoader(function () {
 	if($('deletepage')) {
 		$('deletepage').onclick = deletefolder.button_onclick;
 		$('deletepage').getElementsByTagName('button')[0].onclick = function() { return false; };
-		$('Form_DeleteItemsForm').onsubmit = deletefolder.form_submit;
+		// Prevent bug #4740, particularly with IE
+		Behaviour.register({
+			'#Form_DeleteItemsForm' : {
+				onsubmit: function(event) {
+					deletefolder.form_submit();
+					Event.stop(event);
+					}
+				}
+			});
 		Element.hide('Form_DeleteItemsForm');
 	}
 	

From f17dd0c37e7adc980cbda878cc8a82fa4f43e4da Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 3 Dec 2009 03:53:40 +0000
Subject: [PATCH 040/483] BUGFIX: Fix default inclusion of
 (theme|project)/css/editor.css into the WYSWIWYG editor.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94350 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 _config.php          |  2 --
 code/LeftAndMain.php | 13 +++++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/_config.php b/_config.php
index 962298c6..91ed9372 100644
--- a/_config.php
+++ b/_config.php
@@ -23,7 +23,6 @@ HtmlEditorConfig::get('cms')->setOptions(array(
 	'priority' => '50',
 	'mode' => 'none',
 	'language' => i18n::get_tinymce_lang(),
-	'content_css' => 'cms/css/editor.css, '.(SSViewer::current_theme() ? THEMES_DIR . "/" . SSViewer::current_theme() : project()) . "/css/editor.css",
 
 	'body_class' => 'typography',
 	'document_base_url' => Director::absoluteBaseURL(),
@@ -41,7 +40,6 @@ HtmlEditorConfig::get('cms')->setOptions(array(
 	'extended_valid_elements' => "img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|usemap],iframe[src|name|width|height|align|frameborder|marginwidth|marginheight|scrolling],object[width|height|data|type],param[name|value],map[class|name|id],area[shape|coords|href|target|alt]"
 ));
 
-
 HtmlEditorConfig::get('cms')->enablePlugins('media', 'fullscreen');
 HtmlEditorConfig::get('cms')->enablePlugins(array('ssbuttons' => '../../../cms/javascript/tinymce_ssbuttons/editor_plugin_src.js'));
 			
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 91f67406..f95d96e8 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -153,6 +153,19 @@ class LeftAndMain extends Controller {
 
 		// Set the members html editor config
 		HtmlEditorConfig::set_active(Member::currentUser()->getHtmlEditorConfigForCMS());
+		
+		
+		// Set default values in the config if missing.  These things can't be defined in the config
+		// file because insufficient information exists when that is being processed
+		$htmlEditorConfig = HtmlEditorConfig::get_active();
+		if(!$htmlEditorConfig->getOption('content_css')) {
+			$cssFiles = 'cms/css/editor.css';
+			if(SSViewer::current_theme()) $cssFiles .= ', ' . THEMES_DIR . "/" . SSViewer::current_theme() . '/css/editor.css';
+			else if(project()) $cssFiles .= ', ' . project() . '/css/editor.css';
+
+			$htmlEditorConfig->setOption('content_css', $cssFiles);
+		}
+		
 
 		Requirements::css(CMS_DIR . '/css/typography.css');
 		Requirements::css(CMS_DIR . '/css/layout.css');

From 419da4d67c399a5b1b956e1458c320eb06b1a1a5 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Mon, 7 Dec 2009 05:13:02 +0000
Subject: [PATCH 041/483] MINOR: Added a first cut of some cucumber tests for
 the CMS

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94529 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/cuke/create-page.feature                | 115 ++++++++++++++++++
 tests/cuke/delete-page.feature                |  40 ++++++
 tests/cuke/login.feature                      |  36 ++++++
 tests/cuke/logout.feature                     |  20 +++
 tests/cuke/step_definitions/content.rb        |  92 ++++++++++++++
 tests/cuke/step_definitions/front-end.rb      |  21 ++++
 tests/cuke/step_definitions/general.rb        |  25 ++++
 tests/cuke/step_definitions/log-in.rb         |  25 ++++
 tests/cuke/step_definitions/security.rb       |  23 ++++
 tests/test_windmill/__init__.py               |   1 -
 tests/test_windmill/test_admin/__init__.py    |  24 ----
 .../test_admin/test_CreateGroup.py            |  26 ----
 12 files changed, 397 insertions(+), 51 deletions(-)
 create mode 100644 tests/cuke/create-page.feature
 create mode 100644 tests/cuke/delete-page.feature
 create mode 100644 tests/cuke/login.feature
 create mode 100644 tests/cuke/logout.feature
 create mode 100644 tests/cuke/step_definitions/content.rb
 create mode 100644 tests/cuke/step_definitions/front-end.rb
 create mode 100644 tests/cuke/step_definitions/general.rb
 create mode 100644 tests/cuke/step_definitions/log-in.rb
 create mode 100644 tests/cuke/step_definitions/security.rb
 delete mode 100644 tests/test_windmill/__init__.py
 delete mode 100644 tests/test_windmill/test_admin/__init__.py
 delete mode 100644 tests/test_windmill/test_admin/test_CreateGroup.py

diff --git a/tests/cuke/create-page.feature b/tests/cuke/create-page.feature
new file mode 100644
index 00000000..7bfe5179
--- /dev/null
+++ b/tests/cuke/create-page.feature
@@ -0,0 +1,115 @@
+Feature: Page creation in the CMS
+	As a content author
+	I want to create a basic text page at the root level and save it
+	So that our website can be kept up to date
+	
+	Scenario: An initial change to page name modifies key fields
+		Given I log into the CMS as admin
+		And I create a new page
+		When I put "Change Name" in the "Page name" field
+		And I click on the "Metadata" tab
+		Then the "URLSegment" field is "change-name"
+		And the "MetaTitle" field is "Change Name"
+		When I click on the "Main" tab
+		Then the "Navigation label" field is "Change Name"
+		
+	Scenario: Every subsequent change does not change the key fields
+		Given I save the page
+		And I cancel pop-ups
+		When I put "Change Again" in the "Page name" field
+		And I click on the "Metadata" tab
+		Then the "URLSegment" field is "change-name"
+		And the "MetaTitle" field is "Change Name"
+		When I click on the "Main" tab
+		Then the "Navigation label" field is "Change Name"
+		Then I delete the current page
+		
+	Scenario: I can populate all fields
+		And I create a new page	
+		And I set "Page name" to "Populate name"
+		And I set "Navigation label" to "Populate label"
+		And I click on the "Metadata" tab
+		And I set "URLSegment" to "populate-url-segment"
+		And I set "MetaTitle" to "Populate MetaTitle"
+		And I set "Description" to "Populate Description"
+		And I set "Keywords" to "Populate Keywords"
+		And I set "Custom Meta Tags" to "Populate Custom Meta Tags"
+		And I click on the "Main" tab
+		And I save the page
+		When I load the "Populate label" page
+		Then the "Page name" field is "Populate name"
+		And the "Navigation label" field is "Populate label"
+		When I click on the "Metadata" tab
+		Then the "URLSegment" field is "populate-url-segment"
+		And the "MetaTitle" field is "Populate MetaTitle"
+		And the "Description" field is "Populate Description"
+		And the "Custom Meta Tags" field is "Populate Custom Meta Tags"
+		And I click on the "Main" tab
+		Then I delete the current page
+
+	Scenario: I can create 2 identical pages
+		When I create a new page
+		And I create a new page
+		Then there are 2 root pages with navigation label "New Page"
+		Then I delete the current page
+		And I load the "New Page" root-level page
+		Then I delete the current page
+
+	Scenario: Each change to page name changes the URL
+		When I create a new page
+		And I set "Page name" to "First Change"
+		And I click on the "Metadata" tab
+		Then the "URLSegment" field is "first-change"
+
+		When I confirm pop-ups
+		And I click on the "Main" tab
+		And I set "Page name" to "Second Change"
+		And I click on the "Metadata" tab
+		Then the "URLSegment" field is "second-change"
+
+		When I cancel pop-ups
+		And I click on the "Main" tab
+		And I set "Page name" to "Third Change"
+		And I click on the "Metadata" tab
+		Then the "URLSegment" field is "second-change"
+		And I click on the "Main" tab
+
+		Then I delete the current page
+
+	Scenario: Changes aren't saved if I cancel the warning
+		Given I create a new page
+		And I set "Page name" to "Change name"
+		When I confirm pop-ups to ignore the warning that their is unsaved content	
+		And I load the "New Page" page
+		Then the "Page name" field is "New Page"
+
+		Then I delete the current page
+		
+	Scenario: Page name and navigation label default to new page
+		Given I create a new page
+		Then the "Page name" field is "New Page"
+		And the "Navigation label" field is "New Page"
+
+		When I click on the "Metadata" tab
+		Then the "URLSegment" field is "new-page"
+		And the "MetaTitle" field is blank
+		And the "Description" field is blank
+		And the "Keywords" field is blank
+		And the "Custom Meta Tags" field is blank
+		And I click on the "Main" tab
+
+ 		Then I delete the current page
+
+	Scenario: The navigation label is displayed in the site tree
+		Given I create a new page
+		And I set "Navigation label" to "New Label"
+		And I save the page
+		When I load the "New Label" page
+		Then the "Navigation label" field is "New Label"
+
+	Scenario: If the navigation label is blanked out, it takes the value in the Page Name field
+		Given I set "Page name" to "Page Title"
+		When I set "Navigation label" to ""
+		And I save the page
+		And I load the "Page Title" page
+		Then the "Navigation label" field is "Page Title"
\ No newline at end of file
diff --git a/tests/cuke/delete-page.feature b/tests/cuke/delete-page.feature
new file mode 100644
index 00000000..d80aa2a0
--- /dev/null
+++ b/tests/cuke/delete-page.feature
@@ -0,0 +1,40 @@
+Feature: Page deletion in the CMS
+	As a content author
+	I want to delete pages in the CMS
+	So that out of date content can be removed
+	
+	Scenario: User can delete a page without making any changes
+		Given I log into the CMS as admin
+		And I create a new page
+		And I save the page
+		When I delete the current page
+		Then there are 0 root pages with navigation label "New Page"
+		
+	Scenario: A deleted page can't be viewed
+		Given I create a new page
+		And I save the page
+		When I delete the current page
+		And I log out
+		Then url new-page does not exist
+		
+	Scenario: A deleted URL can be re-used
+		Given I log into the CMS as admin
+		And I create a new page
+		And I click on the "Metadata" tab
+		And the "URLSegment" field is "new-page"
+		And I save the page
+		And I delete the current page
+		When I create a new page
+		And I click on the "Metadata" tab
+		Then the "URLSegment" field is "new-page"
+		
+		Then delete the current page
+		
+	Scenario: A deleted page doesn't appear after re-login
+		Given I create a new page
+		And I save the page
+		And I delete the current page
+		When I log out
+		And I log into the CMS as admin
+		Then there are 0 root pages with navigation label "New Page"
+	
\ No newline at end of file
diff --git a/tests/cuke/login.feature b/tests/cuke/login.feature
new file mode 100644
index 00000000..b9408434
--- /dev/null
+++ b/tests/cuke/login.feature
@@ -0,0 +1,36 @@
+Feature: Log in
+	As a CMS user
+	I want to security log into the CMS
+	So that I can make changes, knowing that other people can't.
+
+	Background:
+		Given I visit Security/logout
+	
+	Scenario: opening admin asks user log-in
+		And I visit admin
+		Then I am sent to Security/login
+
+	Scenario: valid login
+		When I fill out the log in form with user "admin" and password "password"
+		Then I see "Your are logged in as"
+
+	Scenario: no password login
+		When I fill out the log in form with user "admin" and password "password"
+		Then I see "That doesn't seem to be the right e-mail address or password."
+
+	Scenario: no user login
+		When I fill out the log in form with user "" and password "password"
+		Then I see "That doesn't seem to be the right e-mail address or password."
+
+	Scenario: invalid login, getting right 2nd time
+		Given I visit admin
+		And I put "admin" in the "Email" field
+		And I put "wrongpassword" in the "Password" field
+		And I click the "Log in" button
+		Then I am sent to Security/login 
+		And I see "That doesn't seem to be the right e-mail address or password."
+		Given I put "admin" in the "Email" field
+		And I put "password" in the "Password" field
+		And I click the "Log in" button
+		Then I am sent to admin
+
diff --git a/tests/cuke/logout.feature b/tests/cuke/logout.feature
new file mode 100644
index 00000000..1a5b4368
--- /dev/null
+++ b/tests/cuke/logout.feature
@@ -0,0 +1,20 @@
+Feature: Log out
+	As a CMS user
+	I want to be able to log and be locked out of the CMS
+	So that I can know other people can't edit my site
+	
+	Scenario: Log out from CMS
+		Given I log into the CMS as admin
+		And I click the "log out" link
+		When I visit admin/
+		Then I see "Enter your username and password to access the CMS."
+		When I visit admin/assets/
+		Then I see "Enter your username and password to access the CMS."
+		When I visit admin/comments/
+		Then I see "Enter your username and password to access the CMS."
+		When I visit admin/reports/
+		Then I see "Enter your username and password to access the CMS."
+		When I visit admin/security/
+		Then I see "Enter your username and password to access the CMS."
+		When I visit admin/subsites/
+		Then I see "Enter your username and password to access the CMS."
\ No newline at end of file
diff --git a/tests/cuke/step_definitions/content.rb b/tests/cuke/step_definitions/content.rb
new file mode 100644
index 00000000..7bcbad4f
--- /dev/null
+++ b/tests/cuke/step_definitions/content.rb
@@ -0,0 +1,92 @@
+## FIXTURE GENERATON
+
+Given /^the site can be edited by the "([^\"]*)" group$/i do |arg1|
+  pending
+end
+
+Given /^the "([^\"]*)" page can be edited by the "([^\"]*)" group$/i do |arg1, arg2|
+  pending
+end
+
+Given /a "(.*)" page called "(.*)" as a child of "(.*)"/i do |type, title, parent|
+    Given "I click the \"#{parent}\" link"
+    And 'I click the "Create" button'
+    And "I select \"#{type}\" from \"PageType\""
+    And 'I click the "Go" button'
+    And 'I click the "Create" button'
+    And "I put \"#{title}\" in the \"Title\" field"
+    And "I click \"Save\""
+end
+
+Given /^a top\-level "(.*)" page called "(.*)"$/i do |type,title|
+  Given "I click the \"Site Content\" link"
+  And "I create a page "
+  And "I put \"#{title}\" in the \"Title\" field"
+  And "I click \"Save\""
+end
+
+## ACTIONS
+
+Given /load the "(.*)" page/i do |title|
+  Given "I click the \"#{title}\" link"
+end
+
+Given /I load the "(.*)" root-level page/ do |nav|
+  @browser.link(:xpath, "//ul[@id='sitetree']/li/ul/li//a[.='#{nav}']").click
+end
+
+Given /I load the root node/ do
+  Given 'I click the "admin/0" link'
+end
+
+Given /create a new page$/i do
+  Given "I create a new page using template \"Page\""
+end
+
+Given /create a new page using template \"(.*)\"/i do |type|
+  Given 'I load the root node (ajax)'
+  And 'I click the "Create" button'
+  And "I select \"#{type}\" from \"PageType\""
+  And 'I click the "Go" button (ajax)'
+  And 'I click the "Create" button'
+end
+
+Given /save the page$/i do
+  Given 'I click the "Form_EditForm_action_save" button (ajax)'
+end
+
+Given /delete the current page$/i do
+  Given 'I click the "Delete from the draft site" button'
+end
+
+
+## ASSERTIONS
+
+Given /There are ([0-9]+) root pages with navigation label "(.*)"/i do |count, nav|
+  @browser.elements_by_xpath("//ul[@id='sitetree']/li/ul/li//a[.='#{nav}']").count.should == count.to_i
+end
+
+Given /The "(.*)" page does not exist/i do | page|
+  @browser.link(:title, title).should empty?
+  #|''get url''|@{root_url}PAGE|
+  #|''title''|'''is not'''|PAGE|
+end
+
+
+## Current Page
+
+Given /^The (.*) of the current page is "([^\"]*)"$/i do |arg1|
+  pending
+end
+
+Then /^The current page is editable$/i do
+  pending
+end
+
+Then /^The current page is read-only$/i do
+  pending
+end
+
+Then /^The current page is at the top\-level$/i do
+  pending
+end
diff --git a/tests/cuke/step_definitions/front-end.rb b/tests/cuke/step_definitions/front-end.rb
new file mode 100644
index 00000000..93633dff
--- /dev/null
+++ b/tests/cuke/step_definitions/front-end.rb
@@ -0,0 +1,21 @@
+##
+## Step definitions for testing the front-end site
+##
+
+
+Given /I go to the draft site/ do
+  pending
+  Given 'I click the "viewStageSite" link'
+#  |''element''|//a[@id="viewStageSite"]|''exists''|
+#  |''checking timeout''|@{fast_checking_timeout}|
+#  |''optionally''|''element''|//a[@id="viewStageSite"][@style=""]|''exists''|
+# |''checking timeout''|@{checking_timeout}|
+#  |''click''|viewStageSite|
+end
+
+Given /I close window and go back to clean state/ do
+#  |''close''|
+#  |''select initial window''|
+#  |default frame|
+#  |''go to root node''|
+end  
diff --git a/tests/cuke/step_definitions/general.rb b/tests/cuke/step_definitions/general.rb
new file mode 100644
index 00000000..487769fc
--- /dev/null
+++ b/tests/cuke/step_definitions/general.rb
@@ -0,0 +1,25 @@
+##
+## General rules for the SilverStripe CMS as a whole.  They mostly have to do with the LeftAndMain
+## interface
+
+Given /I click on the "([^\"]*)" tab/ do |tab|
+  Given "I click the \"tab-Root_Content_set_#{tab}\" link"
+end
+
+Given /I wait for a status message/ do
+  Watir::Waiter::wait_until {
+    @browser.p(:id, 'statusMessage').exists? && @browser.p(:id, 'statusMessage').visible?
+  }
+end
+
+Given /I wait for a success message/ do
+  # We have to wait until after messages of the form 'Saving...', to get either a good message or
+  # a bad message
+  Watir::Waiter::wait_until {
+    @browser.p(:id, 'statusMessage').exists? && @browser.p(:id, 'statusMessage').visible? && @browser.p(:id, 'statusMessage').class_name != ""
+  }
+
+  @browser.p(:id, 'statusMessage').class_name.should == 'good'
+end
+
+
diff --git a/tests/cuke/step_definitions/log-in.rb b/tests/cuke/step_definitions/log-in.rb
new file mode 100644
index 00000000..c94f45e4
--- /dev/null
+++ b/tests/cuke/step_definitions/log-in.rb
@@ -0,0 +1,25 @@
+
+# Log in
+Given /log in as (.*)$/ do |user|
+	Given "I fill out the log in form with user \"#{user}\" and password \"password\""
+	And 'I see "Your are logged in as"'
+end
+
+Given /log into the CMS as (.*)/ do |user|
+  Given "I log in as #{user}"
+  And  "I visit admin/"
+  And "I load the root node"
+end
+
+Given /log out$/ do
+  Given "I visit Security/logout"
+end
+
+Given /fill out the log in form with user "(.*)" and password "(.*)"/ do |user, password|
+	Given 'I visit Security/logout'
+	And 'I visit Security/login?BackURL=Security/login'
+	And "I put \"#{user}\" in the \"Email\" field"
+	And "I put \"#{password}\" in the \"Password\" field"
+	And "I click the \"Log in\" button"
+end
+  
\ No newline at end of file
diff --git a/tests/cuke/step_definitions/security.rb b/tests/cuke/step_definitions/security.rb
new file mode 100644
index 00000000..3278a033
--- /dev/null
+++ b/tests/cuke/step_definitions/security.rb
@@ -0,0 +1,23 @@
+#  Steps definitions for security
+
+# Fixture instantiation
+Given /a "(.*)" group/ do |group|
+  Given 'I visit admin/security'
+  And 'I click the "Security Groups" link'
+  And 'I click the "Create" button'
+  And "I put \"#{group}\" in the \"Title\" field"
+  And 'I click the "Save" button'
+end
+
+Given /a user called "(.*)" in the "(.*)" group/ do |user, group|
+  Given 'I visit admin/security'
+  And "I click the \"#{group} (global group)\" link"
+  And "I put \"#{user}\" in the \"FirstName\" field"
+  And "I put \"#{user}\" in the \"Email\" field"
+  And "I put \"password\" in the \"SetPassword\" field"
+  And "I click the \"Add\" button"
+end
+
+Given /^I get a permission denied error$/ do
+  pending
+end
diff --git a/tests/test_windmill/__init__.py b/tests/test_windmill/__init__.py
deleted file mode 100644
index 6883e0ca..00000000
--- a/tests/test_windmill/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from windmill.authoring import setup_module, teardown_module, enable_collector
diff --git a/tests/test_windmill/test_admin/__init__.py b/tests/test_windmill/test_admin/__init__.py
deleted file mode 100644
index 20305d35..00000000
--- a/tests/test_windmill/test_admin/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from windmill.authoring import setup_module, teardown_module, enable_collector, WindmillTestClient
-import windmill
-
-def setup_module(module):
-    client = WindmillTestClient(__name__)
-
-    client.type(text=u'cms/tests/CMSMainTest.yml', id=u'fixture-file')
-    client.click(id=u'start-session')
-
-    client.waits.forPageLoad(timeout=u'20000')
-    client.click(id=u'admin-link')
-    client.waits.forPageLoad(timeout=u'20000')
-
-    client.type(text=u'admin@example.com', id=u'MemberLoginForm_LoginForm_Email')
-    client.type(text=u'ZXXlkwecxz2390232233', id=u'MemberLoginForm_LoginForm_Password')
-    client.click(id=u'MemberLoginForm_LoginForm_action_dologin')
-    client.waits.forPageLoad(timeout=u'300000')
-
-def teardown_module(module):
-    client = WindmillTestClient(__name__)
-    
-    client.open(url=windmill.settings['TEST_URL'], id=u'fixture-file')
-    client.click(id=u'end-session')
-    
\ No newline at end of file
diff --git a/tests/test_windmill/test_admin/test_CreateGroup.py b/tests/test_windmill/test_admin/test_CreateGroup.py
deleted file mode 100644
index d53c18ec..00000000
--- a/tests/test_windmill/test_admin/test_CreateGroup.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Generated by the windmill services transformer
-from windmill.authoring import WindmillTestClient
-
-def test():
-    client = WindmillTestClient(__name__)
-
-    client.click(link=u'Security')
-    client.waits.forPageLoad(timeout=u'20000')
-    client.click(xpath=u"/html/body/div[@id='left']/div[@id='treepanes']/ul[@id='TreeActions']/li[@id='addgroup']/button")
-    client.waits.sleep(milliseconds=u'5000')
-
-    client.asserts.assertText(validator=u'New Group', id=u'record-2')
-    client.asserts.assertValue(validator=u'New Group', id=u'Form_EditForm_Title')
-
-    client.click(id=u'Form_EditForm_Title')
-    client.type(text=u'Test Group', id=u'Form_EditForm_Title')
-    client.click(id=u'Form_EditForm_action_save')
-    client.waits.sleep(milliseconds=u'5000')
-
-    client.asserts.assertText(validator=u'Test Group', id=u'record-2')
-
-    client.click(id=u'Form_AddRecordForm_FirstName')
-    client.type(text=u'Test', id=u'Form_AddRecordForm_FirstName')
-    client.type(text=u'Person', id=u'Form_AddRecordForm_Surname')
-    client.type(text=u'test@example.com', id=u'Form_AddRecordForm_Email')
-    client.click(id=u'Form_AddRecordForm_action_addtogroup')
\ No newline at end of file

From 56a4bf0129b1164015bcc7b6033e8482e84eb2fd Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Mon, 7 Dec 2009 05:33:37 +0000
Subject: [PATCH 042/483] MINOR: Fixed a few glitches in the cuke tests

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94531 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/cuke/create-page.feature | 4 +++-
 tests/cuke/logout.feature      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/cuke/create-page.feature b/tests/cuke/create-page.feature
index 7bfe5179..e12675b9 100644
--- a/tests/cuke/create-page.feature
+++ b/tests/cuke/create-page.feature
@@ -112,4 +112,6 @@ Feature: Page creation in the CMS
 		When I set "Navigation label" to ""
 		And I save the page
 		And I load the "Page Title" page
-		Then the "Navigation label" field is "Page Title"
\ No newline at end of file
+		Then the "Navigation label" field is "Page Title"
+		Then I delete the current page
+		
\ No newline at end of file
diff --git a/tests/cuke/logout.feature b/tests/cuke/logout.feature
index 1a5b4368..97761fef 100644
--- a/tests/cuke/logout.feature
+++ b/tests/cuke/logout.feature
@@ -5,7 +5,7 @@ Feature: Log out
 	
 	Scenario: Log out from CMS
 		Given I log into the CMS as admin
-		And I click the "log out" link
+		And I click the "Log out" link
 		When I visit admin/
 		Then I see "Enter your username and password to access the CMS."
 		When I visit admin/assets/

From 0e65de67f8fccd954b94e3d2eda3288bdf583379 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Tue, 8 Dec 2009 01:29:19 +0000
Subject: [PATCH 043/483] BUGFIX: check akismet is enabled before saving spam.
 PATCH via simon_w - #4812

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94568 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/PageComment.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/sitefeatures/PageComment.php b/code/sitefeatures/PageComment.php
index 907ea432..8f82c087 100755
--- a/code/sitefeatures/PageComment.php
+++ b/code/sitefeatures/PageComment.php
@@ -239,7 +239,7 @@ class PageComment_Controller extends Controller {
 			}
 		}
 		if(Director::is_ajax()) {
-			if(SSAkismet::getSaveSpam()) {
+			if(SSAkismet::isEnabled() && SSAkismet::getSaveSpam()) {
 				echo $comment->renderWith('PageCommentInterface_singlecomment');
 			} else {
 				echo '';

From 7d48f2c1c857b23ce08343ac92454480e04ea974 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Tue, 8 Dec 2009 01:50:35 +0000
Subject: [PATCH 044/483] BUGFIX: fixed spam not being turned into ham if
 spamprotection isnt enabled. PATCH via simon_w #4813

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94571 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/PageComment.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/code/sitefeatures/PageComment.php b/code/sitefeatures/PageComment.php
index 8f82c087..c80aa4c4 100755
--- a/code/sitefeatures/PageComment.php
+++ b/code/sitefeatures/PageComment.php
@@ -259,8 +259,6 @@ class PageComment_Controller extends Controller {
 				// if spam protection module exists
 				if(class_exists('SpamProtectorManager')) {
 					SpamProtectorManager::send_feedback($comment, 'ham');
-					$comment->setField('IsSpam', false);
-					$comment->write();
 				}
 				
 				if(SSAkismet::isEnabled()) {
@@ -272,9 +270,9 @@ class PageComment_Controller extends Controller {
 					} catch (Exception $e) {
 						// Akismet didn't work, most likely the service is down.
 					}
-					$comment->setField('IsSpam', false);
-					$comment->write();
 				}
+				$comment->setField('IsSpam', false);
+				$comment->write();
 			}
 		}
 		if(Director::is_ajax()) {

From 6c160db32240106ddfa79a2359369ecadf8a2307 Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Thu, 10 Dec 2009 00:29:32 +0000
Subject: [PATCH 045/483] MINOR fixed bug where widget area editor would not be
 activated

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94829 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/WidgetAreaEditor.js | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/javascript/WidgetAreaEditor.js b/javascript/WidgetAreaEditor.js
index 35c1d199..43f23eee 100644
--- a/javascript/WidgetAreaEditor.js
+++ b/javascript/WidgetAreaEditor.js
@@ -5,8 +5,7 @@ WidgetAreaEditorClass.prototype = {
 		this.name = this.getAttribute('name');
 		this.rewriteWidgetAreaAttributes();
 		UsedWidget.applyToChildren($('usedWidgets-'+this.name), 'div.Widget');
-	
-		// Make available widgets draggable
+
 		var availableWidgets = $('availableWidgets-'+this.name).childNodes;
 		
 		for(var i = 0; i < availableWidgets.length; i++) {
@@ -113,8 +112,8 @@ WidgetAreaEditorClass.prototype = {
 		if ($('WidgetAreaEditor-'+holder).getAttribute('maxwidgets')) {
 			var maxCount = $('WidgetAreaEditor-'+holder).getAttribute('maxwidgets');
 			var count = $$('#usedWidgets-'+holder+' .Widget').length;
-			if (count > maxCount) {
-				alert('Sorry, you have reached the maximum number of widgets in this area');
+			if (count+1 > maxCount) {
+				alert(ss.i18n._t('WidgetAreaEditor.TOOMANY'));
 				return;
 			}
 		}
@@ -254,11 +253,4 @@ WidgetTreeDropdownField.prototype = {
 }
 
 WidgetTreeDropdownField.applyTo('div.usedWidgets .TreeDropdownField');
-
-// Loop over all WidgetAreas and fire 'em up
-var wAs = $$('.WidgetAreaEditor');
-for(var i = 0; i < wAs.length; i++) {
-	WidgetAreaEditorClass.applyTo('div#'+wAs[i].id);
-	
-}
-
+WidgetAreaEditorClass.applyTo('.WidgetAreaEditor');
\ No newline at end of file

From 34c1943a26339054d110ed8ca8ec5966c23776bf Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Fri, 11 Dec 2009 02:51:42 +0000
Subject: [PATCH 046/483] MINOR adding maori macron button back

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94986 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/tinymce_ssmacron/macron.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/tinymce_ssmacron/macron.htm b/javascript/tinymce_ssmacron/macron.htm
index 7c270fd3..44346f3b 100644
--- a/javascript/tinymce_ssmacron/macron.htm
+++ b/javascript/tinymce_ssmacron/macron.htm
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<title>Insert a Macron</title>
-   <script type="text/javascript" src="../../thirdparty/tinymce/tiny_mce_popup.js"></script>
+   <script type="text/javascript" src="../../../sapphire/thirdparty/tinymce/tiny_mce_popup.js"></script>
 	<script type="text/javascript" src="js/macron.js"></script>
 </head>
 <body id="charmap" style="display:none">

From ee49d36dd7393edad155a51cd0472dc1c44bd6e2 Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Sun, 13 Dec 2009 22:55:10 +0000
Subject: [PATCH 047/483] MINOR remove relic of concurrent editing

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95070 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index f95d96e8..df890236 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -977,7 +977,6 @@ JS;
 				DataObject::delete_by_id($this->stat('tree_class'), $id);
 				$script .= "node = st.getTreeNodeByIdx($id); if(node) node.parentTreeNode.removeTreeNode(node); $('Form_EditForm').closeIfSetTo($id); \n";
 				
-				if ($id == $this->currentPageID()) FormResponse::add('CurrentPage.isDeleted = 1;');
 			}
 		}
 		FormResponse::add($script);

From 2d3365f7b27f6a3e4bd26353a35304f8d7342e9d Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Mon, 14 Dec 2009 01:26:49 +0000
Subject: [PATCH 048/483] MINOR make widgetarea/editor more suitable for
 generic use

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95086 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/WidgetAreaEditor.php     | 27 ++++++++++++++++++++++-----
 javascript/lang/en_US.js      |  3 ++-
 templates/WidgetAreaEditor.ss |  8 ++++----
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/code/WidgetAreaEditor.php b/code/WidgetAreaEditor.php
index c862df48..035d6e07 100644
--- a/code/WidgetAreaEditor.php
+++ b/code/WidgetAreaEditor.php
@@ -5,7 +5,21 @@
  * @subpackage content
  */
 class WidgetAreaEditor extends FormField {
-	function __construct($name) {
+	/**
+	 * 3 variables to hold titles for the template
+	 */
+	public $InUseTitle;
+	public $AvailableTitle;
+	public $ToAddTitle;
+
+	function __construct($name, $widgetClasses = array('Widget'), $maxWidgets = 0) {
+		$this->InUseTitle = _t('WidgetAreaEditor.ss', 'INUSE');
+		$this->AvailableTitle = _t('WidgetAreaEditor.ss', 'AVAILABLE');
+		$this->ToAddTitle = _t('WidgetAreaEditor.ss', 'TOADD');
+		$this->MaxWidgets = $maxWidgets;
+		
+		$this->widgetClasses = $widgetClasses;
+		
 		parent::__construct($name);
 	}
 	
@@ -17,12 +31,15 @@ class WidgetAreaEditor extends FormField {
 	}
 	
 	function AvailableWidgets() {
-		$classes = ClassInfo::subclassesFor('Widget');
-		array_shift($classes);
+		
 		$widgets= new DataObjectSet();
 		
-		foreach($classes as $class) {
-			$widgets->push(singleton($class));
+		foreach($this->widgetClasses as $widgetClass) {
+			$classes = ClassInfo::subclassesFor($widgetClass);
+			array_shift($classes);
+			foreach($classes as $class) {
+				$widgets->push(singleton($class));
+			}
 		}
 		
 		return $widgets;
diff --git a/javascript/lang/en_US.js b/javascript/lang/en_US.js
index 8464316e..9b0e6118 100644
--- a/javascript/lang/en_US.js
+++ b/javascript/lang/en_US.js
@@ -24,6 +24,7 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 		'ModelAdmin.DELETED': "Deleted",
 		'ModelAdmin.VALIDATIONERROR': "Validation Error",
 		'LeftAndMain.PAGEWASDELETED': "This page was deleted.  To edit a page, select it from the left.",
-		'LeftAndMain.CONFIRMUNSAVED': "Are you sure you want to navigate away from this page?\n\nWARNING: Your changes have not been saved.\n\nPress OK to continue, or Cancel to stay on the current page."
+		'LeftAndMain.CONFIRMUNSAVED': "Are you sure you want to navigate away from this page?\n\nWARNING: Your changes have not been saved.\n\nPress OK to continue, or Cancel to stay on the current page.",
+		'WidgetAreaEditor.TOOMANY': 'Sorry, you have reached the maximum number of widgets in this area'
 	});
 }
\ No newline at end of file
diff --git a/templates/WidgetAreaEditor.ss b/templates/WidgetAreaEditor.ss
index 6b1989f6..450386d3 100644
--- a/templates/WidgetAreaEditor.ss
+++ b/templates/WidgetAreaEditor.ss
@@ -1,7 +1,7 @@
-<div class="WidgetAreaEditor" id="WidgetAreaEditor-$Name" name="$Name">
+<div class="WidgetAreaEditor" id="WidgetAreaEditor-$Name" name="$Name"<% if MaxWidgets %> maxwidgets="$MaxWidgets"<% end_if %>>
 	<input type="hidden" id="$Name" name="$IdxField" value="$Value" />
 	<div class="availableWidgetsHolder">
-		<h2><% _t('AVAILABLE', 'Available Widgets') %></h2>
+		<h2>$AvailableTitle</h2>
 		<p>&nbsp;</p>
 		<div class="availableWidgets" id="availableWidgets-$Name">
 			<% if AvailableWidgets %>
@@ -16,8 +16,8 @@
 		</div>
 	</div>
 	<div class="usedWidgetsHolder">
-		<h2><% _t('INUSE', 'Widgets currently used') %></h2>
-		<p><% _t('TOADD', 'To add widgets, click on the purple header on the left') %></p>
+		<h2>$InUseTitle</h2>
+		<p>$ToAddTitle</p>
 		
 		<div class="usedWidgets" id="usedWidgets-$Name">
 			<% if UsedWidgets %>

From 77dfeb267f98509133d7ac89b2326537f36673b3 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Mon, 14 Dec 2009 01:27:40 +0000
Subject: [PATCH 049/483] BUGFIX #4848 Fixed ComplexTableField undefined error
 in IE8 when it is not available

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95088 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/MemberTableField.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/javascript/MemberTableField.js b/javascript/MemberTableField.js
index 33f7fa98..c857c7d0 100755
--- a/javascript/MemberTableField.js
+++ b/javascript/MemberTableField.js
@@ -6,7 +6,9 @@
  */
  
 // no confirm message for removal from a group
-ComplexTableField.prototype.deleteConfirmMessage = null;
+if(ComplexTableField && ComplexTableField != undefined) {
+	ComplexTableField.prototype.deleteConfirmMessage = null;
+}
 
 /**
  * Auto-lookup on ajax fields

From 99166edd248f96e627148a688b7cddd4fd27e98e Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Mon, 14 Dec 2009 01:37:35 +0000
Subject: [PATCH 050/483] BUGFIX #4847 Fixed ComplexTableField undefined in IE8
 when opening a CTF popup in the Security section of the CMS

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95091 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/MemberTableField.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/MemberTableField.js b/javascript/MemberTableField.js
index c857c7d0..f376a882 100755
--- a/javascript/MemberTableField.js
+++ b/javascript/MemberTableField.js
@@ -6,7 +6,7 @@
  */
  
 // no confirm message for removal from a group
-if(ComplexTableField && ComplexTableField != undefined) {
+if(typeof(ComplexTableField) != 'undefined') {
 	ComplexTableField.prototype.deleteConfirmMessage = null;
 }
 

From a578804987011071221ef41f44cc0429683c6529 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Mon, 14 Dec 2009 22:40:03 +0000
Subject: [PATCH 051/483] ENHANCEMENT: added translatable support to
 mathspamprotection. PATCH via noini (#4755)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95194 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/MathSpamProtection.php | 40 ++++++++++++++++++------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/code/sitefeatures/MathSpamProtection.php b/code/sitefeatures/MathSpamProtection.php
index 29567d52..4b770610 100644
--- a/code/sitefeatures/MathSpamProtection.php
+++ b/code/sitefeatures/MathSpamProtection.php
@@ -25,7 +25,12 @@ class MathSpamProtection {
 			$v1 = Session::get("mathQuestionV1");
 			$v2 = Session::get("mathQuestionV2");
 		}
-		return "What is ".MathSpamProtection::digitToWord($v1)." plus ".MathSpamProtection::digitToWord($v2)."?";
+		
+		return sprintf(
+			_t('MathSpamProtection.WHATIS',"What is %s plus %s?"), 
+			MathSpamProtection::digitToWord($v1), 
+			MathSpamProtection::digitToWord($v2)
+		);
 	}
 	
 	/**
@@ -49,13 +54,29 @@ class MathSpamProtection {
 	 * Helper method for converting digits to their equivelant english words
 	 */
 	static function digitToWord($num){
-		$numbers = array("zero","one","two","three","four","five","six","seven","eight","nine",
-										"ten","eleven","twelve","thirteen","fourteen","fifteen","sixteen","seventeen","eighteen");									
-			if($num < 0){
-				return "minus ".($numbers[-1*$num]);
-			}
-		//TODO: add checking or return null for bad value??
-			return $numbers[$num];
+		$numbers = array(_t('MathSpamProtection.ZERO', 'zero'),
+			_t('MathSpamProtection.ONE', 'one'),
+			_t('MathSpamProtection.TWO', 'two'),
+			_t('MathSpamProtection.THREE', 'three'),
+			_t('MathSpamProtection.FOUR', 'four'),
+			_t('MathSpamProtection.FIVE', 'five'),
+			_t('MathSpamProtection.SIX', 'six'),
+			_t('MathSpamProtection.SEVEN', 'seven'),
+			_t('MathSpamProtection.EIGHT', 'eight'),
+			_t('MathSpamProtection.NINE', 'nine'),
+			_t('MathSpamProtection.TEN', 'ten'),
+			_t('MathSpamProtection.ELEVEN', 'eleven'),
+			_t('MathSpamProtection.TWELVE', 'twelve'),
+			_t('MathSpamProtection.THIRTEEN', 'thirteen'),
+			_t('MathSpamProtection.FOURTEEN', 'fourteen'),
+			_t('MathSpamProtection.FIFTEEN', 'fifteen'),
+			_t('MathSpamProtection.SIXTEEN', 'sixteen'),
+			_t('MathSpamProtection.SEVENTEEN', 'seventeen'),
+			_t('MathSpamProtection.EIGHTEEN', 'eighteen'));			
+									
+			if($num < 0) return "minus ".($numbers[-1*$num]);
+						
+		return $numbers[$num];
 	}
 	
 	
@@ -67,5 +88,4 @@ class MathSpamProtection {
 		self::$mathProtection = $math;
 	}
 
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file

From 19670e7b27b266901a776142d1d9f2e0cada6f09 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Tue, 15 Dec 2009 03:33:38 +0000
Subject: [PATCH 052/483] FEATURE: added delete all link to page comments.
 Patch via #4427. Thanks walec51

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95418 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/PageComment.php          | 21 +++++++++
 code/sitefeatures/PageCommentInterface.php | 12 +++++-
 templates/PageCommentInterface.ss          |  3 ++
 tests/PageCommentsTest.php                 | 31 ++++++++++++++
 tests/PageCommentsTest.yml                 | 50 ++++++++++++++++++++++
 5 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 tests/PageCommentsTest.php
 create mode 100644 tests/PageCommentsTest.yml

diff --git a/code/sitefeatures/PageComment.php b/code/sitefeatures/PageComment.php
index c80aa4c4..e0981c3e 100755
--- a/code/sitefeatures/PageComment.php
+++ b/code/sitefeatures/PageComment.php
@@ -176,6 +176,27 @@ class PageComment_Controller extends Controller {
 		$rss->outputToBrowser();
 	}
 	
+	/**
+	 * Deletes all comments on the page referenced by the url param pageid
+	 */
+	function deleteallcomments() {
+		if(Permission::check('CMS_ACCESS_CMSMain')) {
+			$pageId = $_REQUEST['pageid'];
+			if(preg_match('/^\d+$/', $pageId)) {
+				$comments = DataObject::get("PageComment", "ParentID = $pageId");
+				if($comments) foreach($comments as $c) {
+					$c->delete();
+				}
+			}
+		}
+		
+		if(Director::is_ajax()) {
+			echo "";
+		} else {
+			Director::redirectBack();
+		}
+	}
+	
 	function deletecomment() {
 		if(Permission::check('CMS_ACCESS_CMSMain')) {
 			$comment = DataObject::get_by_id("PageComment", $this->urlParams['ID']);
diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index 127191b2..ae1b7716 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -228,6 +228,16 @@ class PageCommentInterface extends RequestHandler {
 		return Director::absoluteBaseURL() . "PageComment/rss?pageid=" . $this->page->ID;
 	}
 	
+	/**
+	 * A link to PageComment_Controller.deleteallcomments() which deletes all
+	 * comments on a page referenced by the url param pageid
+	 */
+	function DeleteAllLink() {
+		if(Permission::check('CMS_ACCESS_CMSMain')) {
+			return Director::absoluteBaseURL() . "PageComment/deleteallcomments?pageid=" . $this->page->ID;
+		}
+	}
+	
 }
 
 /**
@@ -337,4 +347,4 @@ class PageCommentInterface_Controller extends ContentController {
 	}
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/templates/PageCommentInterface.ss b/templates/PageCommentInterface.ss
index 90a91e70..b0f9509a 100755
--- a/templates/PageCommentInterface.ss
+++ b/templates/PageCommentInterface.ss
@@ -53,6 +53,9 @@
 			<p id="NoComments"><% _t('NOCOMMENTSYET','No one has commented on this page yet.') %></p>
 		<% end_if %>
 	</div>
+	<% if DeleteAllLink %>
+		<p id="DeleteComments"><a href="$DeleteAllLink">Delete all comments on this page</a></p>
+	<% end_if %>
 	<p id="CommentsRSSFeed">
 		<a class="commentrss" href="$CommentRssLink"><% _t('RSSFEEDCOMMENTS', 'RSS feed for comments on this page') %></a> | 
 		<a href="PageComment/rss" class="commentrss" title="<% _t('RSSVIEWALLCOMMENTS', 'View all Comments') %>"><% _t('RSSFEEDALLCOMMENTS', 'RSS feed for all comments') %></a>
diff --git a/tests/PageCommentsTest.php b/tests/PageCommentsTest.php
new file mode 100644
index 00000000..b4c08976
--- /dev/null
+++ b/tests/PageCommentsTest.php
@@ -0,0 +1,31 @@
+<?php
+
+class PageCommentsTest extends FunctionalTest {
+	
+	static $fixture_file = 'cms/tests/PageCommentsTest.yml';
+	
+	
+	function testDeleteAllCommentsOnPage() {
+		
+		
+		$second = $this->objFromFixture('Page', 'second');
+		$this->autoFollowRedirection = false;
+		$this->logInAs('admin');
+		Director::test('second-page', null, $this->session());
+		Director::test('PageComment/deleteallcomments?pageid='.$second->ID,
+			null, $this->session());
+		Director::test('second-page', null, $this->session());
+		
+		$secondComments = DataObject::get('PageComment', 'ParentID = '.$second->ID);
+		$this->assertNull($secondComments);
+		
+		$first = $this->objFromFixture('Page', 'first');
+		$firstComments = DataObject::get('PageComment', 'ParentID = '.$first->ID);
+		$this->assertNotNull($firstComments);
+		
+		$third = $this->objFromFixture('Page', 'third');
+		$thirdComments = DataObject::get('PageComment', 'ParentID = '.$third->ID);
+		$this->assertEquals($thirdComments->Count(), 3);
+	}
+}
+?>
diff --git a/tests/PageCommentsTest.yml b/tests/PageCommentsTest.yml
new file mode 100644
index 00000000..b70d5c0f
--- /dev/null
+++ b/tests/PageCommentsTest.yml
@@ -0,0 +1,50 @@
+Member:
+   admin:
+      FirstName: admin
+
+Group:
+   admin:
+      Title: Admin
+      Members: =>Member.admin
+
+Permission:
+   admin:
+      Code: ADMIN
+      Group: =>Group.admin
+
+Page:
+    first:
+        Title: First page
+        URLSegment: first-page
+    second:
+        Title: Second page
+        URLSegment: second-page
+    third:
+        Title: Third page
+        URLSegment:third-page
+
+PageComment:
+    firstComA:
+        ParentID: =>Page.first
+        Name: FA
+        Comment: textFA
+    secondComA:
+        ParentID: =>Page.second
+        Name: SA
+        Comment: textSA
+    secondComB:
+        ParentID: =>Page.second
+        Name: SB
+        Comment: textSB
+    thirdComA:
+        ParentID: =>Page.third
+        Name: TA
+        Comment: textTA
+    thirdComB:
+        ParentID: =>Page.third
+        Name: TB
+        Comment: textTB
+    thirdComC:
+        ParentID: =>Page.third
+        Name: TC
+        Comment: textTC

From c4e11804db001201341dd041e563b5131e8b9dac Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Wed, 16 Dec 2009 01:24:47 +0000
Subject: [PATCH 053/483] BUGFIX: Prevent text-selection during drag operation,
 Firefox-specific

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95511 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/LeftAndMain.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index 687b1f7a..7c2482cc 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -26,6 +26,10 @@ DraggableSeparator.prototype = {
 		document.onmousemove = this.document_mousemove.bindAsEventListener(this);
 		document.onmouseup = this.document_mouseup.bindAsEventListener(this);
 
+		// MozUserSelect='none' prevents text-selection during drag, in firefox.
+		Element.setStyle($('right'), {MozUserSelect: 'none'});
+		Element.setStyle($('left'), {MozUserSelect: 'none'});
+		// onselectstart captured to prevent text-selection in IE
 		document.body.onselectstart = this.body_selectstart.bindAsEventListener(this);
 	},
 	document_mousemove : function(event) {
@@ -33,6 +37,9 @@ DraggableSeparator.prototype = {
 		fixRightWidth();
 	},
 	document_mouseup : function(e) {
+		// MozUserSelect='' re-enables text-selection in firefox.
+		Element.setStyle($('right'), {MozUserSelect: ''});
+		Element.setStyle($('left'), {MozUserSelect: ''});
 		document.onmousemove = null;
 	},
 

From 177b3998b3eedc7cdbb5d98bf3b224cc703d63f2 Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Wed, 16 Dec 2009 04:17:52 +0000
Subject: [PATCH 054/483] BUGFIX: Show selected row in autocomplete dropdown

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95558 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/cms_right.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/css/cms_right.css b/css/cms_right.css
index 76dbef64..ea2f5f84 100644
--- a/css/cms_right.css
+++ b/css/cms_right.css
@@ -318,6 +318,10 @@
 		padding: 3px;
 		white-space: nowrap;
 	}
+	.autocomplete li.selected {
+		background: Highlight;
+		color: HighlightText;
+	}
 	.autocomplete .data {
 		display: none;
 	}

From b89cb9b01863d4c263d1d83a98de2b361afd5dc1 Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Thu, 17 Dec 2009 21:53:03 +0000
Subject: [PATCH 055/483] BUGFIX: fixing CMS_ACCESS_LeftAndMain permission
 (=access all cms sections). Also added the test.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95788 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php      |  3 ++-
 tests/CMSMainTest.yml     | 10 +++++++++-
 tests/LeftAndMainTest.php | 11 +++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index df890236..c9efbb68 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -83,7 +83,8 @@ class LeftAndMain extends Controller {
 		}
 			
 		// Default security check for LeftAndMain sub-class permissions
-		if(!Permission::checkMember($member, "CMS_ACCESS_$this->class")) {
+		if(!Permission::checkMember($member, "CMS_ACCESS_$this->class") && 
+		   !Permission::checkMember($member, "CMS_ACCESS_LeftAndMain")) {
 			return false;
 		}
 		
diff --git a/tests/CMSMainTest.yml b/tests/CMSMainTest.yml
index 94384142..0b7fc3f5 100644
--- a/tests/CMSMainTest.yml
+++ b/tests/CMSMainTest.yml
@@ -17,6 +17,8 @@ Group:
       Title: Empty Group
    assetsonly:
       Title: assetsonly
+   allcmssections:
+      Title: allcmssections
 Member:
    admin:
       Email: admin@example.com
@@ -25,10 +27,16 @@ Member:
    assetsonlyuser:
       Email: assetsonlyuser@test.com
       Groups: =>Group.assetsonly
+   allcmssectionsuser:
+      Email: allcmssectionsuser@test.com
+      Groups: =>Group.allcmssections
 Permission:
    admin:
       Code: ADMIN
       GroupID: =>Group.admin
    assetsonly:
       Code: CMS_ACCESS_AssetAdmin
-      GroupID: =>Group.assetsonly
\ No newline at end of file
+      GroupID: =>Group.assetsonly
+   allcmssections:
+      Code: CMS_ACCESS_LeftAndMain
+      GroupID: =>Group.allcmssections
\ No newline at end of file
diff --git a/tests/LeftAndMainTest.php b/tests/LeftAndMainTest.php
index 8f9cad55..6835f7c1 100644
--- a/tests/LeftAndMainTest.php
+++ b/tests/LeftAndMainTest.php
@@ -45,6 +45,7 @@ class LeftAndMainTest extends FunctionalTest {
 	function testCanView() {
 		$adminuser = $this->objFromFixture('Member', 'admin');
 		$assetsonlyuser = $this->objFromFixture('Member', 'assetsonlyuser');
+		$allcmssectionsuser = $this->objFromFixture('Member', 'allcmssectionsuser');
 		
 		// anonymous user
 		$this->session()->inst_set('loggedInAs', null);
@@ -64,6 +65,16 @@ class LeftAndMainTest extends FunctionalTest {
 			'Groups with limited access can only access the interfaces they have permissions for'
 		);
 		
+		// all cms sections user
+		$this->session()->inst_set('loggedInAs', $allcmssectionsuser->ID);
+		$menuItems = singleton('LeftAndMain')->MainMenu();
+		$requiredSections = array('CMSMain','AssetAdmin','CommentAdmin','SecurityAdmin','Help');
+		$this->assertEquals(
+			array_diff($requiredSections, $menuItems->column('Code')),
+			array(),
+			'Group with CMS_ACCESS_LeftAndMain permission can access all sections'
+		);
+		
 		// admin
 		$this->session()->inst_set('loggedInAs', $adminuser->ID);
 		$menuItems = singleton('LeftAndMain')->MainMenu();

From 451aa6c536a87386edfd66d858d54b0f7e365a43 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Mon, 21 Dec 2009 00:52:12 +0000
Subject: [PATCH 056/483] MINOR Set url variable in TreeAPI.reload as local
 variable in LeftAndMain_left.js

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95971 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/LeftAndMain_left.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/LeftAndMain_left.js b/javascript/LeftAndMain_left.js
index 5de22717..8a7a1445 100755
--- a/javascript/LeftAndMain_left.js
+++ b/javascript/LeftAndMain_left.js
@@ -52,7 +52,7 @@ TreeAPI.prototype = {
 		var args = {ajax:1, ID:0};
 		if ($('LangSelector')) args.locale = $('LangSelector').value;
 		
-		url = this.url(args); 
+		var url = this.url(args);
 		
 		var self = this;
 		new Ajax.Request(url, {

From 08e9a352425f1cccbcf0feaf3441efa7f97d3fa9 Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Mon, 21 Dec 2009 00:57:14 +0000
Subject: [PATCH 057/483] BUGFIX: when the JS files are combined, swfupload.js
 gets included in pages where there are no placeholder elements available,
 failing with exception and killing the javascript for the page. Now the
 exception is intercepted and ignored.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95972 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/Upload.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/javascript/Upload.js b/javascript/Upload.js
index a5b51400..a6c20861 100644
--- a/javascript/Upload.js
+++ b/javascript/Upload.js
@@ -41,7 +41,14 @@ Upload.prototype = {
 		if(typeof params.button_width != 'undefined') this.buttonWidth = params.button_width;
 		if(typeof params.button_height != 'undefined') this.buttonHeight = params.button_height;
 		
-		this.onLoad();
+		try {
+			this.onLoad();
+		} catch (ex) {
+			// suppress the exception in case swfupload.js is loaded in a context that has no
+			// placeholder elements
+			if ( ex.indexOf('Could not find the placeholder element')==-1 )
+				throw ex;
+		}
 	},
 	
 	/**

From 2e762da45e72b828f10e71fd728f53842f88982d Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Wed, 23 Dec 2009 01:53:03 +0000
Subject: [PATCH 058/483] MINOR Moved defined variables in
 AssetAdmin::doUpload() to the top of the method for consistency

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96230 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 8647a040..d5990c0d 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -164,6 +164,14 @@ JS
 	 */
 	function doUpload($data, $form) {
 		$processedFiles = array();
+		$newFiles = array();
+		$fileIDs = array();
+		$fileNames = array();
+		$fileSizeWarnings = '';
+		$uploadErrors = '';
+		$jsErrors = '';
+		$status = '';
+		$statusMessage = '';
 		
 		if(!isset($data['Files'])) return Director::set_status_code("404");
 		
@@ -174,26 +182,17 @@ JS
 					$processedFiles[$key][$param] = $value;
 				}
 			}
-		}
-		else {
+		} else {
 			$proccessedFiles[] = $data['Files'];
 		}
 		
 		// get the folder to upload to.
 		if(isset($data['FolderID']) && $data['FolderID'] != "root") {
 			$folder = DataObject::get_by_id('Folder', $data['FolderID']);
-		}
-		else {
+		} else {
 			$folder = DataObject::get_one('Folder');
 		}
 		
-		$newFiles = array();
-		$fileSizeWarnings = '';
-		$uploadErrors = '';
-		$jsErrors = '';
-		$status = '';
-		$statusMessage = '';
-
 		foreach($processedFiles as $tmpFile) {
 			if($tmpFile['error'] == UPLOAD_ERR_NO_TMP_DIR) {
 				$status = 'bad';
@@ -232,15 +231,13 @@ JS
 		
 		if($newFiles) {
 			$numFiles = sizeof($newFiles);
-			$statusMessage = sprintf(_t('AssetAdmin.UPLOADEDX',"Uploaded %s files"),$numFiles) ;
+			$statusMessage = sprintf(_t('AssetAdmin.UPLOADEDX',"Uploaded %s files"),$numFiles);
 			$status = "good";
 		} else if($status != 'bad') {
 			$statusMessage = _t('AssetAdmin.NOTHINGTOUPLOAD','There was nothing to upload');
 			$status = "";
 		}
 
-		$fileIDs = array();
-		$fileNames = array();
 		foreach($newFiles as $newFile) {
 			$fileIDs[] = $newFile;
 			$fileObj = DataObject::get_one('File', "\"File\".\"ID\"=$newFile");

From 904fcf02d0f28e78219fef88b092363431459f2e Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Thu, 7 Jan 2010 01:38:55 +0000
Subject: [PATCH 059/483] FEATURE: Add onLoad callback handler CMSLoadFunctions

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96440 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/LeftAndMain_right.js | 41 ++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/javascript/LeftAndMain_right.js b/javascript/LeftAndMain_right.js
index ab16360a..18e51777 100755
--- a/javascript/LeftAndMain_right.js
+++ b/javascript/LeftAndMain_right.js
@@ -1,3 +1,41 @@
+/**
+ * CMSLoadFunctions provides the ability to have 'onLoad' functions for pages
+ * in the CMS.
+ * These callbacks will be executed when a page has been loaded after clicking
+ * on it in the left-hand Site Content Tree.
+ * The usual document.ready functions won't work in this case as the page data
+ * is loaded via AJAX.
+ *
+ * A function will not be added twice, even if add() is called twice.
+ *
+ * Usage:
+ *	CMSLoadFunctions.add(function(){ ... });
+ *
+ */
+CMSLoadFunctions = {
+	add: function(fn) {
+		if (!this.load_functions) {
+			this.load_functions = [];
+		}
+		if (!(fn in this.load_functions)) {
+			this.load_functions.push(fn);
+		}
+	},
+
+	run: function() {
+		if (!this.load_functions) {
+			this.load_functions = [];
+			return;
+		}
+		for(var i=0; i < this.load_functions.length; i++) {
+			var fn = this.load_functions[i];
+			if(typeof(fn) == 'function') {
+				fn();
+			}
+		}
+	}
+};
+
 
 CMSForm = Class.extend('ChangeTracker').extend('Observable');
 CMSForm.prototype = {
@@ -262,7 +300,8 @@ CMSRightForm.prototype = {
 			}
 			statusMessage('');
 		}
-		
+
+		CMSLoadFunctions.run();
 		// must wait until the javascript has finished
 		document.body.style.cursor = 'default';
 		

From 3a63f1ab52cc7e8c6c19b38e934cebfeda940dab Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Thu, 7 Jan 2010 01:39:21 +0000
Subject: [PATCH 060/483] BUGFIX: Check for empty

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96441 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/WidgetAreaEditor.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/javascript/WidgetAreaEditor.js b/javascript/WidgetAreaEditor.js
index 43f23eee..d8a61b71 100644
--- a/javascript/WidgetAreaEditor.js
+++ b/javascript/WidgetAreaEditor.js
@@ -63,6 +63,9 @@ WidgetAreaEditorClass.prototype = {
 		this.name = this.getAttribute('name');
 
 		var monkeyWith = function(widgets, name) {
+			if (!widgets) {
+				return;
+			}
 			for(var i = 0; i < widgets.length; i++) {
 				widget = widgets[i];
 				if (!widget.getAttribute('rewritten') && (widget.id || widget.name)) {

From e4d1eee3c10df53ab6b9b1b640c6fc3fbe9748f6 Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Thu, 7 Jan 2010 01:39:44 +0000
Subject: [PATCH 061/483] BUGFIX: Check for functions existence

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96443 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/tinymce_ssbuttons/editor_plugin_src.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/javascript/tinymce_ssbuttons/editor_plugin_src.js b/javascript/tinymce_ssbuttons/editor_plugin_src.js
index e67bed5f..33c4e6dd 100644
--- a/javascript/tinymce_ssbuttons/editor_plugin_src.js
+++ b/javascript/tinymce_ssbuttons/editor_plugin_src.js
@@ -79,8 +79,10 @@
 			});
 
 			ed.onNodeChange.add(function(ed, o) {
-	    	    $('Form_EditorToolbarLinkForm').updateSelection(ed);
+	    	    if ($('Form_EditorToolbarLinkForm').updateSelection) {
+			    $('Form_EditorToolbarLinkForm').updateSelection(ed);
 			    $('Form_EditorToolbarLinkForm').respondToNodeChange(ed);
+		    }
 	        });
 	        ed.onKeyUp.add(function(ed, o) {
 	    	    $('Form_EditorToolbarLinkForm').updateSelection(ed);
@@ -110,4 +112,4 @@
 
 	// Adds the plugin class to the list of available TinyMCE plugins
 	tinymce.PluginManager.add("ssbuttons", tinymce.plugins.SSButtons);
-})();
\ No newline at end of file
+})();

From 305cfe9c368c9aab119f57002626b604e6691ad2 Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Thu, 7 Jan 2010 02:01:16 +0000
Subject: [PATCH 062/483] REVERT: Code duplicated, as Observable interface can
 be used instead

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96448 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/LeftAndMain_right.js | 41 +--------------------------------
 1 file changed, 1 insertion(+), 40 deletions(-)

diff --git a/javascript/LeftAndMain_right.js b/javascript/LeftAndMain_right.js
index 18e51777..ab16360a 100755
--- a/javascript/LeftAndMain_right.js
+++ b/javascript/LeftAndMain_right.js
@@ -1,41 +1,3 @@
-/**
- * CMSLoadFunctions provides the ability to have 'onLoad' functions for pages
- * in the CMS.
- * These callbacks will be executed when a page has been loaded after clicking
- * on it in the left-hand Site Content Tree.
- * The usual document.ready functions won't work in this case as the page data
- * is loaded via AJAX.
- *
- * A function will not be added twice, even if add() is called twice.
- *
- * Usage:
- *	CMSLoadFunctions.add(function(){ ... });
- *
- */
-CMSLoadFunctions = {
-	add: function(fn) {
-		if (!this.load_functions) {
-			this.load_functions = [];
-		}
-		if (!(fn in this.load_functions)) {
-			this.load_functions.push(fn);
-		}
-	},
-
-	run: function() {
-		if (!this.load_functions) {
-			this.load_functions = [];
-			return;
-		}
-		for(var i=0; i < this.load_functions.length; i++) {
-			var fn = this.load_functions[i];
-			if(typeof(fn) == 'function') {
-				fn();
-			}
-		}
-	}
-};
-
 
 CMSForm = Class.extend('ChangeTracker').extend('Observable');
 CMSForm.prototype = {
@@ -300,8 +262,7 @@ CMSRightForm.prototype = {
 			}
 			statusMessage('');
 		}
-
-		CMSLoadFunctions.run();
+		
 		// must wait until the javascript has finished
 		document.body.style.cursor = 'default';
 		

From ea20f1101f05763ca426b30372622285fb9bedef Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Sun, 10 Jan 2010 22:27:40 +0000
Subject: [PATCH 063/483] BUGFIX: getting rid of problem with disappearing
 buttons on the initial page load (not ajax). The initialization was called
 twice on the CMSForm, and on the second call the ajaxActionsAtTop was
 removing the buttons - now the buttons are removed only when there is
 something to be added.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96551 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/LeftAndMain.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index 7c2482cc..d22118e9 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -255,13 +255,13 @@ function unlockStatusMessage() {
  */
 function ajaxActionsAtTop(formName, actionHolderName, tabName) {
 	var actions = document.getElementsBySelector('#' + formName + ' .Actions')[0];
-	var holder;
-
-	if((holder = $(actionHolderName)) && holder != actions) {
-		holder.parentNode.removeChild(holder);
-	}
+	var holder = $(actionHolderName);
 
 	if(actions) {
+		if ( holder ) {
+			holder.parentNode.removeChild(holder);
+		}
+		
 		actions.id = actionHolderName;
 		actions.className = 'ajaxActions';
 

From 3c2dcf4dd21568f4b0d3b6476c1e587b788b1e20 Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Mon, 11 Jan 2010 01:16:37 +0000
Subject: [PATCH 064/483] BUGFIX: Fix IE bug with Files&Images (#4912)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96566 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/AssetTableField.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/AssetTableField.js b/javascript/AssetTableField.js
index 85205309..50e82ab2 100644
--- a/javascript/AssetTableField.js
+++ b/javascript/AssetTableField.js
@@ -85,7 +85,7 @@ FileFilterButton.prototype = {
 			updateURL += ($('SecurityID') ? '&SecurityID=' + $('SecurityID').value : '');
 
 			// update the field
-			var field = form.getElementsByClassName('AssetTableField')[0];
+			var field = document.getElementsByClassName('AssetTableField')[0];
 			field.setAttribute('href', updateURL);
 			field.refresh();
 		} catch(er) {

From bf2ed79d8fb52f0e4b023ef00f753cb446b7a6cb Mon Sep 17 00:00:00 2001
From: Mark Stephens <mark@silverstripe.com>
Date: Tue, 12 Jan 2010 02:05:59 +0000
Subject: [PATCH 065/483] ENHANCEMENT: Change to TreeDropdownField, giving it
 filtering behaviour as described in ticket
 http://open.silverstripe.org/ticket/3007 . Its disabled by default for legacy
 compatibility, but enabled for HtmlEditorField so that link editor is
 filterable for local links, via an extra boolean parameter on
 TreeDowndownField.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96668 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/Image_iframe.css |  8 ++++++--
 css/cms_right.css    |  3 +--
 css/layout.css       | 10 ++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/css/Image_iframe.css b/css/Image_iframe.css
index 3fddfbcd..186ec2c3 100755
--- a/css/Image_iframe.css
+++ b/css/Image_iframe.css
@@ -58,7 +58,7 @@ h2 {
 
 
 /**
- * TreeDropdownField stying
+ * TreeDropdownField styling
  */
 .SelectionGroup div.TreeDropdownField {
 	width: 241px;
@@ -68,7 +68,7 @@ html>body div.TreeDropdownField {
 	position:relative;
 }
 
-.SelectionGroup div.TreeDropdownField span.items {
+.SelectionGroup div.TreeDropdownField .items {
 	display: block;
 	height: 100%;
 	border: 1px #7f9db9 solid;
@@ -80,6 +80,10 @@ html>body div.TreeDropdownField {
 	background-color: white;
 }
 
+.SelectionGroup div.TreeDropdownField input.items {
+	height: 19px;
+}
+
 .SelectionGroup div.TreeDropdownField div.tree_holder {
 	clear: left;
 	cursor: default;
diff --git a/css/cms_right.css b/css/cms_right.css
index ea2f5f84..df4e431e 100644
--- a/css/cms_right.css
+++ b/css/cms_right.css
@@ -291,10 +291,9 @@
 	padding-bottom: 150px;
 
 }
-#right form.actionparams div.TreeDropdownField span.items {
+#right form.actionparams div.TreeDropdownField .items {
 	width: 195px;
 }
-
 #right form.actionparams div.TreeDropdownField div.tree_holder {
 	width: 214px;
 }
diff --git a/css/layout.css b/css/layout.css
index 8e8f67af..360cfaca 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -544,6 +544,16 @@ iframe {
 	border:1px solid #A7A7A7;
 	border-right: none;
 	overflow: hidden;
+}
+#contentPanel div.TreeDropdownField input.items {
+	float: left;
+	width: 155px;
+	background: #fff;
+	font-size: 12px;
+	border:1px solid #A7A7A7;
+	border-right: none;
+	height: 19px;
+	overflow: hidden;
 }
 	#contentPanel div.TreeDropdownField a {
 		overflow: visible;

From 7551377671fbae9824a3ac0fb66e936873a159d3 Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Tue, 12 Jan 2010 03:01:58 +0000
Subject: [PATCH 066/483] BUGFIX: Ensure .js variable defined with var keyword

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96678 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/Upload.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/Upload.js b/javascript/Upload.js
index a6c20861..0805ab4c 100644
--- a/javascript/Upload.js
+++ b/javascript/Upload.js
@@ -5,7 +5,7 @@
 
 */
 
-Upload = Class.create();
+var Upload = Class.create();
 Upload.prototype = {
 	
 	/**

From 460fe2e5ab7d4b96ac3fdbdb4202d6c2de775e2d Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 12 Jan 2010 23:49:00 +0000
Subject: [PATCH 067/483] MINOR: fix javscript syntax that can confuse ie (from
 r86395)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96776 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/CMSMain_left.js             | 20 ++++++++++----------
 tests/cuke/step_definitions/content.rb |  3 +++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js
index 136f75a6..6b03f88e 100755
--- a/javascript/CMSMain_left.js
+++ b/javascript/CMSMain_left.js
@@ -118,7 +118,7 @@ searchclass.prototype = {
 		$(_HANDLER_FORMS.search).stopObserving(this.o2);
 		batchActionGlobals.unfilterSiteTree();
 	}
-}
+};
 
 var SiteTreeFilter = Class.create();
 SiteTreeFilter.applyTo('#siteTreeFilterList');
@@ -154,7 +154,7 @@ SiteTreeFilter.prototype = {
 			}
 		});
 	}
-}
+};
 /**
  * Control the site tree filter
  */
@@ -177,7 +177,7 @@ SiteTreeFilterForm.prototype = {
 			});
 			document.getElementsBySelector('.SearchCriteriaContainer', this).each(function(el){
 				Element.hide(el);
-			})
+			});
 		}
 		else {
 			Form.getElements(this).each(function(el){
@@ -199,7 +199,7 @@ SiteTreeFilterForm.prototype = {
 			if ($('sitetree').isDraggable) $('sitetree').stopBeingDraggable();
 			document.getElementsBySelector('.checkboxAboveTree input[type=checkbox]').each(function(el){
 				el.value = false; el.disabled = true;	
-			})
+			});
 		}
 		else {
 			// Reset URL to default
@@ -208,7 +208,7 @@ SiteTreeFilterForm.prototype = {
 			// Enable checkbox tree controls
 			document.getElementsBySelector('.checkboxAboveTree input[type=checkbox]').each(function(el){
 				el.disabled = false;	
-			})
+			});
 		}
 		
 		$('SiteTreeSearchButton').className = $('SiteTreeSearchClearButton').className = 'hidden';
@@ -227,7 +227,7 @@ SiteTreeFilterForm.prototype = {
 		
 		return false;
 	}
-}
+};
 
 /**
  * Add Criteria Drop-down onchange action which allows more criteria to be shown
@@ -241,7 +241,7 @@ SiteTreeFilterAddCriteria.prototype = {
 		// Element.show('Input' + this.value);
 		this.selectedIndex = 0; //reset selected criteria to prompt 
 	}
-}
+};
 
 /**
  * Batch Actions button click action
@@ -261,7 +261,7 @@ batchactionsclass.prototype = {
 	},
 	
 	actionChanged: function() {
-		var urlSegment = $('choose_batch_action').value.split('/').pop()
+		var urlSegment = $('choose_batch_action').value.split('/').pop();
 		if ($('BatchActionParameters_'+urlSegment)) {
 			jQuery('#actionParams').empty();
 			jQuery('#BatchActionParameters_'+urlSegment).appendTo('#actionParams');
@@ -297,7 +297,7 @@ batchactionsclass.prototype = {
 			}
 		}
 	}
-}
+};
 
 // batchActionGlobals is needed because calls to observeMethod doesn't seem to preserve instance variables so a Prototype can't be used
 batchActionGlobals = {
@@ -401,7 +401,7 @@ batchActionGlobals = {
 			});
 		}
 	}
-}
+};
 
 
 Behaviour.register({
diff --git a/tests/cuke/step_definitions/content.rb b/tests/cuke/step_definitions/content.rb
index 7bcbad4f..379671dd 100644
--- a/tests/cuke/step_definitions/content.rb
+++ b/tests/cuke/step_definitions/content.rb
@@ -45,8 +45,11 @@ end
 
 Given /create a new page using template \"(.*)\"/i do |type|
   Given 'I load the root node (ajax)'
+  puts "Clicking the create button"
   And 'I click the "Create" button'
+  puts "Selecting #{type} from PageType"
   And "I select \"#{type}\" from \"PageType\""
+  puts "done selecting"
   And 'I click the "Go" button (ajax)'
   And 'I click the "Create" button'
 end

From 879ddce9944b540cacf0cb0325c62ce88d336b22 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 12 Jan 2010 23:49:09 +0000
Subject: [PATCH 068/483] javascript syntax fixes (from r86396)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96777 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/SideReports.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/SideReports.js b/javascript/SideReports.js
index fc01c0bc..f1433541 100755
--- a/javascript/SideReports.js
+++ b/javascript/SideReports.js
@@ -105,4 +105,4 @@ Behaviour.register({
 			$('reports_holder').reportSelected();
 		}
 	}
-});
\ No newline at end of file
+});

From b14404922d9cec48fed21e9b2b4b91dcb77f9970 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 12 Jan 2010 23:50:39 +0000
Subject: [PATCH 069/483] ENHANCEMENT: Files and images section warns if you
 are deleting a file that is linked to

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96778 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/AssetTableField.js         | 57 ++++++++++++++++++++++++++-
 templates/Includes/AssetTableField.ss |  3 +-
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/javascript/AssetTableField.js b/javascript/AssetTableField.js
index 50e82ab2..3040742b 100644
--- a/javascript/AssetTableField.js
+++ b/javascript/AssetTableField.js
@@ -18,6 +18,13 @@ AssetTableField.prototype = {
 				}
 			}
 		});
+		
+		var rules = {};
+		
+		// Assume that the delete link uses the deleteRecord method
+		rules['#'+this.id+' table.data a.deletelink'] = {onclick: this.deleteRecord.bind(this)};
+		
+		Behaviour.register('ComplexTableField_'+this.id,rules);
 	},
 	
 	// prevent submission of wrong form-button (FileFilterButton)
@@ -32,6 +39,54 @@ AssetTableField.prototype = {
 			Event.stop(event);
 			return false;
 		}
+	},
+	
+	
+	// Override deleteRecord function, so that we can give warning if there are
+	// links to this file. This  is mostly a copy paste from TableField.js
+	deleteRecord: function(e) {
+		var img = Event.element(e);
+		var link = Event.findElement(e,"a");
+		var row = Event.findElement(e,"tr");
+		
+		var linkCount = row.getElementsByClassName('linkCount')[0];
+		if(linkCount) linkCount = linkCount.innerHTML;
+		
+		var confirmMessage = ss.i18n._t('TABLEFIELD.DELETECONFIRMMESSAGE', 'Are you sure you want to delete this record?');
+		if(linkCount) confirmMessage += '\nThere are ' + linkCount + ' page(s) that use this file, please review the list of pages on the Links tab of the file before continuing.';
+		
+		// TODO ajaxErrorHandler and loading-image are dependent on cms, but formfield is in sapphire
+		var confirmed = confirm(confirmMessage);
+		if(confirmed)
+		{
+			img.setAttribute("src",'cms/images/network-save.gif'); // TODO doesn't work
+			new Ajax.Request(
+				link.getAttribute("href"),
+				{
+					method: 'post', 
+					postBody: 'forceajax=1' + ($('SecurityID') ? '&SecurityID=' + $('SecurityID').value : ''),
+					onComplete: function(){
+						Effect.Fade(
+							row,
+							{
+								afterFinish: function(obj) {
+									// remove row from DOM
+									obj.element.parentNode.removeChild(obj.element);
+									// recalculate summary if needed (assumes that TableListField.js is present)
+									// TODO Proper inheritance
+									if(this._summarise) this._summarise();
+									// custom callback
+									if(this.callback_deleteRecord) this.callback_deleteRecord(e);
+								}.bind(this)
+							}
+						);
+					}.bind(this),
+					onFailure: this.ajaxErrorHandler
+				}
+			);
+		}
+		
+		Event.stop(e);
 	}
 }
 
@@ -94,4 +149,4 @@ FileFilterButton.prototype = {
 
 		return false;	
 	}
-}
\ No newline at end of file
+}
diff --git a/templates/Includes/AssetTableField.ss b/templates/Includes/AssetTableField.ss
index 9b7fd7b2..036760ef 100755
--- a/templates/Includes/AssetTableField.ss
+++ b/templates/Includes/AssetTableField.ss
@@ -21,6 +21,7 @@
 					<tr id="record-$Parent.Name-$ID">
 						<td class="dragfile" id="drag-$Parent.Name-$ID">
 							<img id="drag-img-$Parent.Name-$ID" alt="Drag" title="<% _t('DRAGTOFOLDER','Drag to folder on left to move file') %>" src="sapphire/images/drag.gif" />
+							<span class="linkCount" style="display: none;">$BackLinkTrackingCount</span>
 						</div>
 						<% if Markable %><td class="markingcheckbox">$MarkingCheckbox</td><% end_if %>
 						<% control Fields %>
@@ -55,4 +56,4 @@
 			<% end_if %>
 		</tbody>
 	</table>
-</div>
\ No newline at end of file
+</div>

From 00264e219c839bb8829cafa88e1523991500785c Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 12 Jan 2010 23:52:10 +0000
Subject: [PATCH 070/483] BUGFIX: Fix highlighting of incorrect page when
 loading a page in the admin section via URL (from r87320)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96779 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index c9efbb68..24b04276 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -328,10 +328,12 @@ class LeftAndMain extends Controller {
 		return $title;
 	}
 
-	public function show($params) {
+	public function show() {
+		$params = $this->getURLParams();
 		if($params['ID']) $this->setCurrentPageID($params['ID']);
-		if(isset($params['OtherID']))
+		if(isset($params['OtherID'])) {
 			Session::set('currentMember', $params['OtherID']);
+		}
 
 		if(Director::is_ajax()) {
 			SSViewer::setOption('rewriteHashlinks', false);

From fdce9e045df908fcdceec0feea1f223423f60ad1 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 12 Jan 2010 23:53:34 +0000
Subject: [PATCH 071/483] BUGFIX: Fix deleting folders in Internet Explorer
 (from r87390)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96780 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/AssetAdmin.js | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/javascript/AssetAdmin.js b/javascript/AssetAdmin.js
index a3f08fbf..0dcdcb51 100755
--- a/javascript/AssetAdmin.js
+++ b/javascript/AssetAdmin.js
@@ -87,7 +87,7 @@ MarkingPropertiesButton.prototype = {
 		}
 		return false;
 	}
-}
+};
 
 
 // CheckBoxRange adapted from: http://jroller.com/page/rmcmahon?entry=checkboxrange_with_prototype
@@ -148,23 +148,23 @@ CheckBoxRange.prototype = {
 				break;
 		}
 	}
-}
+};
 
 // SubsDraggable adapted from http://dev.rubyonrails.org/ticket/5771
 
 // extentions for scriptaculous dragdrop.js
 Object.extend(Class, {
 	superrise: function(obj, names){
-		names.each( function(n){ obj['super_' + n] = obj[n] } )
+		names.each( function(n){ obj['super_' + n] = obj[n]; } );
 		return obj;
 	}
-})
+});
 
 // Draggable that allows substitution of draggable element
 var SubsDraggable = Class.create();
 
 SubsDraggable.prototype = Object.extend({}, Draggable.prototype);
-Class.superrise(SubsDraggable.prototype, ['initialize', 'startDrag', 'finishDrag', 'endDrag'])
+Class.superrise(SubsDraggable.prototype, ['initialize', 'startDrag', 'finishDrag', 'endDrag']);
 Object.extend( SubsDraggable.prototype , {
 	initialize: function(event) {
 		this.super_initialize.apply(this, arguments);
@@ -216,7 +216,7 @@ Object.extend( SubsDraggable.prototype , {
 			this._originalElement = null;
 		}
 	}
-})
+});
 // gets element that should be dragged instead of original element
 // returned element should be added to DOM tree, and will be deleted by dragdrop library
 function getDragElement(element){
@@ -238,7 +238,7 @@ DragFileItem.prototype = {
 	destroy: function() {
 		this.draggable = null;
 	}
-}
+};
 DragFileItem.applyTo('#Form_EditForm_Files tr td.dragfile');
 
 // Set up folder drop target
@@ -267,7 +267,7 @@ DropFileItem.prototype = {
 					if(checkboxes[i].checked) list += (list?',':'') + checkboxes[i].value;
 				}
 				$('Form_EditForm_FileIDs').value = list;
-				$('Form_EditForm').save(false, null, 'movemarked')
+				$('Form_EditForm').save(false, null, 'movemarked');
 			}
 		});
 	},
@@ -275,7 +275,7 @@ DropFileItem.prototype = {
 		this.droppable = null;
 		this.recordID = null;
 	}
-}
+};
 DropFileItem.applyTo('#sitetree li');
 
 
@@ -328,7 +328,7 @@ addfolder.prototype = {
 	showAddPageError: function(response) {
 		errorMessage('Error adding folder', response);
 	}	
-}
+};
 
 /**
  * Look for new files (FilesystemSync) action
@@ -352,7 +352,7 @@ FilesystemSyncClass.prototype = {
 		});
 		return false;
 	}
-}
+};
 
 /**
  * Delete folder action
@@ -367,7 +367,7 @@ var deletefolder = {
 
 			deletefolder.selectedNodes = { };
 
-			var sel = $('sitetree').firstSelected()
+			var sel = $('sitetree').firstSelected();
 			if(sel) {
 				var selIdx = $('sitetree').getIdxOf(sel);
 				deletefolder.selectedNodes[selIdx] = true;
@@ -411,7 +411,7 @@ var deletefolder = {
 		}
 	},
 
-	form_submit : function() {
+	form_submit : function(e) {
 		var csvIDs = "";
 		for(var idx in deletefolder.selectedNodes) {
 			var selectedNode = $('sitetree').getTreeNodeByIdx(idx);
@@ -438,7 +438,8 @@ var deletefolder = {
 		} else {
 			alert("Please select at least 1 page.");
 		}
-
+		
+		Event.stop(e);
 		return false;
 	},
 	
@@ -446,7 +447,7 @@ var deletefolder = {
 		Ajax.Evaluator(response);
 		treeactions.closeSelection($('deletepage'));
 	}
-}
+};
 
 Behaviour.register({
 	'#Form_EditForm_Files': {

From 7af4414a024acb385e76fd6fe7f51a667a50a855 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 12 Jan 2010 23:53:43 +0000
Subject: [PATCH 072/483] BUGFIX: Fix changing the URLSegment on a page making
 the Draft Site link point to the wrong subsite (from r87776)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96781 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 24b04276..08e22b51 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -717,7 +717,7 @@ JS;
 			if( ($record->class != 'VirtualPage') && $originalURLSegment != $record->URLSegment) {
 				$message .= sprintf(_t('LeftAndMain.CHANGEDURL',"  Changed URL to '%s'"),$record->URLSegment);
 				FormResponse::add("\$('Form_EditForm').elements.URLSegment.value = \"$record->URLSegment\";");
-				FormResponse::add("\$('Form_EditForm_StageURLSegment').value = \"{$record->URLSegment}\";");
+				FormResponse::add("\$('Form_EditForm_StageURLSegment').value = \"" . $record->AbsoluteLink() . "\";");
 			}
 
 			// If the 'Save & Publish' button was clicked, also publish the page

From 096bfb25652ca56482ce0ab3635ded2cd1ff88ac Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 12 Jan 2010 23:54:29 +0000
Subject: [PATCH 073/483] BUGFIX: Fix image tracking not working cross subsite
 (from r88008)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96782 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetTableField.php        | 3 +++
 javascript/LeftAndMain_right.js | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/AssetTableField.php b/code/AssetTableField.php
index ce8cae71..44bb612a 100755
--- a/code/AssetTableField.php
+++ b/code/AssetTableField.php
@@ -197,7 +197,10 @@ class AssetTableField extends ComplexTableField {
 		}
 
 		if($childData && $childData->hasMethod('BackLinkTracking')) {
+			if(class_exists('Subsite')) Subsite::disable_subsite_filter(true);
 			$links = $childData->BackLinkTracking();
+			if(class_exists('Subsite')) Subsite::disable_subsite_filter(false);
+
 			if($links->exists()) {
 				foreach($links as $link) {
 					$backlinks[] = "<li><a href=\"admin/show/$link->ID\">" . $link->Breadcrumbs(null,true). "</a></li>";
diff --git a/javascript/LeftAndMain_right.js b/javascript/LeftAndMain_right.js
index ab16360a..75214ab7 100755
--- a/javascript/LeftAndMain_right.js
+++ b/javascript/LeftAndMain_right.js
@@ -463,4 +463,4 @@ function tinymce_removeAll() {
 		tinymce.EditorManager.editors = {};
 	}
 		
-}
\ No newline at end of file
+}

From 141886d6750935efd75305d70bd197745ea87756 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 12 Jan 2010 23:55:01 +0000
Subject: [PATCH 074/483] MINOR remove default form actions. Unit tests pass.
 (from r88065)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96783 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 7f9b78da..762f7ee4 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -428,14 +428,6 @@ JS;
 				$actions = $record->getAllCMSActions();
 			} else {
 				$actions = $record->getCMSActions();
-				// add default actions if none are defined
-				if(!$actions || !$actions->Count()) {
-					if($record->canEdit()) {
-						$actions->push(new FormAction('save',_t('CMSMain.SAVE','Save')));
-						$actions->push($deleteAction = new FormAction('delete',_t('CMSMain.DELETE','Delete from the draft site')));
-						$deleteAction->addExtraClass('delete');
-					}
-				}
 			}
 			
 			// Add a default or custom validator.

From 25ac72ee22d5fa1e974e4bb337bc13528f312495 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 12 Jan 2010 23:55:12 +0000
Subject: [PATCH 075/483] MINOR create the ability to have some roles only be
 able to be applied by admins (from r88090)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96784 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SecurityAdmin.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 743f8fd1..17c9eab7 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -283,6 +283,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 				'help' => _t('SecurityAdmin.APPLY_ROLES_HELP', 'Ability to edit the roles assigned to a group. Requires "Access to Security.".'),
 				'sort' => 0
 			)
+			'APPLY_ROLES' => _t('SecurityAdmin.APPLY_ROLES', 'Apply roles to groups'),
 		);
 	}
 	

From 291de8d2839ce7fa86c76d5c36d6e3a63db1bd28 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 12 Jan 2010 23:56:36 +0000
Subject: [PATCH 076/483] BUGFIX: Ignore elements without a name in change
 detection.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96785 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SecurityAdmin.php    | 1 -
 javascript/LeftAndMain.js | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 17c9eab7..743f8fd1 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -283,7 +283,6 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 				'help' => _t('SecurityAdmin.APPLY_ROLES_HELP', 'Ability to edit the roles assigned to a group. Requires "Access to Security.".'),
 				'sort' => 0
 			)
-			'APPLY_ROLES' => _t('SecurityAdmin.APPLY_ROLES', 'Apply roles to groups'),
 		);
 	}
 	
diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index d22118e9..0f9ac0fb 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -591,8 +591,9 @@ ChangeTracker.prototype = {
 		var i, element;
 		for(i=0;element=elements[i];i++) {
 		    // NOTE: TinyMCE coupling
-		    // Ignore mce-generated elements
+		    // Ignore mce-generated elements and elements without a name
 		    if(element.className.substr(0,3) == 'mce') continue;
+			if(!element.name) continue;
 		    
 			if(!element.isChanged) element.isChanged = this.field_changed;
 			if(!this.changeDetection_fieldsToIgnore[element.name] && element.isChanged()) {

From 568f808053bab0b797fefa637ad6023106bbc0c0 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 12 Jan 2010 23:56:49 +0000
Subject: [PATCH 077/483] MINOR rename deleted pages report (from r88333)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96786 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSSiteTreeFilter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/CMSSiteTreeFilter.php b/code/CMSSiteTreeFilter.php
index 353ab89a..3e6ae89f 100644
--- a/code/CMSSiteTreeFilter.php
+++ b/code/CMSSiteTreeFilter.php
@@ -75,7 +75,7 @@ abstract class CMSSiteTreeFilter extends Object {
 
 class CMSSiteTreeFilter_DeletedPages extends CMSSiteTreeFilter {
 	static function title() {
-		return "Deleted pages";
+		return "All pages, including deleted";
 	}
 	
 	function getTree() {

From 2b4366b0d3dd59154ee78f4c8a799b5845bfb966 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 12 Jan 2010 23:57:47 +0000
Subject: [PATCH 078/483] MINOR fix issue where javascript popup calendar would
 not fire (from r88836)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96787 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/CMSMain_left.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js
index 6b03f88e..884373b2 100755
--- a/javascript/CMSMain_left.js
+++ b/javascript/CMSMain_left.js
@@ -263,13 +263,11 @@ batchactionsclass.prototype = {
 	actionChanged: function() {
 		var urlSegment = $('choose_batch_action').value.split('/').pop();
 		if ($('BatchActionParameters_'+urlSegment)) {
-			jQuery('#actionParams').empty();
-			jQuery('#BatchActionParameters_'+urlSegment).appendTo('#actionParams');
-			$('actionParams').style.display = 'block';
-			$('actionParams').style.padding = '4px';
+			jQuery('#BatchActionParameters .params').hide();
+			jQuery('#BatchActionParameters_'+urlSegment).show();
+			jQuery('#BatchActionParameters').show();
 		} else {
-			$('actionParams').innerHTML = '';
-			$('actionParams').style.display = 'none';
+			jQuery('#BatchActionParameters').hide();
 		}
 	},
 	

From 430f30b7c413e507719fe17b5b5c4227c68b63f7 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 12 Jan 2010 23:57:58 +0000
Subject: [PATCH 079/483] MINOR more fix around batch action parameters (from
 r88837)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96788 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 templates/Includes/CMSMain_left.ss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/Includes/CMSMain_left.ss b/templates/Includes/CMSMain_left.ss
index b30033bd..fec64957 100755
--- a/templates/Includes/CMSMain_left.ss
+++ b/templates/Includes/CMSMain_left.ss
@@ -65,9 +65,10 @@
 				</div>
 				</form>
 			
-			$BatchActionParameters
 			<div id="batchactionsforms" style="display: none">
 				<form class="actionparams" style="border:0" id="batchactions_options" action="">
+					$BatchActionParameters
+				
 					<p><% _t('SELECTPAGESACTIONS','Select the pages that you want to change &amp; then click an action:') %></p>
 
 					<input type="hidden" name="csvIDs" />

From 2cf10e76fe6dd63fdf744681fbd8acfc7e94a6d0 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 12 Jan 2010 23:59:49 +0000
Subject: [PATCH 080/483] MINOR added batch deletion back for workflow (from
 r88916)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96789 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSBatchAction.php        | 14 ++++++++------
 code/CMSBatchActionHandler.php |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/code/CMSBatchAction.php b/code/CMSBatchAction.php
index d060b61a..16a7f6e6 100644
--- a/code/CMSBatchAction.php
+++ b/code/CMSBatchAction.php
@@ -107,11 +107,14 @@ class CMSBatchAction_Delete extends CMSBatchAction {
 	}
 
 	function run(DataObjectSet $pages) {
+		$failures = 0;
+		
 		foreach($pages as $page) {
 			$id = $page->ID;
 			
 			// Perform the action
 			if($page->canDelete()) $page->delete();
+			else $failures++;
 
 			// check to see if the record exists on the live site, if it doesn't remove the tree node
 			$liveRecord = Versioned::get_one_by_stage( 'SiteTree', 'Live', "\"SiteTree\".\"ID\"=$id");
@@ -130,7 +133,7 @@ class CMSBatchAction_Delete extends CMSBatchAction {
 			unset($page);
 		}
 
-		$message = sprintf(_t('CMSBatchActions.DELETED_DRAFT_PAGES', 'Deleted %d pages from the draft site'), $pages->Count());
+		$message = sprintf(_t('CMSBatchActions.DELETED_DRAFT_PAGES', 'Deleted %d pages from the draft site'), $pages->Count()-$failures);
 		FormResponse::add('statusMessage("'.$message.'","good");');
 
 		return FormResponse::respond();
@@ -160,7 +163,7 @@ class CMSBatchAction_DeleteFromLive extends CMSBatchAction {
 		foreach($ids as $pageID) {
 			$id = $pageID;
 
-			// check to see if the record exists on the live site, if it doesn't remove the tree node
+			// check to see if the record exists on the stage site, if it doesn't remove the tree node
 			$stageRecord = Versioned::get_one_by_stage( 'SiteTree', 'Stage', "\"SiteTree\".\"ID\"=$id");
 			if($stageRecord) {
 				$stageRecord->IsAddedToStage = true;
@@ -173,11 +176,10 @@ class CMSBatchAction_DeleteFromLive extends CMSBatchAction {
 				FormResponse::add("$('Form_EditForm').reloadIfSetTo($id);");
 			}
 		}
-
-		$message = sprintf(_t('CMSBatchActions.DELETED_PAGES', 'Deleted %d pages from the published site'), $pages->Count());
-		FormResponse::add('statusMessage("'.$message.'","good");');
-
+		
 		return FormResponse::respond();
 	}
 }
 
+
+
diff --git a/code/CMSBatchActionHandler.php b/code/CMSBatchActionHandler.php
index 640b78b4..3ccadcee 100644
--- a/code/CMSBatchActionHandler.php
+++ b/code/CMSBatchActionHandler.php
@@ -69,7 +69,7 @@ class CMSBatchActionHandler extends RequestHandler {
 				if($pages) foreach($pages as $page) unset($idsFromLive[$page->ID]);
 				$idsFromLive = array_keys($idsFromLive);
 				
-				Debug::message("\"SiteTree\".\"ID\" IN (" . implode(", ", $idsFromLive) . ")");
+				// Debug::message("\"SiteTree\".\"ID\" IN (" . implode(", ", $idsFromLive) . ")");
 				$livePages = Versioned::get_by_stage('SiteTree', 'Live', "\"SiteTree\".\"ID\" IN (" . implode(", ", $idsFromLive) . ")");
 				if($pages) $pages->merge($livePages);
 				else $pages = $livePages;

From 7ac22033194d75487c9cca73668c16d3fc831ae6 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:00:01 +0000
Subject: [PATCH 081/483] BUGFIX: Don't cut off document.body overflow in CTF
 popups in the admin, when on test mode. (from r88958)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96790 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/LeftAndMain.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index 0f9ac0fb..a71ca9a2 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -213,8 +213,12 @@ window.onresize = function(init) {
 }
 
 appendLoader(function() {
-	document.body.style.overflow = 'hidden';
-	window.onresize(true);
+	// Only execute this code if it's actually called from the LeftAndMain interface
+	// JSMin/concatenation can get this file included in strange places
+	if(document.getElementById('left') && document.getElementById('right')) {
+		document.body.style.overflow = 'hidden';
+		window.onresize(true);
+	}
 });
 
 function isVisible(el) {

From c841b11eddfbecf276b9cc16f3c7a8d3bda0e6e8 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:00:33 +0000
Subject: [PATCH 082/483] ENHANCEMENT: Added new onRenameLinkAsset() handler to
 static publishing for better link rewriting. (from r89014)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96792 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/staticpublisher/StaticPublisher.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/code/staticpublisher/StaticPublisher.php b/code/staticpublisher/StaticPublisher.php
index b8869cd8..b8e29173 100644
--- a/code/staticpublisher/StaticPublisher.php
+++ b/code/staticpublisher/StaticPublisher.php
@@ -30,9 +30,26 @@ abstract class StaticPublisher extends DataObjectDecorator {
 		self::$echo_progress = (boolean)$progress;
 	}
 
+	/**
+	 * Called after a page is published.
+	 */
 	function onAfterPublish($original) {
+		$this->republish($original);
+	}
+	
+	/**
+	 * Called after link assets have been renamed, and the live site has been updated, without
+	 * an actual publish event.
+	 * 
+	 * Only called if the published content exists and has been modified.
+	 */
+	function onRenameLinkedAsset($original) {
+		$this->republish($original);
+	}
+	
+	function republish($original) {
 		if (self::$disable_realtime) return;
-		
+
 		$urls = array();
 		
 		if($this->owner->hasMethod('pagesAffectedByChanges')) {

From f1bac8fd674a6881f4b0cfd59bdcc8d1f3e4e013 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:00:47 +0000
Subject: [PATCH 083/483] ENHANCEMENT: Renamed Author column to User in the
 page version history to better reflect that they might not have been authors,
 and just iniators of workflow actions. (from r89015)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96793 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 lang/en_US.php                | 2 +-
 templates/CMSMain_versions.ss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/en_US.php b/lang/en_US.php
index e74fd54c..61dcc8eb 100755
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -179,7 +179,7 @@ $lang['en_US']['CMSMain_left.ss']['SITECONTENT TITLE'] = array(
 $lang['en_US']['CMSMain_left.ss']['SITEREPORTS'] = 'Site Reports';
 $lang['en_US']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Please choose a page from the left.';
 $lang['en_US']['CMSMain_right.ss']['WELCOMETO'] = 'Welcome to';
-$lang['en_US']['CMSMain_versions.ss']['AUTHOR'] = 'Author';
+$lang['en_US']['CMSMain_versions.ss']['AUTHOR'] = 'User';
 $lang['en_US']['CMSMain_versions.ss']['NOTPUB'] = 'Not published';
 $lang['en_US']['CMSMain_versions.ss']['PUBR'] = 'Publisher';
 $lang['en_US']['CMSMain_versions.ss']['UNKNOWN'] = 'Unknown';
diff --git a/templates/CMSMain_versions.ss b/templates/CMSMain_versions.ss
index 2c829227..605c5f65 100755
--- a/templates/CMSMain_versions.ss
+++ b/templates/CMSMain_versions.ss
@@ -3,7 +3,7 @@
 	<tr>
 		<td>#</td>
 		<td><% _t('WHEN','When') %></td>
-		<td><% _t('AUTHOR','Author') %></td>
+		<td><% _t('AUTHOR','User') %></td>
 		<td><% _t('PUBR','Publisher') %></td>
 	</tr>
 	</thead>

From b7181a832fe4485e42ca3b4d13f4320e44954afc Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:01:39 +0000
Subject: [PATCH 084/483] MINOR: Make CMSMainTest compatible with cmsworkflow
 module. (from r89030)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96794 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/CMSMainTest.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/CMSMainTest.php b/tests/CMSMainTest.php
index 90769c81..b3ad8afa 100644
--- a/tests/CMSMainTest.php
+++ b/tests/CMSMainTest.php
@@ -39,11 +39,14 @@ class CMSMainTest extends FunctionalTest {
 			sprintf(_t('CMSMain.PUBPAGES',"Done: Published %d pages"), 5), 
 			$response->getBody()
 		);
-
-		$response = Director::test("admin/cms/batchactions/publish", array('csvIDs' => '1,2', 'ajax' => 1), $this->session());
 		
-		$this->assertContains('setNodeTitle(1, \'Page 1\');', $response->getBody());
-		$this->assertContains('setNodeTitle(2, \'Page 2\');', $response->getBody());
+		// Some modules (e.g., cmsworkflow) will remove this action
+		if(isset(CMSBatchActionHandler::$batch_actions['publish'])) {
+			$response = Director::test("admin/cms/batchactions/publish", array('csvIDs' => '1,2', 'ajax' => 1), $this->session());
+	
+			$this->assertContains('setNodeTitle(1, \'Page 1\');', $response->getBody());
+			$this->assertContains('setNodeTitle(2, \'Page 2\');', $response->getBody());
+		}
 		
 		$this->session()->clear('loggedInAs');
 		
@@ -123,8 +126,8 @@ class CMSMainTest extends FunctionalTest {
 		$this->assertType('SiteTree', $livePage);
 		$this->assertTrue($livePage->canDelete());
 
-		// Check that the 'delete from live' button exists as a simple way of checking that the correct page is returned.
-		$this->assertRegExp('/<input[^>]+type="submit"[^>]+name="action_deletefromlive"/i', $response->getBody());
+		// Check that the 'restore' button exists as a simple way of checking that the correct page is returned.
+		$this->assertRegExp('/<input[^>]+type="submit"[^>]+name="action_restore"/i', $response->getBody());
 	}
 	
 	/**

From 27f3dfc6ed32e37cb589901135682c0cf0c1e603 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:02:06 +0000
Subject: [PATCH 085/483] BUGFIX: Fixed viewing of deleted pages. (from r89833)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96795 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSSiteTreeFilter.php |  2 +-
 tests/CMSMainTest.php      |  9 ++++++++-
 tests/CMSMainTest.yml      | 10 ++++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/code/CMSSiteTreeFilter.php b/code/CMSSiteTreeFilter.php
index 3e6ae89f..ce5c3b99 100644
--- a/code/CMSSiteTreeFilter.php
+++ b/code/CMSSiteTreeFilter.php
@@ -79,7 +79,7 @@ class CMSSiteTreeFilter_DeletedPages extends CMSSiteTreeFilter {
 	}
 	
 	function getTree() {
-		$leftAndMain = new LeftAndMain();
+		$leftAndMain = new CMSMain();
 		$tree = $leftAndMain->getSiteTreeFor('SiteTree', isset($_REQUEST['ID']) ? $_REQUEST['ID'] : 0, "AllHistoricalChildren");
 
 		// Trim off the outer tag
diff --git a/tests/CMSMainTest.php b/tests/CMSMainTest.php
index b3ad8afa..3ab1fd4f 100644
--- a/tests/CMSMainTest.php
+++ b/tests/CMSMainTest.php
@@ -36,7 +36,7 @@ class CMSMainTest extends FunctionalTest {
 		$response = Director::test("admin/cms/publishall", array('confirm' => 1), $this->session());
 		
 		$this->assertContains(
-			sprintf(_t('CMSMain.PUBPAGES',"Done: Published %d pages"), 5), 
+			sprintf(_t('CMSMain.PUBPAGES',"Done: Published %d pages"), 7), 
 			$response->getBody()
 		);
 		
@@ -156,4 +156,11 @@ class CMSMainTest extends FunctionalTest {
 		$this->assertEquals('5', $newPage->ParentID);
 
 	}
+	
+	function testDeletedPagesSiteTreeFilter() {
+		$id = $this->idFromFixture('Page', 'page3');
+		$this->logInWithPermssion('ADMIN');
+		$result = $this->get('admin/getfilteredsubtree?filter=CMSSiteTreeFilter_DeletedPages&ajax=1&ID=' . $id);
+		$this->assertEquals(200, $result->getStatusCode());
+	}
 }
diff --git a/tests/CMSMainTest.yml b/tests/CMSMainTest.yml
index 0b7fc3f5..2288554f 100644
--- a/tests/CMSMainTest.yml
+++ b/tests/CMSMainTest.yml
@@ -4,9 +4,15 @@ Page:
    page2:
       Title: Page 2
    page3:
-      Title: Page 2
+      Title: Page 3
+   page31:
+      Title: Page 3.1
+      Parent: =>Page.page3
+   page32:
+      Title: Page 3.2
+      Parent: =>Page.page3
    page4:
-      Title: Page 2
+      Title: Page 4
    home:
       Title: Home
       URLSegment: home

From a695b6b034af090be9574fe4ed8a79d819cb538b Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:02:12 +0000
Subject: [PATCH 086/483] BUGFIX: Don't set the Owner by default on new
 records. (from r89910)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96796 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 762f7ee4..a2254e84 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -531,9 +531,6 @@ JS;
 			$newItem->Sort = DB::query("SELECT MAX(\"Sort\") FROM \"SiteTree\" WHERE \"ParentID\" = '" . Convert::raw2sql($parentID) . "'")->value() + 1;
 		}
 
-		if( Member::currentUser() )
-			$newItem->OwnerID = Member::currentUser()->ID;
-
 		if($setID) $newItem->ID = $id;
 
 		# Some modules like subsites add extra fields that need to be set when the new item is created

From 9abe9a581b53913c19307c1a5a9e5957814aad13 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:02:19 +0000
Subject: [PATCH 087/483] BUGFIX: Fixed width of time dropdown fields in the
 LHS CMS (from r89913)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96797 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/cms_left.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/css/cms_left.css b/css/cms_left.css
index a2255c12..e3f5afe8 100644
--- a/css/cms_left.css
+++ b/css/cms_left.css
@@ -17,6 +17,11 @@
 #ReportSelector_holder select {
 	width: 75%;
 }
+	/* reset for a fieldtype that shouldn't have this width setting */
+	#left form.actionparams .dropdownpopup select {
+		width: auto;
+	}
+
 #PageType,
 #ReportSelector_holder select {
 	float: left;

From b561550c696b942bd67eb61f0c6b31cf9809cee3 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:02:48 +0000
Subject: [PATCH 088/483] BUGFIX: Removed destroy() calls from static cache
 builder; with the garbage collection improvements it shouldn't be necessary.
 (from r89983)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96798 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/staticpublisher/FilesystemPublisher.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/staticpublisher/FilesystemPublisher.php b/code/staticpublisher/FilesystemPublisher.php
index 600d9cda..c6af352c 100644
--- a/code/staticpublisher/FilesystemPublisher.php
+++ b/code/staticpublisher/FilesystemPublisher.php
@@ -118,7 +118,7 @@ class FilesystemPublisher extends StaticPublisher {
 			$response = Director::test(str_replace('+', ' ', $url));
 			Requirements::clear();
 			
-			DataObject::flush_and_destroy_cache();
+			singleton('DataObject')->flushCache();
 
 			// Generate file content			
 			// PHP file caching will generate a simple script from a template

From 58534f76c50a5d624059e0b8fabb66eb478c01eb Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:03:05 +0000
Subject: [PATCH 089/483] BUGFIX: Updated onAfterUnpublish to republish page
 from static cache as well as unpublish them. (from r90002)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96799 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/staticpublisher/StaticPublisher.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/code/staticpublisher/StaticPublisher.php b/code/staticpublisher/StaticPublisher.php
index b8e29173..fe690043 100644
--- a/code/staticpublisher/StaticPublisher.php
+++ b/code/staticpublisher/StaticPublisher.php
@@ -84,6 +84,7 @@ abstract class StaticPublisher extends DataObjectDecorator {
 	function onAfterUnpublish($page) {
 		if (self::$disable_realtime) return;
 		
+		// Get the affected URLs
 		if($this->owner->hasMethod('pagesAffectedByUnpublishing')) {
 			$urls = $this->owner->pagesAffectedByUnpublishing();
 			$urls = array_unique($urls);
@@ -91,7 +92,16 @@ abstract class StaticPublisher extends DataObjectDecorator {
 			$urls = array($this->owner->AbsoluteLink());
 		}
 		
-		$this->unpublishPages($urls);
+		$legalPages = $this->owner->allPagesToCache();
+		
+		$urlsToRepublish = array_intersect($urls, $legalPages);
+		$urlsToUnpublish = array_diff($urls, $legalPages);
+
+		Debug::dump($urlsToRepublish);
+		Debug::dump($urlsToUnpublish);
+
+		$this->unpublishPages($urlsToUnpublish);
+		$this->publishPages($urlsToRepublish);
 	}
 		
 	/**

From 0ee53df7a6e2da548ec007c133cc9e219a4fd7c9 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:03:18 +0000
Subject: [PATCH 090/483] ENHANCEMENT: Let LeftAndMain subclass canView()
 methods optionally redirect. (from r90018)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96800 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 08e22b51..c4ee1816 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -118,7 +118,8 @@ class LeftAndMain extends Controller {
 		}
 
 		// Allow customisation of the access check by a decorator
-		if(!$this->canView()) {
+		// Also all the canView() check to execute Director::redirect()
+		if(!$this->canView() && !$this->response->isFinished()) {
 			// When access /admin/, we should try a redirect to another part of the admin rather than be locked out
 			$menu = $this->MainMenu();
 			foreach($menu as $candidate) {
@@ -145,7 +146,7 @@ class LeftAndMain extends Controller {
 
 			return Security::permissionFailure($this, $messageSet);
 		}
-
+		
 		// Don't continue if there's already been a redirection request.
 		if(Director::redirected_to()) return;
 

From aacde1063d739910439071864f5981ec8a5bca8d Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:03:28 +0000
Subject: [PATCH 091/483] MINOR: Fixed testing quirk of static publisher
 unpublishing. (from r90048)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96801 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/staticpublisher/StaticPublisher.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/staticpublisher/StaticPublisher.php b/code/staticpublisher/StaticPublisher.php
index fe690043..93092bff 100644
--- a/code/staticpublisher/StaticPublisher.php
+++ b/code/staticpublisher/StaticPublisher.php
@@ -92,7 +92,7 @@ abstract class StaticPublisher extends DataObjectDecorator {
 			$urls = array($this->owner->AbsoluteLink());
 		}
 		
-		$legalPages = $this->owner->allPagesToCache();
+		$legalPages = singleton('Page')->allPagesToCache();
 		
 		$urlsToRepublish = array_intersect($urls, $legalPages);
 		$urlsToUnpublish = array_diff($urls, $legalPages);

From 4ba5e78b28f353e8573cb10867fd801dcc6bfc05 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:03:33 +0000
Subject: [PATCH 092/483] MINOR: Removed debugging statements (from r90052)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96802 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/staticpublisher/StaticPublisher.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/staticpublisher/StaticPublisher.php b/code/staticpublisher/StaticPublisher.php
index 93092bff..afc9f14b 100644
--- a/code/staticpublisher/StaticPublisher.php
+++ b/code/staticpublisher/StaticPublisher.php
@@ -97,9 +97,6 @@ abstract class StaticPublisher extends DataObjectDecorator {
 		$urlsToRepublish = array_intersect($urls, $legalPages);
 		$urlsToUnpublish = array_diff($urls, $legalPages);
 
-		Debug::dump($urlsToRepublish);
-		Debug::dump($urlsToUnpublish);
-
 		$this->unpublishPages($urlsToUnpublish);
 		$this->publishPages($urlsToRepublish);
 	}

From 4567f66a0a3800241762624338db2ce195d25f0a Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:03:43 +0000
Subject: [PATCH 093/483] MINOR: Updated ModelAdminTest to use extraDataObjects
 (from r90055)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96803 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/ModelAdminTest.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/ModelAdminTest.php b/tests/ModelAdminTest.php
index d043800e..7db110eb 100644
--- a/tests/ModelAdminTest.php
+++ b/tests/ModelAdminTest.php
@@ -3,6 +3,11 @@
 class ModelAdminTest extends FunctionalTest {
 	static $fixture_file = 'cms/tests/ModelAdminTest.yml';
 	
+	protected $extraDataObjects = array(
+		'ModelAdminTest_Admin',
+		'ModelAdminTest_Contact',
+	);
+	
 	function testModelAdminOpens() {
 		$this->autoFollowRedirection = false;
 		$this->logInAs('admin');
@@ -19,7 +24,7 @@ class ModelAdminTest_Admin extends ModelAdmin implements TestOnly {
 	);
 }
 
-class ModelAdminTest_Contact extends DataObject {
+class ModelAdminTest_Contact extends DataObject implements TestOnly {
 	static $db = array(
 		"Name" => "Varchar",
 		"Phone" => "Varchar",

From df0bc2ff73d9afe12ee2e2e125a1bf74321f6be8 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:04:14 +0000
Subject: [PATCH 094/483] MINOR: Fixed notice-level error in rollback. (from
 r90260)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96804 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index a2254e84..d1816a42 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -729,6 +729,7 @@ JS;
 	 */
 	function rollback() {
 		if(isset($_REQUEST['Version']) && (bool)$_REQUEST['Version']) {
+			$this->extend('onBeforeRollback', $_REQUEST['ID']);
 			$record = $this->performRollback($_REQUEST['ID'], $_REQUEST['Version']);
 			echo sprintf(_t('CMSMain.ROLLEDBACKVERSION',"Rolled back to version #%d.  New version number is #%d"),$_REQUEST['Version'],$record->Version);
 		} else {
@@ -890,6 +891,7 @@ JS;
 		if($page && !$page->canView()) return Security::permissionFailure($this);
 		
 		$record = $page->compareVersions($fromVersion, $toVersion);
+		
 		$fromVersionRecord = Versioned::get_version('SiteTree', $id, $fromVersion);
 		$toVersionRecord = Versioned::get_version('SiteTree', $id, $toVersion);
 		if(!$fromVersionRecord) user_error("Can't find version $fromVersion of page $id", E_USER_ERROR);

From a53967b266a47f2f0405915f9bc8f5c454be13cd Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:04:25 +0000
Subject: [PATCH 095/483] BUGFIX: Correct confirmation alert message when
 rolling back to a specific version. (from r90261)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96805 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/CMSMain_right.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/javascript/CMSMain_right.js b/javascript/CMSMain_right.js
index 453cc6de..5a49058a 100755
--- a/javascript/CMSMain_right.js
+++ b/javascript/CMSMain_right.js
@@ -34,7 +34,15 @@ function action_rollback_right() {
 		}
 	}
 	
-	if(confirm("Do you really want to copy the published content to the stage site?")) {
+	if($('Form_EditForm').elements.Version && $('Form_EditForm').elements.Version.value) {
+		var message = "Do you really want to roll back to version #" 
+			+ $('Form_EditForm').elements.Version.value + " of this page?";
+			
+	} else {
+		var message = "Do you really want to copy the published content to the stage site?";
+	}
+	
+	if(confirm(message)) {
 		options.OK();
 	} else {
 		return false;

From ae104032400af6843dce64e891e2dabf74d73fd9 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:05:48 +0000
Subject: [PATCH 096/483] BUGFIX: Preserve selection of LHS multiselect tree
 when switching between filters. (from r90290)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96806 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/CMSMain_left.js     | 30 +++++++++++++++++++++---------
 javascript/LeftAndMain_left.js | 10 +++++++++-
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js
index 884373b2..71ecfa42 100755
--- a/javascript/CMSMain_left.js
+++ b/javascript/CMSMain_left.js
@@ -148,6 +148,7 @@ SiteTreeFilter.prototype = {
 			onSuccess: function() {
 				indicator.style.display = 'none';
 				if(__makeDraggableAfterUpdate) $('sitetree').makeDraggable();
+				batchActionGlobals.refreshSelected();
 			},
 			onFailure: function(response) {
 				errorMessage('Could not update tree', response);
@@ -276,7 +277,7 @@ batchactionsclass.prototype = {
 		batchActionGlobals.o2 = $(_HANDLER_FORMS.batchactions).observeMethod('Close', batchActionGlobals.popupClosed);
 	
 		addClass($('sitetree'),'multiselect');
-
+	
 		batchActionGlobals.selectedNodes = { };
 
 		var selectedNode = $('sitetree').firstSelected();
@@ -301,7 +302,9 @@ batchactionsclass.prototype = {
 batchActionGlobals = {
 	selectedNodes: { },
 	// count Int - The number of nodes selected
-	count: { },
+	count: function() {
+		return batchActionGlobals.getIds().length;
+	},
 	// TODO: Remove 'new-' code http://open.silverstripe.com/ticket/875
 	newNodes: { },
 	treeSelectionChanged : function(selectedNode) {
@@ -337,6 +340,7 @@ batchActionGlobals = {
 	
 	popupClosed : function() {
 		removeClass($('sitetree'),'multiselect');
+
 		$('sitetree').stopObserving(batchActionGlobals.o1);
 		$(_HANDLER_FORMS.batchactions).stopObserving(batchActionGlobals.o2);
 
@@ -351,8 +355,8 @@ batchActionGlobals = {
 		}
 		batchActionGlobals.selectedNodes = { };
 	},
-
-	getCsvIds : function() {
+	
+	getIds: function() {
 		var csvIDs = new Array();
 		var st = $('sitetree');
 		batchActionGlobals.newNodes = new Array();
@@ -375,8 +379,17 @@ batchActionGlobals = {
 				}
 			}
 		}
-		batchActionGlobals.count=csvIDs.length;	
-		return (csvIDs.toString());
+		return csvIDs;
+	},
+	getCsvIds : function() {
+		return (batchActionGlobals.getIds().toString());
+	},
+	refreshSelected : function() {
+		var st = $('sitetree');
+		for(var idx in batchActionGlobals.selectedNodes) {
+			st.getTreeNodeByIdx(idx).addNodeClass('selected');
+			st.getTreeNodeByIdx(idx).selected = true;
+		}
 	},
 	unfilterSiteTree : function() {
 		// Reload the site tree if it has been filtered
@@ -427,7 +440,7 @@ publishpage.prototype = {
 			var ingText = optionParams.doingText;
 
 			// Confirmation
-			if(!confirm("You have " + batchActionGlobals.count + " pages selected.\n\nDo your really want to " + actionText.toLowerCase() + "?")) {
+			if(!confirm("You have " + batchActionGlobals.count() + " pages selected.\n\nDo your really want to " + actionText.toLowerCase() + "?")) {
 				return false;
 			}
 
@@ -470,11 +483,10 @@ deletepage.prototype = {
 	onsubmit : function() {
 		csvIDs = batchActionGlobals.getCsvIds();
 		if(csvIDs || batchActionGlobals.newNodes.length > 0) {
-			batchActionGlobals.count += batchActionGlobals.newNodes.length;
 			
 			if(confirm(ss.i18n.sprintf(
 				ss.i18n._t('CMSMAIN.REALLYDELETEPAGES'),
-				batchActionGlobals.count
+				batchActionGlobals.count()
 			))) {
 				this.elements.csvIDs.value = csvIDs;
 				
diff --git a/javascript/LeftAndMain_left.js b/javascript/LeftAndMain_left.js
index 8a7a1445..6e5c390a 100755
--- a/javascript/LeftAndMain_left.js
+++ b/javascript/LeftAndMain_left.js
@@ -231,10 +231,18 @@ TreeNodeAPI.prototype = {
 		url = this.tree.url(args); 
 		
 		new Ajax.Request(url, {
-			onSuccess : this.installSubtree.bind(this),
+			onSuccess : this.installSubtreeAndRefresh.bind(this),
 			onFailure : this.showSubtreeLoadingError
 		});
 	},
+	
+	installSubtreeAndRefresh : function(response){
+		this.installSubtree(response);
+		if(this.tree.className.indexOf('multiselect') != -1) {
+			batchActionGlobals.refreshSelected();
+		}
+	},
+	
 	showSubtreeLoadingError: function(response) { 
 		errorMessage('error loading subtree', response);
 	},

From 513de2271acd8e14ed710892b0c4a0a599cc9a84 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:06:00 +0000
Subject: [PATCH 097/483] MINOR no longer assume with batch actions that the
 child pages of a parent are to be ticked (from r90999)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96807 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/cms_left.css           | 4 ----
 javascript/CMSMain_left.js | 6 ------
 2 files changed, 10 deletions(-)

diff --git a/css/cms_left.css b/css/cms_left.css
index e3f5afe8..5475e65d 100644
--- a/css/cms_left.css
+++ b/css/cms_left.css
@@ -122,10 +122,6 @@ ul.tree.multiselect span.a.selected span.b span.c a {
 	background-image: url(../images/tickbox-ticked.gif) !important;
 }
 
-ul.tree.multiselect li.selected ul span.a a {
-	background-image: url(../images/tickbox-greyticked.gif) !important;
-}
-
 /* Span-B: Plus/Minus icon */
 ul.tree.multiselect li.selected span.a.children span.b, 
 ul.tree.multiselect li.selected span.a.unexpanded span.b {
diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js
index 71ecfa42..83793f04 100755
--- a/javascript/CMSMain_left.js
+++ b/javascript/CMSMain_left.js
@@ -367,12 +367,6 @@ batchActionGlobals = {
 				if( idx.match(/^new-[a-z0-9A-Z\-]+$/) ) {
 					batchActionGlobals.newNodes.push( idx );
 				} else {
-					var i, item, childrenTopublish = st.getTreeNodeByIdx(idx).getElementsByTagName('li');
-					for(i=0;item=childrenTopublish[i];i++) {
-						if(csvIDs.indexOf(st.getIdxOf(childrenTopublish[i])) == -1) {
-							csvIDs.push(st.getIdxOf(childrenTopublish[i]));
-						}
-					}
 					if(csvIDs.indexOf(idx) == -1) {
 						csvIDs.push(idx);
 					}

From 80756cc49842c18ee4693edca9c748d05dab96a8 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:06:12 +0000
Subject: [PATCH 098/483] MINOR add a hidden field to attach the subsite ID,
 rather than relying on the session (from r91014)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96808 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index d1816a42..9dac31f2 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -1113,6 +1113,8 @@ JS;
 			new DropdownField("PageType", "", $pageTypes, 'Page')
 		);
 		
+		$this->extend('updatePageOptions', $fields);
+		
 		$actions = new FieldSet(
 			new FormAction("addpage", _t('CMSMain.GO',"Go"))
 		);

From 0cdd75dfb1feed7b8142fe50c21aec00a070ce88 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:06:28 +0000
Subject: [PATCH 099/483] API CHANGE: Added numChildrenMethod argument to
 LeftAndMain::getSiteTreeFor() BUGFIX: Use the correct numChildrenMethod when
 showing the 'all children, including deleted' tree (from r91166)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96809 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSSiteTreeFilter.php | 4 ++--
 code/LeftAndMain.php       | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/code/CMSSiteTreeFilter.php b/code/CMSSiteTreeFilter.php
index ce5c3b99..d77bcc7b 100644
--- a/code/CMSSiteTreeFilter.php
+++ b/code/CMSSiteTreeFilter.php
@@ -28,7 +28,7 @@ abstract class CMSSiteTreeFilter extends Object {
 		}
 
 		$leftAndMain = new LeftAndMain();
-		$tree = $leftAndMain->getSiteTreeFor('SiteTree', isset($_REQUEST['ID']) ? $_REQUEST['ID'] : 0, null, array($this, 'includeInTree'));
+		$tree = $leftAndMain->getSiteTreeFor('SiteTree', isset($_REQUEST['ID']) ? $_REQUEST['ID'] : 0, null, null, array($this, 'includeInTree'));
 
 		// Trim off the outer tag
 		$tree = ereg_replace('^[ \t\r\n]*<ul[^>]*>','', $tree);
@@ -80,7 +80,7 @@ class CMSSiteTreeFilter_DeletedPages extends CMSSiteTreeFilter {
 	
 	function getTree() {
 		$leftAndMain = new CMSMain();
-		$tree = $leftAndMain->getSiteTreeFor('SiteTree', isset($_REQUEST['ID']) ? $_REQUEST['ID'] : 0, "AllHistoricalChildren");
+		$tree = $leftAndMain->getSiteTreeFor('SiteTree', isset($_REQUEST['ID']) ? $_REQUEST['ID'] : 0, "AllHistoricalChildren", "numHistoricalChildren");
 
 		// Trim off the outer tag
 		$tree = ereg_replace('^[ \t\r\n]*<ul[^>]*>','', $tree);
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index c4ee1816..3aebdc3c 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -469,9 +469,10 @@ class LeftAndMain extends Controller {
 	 * @param $childrenMethod The method to call to get the children of the tree.  For example,
 	 *                        Children, AllChildrenIncludingDeleted, or AllHistoricalChildren
 	 */
-	function getSiteTreeFor($className, $rootID = null, $childrenMethod = null, $filterFunction = null, $minNodeCount = 30) {
-		// Default childrenMethod
+	function getSiteTreeFor($className, $rootID = null, $childrenMethod = null, $numChildrenMethod = null, $filterFunction = null, $minNodeCount = 30) {
+		// Default childrenMethod and numChildrenMethod
 		if (!$childrenMethod) $childrenMethod = 'AllChildrenIncludingDeleted';
+		if (!$numChildrenMethod) $numChildrenMethod = 'numChildren';
 		
 		// Get the tree root
 		$obj = $rootID ? $this->getRecord($rootID) : singleton($className);
@@ -479,7 +480,7 @@ class LeftAndMain extends Controller {
 		// Mark the nodes of the tree to return
 		if ($filterFunction) $obj->setMarkingFilterFunction($filterFunction);
 
-		$obj->markPartialTree($minNodeCount, $this, $childrenMethod);
+		$obj->markPartialTree($minNodeCount, $this, $childrenMethod, $numChildrenMethod);
 		
 		// Ensure current page is exposed
 		if($p = $this->currentPage()) $obj->markToExpose($p);
@@ -501,6 +502,7 @@ class LeftAndMain extends Controller {
 			$this, 
 			true, 
 			$childrenMethod,
+			$numChildrenMethod,
 			$minNodeCount
 		);
 
@@ -532,6 +534,7 @@ class LeftAndMain extends Controller {
 			$request->getVar('ID'), 
 			null, 
 			null, 
+			null,
 			$minNodeCount
 		);
 

From adfab8b55fb00a393281a5a7b3039504675f904e Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:06:38 +0000
Subject: [PATCH 100/483] API CHANGE: Added
 FilesystemPublisher::getExistingStaticCacheFiles(), to help build caching
 logic methods. (from r91354)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96810 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/staticpublisher/FilesystemPublisher.php | 26 ++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/code/staticpublisher/FilesystemPublisher.php b/code/staticpublisher/FilesystemPublisher.php
index c6af352c..fe8c7f5f 100644
--- a/code/staticpublisher/FilesystemPublisher.php
+++ b/code/staticpublisher/FilesystemPublisher.php
@@ -221,6 +221,32 @@ class FilesystemPublisher extends StaticPublisher {
 	public function getDestDir() {
 		return '../'.$this->destFolder;
 	}
+	
+	/**
+	 * Return an array of all the existing static cache files, as a map of URL => file.
+	 * Only returns cache files that will actually map to a URL, based on urlsToPaths.
+	 */
+	public function getExistingStaticCacheFiles() {
+		$cacheDir = '../'.$this->destFolder;
+
+		$urlMapper = array_flip($this->urlsToPaths($this->owner->allPagesToCache()));
+		
+		$output = array();
+		
+		// Glob each dir, then glob each one of those
+		foreach(glob("$cacheDir/*", GLOB_ONLYDIR) as $cacheDir) {
+			foreach(glob($cacheDir.'/*') as $cacheFile) {
+				$mapKey = str_replace("../cache/","",$cacheFile);
+				if(isset($urlMapper[$mapKey])) {
+					$url = $urlMapper[$mapKey];
+					$output[$url] = $cacheFile;
+				}
+			}
+		}
+		
+		return $output;
+	}
+	
 }
 
 ?>

From 86b08f44a417f53b03e9a57b4b6dedeabdad0e32 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:06:50 +0000
Subject: [PATCH 101/483] BUGFIX: Use doDeleteFromLive when deleting pages from
 live, so that onBeforeUnpublish and onAfterUnpublish are called. (from
 r91381)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96811 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 9dac31f2..707c96c2 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -561,12 +561,12 @@ JS;
 			$descendantsRemoved = 0;
 			foreach( $descendantIDs as $descID )
 				if( $descendant = DataObject::get_by_id('SiteTree', $descID) ) {
-					$descendant->delete();
+					$descendant->doDeleteFromLive();
 					$descendantsRemoved++;
 				}
 
 			// delete the record
-			$record->delete();
+			$record->doDeleteFromLive();
 		}
 
 		Versioned::reading_stage('Stage');

From a3306e88343c5b5692bd9a1524fe8eba98a94a83 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:07:31 +0000
Subject: [PATCH 102/483] BUGFIX: Correct labels for "delete from draft" batch
 actions (from r91838)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96812 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSBatchAction.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/CMSBatchAction.php b/code/CMSBatchAction.php
index 16a7f6e6..27e003bf 100644
--- a/code/CMSBatchAction.php
+++ b/code/CMSBatchAction.php
@@ -133,7 +133,7 @@ class CMSBatchAction_Delete extends CMSBatchAction {
 			unset($page);
 		}
 
-		$message = sprintf(_t('CMSBatchActions.DELETED_DRAFT_PAGES', 'Deleted %d pages from the draft site'), $pages->Count()-$failures);
+		$message = sprintf(_t('CMSBatchActions.DELETED_DRAFT_PAGES', 'Deleted %d pages from the draft site, %d failures'), $pages->Count()-$failures, $failures);
 		FormResponse::add('statusMessage("'.$message.'","good");');
 
 		return FormResponse::respond();

From d85d2bd1c96f757c853677a5c6e118362e245162 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:07:40 +0000
Subject: [PATCH 103/483] MINOR: Made delete from draft batch action text more
 consistent with published. (from r91839)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96813 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSBatchAction.php | 4 ++--
 lang/en_US.php          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/CMSBatchAction.php b/code/CMSBatchAction.php
index 27e003bf..baf807dd 100644
--- a/code/CMSBatchAction.php
+++ b/code/CMSBatchAction.php
@@ -100,10 +100,10 @@ class CMSBatchAction_Publish extends CMSBatchAction {
  */
 class CMSBatchAction_Delete extends CMSBatchAction {
 	function getActionTitle() {
-		return _t('CMSBatchActions.DELETE_DRAFT_PAGES', 'Delete from draft');
+		return _t('CMSBatchActions.DELETE_DRAFT_PAGES', 'Delete from draft site');
 	}
 	function getDoingText() {
-		return _t('CMSBatchActions.DELETING_DRAFT_PAGES', 'Deleting selected pages from draft');
+		return _t('CMSBatchActions.DELETING_DRAFT_PAGES', 'Deleting selected pages from the draft site');
 	}
 
 	function run(DataObjectSet $pages) {
diff --git a/lang/en_US.php b/lang/en_US.php
index 61dcc8eb..60691c5f 100755
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -61,8 +61,8 @@ $lang['en_US']['CMSBatchActions']['DELETED_PAGES'] = 'Deleted %d pages from the
 $lang['en_US']['CMSBatchActions']['DELETE_PAGES'] = 'Delete from published site';
 $lang['en_US']['CMSBatchActions']['DELETING_PAGES'] = 'Deleting selected pages from the published site';
 $lang['en_US']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = 'Deleted %d pages from the draft site';
-$lang['en_US']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Delete from draft';
-$lang['en_US']['CMSBatchActions']['DELETING_DRAFT_PAGES'] = 'Deleting selected pages from draft';
+$lang['en_US']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Delete from draft site';
+$lang['en_US']['CMSBatchActions']['DELETING_DRAFT_PAGES'] = 'Deleting selected pages from the draft site';
 $lang['en_US']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Published %d pages, %d failures';
 $lang['en_US']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Publishing pages';
 $lang['en_US']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publish';

From 713f5951382fea8c2c9b43b9d9871635a1990683 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:07:47 +0000
Subject: [PATCH 104/483] MINOR implement the allowedExtensions functionality
 of AssetAdmin when you rename a file (from r92037)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96814 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetTableField.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/code/AssetTableField.php b/code/AssetTableField.php
index 44bb612a..69dd471a 100755
--- a/code/AssetTableField.php
+++ b/code/AssetTableField.php
@@ -247,6 +247,30 @@ class AssetTableField extends ComplexTableField {
 		return $fieldContainer->FieldHolder();
 	}
 	
+	function handleItem($request) {
+		return new AssetTableField_ItemRequest($this, $request->param('ID'));
+	}
 }
 
+class AssetTableField_ItemRequest extends ComplexTableField_ItemRequest {
+	function saveComplexTableField($data, $form, $request) {
+		
+		if(!AssetAdmin::$apply_restrictions_to_admin && Permission::check('ADMIN')) {
+			if(!in_array(strtolower(pathinfo($data['Name'], PATHINFO_EXTENSION)), AssetAdmin::$allowed_extensions)) {
+				$form->sessionMessage(sprintf(
+					_t(
+						'File.INVALIDEXTENSION', 
+						'Extension is not allowed (valid: %s)',
+						PR_MEDIUM,
+						'Argument 1: Comma-separated list of valid extensions'
+					),
+					implode(',',AssetAdmin::$allowed_extensions)
+				), 'bad');
+				Director::redirectBack();
+				return;
+			}
+		}
+		return parent::saveComplexTableField($data, $form, $request);
+	}
+}
 ?>

From 37dcb0d970ef38161467717149f9f1a74d24fce2 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:07:54 +0000
Subject: [PATCH 105/483] MINOR moved File validation to the model (from
 r92044)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96815 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetTableField.php | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/code/AssetTableField.php b/code/AssetTableField.php
index 69dd471a..09903cbd 100755
--- a/code/AssetTableField.php
+++ b/code/AssetTableField.php
@@ -246,31 +246,6 @@ class AssetTableField extends ComplexTableField {
 
 		return $fieldContainer->FieldHolder();
 	}
-	
-	function handleItem($request) {
-		return new AssetTableField_ItemRequest($this, $request->param('ID'));
-	}
 }
 
-class AssetTableField_ItemRequest extends ComplexTableField_ItemRequest {
-	function saveComplexTableField($data, $form, $request) {
-		
-		if(!AssetAdmin::$apply_restrictions_to_admin && Permission::check('ADMIN')) {
-			if(!in_array(strtolower(pathinfo($data['Name'], PATHINFO_EXTENSION)), AssetAdmin::$allowed_extensions)) {
-				$form->sessionMessage(sprintf(
-					_t(
-						'File.INVALIDEXTENSION', 
-						'Extension is not allowed (valid: %s)',
-						PR_MEDIUM,
-						'Argument 1: Comma-separated list of valid extensions'
-					),
-					implode(',',AssetAdmin::$allowed_extensions)
-				), 'bad');
-				Director::redirectBack();
-				return;
-			}
-		}
-		return parent::saveComplexTableField($data, $form, $request);
-	}
-}
 ?>

From d674e2b0325345d7fd8fa2ab739e11936e68ae1f Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:08:01 +0000
Subject: [PATCH 106/483] MINOR moved allowed_extensions and friends to the
 model layer (from r92046)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96816 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index d5990c0d..a2637ca2 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -22,19 +22,6 @@ class AssetAdmin extends LeftAndMain {
 	 */
 	public static $allowed_max_file_size;
 	
-	/**
-	 * @see Upload->allowedExtensions
-	 * @var array
-	 */
-	public static $allowed_extensions = array();
-	
-	/**
-	 * If this is true, then restrictions set in $allowed_max_file_size and
-	 * $allowed_extensions will be applied to users with admin privileges as
-	 * well.
-	 */
-	public static $apply_restrictions_to_admin = false;
-	
 	static $allowed_actions = array(
 		'addfolder',
 		'deletefolder',
@@ -209,11 +196,11 @@ JS
 				}
 				
 				// validate files (only if not logged in as admin)
-				if(!self::$apply_restrictions_to_admin && Permission::check('ADMIN')) {
+				if(!File::$apply_restrictions_to_admin && Permission::check('ADMIN')) {
 					$valid = true;
 				} else {
 					$upload = new Upload();
-					$upload->setAllowedExtensions(self::$allowed_extensions);
+					$upload->setAllowedExtensions(File::$allowed_extensions);
 					$upload->setAllowedMaxFileSize(self::$allowed_max_file_size);
 					$valid = $upload->validate($tmpFile);
 					if(!$valid) {

From bef0f2f2900b5e5458f556a56937b9e3f46306f0 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:08:07 +0000
Subject: [PATCH 107/483] BUGFIX: Use canDeleteFromLive instead of canPublish
 for checking delete from live action (from r93316)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96817 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 707c96c2..a3c61cb8 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -742,7 +742,8 @@ JS;
 		$SQL_id = Convert::raw2sql($_REQUEST['ID']);
 
 		$page = DataObject::get_by_id("SiteTree", $SQL_id);
-		if($page && !$page->canPublish()) return Security::permissionFailure($this);
+		
+		if($page && !$page->canDeleteFromLive()) return Security::permissionFailure($this);
 		
 		$page->doUnpublish();
 		

From 7c6623373ba77708079d06a38737175676c03dd0 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:08:13 +0000
Subject: [PATCH 108/483] BUGFIX: Don't show obsolete page if you refresh the
 CMS after deleting a page (from r94242)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96818 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 3aebdc3c..cd91ded2 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -852,6 +852,11 @@ if(node && node.parentTreeNode) node.parentTreeNode.removeTreeNode(node);
 $('Form_EditForm').closeIfSetTo($id);
 JS;
 		FormResponse::add($response);
+
+		// If we have that page selected currently, then clear that info from the session
+		if(Session::get("{$this->class}.currentPage") == $id) {
+			$this->setCurrentPageID(null);
+		}
 		
 		if ($this instanceof LeftAndMain) FormResponse::add($this->showSingleInstanceOnlyInCreateFieldJS($page));
 		return FormResponse::respond();

From ad92b8073798e549392221e4aa8597bc9142abe4 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:08:27 +0000
Subject: [PATCH 109/483] ENHANCEMENT: Update the checkboxes available to
 batch-actions to show only the applicable pages for that particular action.
 API CHANGE: Allow for an applicablePages($idArray) method to be defined on a
 CMSBatchAction class. (from r94761)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96819 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSBatchActionHandler.php | 25 +++++++++++++++++-
 code/SecurityAdmin.php         |  2 +-
 javascript/CMSMain_left.js     | 47 +++++++++++++++++++++++++++++++++-
 javascript/LeftAndMain_left.js |  2 +-
 4 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/code/CMSBatchActionHandler.php b/code/CMSBatchActionHandler.php
index 3ccadcee..bed33ba3 100644
--- a/code/CMSBatchActionHandler.php
+++ b/code/CMSBatchActionHandler.php
@@ -13,7 +13,8 @@ class CMSBatchActionHandler extends RequestHandler {
 	);
 	
 	static $url_handlers = array(
-		'$BatchAction' => 'handleAction'
+		'$BatchAction/applicablepages' => 'handleApplicablePages',
+		'$BatchAction' => 'handleAction',
 	);
 	
 	protected $parentController;
@@ -80,6 +81,28 @@ class CMSBatchActionHandler extends RequestHandler {
 		
 		return $actionHandler->run($pages);
 	} 
+
+	function handleApplicablePages($request) {
+		// Find the action handler
+		$actions = Object::get_static($this->class, 'batch_actions');
+		$actionClass = $actions[$request->param('BatchAction')];
+		$actionHandler = new $actionClass();
+
+		// Sanitise ID list and query the database for apges
+		$ids = split(' *, *', trim($request->requestVar('csvIDs')));
+		foreach($ids as $k => $id) $ids[$k] = (int)$id;
+		$ids = array_filter($ids);
+		
+		if($actionHandler->hasMethod('applicablePages')) {
+			$applicableIDs = $actionHandler->applicablePages($ids);
+		} else {
+			$applicableIDs = $ids;
+		}
+		
+		$response = new HTTPResponse(json_encode($applicableIDs));
+		$response->addHeader("Content-type", "application/json");
+		return $response;
+	}
 	
 	/**
 	 * Return a DataObjectSet of ArrayData objects containing the following pieces of info
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 743f8fd1..3a18553a 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -236,7 +236,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		// getChildrenAsUL is a flexible and complex way of traversing the tree
 		$siteTreeList = $obj->getChildrenAsUL(
 			'',
-			'"<li id=\"record-$child->ID\" class=\"$child->class " . ($child->Locked ? " nodelete" : "") . $child->markingClasses() . ($extraArg->isCurrentPage($child) ? " current" : "") . "\">" . ' .
+			'"<li id=\"record-$child->ID\" class=\"$child->class " . $child->markingClasses() . ($extraArg->isCurrentPage($child) ? " current" : "") . "\">" . ' .
 			'"<a href=\"" . Controller::join_links(substr($extraArg->Link(),0,-1), "show", $child->ID) . "\" >" . $child->TreeTitle() . "</a>" ',
 			$this,
 			true
diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js
index 83793f04..1a584db2 100755
--- a/javascript/CMSMain_left.js
+++ b/javascript/CMSMain_left.js
@@ -257,11 +257,13 @@ batchactionsclass.prototype = {
 	onclick : function() {
 		if(treeactions.toggleSelection(this)) {
 			this.multiselectTransform();
+			this.actionChanged();
 		}
 		return false;
 	},
 	
 	actionChanged: function() {
+		// Show parameters form, if necessary
 		var urlSegment = $('choose_batch_action').value.split('/').pop();
 		if ($('BatchActionParameters_'+urlSegment)) {
 			jQuery('#BatchActionParameters .params').hide();
@@ -270,6 +272,8 @@ batchactionsclass.prototype = {
 		} else {
 			jQuery('#BatchActionParameters').hide();
 		}
+		
+		batchActionGlobals.refreshSelected();
 	},
 	
 	multiselectTransform : function() {
@@ -378,12 +382,53 @@ batchActionGlobals = {
 	getCsvIds : function() {
 		return (batchActionGlobals.getIds().toString());
 	},
-	refreshSelected : function() {
+	refreshSelected : function(rootNode) {
 		var st = $('sitetree');
+		
 		for(var idx in batchActionGlobals.selectedNodes) {
 			st.getTreeNodeByIdx(idx).addNodeClass('selected');
 			st.getTreeNodeByIdx(idx).selected = true;
 		}
+
+		// Default to refreshing the entire tree
+		if(rootNode == null) rootNode = st;
+
+		/// If batch actions is enabled, then enable/disable the appropriate tree fields
+		if($('batchactionsforms').style.display != 'none' && $('choose_batch_action').value) {
+			// Collect list of visible tree IDs 
+			var ids = [];
+			jQuery(rootNode).find('li').each(function() {
+				var id = parseInt(this.id.replace('record-',''));
+				if(id) ids.push(id);
+				
+				// Disable the nodes while the ajax request is being processed
+				this.addNodeClass('nodelete');
+			});
+		
+			// Post to the server to ask which pages can have this batch action applied
+			var applicablePagesURL = $('choose_batch_action').value + '/applicablepages?csvIDs=' + ids.join(',') + ',horse';
+			jQuery.getJSON(applicablePagesURL, function(applicableIDs) {
+				var i;
+				var applicableIDMap = {};
+				for(i=0;i<applicableIDs.length;i++) applicableIDMap[applicableIDs[i]] = true;
+			
+				// Set a CSS class on each tree node indicating which can be batch-actioned and which can't
+				jQuery(rootNode).find('li').each(function() {
+					var id = parseInt(this.id.replace('record-',''));
+					if(id) {
+						if(applicableIDMap[id] === true) {
+							this.removeNodeClass('nodelete');
+						} else {
+							// De-select the node if it's non-applicable
+							delete batchActionGlobals.selectedNodes[id];
+
+							this.removeNodeClass('selected');
+							this.addNodeClass('nodelete');
+						}
+					}
+				});
+			});
+		}
 	},
 	unfilterSiteTree : function() {
 		// Reload the site tree if it has been filtered
diff --git a/javascript/LeftAndMain_left.js b/javascript/LeftAndMain_left.js
index 6e5c390a..2d4b33ff 100755
--- a/javascript/LeftAndMain_left.js
+++ b/javascript/LeftAndMain_left.js
@@ -239,7 +239,7 @@ TreeNodeAPI.prototype = {
 	installSubtreeAndRefresh : function(response){
 		this.installSubtree(response);
 		if(this.tree.className.indexOf('multiselect') != -1) {
-			batchActionGlobals.refreshSelected();
+			batchActionGlobals.refreshSelected(this);
 		}
 	},
 	

From 59899c68cfdf3f289fda9f348f32d3e971d0b783 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:08:37 +0000
Subject: [PATCH 110/483] ENHANCEMENT: Added 'greyed out' status of batch
 action checkboxes while applicable pages are being loaded via ajax. (from
 r94774)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96820 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/cms_left.css             |   3 +++
 images/tickbox-greyedout.gif | Bin 0 -> 64 bytes
 javascript/CMSMain_left.js   |   5 ++++-
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 images/tickbox-greyedout.gif

diff --git a/css/cms_left.css b/css/cms_left.css
index 5475e65d..89c8b887 100644
--- a/css/cms_left.css
+++ b/css/cms_left.css
@@ -116,6 +116,9 @@ ul.tree.multiselect span.a span.b a {
 ul.tree.multiselect span.a.nodelete span.b a {
 	background-image: url(../images/tickbox-canttick.gif) !important;
 }
+ul.tree.multiselect span.a.treeloading span.b a {
+	background-image: url(../images/tickbox-greyedout.gif) !important;
+}
 
 
 ul.tree.multiselect span.a.selected span.b span.c a {
diff --git a/images/tickbox-greyedout.gif b/images/tickbox-greyedout.gif
new file mode 100644
index 0000000000000000000000000000000000000000..df2106f98185aedc88d2aaf00b8af33371a228be
GIT binary patch
literal 64
zcmZ?wbhEHb<YC}pXkcKteEIVK|Nj+#vam1!fewfO$uKa9xAcpj&gDJaofE|QZqpQZ
O{zkuLs>=cy7_0$W*Aox`

literal 0
HcmV?d00001

diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js
index 1a584db2..f13d4ece 100755
--- a/javascript/CMSMain_left.js
+++ b/javascript/CMSMain_left.js
@@ -402,7 +402,8 @@ batchActionGlobals = {
 				if(id) ids.push(id);
 				
 				// Disable the nodes while the ajax request is being processed
-				this.addNodeClass('nodelete');
+				this.removeNodeClass('nodelete');
+				this.addNodeClass('treeloading');
 			});
 		
 			// Post to the server to ask which pages can have this batch action applied
@@ -414,6 +415,8 @@ batchActionGlobals = {
 			
 				// Set a CSS class on each tree node indicating which can be batch-actioned and which can't
 				jQuery(rootNode).find('li').each(function() {
+					this.removeNodeClass('treeloading');
+
 					var id = parseInt(this.id.replace('record-',''));
 					if(id) {
 						if(applicableIDMap[id] === true) {

From ee2490fe68604c502c1e7a9533203fa230acc7c9 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:08:44 +0000
Subject: [PATCH 111/483] API CHANGE: Added applicablePagesHelper to
 CMSBatchAction to ease the process of creating new applicable page methods.
 ENHANCEMENT: Added applicable pages checks to delete from live, delete from
 draft, and publish (from r94775)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96821 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSBatchAction.php | 52 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/code/CMSBatchAction.php b/code/CMSBatchAction.php
index baf807dd..24cbaee5 100644
--- a/code/CMSBatchAction.php
+++ b/code/CMSBatchAction.php
@@ -64,6 +64,46 @@ abstract class CMSBatchAction extends Object {
 
 		return FormResponse::respond();
 	}
+
+	
+
+	/**
+	 * Helper method for applicablePages() methods.  Acts as a skeleton implementation.
+	 * 
+	 * @param $ids The IDs passed to applicablePages
+	 * @param $methodName The canXXX() method to call on each page to check if the action is applicable
+	 * @param $checkStagePages Set to true if you want to check stage pages
+	 * @param $checkLivePages Set to true if you want to check live pages (e.g, for deleted-from-draft)
+	 */
+	function applicablePagesHelper($ids, $methodName, $checkStagePages = true, $checkLivePages = true) {
+		if(!is_array($ids)) user_error("Bad \$ids passed to applicablePagesHelper()", E_USER_WARNING);
+		if(!is_string($methodName)) user_error("Bad \$methodName passed to applicablePagesHelper()", E_USER_WARNING);
+		
+		$applicableIDs = array();
+		
+		$SQL_ids = implode(', ', array_filter($ids, 'is_numeric'));
+		$draftPages = DataObject::get("SiteTree", "\"SiteTree\".\"ID\" IN ($SQL_ids)");
+		
+		$onlyOnLive = array_fill_keys($ids, true);
+		if($checkStagePages) {
+			foreach($draftPages as $page) {
+				unset($onlyOnLive[$page->ID]);
+				if($page->$methodName()) $applicableIDs[] = $page->ID;
+			}
+		}
+		
+		// Get the pages that only exist on live (deleted from stage)
+		if($checkLivePages && $onlyOnLive) {
+			$SQL_ids = implode(', ', array_keys($onlyOnLive));
+			$livePages = Versioned::get_by_stage("SiteTree", "Live", "\"SiteTree\".\"ID\" IN ($SQL_ids)");
+		
+			if($livePages) foreach($livePages as $page) {
+				if($page->$methodName()) $applicableIDs[] = $page->ID;
+			}
+		}
+		
+		return $applicableIDs;
+	}
 	
 	// if your batchaction has parameters, return a fieldset here
 	function getParameterFields() {
@@ -90,6 +130,10 @@ class CMSBatchAction_Publish extends CMSBatchAction {
 			_t('CMSBatchActions.PUBLISHED_PAGES', 'Published %d pages, %d failures')
 		);
 	}
+
+	function applicablePages($ids) {
+		return $this->applicablePagesHelper($ids, 'canPublish', true, false);
+	}
 }
 
 /**
@@ -138,6 +182,10 @@ class CMSBatchAction_Delete extends CMSBatchAction {
 
 		return FormResponse::respond();
 	}
+
+	function applicablePages($ids) {
+		return $this->applicablePagesHelper($ids, 'canDelete', true, false);
+	}
 }
 
 /**
@@ -179,6 +227,10 @@ class CMSBatchAction_DeleteFromLive extends CMSBatchAction {
 		
 		return FormResponse::respond();
 	}
+
+	function applicablePages($ids) {
+		return $this->applicablePagesHelper($ids, 'canDelete', false, true);
+	}
 }
 
 

From c124dd23fa210bb5421796595fbbc4ec5f6057bc Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:09:17 +0000
Subject: [PATCH 112/483] BUGFIX: Removed XSS holes (from r94822)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96822 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberTableField.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index 7a17292e..aaceb7db 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -285,6 +285,7 @@ class MemberTableField extends ComplexTableField {
 	function saveComplexTableField($data, $form, $params) {
 		$className = $this->sourceClass();
 		$childData = new $className();
+		
 		$form->saveInto($childData);
 		$childData->write();
 
@@ -297,7 +298,7 @@ class MemberTableField extends ComplexTableField {
 		$message = sprintf(
 			_t('ComplexTableField.SUCCESSADD', 'Added %s %s %s'),
 			$childData->singular_name(),
-			'<a href="' . $this->Link() . '">' . $childData->Title . '</a>',
+			'<a href="' . $this->Link() . '">' . htmlspecialchars($childData->Title, ENT_QUOTES) . '</a>',
 			$closeLink
 		);
 		$form->sessionMessage($message, 'good');

From 27907e4ced0a97c961319cbcb6630df2303c7480 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:09:30 +0000
Subject: [PATCH 113/483] API CHANGE: Added canView() to CMSBatchAction so that
 you could hide certain batch actions from some users. (from r94846)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96823 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSBatchAction.php        |  9 ++++++++-
 code/CMSBatchActionHandler.php | 14 ++++++++------
 code/CMSMain.php               |  3 ++-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/code/CMSBatchAction.php b/code/CMSBatchAction.php
index 24cbaee5..d8b33cf7 100644
--- a/code/CMSBatchAction.php
+++ b/code/CMSBatchAction.php
@@ -101,7 +101,7 @@ abstract class CMSBatchAction extends Object {
 				if($page->$methodName()) $applicableIDs[] = $page->ID;
 			}
 		}
-		
+
 		return $applicableIDs;
 	}
 	
@@ -109,6 +109,13 @@ abstract class CMSBatchAction extends Object {
 	function getParameterFields() {
 		return false;
 	}
+	
+	/**
+	 * If you wish to restrict the batch action to some users, overload this function.
+	 */
+	function canView() {
+		return true;
+	}
 }
 
 /**
diff --git a/code/CMSBatchActionHandler.php b/code/CMSBatchActionHandler.php
index bed33ba3..89de7109 100644
--- a/code/CMSBatchActionHandler.php
+++ b/code/CMSBatchActionHandler.php
@@ -117,12 +117,14 @@ class CMSBatchActionHandler extends RequestHandler {
 		
 		foreach($actions as $urlSegment => $actionClass) {
 			$actionObj = new $actionClass();
-			$actionDef = new ArrayData(array(
-				"Link" => Controller::join_links($this->Link(), $urlSegment),
-				"Title" => $actionObj->getActionTitle(),
-				"DoingText" => $actionObj->getDoingText(),
-			));
-			$actionList->push($actionDef);
+			if($actionObj->canView()) {
+				$actionDef = new ArrayData(array(
+					"Link" => Controller::join_links($this->Link(), $urlSegment),
+					"Title" => $actionObj->getActionTitle(),
+					"DoingText" => $actionObj->getDoingText(),
+				));
+				$actionList->push($actionDef);
+			}
 		}
 		
 		return $actionList;
diff --git a/code/CMSMain.php b/code/CMSMain.php
index a3c61cb8..da4035d3 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -1027,7 +1027,8 @@ JS;
 
 		$forms = array();
 		foreach($batchActions as $urlSegment => $batchAction) {
-			if ($fieldset = singleton($batchAction)->getParameterFields()) {
+			$SNG_action = singleton($batchAction);
+			if ($SNG_action->canView() && $fieldset = $SNG_action->getParameterFields()) {
 				$formHtml = '';
 				foreach($fieldset as $field) {
 					$formHtml .= $field->Field();

From 79968d0814db9c650a8eddc319e0046e4f608b31 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:14:29 +0000
Subject: [PATCH 114/483] API CHANGE: Added capability for batch actions to
 indicate failure through red checkboxes (from r94868)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96824 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSBatchAction.php        |   4 +++-
 css/cms_left.css               |   3 +++
 images/tickbox-fail.gif        | Bin 0 -> 64 bytes
 javascript/CMSMain_left.js     |  31 +++++++++++++++++++++++++++++--
 javascript/LeftAndMain_left.js |   6 ++++++
 5 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 images/tickbox-fail.gif

diff --git a/code/CMSBatchAction.php b/code/CMSBatchAction.php
index d8b33cf7..0facc18d 100644
--- a/code/CMSBatchAction.php
+++ b/code/CMSBatchAction.php
@@ -44,9 +44,11 @@ abstract class CMSBatchAction extends Object {
 		foreach($pages as $page) {
 			
 			// Perform the action
-			if (!call_user_func_array(array($page, $helperMethod), $arguments)) {
+			if (call_user_func_array(array($page, $helperMethod), $arguments) === false) {
 				$failures++;
+				FormResponse::add("\$('sitetree').addNodeClassByIdx('$page->ID', 'failed');");
 			}
+				
 			
 			// Now make sure the tree title is appropriately updated
 			$publishedRecord = DataObject::get_by_id('SiteTree', $page->ID);
diff --git a/css/cms_left.css b/css/cms_left.css
index 89c8b887..4935eebc 100644
--- a/css/cms_left.css
+++ b/css/cms_left.css
@@ -119,6 +119,9 @@ ul.tree.multiselect span.a.nodelete span.b a {
 ul.tree.multiselect span.a.treeloading span.b a {
 	background-image: url(../images/tickbox-greyedout.gif) !important;
 }
+ul.tree.multiselect span.a.failed span.b a {
+	background-image: url(../images/tickbox-fail.gif) !important;
+}
 
 
 ul.tree.multiselect span.a.selected span.b span.c a {
diff --git a/images/tickbox-fail.gif b/images/tickbox-fail.gif
new file mode 100644
index 0000000000000000000000000000000000000000..88666fe29b0439358c284ae82097dec8493d72fa
GIT binary patch
literal 64
zcmZ?wbhEHb<YC}pXkcKtYcBBr|9{1wEG!H_paUX6G7L=OE&bxBb9oPU=LB)S+cd?U
OztL}*>asuv25SHr3K6>i

literal 0
HcmV?d00001

diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js
index f13d4ece..b00fe33c 100755
--- a/javascript/CMSMain_left.js
+++ b/javascript/CMSMain_left.js
@@ -273,6 +273,9 @@ batchactionsclass.prototype = {
 			jQuery('#BatchActionParameters').hide();
 		}
 		
+		// Don't show actions that have failed from the previous execution
+		batchActionGlobals.removeFailures();
+		
 		batchActionGlobals.refreshSelected();
 	},
 	
@@ -407,7 +410,7 @@ batchActionGlobals = {
 			});
 		
 			// Post to the server to ask which pages can have this batch action applied
-			var applicablePagesURL = $('choose_batch_action').value + '/applicablepages?csvIDs=' + ids.join(',') + ',horse';
+			var applicablePagesURL = $('choose_batch_action').value + '/applicablepages?csvIDs=' + ids.join(',');
 			jQuery.getJSON(applicablePagesURL, function(applicableIDs) {
 				var i;
 				var applicableIDMap = {};
@@ -433,6 +436,27 @@ batchActionGlobals = {
 			});
 		}
 	},
+
+	/**
+	 * Deselect all nodes in the tree
+	 */
+	deselectAll : function() {
+		batchActionGlobals.selectedNodes = {}
+		jQuery('#sitetree').find('li').each(function() {
+			this.removeNodeClass('selected');
+			this.selected = false;
+		});
+	},
+
+	/**
+	 * Remove the indications of failed batch actions
+	 */
+	removeFailures : function() {
+		jQuery('#sitetree').find('li.failed').each(function() {
+			this.removeNodeClass('failed');
+		});
+	},
+	
 	unfilterSiteTree : function() {
 		// Reload the site tree if it has been filtered
 		if ($('SiteTreeIsFiltered').value == 1) {
@@ -495,12 +519,15 @@ publishpage.prototype = {
 			statusMessage(ingText);
 			$('batchactions_go').className = 'loading';
 			
+			// Don't show actions that have failed from the previous execution
+			batchActionGlobals.removeFailures();
+			
 			// Submit form
 			Ajax.SubmitForm(this, null, {
 				onSuccess :  function(response) {
 					Ajax.Evaluator(response);
 					$('batchactions_go').className = '';
-					treeactions.closeSelection($('batchactions'));
+					batchActionGlobals.deselectAll();
 				},
 				onFailure : function(response) {
 					errorMessage('Error ' + ingText, response);
diff --git a/javascript/LeftAndMain_left.js b/javascript/LeftAndMain_left.js
index 2d4b33ff..7289dbd2 100755
--- a/javascript/LeftAndMain_left.js
+++ b/javascript/LeftAndMain_left.js
@@ -132,6 +132,12 @@ TreeAPI.prototype = {
 			aTag.innerHTML = title;
 		});
 	},
+
+	addNodeClassByIdx : function(idx, className) {
+		this.performOnTreeNode(idx, function(treeNode) {
+			treeNode.addNodeClass(className);
+		});
+	},
 	
 	setNodeIcon: function(idx, oldClassName, newClassName) {
 		this.performOnTreeNode(idx, function(treeNode) {

From 4f07a30a6bf89105ce81f924266770694887f7cc Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 00:51:25 +0000
Subject: [PATCH 115/483] MINOR: Fixed CMSMainTest to be more flexible about
 modules altering the buttons.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96827 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/CMSMainTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/CMSMainTest.php b/tests/CMSMainTest.php
index 3ab1fd4f..5de6d15c 100644
--- a/tests/CMSMainTest.php
+++ b/tests/CMSMainTest.php
@@ -127,7 +127,7 @@ class CMSMainTest extends FunctionalTest {
 		$this->assertTrue($livePage->canDelete());
 
 		// Check that the 'restore' button exists as a simple way of checking that the correct page is returned.
-		$this->assertRegExp('/<input[^>]+type="submit"[^>]+name="action_restore"/i', $response->getBody());
+		$this->assertRegExp('/<input[^>]+type="submit"[^>]+name="action_(restore|revert)"/i', $response->getBody());
 	}
 	
 	/**

From ec990131dc5f216bc09ab533962749f5a85a6ea7 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Jan 2010 05:54:25 +0000
Subject: [PATCH 116/483] BUGFIX: Fixed a PHP segfault bug with the
 WidgetAreaEditor

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96868 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/WidgetAreaEditor.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/WidgetAreaEditor.php b/code/WidgetAreaEditor.php
index 035d6e07..6fb7b829 100644
--- a/code/WidgetAreaEditor.php
+++ b/code/WidgetAreaEditor.php
@@ -46,6 +46,9 @@ class WidgetAreaEditor extends FormField {
 	}
 	
 	function UsedWidgets() {
+		// Call class_exists() to load Widget.php earlier and avoid a segfault
+		class_exists('Widget');
+		
 		$relationName = $this->name;
 		$widgets = $this->form->getRecord()->getComponent($relationName)->Items();
 		return $widgets;

From 169598e1ea6022196512c865b6e2ed1f6ff93387 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Wed, 13 Jan 2010 21:44:20 +0000
Subject: [PATCH 117/483] BUGFIX: Fixed add button overlapping image/flash
 popups in modeladmin. #4906

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96884 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/ModelAdmin.css | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/css/ModelAdmin.css b/css/ModelAdmin.css
index 3d7360a1..490209dc 100644
--- a/css/ModelAdmin.css
+++ b/css/ModelAdmin.css
@@ -131,10 +131,9 @@ body.ModelAdmin #statusMessage {
 }
 
 body.ModelAdmin #right .ajaxActions {
-	position: fixed !important;
 	position: absolute;
-	right: 30px !important;
-	bottom: 35px !important;
+	right: 2px;
+	bottom: -25px;
 }
 
 #LeftPane .tab {

From 8b082d3bedebca21cf5ec974321c1901c82106b2 Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Thu, 14 Jan 2010 03:43:56 +0000
Subject: [PATCH 118/483] <a ... /> tag which is not so nice

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96926 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 _config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_config.php b/_config.php
index 91ed9372..aa1fa5c2 100644
--- a/_config.php
+++ b/_config.php
@@ -36,7 +36,7 @@ HtmlEditorConfig::get('cms')->setOptions(array(
 	),
 
 	'use_native_selects' => true, // fancy selects are bug as of SS 2.3.0
-	'valid_elements' => "@[id|class|style|title],+a[id|rel|rev|dir|tabindex|accesskey|type|name|href|target|title|class],-strong/-b[class],-em/-i[class],-strike[class],-u[class],#p[id|dir|class|align|style],-ol[class],-ul[class],-li[class],br,img[id|dir|longdesc|usemap|class|src|border|alt=|title|width|height|align],-sub[class],-sup[class],-blockquote[dir|class],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|dir|id|style],-tr[id|dir|class|rowspan|width|height|align|valign|bgcolor|background|bordercolor|style],tbody[id|class|style],thead[id|class|style],tfoot[id|class|style],#td[id|dir|class|colspan|rowspan|width|height|align|valign|scope|style],-th[id|dir|class|colspan|rowspan|width|height|align|valign|scope|style],caption[id|dir|class],-div[id|dir|class|align|style],-span[class|align|style],-pre[class|align],address[class|align],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style],-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|dir|class|align|style],hr[class],dd[id|class|title|dir],dl[id|class|title|dir],dt[id|class|title|dir],@[id,style,class]",
+	'valid_elements' => "@[id|class|style|title],#a[id|rel|rev|dir|tabindex|accesskey|type|name|href|target|title|class],-strong/-b[class],-em/-i[class],-strike[class],-u[class],#p[id|dir|class|align|style],-ol[class],-ul[class],-li[class],br,img[id|dir|longdesc|usemap|class|src|border|alt=|title|width|height|align],-sub[class],-sup[class],-blockquote[dir|class],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|dir|id|style],-tr[id|dir|class|rowspan|width|height|align|valign|bgcolor|background|bordercolor|style],tbody[id|class|style],thead[id|class|style],tfoot[id|class|style],#td[id|dir|class|colspan|rowspan|width|height|align|valign|scope|style],-th[id|dir|class|colspan|rowspan|width|height|align|valign|scope|style],caption[id|dir|class],-div[id|dir|class|align|style],-span[class|align|style],-pre[class|align],address[class|align],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style],-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|dir|class|align|style],hr[class],dd[id|class|title|dir],dl[id|class|title|dir],dt[id|class|title|dir],@[id,style,class]",
 	'extended_valid_elements' => "img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|usemap],iframe[src|name|width|height|align|frameborder|marginwidth|marginheight|scrolling],object[width|height|data|type],param[name|value],map[class|name|id],area[shape|coords|href|target|alt]"
 ));
 

From e81b978ecfe7b2c19faf31d3861890629b42c66e Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Thu, 14 Jan 2010 22:02:44 +0000
Subject: [PATCH 119/483] BUGFIX: loading a subtree was failing - couldn't call
 getSiteTreeFor reliably on LeftAndMain which is abstract class in its nature.
 Now using valid subclass instead.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96961 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSSiteTreeFilter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/CMSSiteTreeFilter.php b/code/CMSSiteTreeFilter.php
index d77bcc7b..73e793c6 100644
--- a/code/CMSSiteTreeFilter.php
+++ b/code/CMSSiteTreeFilter.php
@@ -27,7 +27,7 @@ abstract class CMSSiteTreeFilter extends Object {
 			$this->populateIDs();
 		}
 
-		$leftAndMain = new LeftAndMain();
+		$leftAndMain = new CMSMain();
 		$tree = $leftAndMain->getSiteTreeFor('SiteTree', isset($_REQUEST['ID']) ? $_REQUEST['ID'] : 0, null, null, array($this, 'includeInTree'));
 
 		// Trim off the outer tag

From ed388aef1198b45996d33ff0b38a4b91b41de120 Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Thu, 14 Jan 2010 22:28:17 +0000
Subject: [PATCH 120/483] REVERTED: 96961 fails the test, reverted.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96966 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSSiteTreeFilter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/CMSSiteTreeFilter.php b/code/CMSSiteTreeFilter.php
index 73e793c6..d77bcc7b 100644
--- a/code/CMSSiteTreeFilter.php
+++ b/code/CMSSiteTreeFilter.php
@@ -27,7 +27,7 @@ abstract class CMSSiteTreeFilter extends Object {
 			$this->populateIDs();
 		}
 
-		$leftAndMain = new CMSMain();
+		$leftAndMain = new LeftAndMain();
 		$tree = $leftAndMain->getSiteTreeFor('SiteTree', isset($_REQUEST['ID']) ? $_REQUEST['ID'] : 0, null, null, array($this, 'includeInTree'));
 
 		// Trim off the outer tag

From 51ad525b690764c415639319a96326e837dc207b Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Thu, 14 Jan 2010 23:10:12 +0000
Subject: [PATCH 121/483] BUGFIX: reintroduced 96961, build failed for other
 reason.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96977 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSSiteTreeFilter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/CMSSiteTreeFilter.php b/code/CMSSiteTreeFilter.php
index d77bcc7b..73e793c6 100644
--- a/code/CMSSiteTreeFilter.php
+++ b/code/CMSSiteTreeFilter.php
@@ -27,7 +27,7 @@ abstract class CMSSiteTreeFilter extends Object {
 			$this->populateIDs();
 		}
 
-		$leftAndMain = new LeftAndMain();
+		$leftAndMain = new CMSMain();
 		$tree = $leftAndMain->getSiteTreeFor('SiteTree', isset($_REQUEST['ID']) ? $_REQUEST['ID'] : 0, null, null, array($this, 'includeInTree'));
 
 		// Trim off the outer tag

From cb541e63330e8e19904f4d827431f49b2f091d9e Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Fri, 15 Jan 2010 01:36:54 +0000
Subject: [PATCH 122/483] BUGFIX #4857 Fixed potential bug where a file would
 just be uploaded to a random folder, also files can now be uploaded to the
 assets root properly

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96993 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index a2637ca2..faef5cb1 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -174,10 +174,10 @@ JS
 		}
 		
 		// get the folder to upload to.
-		if(isset($data['FolderID']) && $data['FolderID'] != "root") {
+		if(isset($data['FolderID']) && $data['FolderID'] && $data['FolderID'] != "root") {
 			$folder = DataObject::get_by_id('Folder', $data['FolderID']);
 		} else {
-			$folder = DataObject::get_one('Folder');
+			$folder = singleton('Folder');
 		}
 		
 		foreach($processedFiles as $tmpFile) {

From 463053136d8a977fe0aa41a3b79f1d3450820900 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Fri, 15 Jan 2010 02:52:37 +0000
Subject: [PATCH 123/483] BUGFIX: Comment URL field check is now case
 insenstive. Included tests for various protocols. PATCH via simon_w. Ticket
 #4776

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97016 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/PageComment.php |  9 ++-------
 tests/PageCommentsTest.php        | 18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/code/sitefeatures/PageComment.php b/code/sitefeatures/PageComment.php
index e0981c3e..9067d0f7 100755
--- a/code/sitefeatures/PageComment.php
+++ b/code/sitefeatures/PageComment.php
@@ -150,16 +150,11 @@ class PageComment extends DataObject {
 		$url = $this->CommenterURL;
 		
 		if($url) {
-			if(substr($url, 0, 8) != 'https://') {
-				if(substr($url, 0, 7) != 'http://') {
-					$url = $this->CommenterURL = 'http://' . $url;
-				}
+			if(strtolower(substr($url, 0, 8)) != 'https://' && strtolower(substr($url, 0, 7)) != 'http://') { 
+				$this->CommenterURL = 'http://' . $url; 
 			}
 		}
-		
-		$this->CommenterURL = $url;
 	}
-	
 }
 
 
diff --git a/tests/PageCommentsTest.php b/tests/PageCommentsTest.php
index b4c08976..fa57b991 100644
--- a/tests/PageCommentsTest.php
+++ b/tests/PageCommentsTest.php
@@ -27,5 +27,21 @@ class PageCommentsTest extends FunctionalTest {
 		$thirdComments = DataObject::get('PageComment', 'ParentID = '.$third->ID);
 		$this->assertEquals($thirdComments->Count(), 3);
 	}
+	
+	function testCommenterURLWrite() {
+		$comment = new PageComment();
+		// We only care about the CommenterURL, so only set that
+		// Check a http and https URL. Add more test urls here as needed.
+		$protocols = array(
+			'Http',
+			'Https',
+		);
+		$url = '://example.com';
+		foreach($protocols as $protocol) {
+			$comment->CommenterURL = $protocol . $url;
+			// The protocol should stay as if, assuming it is valid
+			$comment->write();
+			$this->assertEquals($comment->CommenterURL, $protocol . $url, $protocol . ':// is a valid protocol');
+		}
+	}
 }
-?>

From 8cbffb199accc3da39b702ba6641cd7a1a6c6e15 Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Fri, 15 Jan 2010 03:33:29 +0000
Subject: [PATCH 124/483] BUGFIX: HTTPResponse has been replaced with
 SS_HTTPResponse

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97023 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSBatchActionHandler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/CMSBatchActionHandler.php b/code/CMSBatchActionHandler.php
index 89de7109..e4ae65d4 100644
--- a/code/CMSBatchActionHandler.php
+++ b/code/CMSBatchActionHandler.php
@@ -99,7 +99,7 @@ class CMSBatchActionHandler extends RequestHandler {
 			$applicableIDs = $ids;
 		}
 		
-		$response = new HTTPResponse(json_encode($applicableIDs));
+		$response = new SS_HTTPResponse(json_encode($applicableIDs));
 		$response->addHeader("Content-type", "application/json");
 		return $response;
 	}

From 2ccc3235fba52c6e8eac14a4d3a849bf4a7228d2 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 18 Jan 2010 02:45:35 +0000
Subject: [PATCH 125/483] BUGFIX Attribute escaping in
 PageCommentInterface?_singlecomment.ss (merged from r97071)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97073 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 templates/PageCommentInterface_singlecomment.ss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/PageCommentInterface_singlecomment.ss b/templates/PageCommentInterface_singlecomment.ss
index 8c0f91bf..2084730b 100755
--- a/templates/PageCommentInterface_singlecomment.ss
+++ b/templates/PageCommentInterface_singlecomment.ss
@@ -7,7 +7,7 @@
 </p>
 <p class="info">
 	<% if CommenterURL %>
-		<span><% _t('PBY','Posted by') %> <a href="$CommenterURL">$Name.XML</a>, $Created.Nice ($Created.Ago)</span>
+		<span><% _t('PBY','Posted by') %> <a href="$CommenterURL.ATT">$Name.XML</a>, $Created.Nice ($Created.Ago)</span>
 	<% else %>
 		<span><% _t('PBY','Posted by') %> $Name.XML, $Created.Nice ($Created.Ago)</span>
 	<% end_if %>

From 48171d1f585cfbafc802ca97f2d6ea8df16741e0 Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Tue, 19 Jan 2010 01:01:46 +0000
Subject: [PATCH 126/483] BUGFIX: now hiding the permissions via
 SecurityAdmin::add_hidden_permission works also for PermissionRoleAdmin

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97168 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/PermissionRoleAdmin.php | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/code/PermissionRoleAdmin.php b/code/PermissionRoleAdmin.php
index cb828a9f..1f4aed6c 100644
--- a/code/PermissionRoleAdmin.php
+++ b/code/PermissionRoleAdmin.php
@@ -8,8 +8,39 @@ class PermissionRoleAdmin extends ModelAdmin {
 		'PermissionRole'
 	);
 	
+	public static $collection_controller_class = "PermissionRoleAdmin_CollectionController";
+	public static $record_controller_class = "PermissionRoleAdmin_RecordController";
+	
 	static $url_segment = 'roles';
 	static $menu_title = 'Roles';
 }
 
+/**
+ * Customized controller for hiding permissions on AddForm
+ */
+class PermissionRoleAdmin_CollectionController extends ModelAdmin_CollectionController {
+	public function AddForm() {
+		$form = parent::AddForm();
+		if ( $this->modelClass=='PermissionRole' ) {
+			$permissionField = $form->Fields()->dataFieldByName('Codes');
+			if($permissionField) $permissionField->setHiddenPermissions(SecurityAdmin::$hidden_permissions);
+		}
+		return $form;
+	}
+}
+
+/**
+ * Customized controller for hiding permissions on EditForm
+ */
+class PermissionRoleAdmin_RecordController extends ModelAdmin_RecordController {
+	public function EditForm() {
+		$form = parent::EditForm();
+		if ( $this->parentController->modelClass=='PermissionRole' ) {
+			$permissionField = $form->Fields()->dataFieldByName('Codes');
+			if($permissionField) $permissionField->setHiddenPermissions(SecurityAdmin::$hidden_permissions);
+		}
+		return $form;
+	}	
+}
+
 ?>

From cd63f3f8724d219a24f154526b97fd75568f1f14 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 19 Jan 2010 02:06:02 +0000
Subject: [PATCH 127/483] MINOR Removed 'print' button from
 CMSMain->getEditForm() for display of older versions (see #4745)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97178 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index da4035d3..b8c7cd80 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -829,7 +829,6 @@ JS;
 
 			$actions = new FieldSet(
 				new FormAction("email", _t('CMSMain.EMAIL',"Email")),
-				new FormAction("print", _t('CMSMain.PRINT',"Print")),
 				new FormAction("rollback", _t('CMSMain.ROLLBACK',"Roll back to this version"))
 			);
 

From d40afc9cdced04a9e52f98c98b5eb4e52bc56f0a Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 19 Jan 2010 02:18:07 +0000
Subject: [PATCH 128/483] BUGFIX: Fixed redirection destionation of the
 modeladmin delete button on the detail form.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97179 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ModelAdmin.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index cd7920f7..3dc5b1fc 100755
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -383,6 +383,7 @@ class ModelAdmin_CollectionController extends Controller {
 		//$form->setFormAction(Controller::join_links($this->Link(), "search"));
 		$form->setFormMethod('get');
 		$form->setHTMLID("Form_SearchForm_" . $this->modelClass);
+		$form->disableSecurityToken();
 		$clearAction->useButtonTag = true;
 		$clearAction->addExtraClass('minorAction');
 
@@ -951,7 +952,7 @@ class ModelAdmin_RecordController extends Controller {
 	public function doDelete($data, $form, $request) {
 		if($this->currentRecord->canDelete(Member::currentUser())) {
 			$this->currentRecord->delete();
-			Director::redirect($this->parentController->Link());
+			Director::redirect($this->parentController->Link('SearchForm?action=search'));
 		}
 		else Director::redirectBack();
 		return;

From cda3d5ae2a8b5712fcc3958b78b2375ff17af51e Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 19 Jan 2010 02:49:01 +0000
Subject: [PATCH 129/483] MINOR Reverted 'single instance only' feature from
 r79868, delayed until later release (see #4277)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97182 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 75 +++-----------------------------------------
 1 file changed, 5 insertions(+), 70 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index cd91ded2..4f332b3a 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -556,23 +556,21 @@ class LeftAndMain extends Controller {
 			$id = $p->ID ? $p->ID : "new-$p->class-$p->ParentID";
 			$treeTitle = Convert::raw2js($p->TreeTitle());
 			$hasChildren = (is_numeric($id) && $p->AllChildren() && $p->AllChildren()->Count()) ? ' unexpanded' : '';
-			$singleInstanceCSSClass = $p->stat('single_instance_only') ?  $p->stat('single_instance_only_css_class') : "";
 
 			// Ensure there is definitly a node avaliable. if not, append to the home tree.
 			$response = <<<JS
 				var tree = $('sitetree');
-				var newNode = tree.createTreeNode("$id", "$treeTitle", "{$p->class}{$hasChildren} {$singleInstanceCSSClass}");
+				var newNode = tree.createTreeNode("$id", "$treeTitle", "{$p->class}{$hasChildren}");
 				node = tree.getTreeNodeByIdx($parentID);
 				if(!node) {
 					node = tree.getTreeNodeByIdx(0);
 				}
 				node.open();
 				node.appendTreeNode(newNode);
-				newNode.selectTreeNode();	
+				newNode.selectTreeNode();
 JS;
 			FormResponse::add($response);
-			FormResponse::add($this->hideSingleInstanceOnlyFromCreateFieldJS($p));
-			
+
 			return FormResponse::respond();
 		} else {
 			Director::redirect('admin/' . self::$url_segment . '/show/' . $p->ID);
@@ -703,21 +701,7 @@ JS;
 			}
 
 			$record->write();
-			
-			// if changed to a single_instance_only page type
-			if ($record->stat('single_instance_only')) {
-				FormResponse::add("jQuery('#sitetree li.{$record->ClassName}').addClass('{$record->stat('single_instance_only_css_class')}');");
-				FormResponse::add($this->hideSingleInstanceOnlyFromCreateFieldJS($record));
-			}
-			else {
-				FormResponse::add("jQuery('#sitetree li.{$record->ClassName}').removeClass('{$record->stat('single_instance_only_css_class')}');");
-			}
-			// if chnaged from a single_instance_only page type
-			$sampleOriginalClassObject = new $originalClass();
-			if($sampleOriginalClassObject->stat('single_instance_only')) {
-				FormResponse::add($this->showSingleInstanceOnlyInCreateFieldJS($sampleOriginalClassObject));
-			}
-			
+
 			if( ($record->class != 'VirtualPage') && $originalURLSegment != $record->URLSegment) {
 				$message .= sprintf(_t('LeftAndMain.CHANGEDURL',"  Changed URL to '%s'"),$record->URLSegment);
 				FormResponse::add("\$('Form_EditForm').elements.URLSegment.value = \"$record->URLSegment\";");
@@ -755,59 +739,11 @@ JS;
 				FormResponse::update_status($record->Status);
 
 				$this->extend('onAfterSave', $record);
-				
+
 				return FormResponse::respond();
 			}
 		}
 	}
-	
-	/** 
-	 * Return a javascript snippet that hides a page type from Create dropdownfield 
-	 * if it's a single_instance_only page type and has been created in the site tree
-	 */
-	protected function hideSingleInstanceOnlyFromCreateFieldJS($createdPage) {
-		// Prepare variable to single_instance_only checking in javascript
-		$pageClassName = $createdPage->class;
-		$singleInstanceCSSClass = "";
-		$singleInstanceClassSelector = "." . $createdPage->stat('single_instance_only_css_class');
-		if ($createdPage->stat('single_instance_only')) {
-			$singleInstanceCSSClass = $createdPage->stat('single_instance_only_css_class');
-		}
-		
-		return <<<JS
-			// if the current page type that was created is single_instance_only, 
-			// hide it from the create dropdownlist afterward
-			singleSingleOnlyOfThisPageType = jQuery("#sitetree li.{$pageClassName}{$singleInstanceClassSelector}");
-			
-			if (singleSingleOnlyOfThisPageType.length > 0) {
-				jQuery("#" + _HANDLER_FORMS.addpage + " option[@value={$pageClassName}]").remove();
-			}
-JS;
-	}
-	
-	/** 
-	 * Return a javascript snippet that that shows a single_instance_only page type in Create dropdownfield 
-	 * if there isn't any of its instance in the site tree
-	 */
-	protected function showSingleInstanceOnlyInCreateFieldJS($deletedPage) {
-		$className = $deletedPage->class;
-		$singularName = $deletedPage->singular_name();
-		$singleInstanceClassSelector = "." . $deletedPage->stat('single_instance_only_css_class');
-		return <<<JS
-// show the hidden single_instance_only page type in the create dropdown field
-singleSingleOnlyOfThisPageType = jQuery("#sitetree li.{$className}{$singleInstanceClassSelector}");
-
-if (singleSingleOnlyOfThisPageType.length == 0) {	
-	if(jQuery("#" + _HANDLER_FORMS.addpage + " option[@value={$className}]").length == 0) {
-		jQuery("#" + _HANDLER_FORMS.addpage + " select option").each(function(){
-			if ("{$singularName}".toLowerCase() >= jQuery(this).val().toLowerCase()) {
-				jQuery("<option value=\"{$className}\">{$singularName}</option>").insertAfter(this);
-			}
-		});
-	}
-}
-JS;
-	}
 
 	/**
 	 * Return a piece of javascript that will update the actions of the main form
@@ -858,7 +794,6 @@ JS;
 			$this->setCurrentPageID(null);
 		}
 		
-		if ($this instanceof LeftAndMain) FormResponse::add($this->showSingleInstanceOnlyInCreateFieldJS($page));
 		return FormResponse::respond();
 	}
 

From 6e09296937749c4060450c347a05aebad20389d4 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 19 Jan 2010 08:53:46 +0000
Subject: [PATCH 130/483] BUGFIX Language switcher dropdown javascript uses
 baseHref() to avoid invalid relative links in IE8 (#4891)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97210 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/LangSelector.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/LangSelector.js b/javascript/LangSelector.js
index 36353082..ba7bfc0a 100755
--- a/javascript/LangSelector.js
+++ b/javascript/LangSelector.js
@@ -15,7 +15,7 @@ LangSelectorClass.prototype = {
 	onchange: function(e, val) {
 		if(this.value != _TRANSLATING_LANG) {
 			_TRANSLATING_LANG = this.value;
-			document.location = 'admin/?locale=' + this.value;
+			document.location = baseHref() + 'admin/?locale=' + this.value;
 		}
 	},
 

From e4726af3636891b02ecb8a1ef9b5a91f678524ff Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Tue, 19 Jan 2010 22:19:56 +0000
Subject: [PATCH 131/483] BUGFIX: removing hardcoded reference to
 ModelAdmin_RecordController, also added getters for model controllers.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97231 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ModelAdmin.php | 61 +++++++++++++++++++++++++++++++--------------
 1 file changed, 42 insertions(+), 19 deletions(-)

diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index 3dc5b1fc..a451f42d 100755
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -167,6 +167,43 @@ abstract class ModelAdmin extends LeftAndMain {
 	static function get_page_length(){
 		return self::$page_length;
 	} 
+	
+	/**
+	 * Return the class name of the collection controller
+	 *
+	 * @param string $model model name to get the controller for
+	 * @return string the collection controller class
+	 */
+	function getCollectionControllerClass($model) {
+		$models = $this->getManagedModels();
+		
+		if(isset($models[$model]['collection_controller'])) {
+			$class = $models[$model]['collection_controller'];
+		} else {
+			$class = $this->stat('collection_controller_class');
+		}
+		
+		return $class;
+	}
+	
+	/**
+	 * Return the class name of the record controller
+	 *
+	 * @param string $model model name to get the controller for
+	 * @return string the record controller class
+	 */
+	function getRecordControllerClass($model) {
+		$models = $this->getManagedModels();
+		
+		if(isset($models[$model]['record_controller'])) {
+			$class = $models[$model]['record_controller'];
+		} else {
+			$class = $this->stat('record_controller_class');
+		}
+		
+		return $class;
+	}
+	
 	/**
 	 * Add mappings for generic form constructors to automatically delegate to a scaffolded form object.
 	 */
@@ -183,14 +220,7 @@ abstract class ModelAdmin extends LeftAndMain {
 	 * Base scaffolding method for returning a generic model instance.
 	 */
 	public function bindModelController($model, $request = null) {
-		$models = $this->getManagedModels();
-		
-		if(isset($models[$model]['collection_controller'])) {
-			$class = $models[$model]['collection_controller'];
-		} else {
-			$class = $this->stat('collection_controller_class');
-		}
-		
+		$class = $this->getCollectionControllerClass($model);	
 		return new $class($this, $model);
 	}
 	
@@ -312,7 +342,7 @@ class ModelAdmin_CollectionController extends Controller {
 	function getModelClass() {
 		return $this->modelClass;
 	}
-		
+	
 	/**
 	 * Delegate to different control flow, depending on whether the
 	 * URL parameter is a number (record id) or string (action).
@@ -336,15 +366,7 @@ class ModelAdmin_CollectionController extends Controller {
 	 * @return RecordController
 	 */
 	public function handleID($request) {
-		$models = $this->parentController->getManagedModels();
-		$model  = $this->getModelClass();
-		
-		if(isset($models[$model]['record_controller'])) {
-			$class = $models[$model]['record_controller'];
-		} else {
-			$class = $this->parentController->stat('record_controller_class');
-		}
-		
+		$class = $this->parentController->getRecordControllerClass($this->getModelClass());
 		return new $class($this, $request);
 	}
 	
@@ -816,7 +838,8 @@ class ModelAdmin_CollectionController extends Controller {
 		$model->write();
 		
 		if(Director::is_ajax()) {
-			$recordController = new ModelAdmin_RecordController($this, $request, $model->ID);
+			$class = $this->parentController->getRecordControllerClass($this->getModelClass());
+			$recordController = new $class($this, $request, $model->ID);
 			return new SS_HTTPResponse(
 				$recordController->EditForm()->forAjaxTemplate(), 
 				200, 

From fcbce693b7b080d36831bf4cf6b64f38cdb29173 Mon Sep 17 00:00:00 2001
From: Andrew Short <andrewjshort@gmail.com>
Date: Fri, 22 Jan 2010 01:43:39 +0000
Subject: [PATCH 132/483] BUGFIX: Properly closed a tag in AssetTableField that
 was hiding content after the back link tracking tab.

From: Andrew Short <andrewjshort@gmail.com> (from r95036)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97437 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetTableField.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/AssetTableField.php b/code/AssetTableField.php
index 09903cbd..e80d8700 100755
--- a/code/AssetTableField.php
+++ b/code/AssetTableField.php
@@ -205,7 +205,7 @@ class AssetTableField extends ComplexTableField {
 				foreach($links as $link) {
 					$backlinks[] = "<li><a href=\"admin/show/$link->ID\">" . $link->Breadcrumbs(null,true). "</a></li>";
 				}
-				$backlinks = "<div style=\"clear:left\">". _t('AssetTableField.PAGESLINKING','The following pages link to this file:') ."<ul>" . implode("",$backlinks) . "</ul>";
+				$backlinks = "<div style=\"clear:left\">". _t('AssetTableField.PAGESLINKING','The following pages link to this file:') ."<ul>" . implode("",$backlinks) . "</ul></div>";
 			}
 			if(!isset($backlinks)) $backlinks = "<p>". _t('AssetTableField.NOLINKS',"This file hasn't been linked to from any pages.") ."</p>";
 			$detailFormFields->addFieldToTab("BottomRoot.Links", new LiteralField("Backlinks", $backlinks));

From 07727e60bc90b385bc48ed4a0bd8788f2dd12858 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 25 Jan 2010 02:08:49 +0000
Subject: [PATCH 133/483] BUGFIX Setting 'Locale' as HiddenField in
 CMSMain->getEditForm() to support translatable SiteConfig records (see
 r97370, #4770)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97472 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index b8c7cd80..f081c610 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -461,7 +461,11 @@ JS;
 			return $form;
 		} if ($id == 0) {
 			$siteConfig = SiteConfig::current_site_config();
-			$form = new Form($this, "EditForm", $siteConfig->getFormFields(), $siteConfig->getFormActions());
+			$fields = $siteConfig->getFormFields(); 
+			if(Object::has_extension('SiteConfig',"Translatable")){ 
+				$fields->push(new HiddenField('Locale','', $siteConfig->Locale ));       
+			} 
+			$form = new Form($this, "EditForm", $fields, $siteConfig->getFormActions());
 			$form->loadDataFrom($siteConfig);
 			return $form;
 		} else if($id) {

From 0b0f2b8d9387b1203c56bcf296d74b391862e43d Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 25 Jan 2010 09:19:40 +0000
Subject: [PATCH 134/483] MINOR Backwards compat fix for sprintf() call in
 CMSMain->providePermissions() (#4764)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97485 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index f081c610..44f1409e 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -1307,7 +1307,7 @@ JS;
 					"Access to %s",
 					PR_MEDIUM,
 					"Item in permission selection identifying the admin section, with title and classname. Example: Access to Files & Images"
-				), $title),
+				), $title, null),
 				'category' => _t('Permission.CMS_ACCESS_CATEGORY', 'CMS Access')
 			);
 		}

From 99e9581d2bf84d6961741541815abcd392b3ed58 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 25 Jan 2010 09:32:29 +0000
Subject: [PATCH 135/483] MINOR Updated master translation file

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97487 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 lang/en_US.php | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/lang/en_US.php b/lang/en_US.php
index 60691c5f..68681201 100755
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -57,12 +57,12 @@ $lang['en_US']['AssetTableField.ss']['DELFILE'] = 'Delete this file';
 $lang['en_US']['AssetTableField.ss']['DRAGTOFOLDER'] = 'Drag to folder on left to move file';
 $lang['en_US']['AssetTableField.ss']['EDIT'] = 'Edit asset';
 $lang['en_US']['AssetTableField.ss']['SHOW'] = 'Show asset';
-$lang['en_US']['CMSBatchActions']['DELETED_PAGES'] = 'Deleted %d pages from the published site';
-$lang['en_US']['CMSBatchActions']['DELETE_PAGES'] = 'Delete from published site';
-$lang['en_US']['CMSBatchActions']['DELETING_PAGES'] = 'Deleting selected pages from the published site';
-$lang['en_US']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = 'Deleted %d pages from the draft site';
+$lang['en_US']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = 'Deleted %d pages from the draft site, %d failures';
+$lang['en_US']['CMSBatchActions']['DELETED_PAGES'] = 'Deleted %d pages from the published site, %d failures';
 $lang['en_US']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Delete from draft site';
+$lang['en_US']['CMSBatchActions']['DELETE_PAGES'] = 'Delete from published site';
 $lang['en_US']['CMSBatchActions']['DELETING_DRAFT_PAGES'] = 'Deleting selected pages from the draft site';
+$lang['en_US']['CMSBatchActions']['DELETING_PAGES'] = 'Deleting selected pages from the published site';
 $lang['en_US']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Published %d pages, %d failures';
 $lang['en_US']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Publishing pages';
 $lang['en_US']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publish';
@@ -76,7 +76,6 @@ $lang['en_US']['CMSMain']['CANCEL'] = 'Cancel';
 $lang['en_US']['CMSMain']['CHOOSEREPORT'] = '(Choose a report)';
 $lang['en_US']['CMSMain']['COMPARINGV'] = 'Comparing versions %s and %s';
 $lang['en_US']['CMSMain']['COPYPUBTOSTAGE'] = 'Do you really want to copy the published content to the stage site?';
-$lang['en_US']['CMSMain']['DELETE'] = 'Delete from the draft site';
 $lang['en_US']['CMSMain']['DESCREMOVED'] = 'and %s descendants';
 $lang['en_US']['CMSMain']['EMAIL'] = 'Email';
 $lang['en_US']['CMSMain']['GO'] = 'Go';
@@ -96,7 +95,6 @@ $lang['en_US']['CMSMain']['NEW'] = array(
 $lang['en_US']['CMSMain']['NOCONTENT'] = 'no content';
 $lang['en_US']['CMSMain']['OK'] = 'OK';
 $lang['en_US']['CMSMain']['PAGENOTEXISTS'] = 'This page doesn\'t exist';
-$lang['en_US']['CMSMain']['PRINT'] = 'Print';
 $lang['en_US']['CMSMain']['PUBALLCONFIRM'] = array(
 	'Please publish every page in the site, copying content stage to live',
 	PR_LOW,
@@ -120,7 +118,6 @@ $lang['en_US']['CMSMain']['RESTORED'] = array(
 $lang['en_US']['CMSMain']['ROLLBACK'] = 'Roll back to this version';
 $lang['en_US']['CMSMain']['ROLLEDBACKPUB'] = 'Rolled back to published version. New version number is #%d';
 $lang['en_US']['CMSMain']['ROLLEDBACKVERSION'] = 'Rolled back to version #%d.  New version number is #%d';
-$lang['en_US']['CMSMain']['SAVE'] = 'Save';
 $lang['en_US']['CMSMain']['STATUSOPT'] = 'Status';
 $lang['en_US']['CMSMain']['TITLEOPT'] = 'Title';
 $lang['en_US']['CMSMain']['TOTALPAGES'] = 'Total pages: ';
@@ -299,6 +296,26 @@ $lang['en_US']['LeftAndMain.ss']['SSWEB'] = 'Silverstripe Website';
 $lang['en_US']['LeftAndMain.ss']['VIEWINDRAFT'] = 'View the Page in the Draft Site';
 $lang['en_US']['LeftAndMain.ss']['VIEWINPUBLISHED'] = 'View the Page in the Published Site';
 $lang['en_US']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Page view:';
+$lang['en_US']['MathSpamProtection']['EIGHT'] = 'eight';
+$lang['en_US']['MathSpamProtection']['EIGHTEEN'] = 'eighteen';
+$lang['en_US']['MathSpamProtection']['ELEVEN'] = 'eleven';
+$lang['en_US']['MathSpamProtection']['FIFTEEN'] = 'fifteen';
+$lang['en_US']['MathSpamProtection']['FIVE'] = 'five';
+$lang['en_US']['MathSpamProtection']['FOUR'] = 'four';
+$lang['en_US']['MathSpamProtection']['FOURTEEN'] = 'fourteen';
+$lang['en_US']['MathSpamProtection']['NINE'] = 'nine';
+$lang['en_US']['MathSpamProtection']['ONE'] = 'one';
+$lang['en_US']['MathSpamProtection']['SEVEN'] = 'seven';
+$lang['en_US']['MathSpamProtection']['SEVENTEEN'] = 'seventeen';
+$lang['en_US']['MathSpamProtection']['SIX'] = 'six';
+$lang['en_US']['MathSpamProtection']['SIXTEEN'] = 'sixteen';
+$lang['en_US']['MathSpamProtection']['TEN'] = 'ten';
+$lang['en_US']['MathSpamProtection']['THIRTEEN'] = 'thirteen';
+$lang['en_US']['MathSpamProtection']['THREE'] = 'three';
+$lang['en_US']['MathSpamProtection']['TWELVE'] = 'twelve';
+$lang['en_US']['MathSpamProtection']['TWO'] = 'two';
+$lang['en_US']['MathSpamProtection']['WHATIS'] = 'What is %s plus %s?';
+$lang['en_US']['MathSpamProtection']['ZERO'] = 'zero';
 $lang['en_US']['MemberList.ss']['FILTER'] = array(
 	'Filter',
 	50,
@@ -501,10 +518,8 @@ $lang['en_US']['ViewArchivedEmail.ss']['HAVEASKED'] = array(
 	30,
 	'Followed by a date'
 );
-$lang['en_US']['WidgetAreaEditor.ss']['AVAILABLE'] = 'Available Widgets';
-$lang['en_US']['WidgetAreaEditor.ss']['INUSE'] = 'Widgets currently used';
+$lang['en_US']['WidgetAreaEditor']['ss'] = 'TOADD';
 $lang['en_US']['WidgetAreaEditor.ss']['NOAVAIL'] = 'There are currently no widgets available.';
-$lang['en_US']['WidgetAreaEditor.ss']['TOADD'] = 'To add widgets, drag them from the left area to here.';
 $lang['en_US']['WidgetEditor.ss']['DELETE'] = 'Delete';
 
 ?>
\ No newline at end of file

From a19fea24163663fc8eff5c0d5605c77be4250f60 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Mon, 25 Jan 2010 21:10:43 +0000
Subject: [PATCH 136/483] APICHANGE: removed SWFUpload. Refactored Content
 Editors uploader to use standard uploader.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97489 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php                     |    6 -
 code/LeftAndMain.php                    |    3 -
 css/TinyMCEImageEnhancement.css         |   20 -
 css/cms_right.css                       |   26 +
 javascript/CMSMain_upload.js            |  166 ----
 javascript/TinyMCEImageEnhancement.js   |  221 -----
 javascript/Upload.js                    |  284 ------
 thirdparty/swfupload/license.txt        |   11 -
 thirdparty/swfupload/swfupload.js       | 1052 -----------------------
 thirdparty/swfupload/swfupload.queue.js |   98 ---
 thirdparty/swfupload/swfupload.swf      |  Bin 33328 -> 0 bytes
 11 files changed, 26 insertions(+), 1861 deletions(-)
 delete mode 100644 css/TinyMCEImageEnhancement.css
 delete mode 100644 javascript/CMSMain_upload.js
 delete mode 100644 javascript/TinyMCEImageEnhancement.js
 delete mode 100644 javascript/Upload.js
 delete mode 100644 thirdparty/swfupload/license.txt
 delete mode 100755 thirdparty/swfupload/swfupload.js
 delete mode 100755 thirdparty/swfupload/swfupload.queue.js
 delete mode 100755 thirdparty/swfupload/swfupload.swf

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index faef5cb1..a53739ae 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -70,10 +70,6 @@ class AssetAdmin extends LeftAndMain {
 		Requirements::css(SAPPHIRE_DIR . "/css/ComplexTableField.css");
 
 		Requirements::javascript(CMS_DIR . "/javascript/AssetAdmin.js");
-
-		Requirements::javascript(CMS_DIR . "/javascript/CMSMain_upload.js");
-		Requirements::javascript(CMS_DIR . "/javascript/Upload.js");
-		Requirements::javascript(CMS_DIR . "/thirdparty/swfupload/swfupload.js");
 		
 		Requirements::javascript(THIRDPARTY_DIR . "/greybox/AmiJS.js");
 		Requirements::javascript(THIRDPARTY_DIR . "/greybox/greybox.js");
@@ -121,8 +117,6 @@ JS
 	 * Return the form object shown in the uploadiframe.
 	 */
 	function UploadForm() {
-		// disabled flash upload javascript (CMSMain_upload()) below,
-		// see r54952 (originally committed in r42014)
 		$form = new Form($this,'UploadForm', new FieldSet(
 			new HiddenField("ID", "", $this->currentPageID()),
 			new HiddenField("FolderID", "", $this->currentPageID()),
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 4f332b3a..b2b6ca1c 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -268,9 +268,6 @@ class LeftAndMain extends Controller {
 				CMS_DIR . '/javascript/LeftAndMain_right.js',
 				SAPPHIRE_DIR . '/javascript/tree/tree.js',
 				THIRDPARTY_DIR . '/tabstrip/tabstrip.js',
-				CMS_DIR . '/thirdparty/swfupload/swfupload.js',
-				CMS_DIR . '/javascript/Upload.js',
-				CMS_DIR . '/javascript/TinyMCEImageEnhancement.js',
 				SAPPHIRE_DIR . '/javascript/TreeSelectorField.js',
 		 		CMS_DIR . '/javascript/ThumbnailStripField.js',
 			)
diff --git a/css/TinyMCEImageEnhancement.css b/css/TinyMCEImageEnhancement.css
deleted file mode 100644
index aafadef7..00000000
--- a/css/TinyMCEImageEnhancement.css
+++ /dev/null
@@ -1,20 +0,0 @@
-.contentPanel .group {
-    display: inline;
-    margin-left: 2px;
-}
-.contentPanel .middleColumn {
-    margin-bottom: 2px;	
-}
-.contentPanel .link {
-    text-decoration: none;
-    margin-left: 2px;
-} 
-
-
-.contentPanel .tree_holder {
-    display: inline;
-}
-.contentPanel #NewFolderName {
-    width: 120px;
-    margin-top: 0;	
-}
diff --git a/css/cms_right.css b/css/cms_right.css
index df4e431e..0ff55828 100644
--- a/css/cms_right.css
+++ b/css/cms_right.css
@@ -490,3 +490,29 @@ div.filterBox {
 .autocompleteoptions {
 	background-color: white;
 }
+
+/**
+ * Upload Image (Image Toolbar)
+ */
+#Form_EditorToolbarImageForm .file,
+#Form_EditorToolbarImageForm #UploadFormResponse {
+	display: none;
+}
+
+.showUploadField {
+	font-size: 11px;
+	padding: 1px 3px;
+}
+	.showUploadField a {
+		display: none;
+	}
+	
+	#UploadFormResponse {
+		padding: 6px 0;
+		font-size: 12px;
+	}
+		#UploadFormResponse.loading
+		.loading#UploadFormResponse {
+			background: url(../../cms/images/network-save.gif) no-repeat left center;
+			padding-left: 20px;
+		}
diff --git a/javascript/CMSMain_upload.js b/javascript/CMSMain_upload.js
deleted file mode 100644
index 1960ae17..00000000
--- a/javascript/CMSMain_upload.js
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * This class is used for upload in asset part.
- * If one of methods is not commented look for comment in Upload.js
-  
-*/
-CMSMain_upload = Class.create();
-CMSMain_upload.prototype = {
-	initialize: function() {
-
-		// If those 2 checks pass, we can provide upload capabilities to the user
-		this.iframe = window.top.document.getElementById('AssetAdmin_upload');
-		this.onLoad();
-	},
-
-	onLoad: function() {
-		this.upload = new Upload({
-				fileUploadLimit : '6',
-				securityID : $('SecurityID').value,
-				beginUploadOnQueue : false,
-				fileQueued : this.uploadFileQueuedCallback.bind(this),
-				fileProgress : this.uploadProgressCallback.bind(this),
-				fileCancelled : this.uploadFileCancelCallback.bind(this),
-				fileComplete : this.uploadFileCompleteCallback.bind(this),
-				queueComplete : this.uploadQueueCompleteCallback.bind(this),
-				buildUI : this.extendForm.bind(this)
-			});
-	},
-	
-	/**
-	 * Builds UI, called only when Upload object will be able to create flash uploader. 
-	*/
-	
-	extendForm: function() {
-		if(this.iframe.contentDocument == undefined) this.iframe.contentDocument = document.frames[0].document;//IE HACK   
-		element = this.iframe.contentDocument.getElementById('Form_UploadForm');
-		inputFile = this.iframe.contentDocument.getElementById('Form_UploadForm_Files-0');
-		inputFileParent = inputFile.parentNode;
-		inputFileParent.removeChild(inputFile);
-		inputFile = this.iframe.contentDocument.createElement('input');
-		inputFile.type = 'text';
-		inputFile.id = 'Form_UploadForm_Files-0';
-		inputFileParent.appendChild(inputFile);
-		inputButton = this.iframe.contentDocument.getElementById('Form_UploadForm_Files-1');
-		if(inputButton != null) inputButton.parentNode.removeChild(inputButton);
-		inputButton = this.iframe.contentDocument.createElement('input');
-		inputButton.type = 'button';
-		inputButton.id = 'Form_UploadForm_Files-1';
-		inputButton.value = ' Browse...';
-		inputButton.style.width = '66px';
-		inputButton.style.height = '19px';
-		inputButton.style.position = 'relative';
-		inputButton.style.top = '1px';
-		inputButton.style.fontFamily = 'Arial';
-		inputButton.style.fontSize = '1.06em';
-		inputFileParent.appendChild(inputButton);
-		Event.observe(inputButton,'click',this.onBrowseClick.bind(this));
-		Event.observe(this.iframe.contentDocument.getElementById('Form_UploadForm_action_upload'),'click',this.onUploadClick.bind(this));
-	},
-	
-	onBrowseClick: function(event) {
-		this.upload.browse();
-	},
-	
-	onUploadClick: function(event) {
-		Event.stop(event);
-		this.upload.startUpload();
-	},
-	
-	uploadFileQueuedCallback: function(file,queueLength) {
-		this.upload.setFolderID(this.iframe.contentDocument.getElementById('Form_UploadForm_ID').value); 
-		this.iframe.contentDocument.getElementById('Form_UploadForm_action_upload').disabled = false;
-		var fileContainer = this.iframe.contentDocument.getElementById('Form_UploadForm_FilesList');
-		if(fileContainer == null) {
-		   fileContainer = this.iframe.contentDocument.createElement('div');
-		   fileContainer.id = 'Form_UploadForm_FilesList';
-		   this.iframe.contentDocument.getElementById('Form_UploadForm').appendChild(fileContainer);
-		}
-		
-		var fileToUpload = this.iframe.contentDocument.createElement('div');
-		fileToUpload.id = 'Form_UploadForm_FilesList_' + file.id;
-		fileToUpload.style.marginBottom = '3px';
-		fileContainer.appendChild(fileToUpload);
-		
-		var fileName = this.iframe.contentDocument.createElement('div');
-		fileName.id = 'Form_UploadForm_FilesList_Name_' + file.id;
-		fileName.style.position = 'relative';
-		fileName.style.top = '-4px';
-		fileName.style.display = 'inline';
-		fileName.style.padding = '2px';
-		fileName.innerHTML = file.name;
-		fileName.style.height = Element.getDimensions(fileName).height + 1 + 'px';//IE hack
-		fileToUpload.appendChild(fileName);
-		
-		var fileProgress = this.iframe.contentDocument.createElement('div');
-		fileProgress.id = 'Form_UploadForm_FilesList_Progress_' + file.id;
-		Position.clone(fileName,fileProgress);	   
-		fileProgress.style.backgroundColor = 'black';
-		fileProgress.style.display = 'inline';
-		fileProgress.style.position = 'absolute';
-		fileProgress.style.left = '5px';
-		fileProgress.style.width = '0px';
-		fileProgress.finished = false;		
-		fileProgress.style.top = parseInt(fileProgress.style.top) + 6 + 'px';
-		fileProgress.style.height = Element.getDimensions(fileName).height + 1 + 'px';		
-		fileToUpload.appendChild(fileProgress);
-		
-		var fileDelete = this.iframe.contentDocument.createElement('input');
-		fileDelete.id = file.id;
-		fileDelete.type = 'button';
-		fileDelete.value = 'Delete';
-		Element.addClassName(fileDelete,'delete');
-		fileToUpload.appendChild(fileDelete);
-		Event.observe(fileDelete,'click',this.uploadFileCancelCallback.bind(this));
-	},
-	
-	uploadProgressCallback: function(file,bytesLoaded) {
-		fileName = this.iframe.contentDocument.getElementById('Form_UploadForm_FilesList_Name_' + file.id);
-		fileName.style.border = 'solid 1px black';
-		fileProgress = this.iframe.contentDocument.getElementById('Form_UploadForm_FilesList_Progress_' + file.id);
-		fileProgress.style.opacity = 0.3;fileProgress.style.filter = 'alpha(opacity=30)';
-		if(!fileProgress.cloned) {
-			Position.clone(fileName,fileProgress);
-			fileProgress.style.width = '0px';
-			fileProgress.cloned = true;
-		}
-		fileProgress.style.width = (bytesLoaded / file.size) * Element.getDimensions(fileName).width - 1 + 'px';
-	},
-	
-	uploadFileCompleteCallback: function(file,serverData) {
-		this.iframe.contentDocument.getElementById('Form_UploadForm_FilesList_Progress_' + file.id).finished = true;
-	},
-	
-	uploadFileCancelCallback: function(event) {
-		element = Event.element(event);
-		fileId = element.id;
-		fileContainer = this.iframe.contentDocument.getElementById('Form_UploadForm_FilesList');
-		elementToDelete = this.iframe.contentDocument.getElementById('Form_UploadForm_FilesList_' + fileId);
-		elementToDelete.parentNode.removeChild(elementToDelete);
-		filesToUpload = fileContainer.childNodes.length;
-		if(filesToUpload > 0) {
-			this.iframe.contentDocument.getElementById('Form_UploadForm_action_upload').disabled = false;
-		} else {
-			this.iframe.contentDocument.getElementById('Form_UploadForm_action_upload').disabled = true;
-		}
-		$A(fileContainer.childNodes).each(
-			function(item) {
-				$A(item.childNodes).each(
-					function(item) {
-						if(item.id.indexOf('Name') != -1) {
-							fileName = item;
-						}
-						if(item.id.indexOf('Progress') != -1) {
-							fileProgress = item;
-						}
-					});
-				 Position.clone(fileName,fileProgress);
-				 if(fileProgress.finished == false) fileProgress.style.width = '0px';
-			}
-		);
-	},
-	
-	uploadQueueCompleteCallback: function() {
-		eval(this.upload.getUploadMessage().replace(/Uploaded 1 files/g,'Uploaded ' + this.upload.getFilesUploaded() + ' files'));
-	}
-}
-window.top.document.CMSMain_upload = CMSMain_upload;
diff --git a/javascript/TinyMCEImageEnhancement.js b/javascript/TinyMCEImageEnhancement.js
deleted file mode 100644
index d5a43cad..00000000
--- a/javascript/TinyMCEImageEnhancement.js
+++ /dev/null
@@ -1,221 +0,0 @@
-/**
- * This class is used for upload in TinyMCE editor.
- * If one of methods is not commented look for comment in Upload.js.
-*/
-TinyMCEImageEnhancement = Class.create();
-TinyMCEImageEnhancement.prototype = {
-    initialize: function() {
-        this.filesUploaded = 0;
-        this.processInProgress = false;
-
-        Event.observe($('AddFolder'),'click',this.onAddFolder.bind(this));
-        Event.observe($('FolderOk'),'click',this.onFolderOk.bind(this));
-        Event.observe($('FolderCancel'),'click',this.onFolderCancel.bind(this));
-
-		this.onLoad();
-    },   
-	
-	onLoad: function() {
-		this.upload = new Upload({
-			fileUploadLimit : '6',
-			button_image_url : 'cms/images/swf-upload-button-small.jpg',
-			button_width : 59,
-			button_height: 18,
-			fileQueued: this.uploadFileQueuedCallback.bind(this),
-			fileComplete: this.uploadFileCompleteCallback.bind(this),
-			queueComplete: this.uploadQueueCompleteCallback.bind(this)
-		});
-	},
-	
-	/**
-     * Method creates HTML element, only reason for this method is DRY. 
-    */
-    addElement: function(tag, className, parent, properties) {
-        var e = document.createElement(tag);
-        Element.addClassName(e,className);
-        parent.appendChild(e);
-        Object.extend(e,properties);
-        return e;
-    },
-        
-    /**
-     * Called when user clicks "add folder" anchor. 
-    */
-    
-    onAddFolder: function(event) {
-        Event.stop(event);
-        Element.hide('AddFolder');
-        Element.show('NewFolderName','FolderOk','FolderCancel');
-        this.applyIE6Hack();
-    },
-    
-	/**
-	 * The user clicks the "ok" anchor link, the click event calls up
-	 * this function which creates a new AJAX request to add a new folder
-	 * using the addfolder function in AssetAdmin.php (admin/assets/addfolder).
-	 */
-	onFolderOk: function(event) {
-		Event.stop(event);
-		var folderName = $('NewFolderName').value;
-		var options = {
-			method: 'post',
-			postBody: 'ParentID=' + this.getParentID() + '&ajax=1&returnID=1&Name=' + folderName + ($('SecurityID') ? '&SecurityID=' + $('SecurityID').value : ''),
-			onSuccess: this.onFolderGetSuccess.bind(this),
-			onFailure: function(transport) {
-				errorMessage('Error: Folder not added', transport); 
-			}
-		};
-		
-		new Ajax.Request('admin/assets/addfolder', options);
-	},
-    
-	/**
-	 * If the "addFolderOk" function does a successful AJAX post, call this
-	 * function. Take the folder ID that was created in "addFolderOk"
-	 * via ajax and send data to modify that folder record.
-	 */    
-	onFolderGetSuccess: function(transport) {
-		var folderID = transport.responseText;
-		
-		var date = new Date();
-		var year = date.getFullYear();
-		var month = date.getMonth() < 10 ? '0' + date.getMonth() : date.getMonth();  
-		var day = date.getDay() < 10  ? '0' + date.getDay() : date.getDay();
-		var hours = date.getHours() < 10  ? '0' + date.getHours() : date.getHours();
-		var minutes = date.getMinutes() < 10  ? '0' + date.getMinutes() : date.getMinutes();
-		var seconds = date.getSeconds() < 10  == 1 ? '0' + date.getSeconds() : date.getSeconds();
-		var currentDate = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds; 
-		
-		var folderName = $('NewFolderName').value;
-		
-		this.folderID = folderID;
-		
-		statusMessage('Creating new folder');
-        $('TreeDropdownField_Form_EditorToolbarImageForm_FolderID').itemTree = null;
-        $('TreeDropdownField_Form_EditorToolbarImageForm_FolderID').setValue(this.folderID);
-        $('NewFolderName').value = '';
-        Element.show('AddFolder');
-        Element.hide('NewFolderName','FolderOk','FolderCancel');
-        this.removeIE6Hack();
-    },
-    
-    /**
-     * If user doesn't want to add folder return to default UI. 
-    */
-    
-    onFolderCancel: function(event) {
-        $('NewFolderName').value = '';
-        Element.show('AddFolder');
-        Element.hide('NewFolderName','FolderOk','FolderCancel');
-        this.removeIE6Hack();
-		Event.stop(event);
-		return false;
-    },
-    
-	uploadFileQueuedCallback: function(file,queueLength) {
-		if(this.getParentID() == "root") {
-			statusMessage("Please choose folder","bad");	
-		}
-		else {
-			this.processInProgress = true;
-			this.upload.swfu.addPostParam('FolderID', this.getParentID());
-			this.upload.swfu.addFileParam(file.id,'ID',this.folderID);
-			this.upload.swfu.addFileParam(file.id,'Files',file.name);
-			$('UploadFiles').innerHTML = "Uploading Files...("+ this.filesUploaded +")";	
-			this.upload.swfu.startUpload(file.id);		
-		}
-	},
-	
-	uploadFileCompleteCallback: function(file,serverData) {
-		this.filesUploaded++;
-		$('UploadFiles').innerHTML = 'Uploading Files..... ('+ this.filesUploaded +")";
-	},
-	
-	uploadQueueCompleteCallback: function(serverData) {
-		this.filesUploaded = this.upload.getFilesUploaded();
-		$('UploadFiles').innerHTML = "";
-		statusMessage('Uploaded Files Successfully','good');
-		
-		$('FolderImages').ajaxGetFiles(this.getParentID(), null);	
-	},
-	
-	/**
-	 * Iterates over all uploaded images and add them to TinyMCE editor
-	 *
-	 * @param transport object
-	*/
-	insertImages: function(transport) {
-		//HACK FOR STRANGE ERROR OCCURING UNDER SAFARI
-		if(transport.responseText == '') {
-			$('Image').ajaxGetFiles(this.getParentID(), null, this.insertImages.bind(this));
-			return;
-		}
-		//END OF HACK
-
-        $('Image').reapplyBehaviour();
-
-        this.addToTinyMCE = this.addToTinyMCE.bind(this);
-		this.processInProgress = false;
-    },
-    
-    /**
-     * Adds particular image to TinyMCE. Most of code has been copied from tiny_mce_improvements.js / ImageThumbnail.onclick
-     * Sorry for not following DRY, I didn't want to break smth in tiny_mce_improvements.
-     * 
-     *  @param target object
-    */
-    
-    addToTinyMCE: function(target) {
-		var formObj = $('Form_EditorToolbarImageForm');
-        var altText = formObj.elements.AltText.value;
-        var cssClass = formObj.elements.CSSClass.value;
-        var baseURL = document.getElementsByTagName('base')[0].href;
-        var relativeHref = target.href.substr(baseURL.length)
-        if(!tinyMCE.selectedInstance) tinyMCE.selectedInstance = Toolbar.instance().editor;
-        if(tinyMCE.selectedInstance.contentWindow.focus) tinyMCE.selectedInstance.contentWindow.focus();
-        // Extract dest width and dest height from the class name 
-        var destWidth = null;
-        var destHeight = null;
-        try {
-            var imgTag = target.getElementsByTagName('img')[0];
-            destWidth = imgTag.className.match(/destwidth=([0-9.\-]+)([, ]|$)/) ? RegExp.$1 : null;
-            destHeight = imgTag.className.match(/destheight=([0-9.\-]+)([, ]|$)/) ? RegExp.$1 : null;
-        } catch(er) {
-        }
-        TinyMCE_AdvancedTheme._insertImage(relativeHref, altText, 0, '', '', destWidth, destHeight, '', '', cssClass);
-    },
-    
-    /**
-     * Under IE6 when we click on "add folder" anchor, rest of anchors loose their correct position
-     *
-    */
-    
-    applyIE6Hack: function() {
-        if(/msie/i.test(navigator.userAgent)) {
-	        elements = [$('FolderOk'),$('FolderCancel'),$('UploadFiles')];
-	        $A(elements).each(function(element) {
-	            element.style.position = "relative";
-	            element.style.top = "-3px";
-	        });
-	   }
-    },
-    
-    removeIE6Hack: function() {
-        if(/msie/i.test(navigator.userAgent)) {
-	        elements = [$('FolderOk'),$('FolderCancel'),$('UploadFiles')];
-	        $A(elements).each(function(element) {
-	            element.style.position = "";
-	        });
-	    }
-    },
-    
-    /**
-     * Returns id of upload folder.
-     *
-    */
-    
-    getParentID: function() {
-        return  $('Form_EditorToolbarImageForm_FolderID').value == '' ? 'root' : $('Form_EditorToolbarImageForm_FolderID').value;
-    }
-}
-tinyMCEImageEnhancement = new TinyMCEImageEnhancement();
diff --git a/javascript/Upload.js b/javascript/Upload.js
deleted file mode 100644
index 0805ab4c..00000000
--- a/javascript/Upload.js
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
-	This class is wrapper for SWFUpload class. 
-	If you want use SWFUpload, please use this class becuase it will take care of configuration
-	error handling and other things.
-
-*/
-
-var Upload = Class.create();
-Upload.prototype = {
-	
-	/**
-	 * Sets configuration data provided from user if smth is missing sets default value.
-	 *
-	 * @param params object contains all configuration data for upload.
-	*/
-	initialize: function(params) {
-		
-		this.filesUploaded = 0;
-		this.filesToUpload = 0;
-		this.folderID = 'root';
-		this.uploadInProgress = false;
-		this.uploadMessage = '';
-		this.queueComplete = this.uploadQueueCompleteCallback.bind(this);
-		this.fileComplete = this.uploadFileCompleteCallback.bind(this);
-		this.fileQueued = this.uploadFileQueuedCallback;
-		
-		if(typeof params.fileSizeLimit != 'undefined') this.setFileSizeLimit = params.fileSizeLimit; else this.fileSizeLimit = '30720';
-		if(typeof params.fileTypes != 'undefined') this.fileTypes = params.fileTypes; else this.fileTypes = '*.*';
-		if(typeof params.fileTypesDescription != 'undefined') this.fileTypesDescription = params.fileTypesDescription; else this.fileTypesDescription = 'All Files';
-		if(typeof params.fileUploadLimit != 'undefined') this.fileUploadLimit = params.fileUploadLimit; else this.fileUploadLimit = '6';
-		if(typeof params.beginUploadOnQueue != 'undefined') this.beginUploadOnQueue = params.beginUploadOnQueue; else this.beginUploadOnQueue = true;
-		if(typeof params.fileQueued != 'undefined') this.fileQueued = params.fileQueued; 
-		
-		if(typeof params.fileProgress != 'undefined') this.fileProgress = params.fileProgress; else this.fileProgress = Prototype.emptyFunction;
-		if(typeof params.fileCancelled != 'undefined') this.fileCancelled  = params.fileCancelled;
-		if(typeof params.fileComplete != 'undefined') this.fileComplete = params.fileComplete;
-		if(typeof params.queueComplete != 'undefined') this.queueComplete = params.queueComplete;
-		if(typeof params.buildUI != 'undefined') this.customBuildUI = params.buildUI;
-		if(typeof params.securityID != 'undefined') this.securityID = params.securityID;
-		if(typeof params.button_image_url != 'undefined') this.buttonImageURL = params.button_image_url;
-		if(typeof params.button_width != 'undefined') this.buttonWidth = params.button_width;
-		if(typeof params.button_height != 'undefined') this.buttonHeight = params.button_height;
-		
-		try {
-			this.onLoad();
-		} catch (ex) {
-			// suppress the exception in case swfupload.js is loaded in a context that has no
-			// placeholder elements
-			if ( ex.indexOf('Could not find the placeholder element')==-1 )
-				throw ex;
-		}
-	},
-	
-	/**
-	 * Creates SWFUpload object for uploading files.  
-	 * 
-	*/
-	onLoad: function() {
-		
-		path = this.getBasePath();
-		sessId = this.getSessionId();//Because flash doesn't send proper cookies, we need to set session id in URL. 
-		this.swfu = new SWFUpload({
-				upload_url: path + 'admin/assets/UploadForm?action_doUpload=1&PHPSESSID=' + sessId,   // Relative to the SWF file
-				file_post_name: 'Files',
-				file_size_limit : this.fileSizeLimit,
-				file_types : this.fileTypes,
-				file_types_description : this.fileTypesDescription,
-				file_upload_limit : this.fileUploadLimit,
-				begin_upload_on_queue : this.beginUploadOnQueue,
-				use_server_data_event : true,
-				validate_files: false,
-				button_placeholder_id: "SWFUploadButton",
-				file_queued_handler : this.fileQueued,
-				upload_success_handler : this.queueComplete,
-				file_dialog_complete_handler : this.fileCompleted,
-				upload_progress_handler: this.uploadFileProgressCallback.bind(this),
-				error_handler : this.uploadErrorCallback.bind(this),
-				file_validation_handler : Prototype.emptyFunction,
-				file_cancelled_handler: Prototype.emptyFunction,
-				button_image_url : this.buttonImageURL,
-				button_window_mode : "transparent",
-				button_width : this.buttonWidth,
-				button_height : this.buttonHeight,
-				flash_url : 'cms/thirdparty/swfupload/swfupload.swf',	// Relative to this file
-				swfupload_loaded_handler: this.buildUI.bind(this),
-				debug: false,
-				preserve_relative_urls: true
-			});
-
-	},	
-	
-	/**
-	 * Retrieves base path from URL.
-	 * TODO: Use base tag. 
-	*/
-	
-	getBasePath: function() {
-		var path = 'http://' + window.location.host + window.location.pathname;
-
-		if(path.match(/^(.*\/)admin/i)) return RegExp.$1;
-		else return path;
-	},
-	
-	/**
-	 * Retrieves sessionId from cookie. 
-	 * 
-	*/
-
-	getSessionId: function() {
-		var start = document.cookie.indexOf('PHPSESSID')+10;
-		var end = document.cookie.indexOf(';',start);
-		if(end == -1) end = document.cookie.length;
-		return document.cookie.substring(start,end);
-	},
-	
-	/**
-	 * Calls method defined by user, method should create user interface. 
-	 * 
-	*/
-	
-	buildUI: function() {
-		return;
-	},
-	
-	/**
-	 * Called when new file is added to the queue
-	 * 
-	 * @param file object 
-	 * @param queueLength int
-	*/
-	
-	uploadFileQueuedCallback: function(file,queueLength) {
-		this.filesToUpload++;
-//		this.swfu.fileQueued(file, queueLength);
-		this.addFileParam(file);
-	},
-	
-	/**
-	 * Called when uploading of particular file has finished
-	 * 
-	 * @param file object 
-	 * @param servedData string
-	*/
-	uploadFileCompleteCallback: function(file,serverData) {
-		this.filesUploaded++;
-		if(serverData) {
-		   var toEval = serverData.substr(serverData.indexOf('<script'));
-		   toEval = toEval.replace('<script type="text/javascript">','');
-		   toEval = toEval.replace('</script>','');
-		   this.uploadMessage = toEval;
-	   }
-
-		this.fileComplete(file, serverData);
-		
-		// Run the next file in the queue, if there is one
-		if(this.swfu.getStats().files_queued > 0) this.startUpload();
-		// Otherwise indicate that the queue is finished
-		else {
-			this.queueComplete();
-			this.uploadInProgress = false;
-			this.filesUploaded = 0;
-			this.filesToUpload = 0;
-		}
-	},
-	
-	/**
-	 * Called during uploading file. 
-	 *
-	 * @param file object 
-	 * @param bytes_complete int
-	*/
-	
-	uploadFileProgressCallback: function(file, bytes_complete) {
-		this.uploadInProgress = true;
-		this.fileProgress(file, bytes_complete);
-	},
-		
-	uploadQueueCompleteCallback: function(event) {
-		
-	},
-	
-	/**
-	 * Called on error.
-	 * @param error_code int
-	 * @param file object
-	 * @param message string
-	*/
-
-	uploadErrorCallback: function(error_code, file, message) {
-		this.swfu.cancelQueue();
-		switch(error_code) {
-			case SWFUpload.ERROR_CODE_HTTP_ERROR:
-				alert('You have encountered an error. File hasn\'t been uploaded. Please hit the "Refresh" button in your web browser. Error Code: HTTP Error, File name: ' + file.name + ', Message: ' + msg);
-			break;
-			case SWFUpload.ERROR_CODE_IO_ERROR:
-				alert('You have encountered an error. File hasn\'t been uploaded. Please hit the "Refresh" button in your web browser. Error Code: IO Error, File name: ' + file.name + ', Message: ' + msg);
-			break;
-			case SWFUpload.ERROR_CODE_SECURITY_ERROR:
-				alert('You have encountered an error. File hasn\'t been uploaded. Please hit the "Refresh" button in your web browser. Error Code: Security Error, File name: ' + file.name + ', Message: ' + msg);
-			break;
-			case SWFUpload.ERROR_CODE_FILE_EXCEEDS_SIZE_LIMIT:
-				alert('Files cannot be bigger than ' + this.fileSizeLimit/1024 + ' MB.');
-			break;
-			case SWFUpload.ERROR_CODE_ZERO_BYTE_FILE:
-				alert('Files cannot be empty');
-			break;
-			case SWFUpload.ERROR_CODE_QUEUE_LIMIT_EXCEEDED:
-				alert('You can only have six files in queue');
-			break;
-			case SWFUpload.ERROR_CODE_UPLOAD_FAILED:
-				alert('You have encountered an error. File hasn\'t has been uploaded. Please hit the "Refresh" button in your web browser');
-			break;
-			case SWFUpload.ERROR_CODE_SPECIFIED_FILE_NOT_FOUND:
-				alert('You have encountered an error. File hasn\'t has been uploaded. Please hit the "Refresh" button in your web browser');
-			break;
-			default:
-				alert('You have encountered an error. File hasn\'t has been uploaded. Please hit the "Refresh" button in your web browser');
-		}
-	},
-	
-	/**
-	 * Because we are on top of standard upload we need to add some POST vars that 
-	 * normally are being sent as part of form.
-	 *
-	 * @param file object
-	*/
-	 
-	addFileParam: function(file) {
-		this.swfu.addFileParam(file.id,'ID',this.folderID);
-		this.swfu.addFileParam(file.id,'action_doUpload','1');
-		this.swfu.addFileParam(file.id,'Files',file.name);
-		this.swfu.addFileParam(file.id,'MAX_FILE_SIZE','31457280');
-	},
-	
-	/**
-	 * Starts file explorer. 
-	 *
-	*/
-	
-	browse: function() {
-		this.swfu.selectFiles();
-	},
-	
-	/**
-	 *  Starts upload
-	 * 
-	*/
-	
-	startUpload: function() {
-		this.swfu.startUpload();
-	},
-	
-	/**
-	 * Cancels uploading of file. 
-	*/
-	
-	cancelUpload: function(fileId) {
-		this.filesToUpload--;
-		this.swfu.cancelUpload(fileId);
-	},
-	
-	/*
-	 * Getters and setters.
-	*/   
-	setFolderID: function(id) {
-		this.folderID = id;
-	},
-	
-	getFilesUploaded: function() {
-		return this.filesUploaded;
-	},
-	
-	getFilesToUpload: function() {
-		return this.filesToUpload;
-	},
-	
-	getUploadMessage: function() {
-		return this.uploadMessage;
-	},
-	
-	isUploadInProgress: function() {
-		return this.uploadInProgress;
-	}
-}
diff --git a/thirdparty/swfupload/license.txt b/thirdparty/swfupload/license.txt
deleted file mode 100644
index dd26171a..00000000
--- a/thirdparty/swfupload/license.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/
- *
- * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilz�n and Mammon Media and is released under the MIT License:
- * http://www.opensource.org/licenses/mit-license.php
- *
- *
- * SWFUpload Revision 7.0 is (c) 2007 Jake Roberts and is released under the MIT License:
- * http://www.opensource.org/licenses/mit-license.php
- *
- */
\ No newline at end of file
diff --git a/thirdparty/swfupload/swfupload.js b/thirdparty/swfupload/swfupload.js
deleted file mode 100755
index e1aaa3f7..00000000
--- a/thirdparty/swfupload/swfupload.js
+++ /dev/null
@@ -1,1052 +0,0 @@
-/**
- * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
- *
- * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/,  http://www.vinterwebb.se/
- *
- * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilz�n and Mammon Media and is released under the MIT License:
- * http://www.opensource.org/licenses/mit-license.php
- *
- * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
- * http://www.opensource.org/licenses/mit-license.php
- *
- */
-
-
-/* ******************* */
-/* Constructor & Init  */
-/* ******************* */
-var SWFUpload;
-
-if (SWFUpload == undefined) {
-	SWFUpload = function (settings) {
-		this.initSWFUpload(settings);
-	};
-}
-
-SWFUpload.prototype.initSWFUpload = function (userSettings) {
-	try {
-		this.customSettings = {};	// A container where developers can place their own settings associated with this instance.
-		this.settings = {};
-		this.eventQueue = [];
-		this.movieName = "SWFUpload_" + SWFUpload.movieCount++;
-		this.movieElement = null;
-
-
-		// Setup global control tracking
-		SWFUpload.instances[this.movieName] = this;
-
-		// Load the settings.  Load the Flash movie.
-		this.initSettings(userSettings);
-		this.loadFlash();
-		this.displayDebugInfo();
-	} catch (ex) {
-		delete SWFUpload.instances[this.movieName];
-		throw ex;
-	}
-};
-
-/* *************** */
-/* Static Members  */
-/* *************** */
-SWFUpload.instances = {};
-SWFUpload.movieCount = 0;
-SWFUpload.version = "2.5.0 2009-11-04 Alpha";
-SWFUpload.QUEUE_ERROR = {
-	QUEUE_LIMIT_EXCEEDED            : -100,
-	FILE_EXCEEDS_SIZE_LIMIT         : -110,
-	ZERO_BYTE_FILE                  : -120,
-	INVALID_FILETYPE                : -130
-};
-SWFUpload.UPLOAD_ERROR = {
-	HTTP_ERROR                      : -200,
-	MISSING_UPLOAD_URL              : -210,
-	IO_ERROR                        : -220,
-	SECURITY_ERROR                  : -230,
-	UPLOAD_LIMIT_EXCEEDED           : -240,
-	UPLOAD_FAILED                   : -250,
-	SPECIFIED_FILE_ID_NOT_FOUND     : -260,
-	FILE_VALIDATION_FAILED          : -270,
-	FILE_CANCELLED                  : -280,
-	UPLOAD_STOPPED                  : -290,
-	RESIZE_ERROR                    : -300
-};
-SWFUpload.FILE_STATUS = {
-	QUEUED       : -1,
-	IN_PROGRESS  : -2,
-	ERROR        : -3,
-	COMPLETE     : -4,
-	CANCELLED    : -5
-};
-SWFUpload.UPLOAD_TYPE = {
-	NORMAL       : -1,
-	RESIZED      : -2
-};
-
-SWFUpload.BUTTON_ACTION = {
-	SELECT_FILE             : -100,
-	SELECT_FILES            : -110,
-	START_UPLOAD            : -120,
-	JAVASCRIPT              : -130
-};
-SWFUpload.CURSOR = {
-	ARROW : -1,
-	HAND  : -2
-};
-SWFUpload.WINDOW_MODE = {
-	WINDOW       : "window",
-	TRANSPARENT  : "transparent",
-	OPAQUE       : "opaque"
-};
-
-SWFUpload.RESIZE_ENCODING = {
-	JPEG  : -1,
-	PNG   : -2
-};
-
-// Private: takes a URL, determines if it is relative and converts to an absolute URL
-// using the current site. Only processes the URL if it can, otherwise returns the URL untouched
-SWFUpload.completeURL = function (url) {
-	try {
-		var path = "", indexSlash = -1;
-		if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//) || url === "") {
-			return url;
-		}
-		
-		indexSlash = window.location.pathname.lastIndexOf("/");
-		if (indexSlash <= 0) {
-			path = "/";
-		} else {
-			path = window.location.pathname.substr(0, indexSlash) + "/";
-		}
-		
-		return path + url;
-	} catch (ex) {
-		return url;
-	}
-};
-
-
-/* ******************** */
-/* Instance Members  */
-/* ******************** */
-
-// Private: initSettings ensures that all the
-// settings are set, getting a default value if one was not assigned.
-SWFUpload.prototype.initSettings = function (userSettings) {
-	this.ensureDefault = function (settingName, defaultValue) {
-		var setting = userSettings[settingName];
-		if (setting != undefined) {
-			this.settings[settingName] = setting;
-		} else {
-			this.settings[settingName] = defaultValue;
-		}
-	};
-	
-	// Upload backend settings
-	this.ensureDefault("upload_url", "");
-	
-	this.ensureDefault("preserve_relative_urls", false);
-	this.ensureDefault("file_post_name", "Filedata");
-	this.ensureDefault("post_params", {});
-	this.ensureDefault("use_query_string", false);
-	this.ensureDefault("requeue_on_error", false);
-	this.ensureDefault("http_success", []);
-	this.ensureDefault("assume_success_timeout", 0);
-	
-	// File Settings
-	this.ensureDefault("file_types", "*.*");
-	this.ensureDefault("file_types_description", "All Files");
-	this.ensureDefault("file_size_limit", 0);	// Default zero means "unlimited"
-	this.ensureDefault("file_upload_limit", 0);
-	this.ensureDefault("file_queue_limit", 0);
-
-	// Flash Settings
-	this.ensureDefault("flash_url", "swfupload.swf");
-	this.ensureDefault("prevent_swf_caching", true);
-	
-	// Button Settings
-	this.ensureDefault("button_image_url", "");
-	this.ensureDefault("button_width", 1);
-	this.ensureDefault("button_height", 1);
-	this.ensureDefault("button_text", "");
-	this.ensureDefault("button_text_style", "color: #000000; font-size: 16pt;");
-	this.ensureDefault("button_text_top_padding", 0);
-	this.ensureDefault("button_text_left_padding", 0);
-	this.ensureDefault("button_action", SWFUpload.BUTTON_ACTION.SELECT_FILES);
-	this.ensureDefault("button_disabled", false);
-	this.ensureDefault("button_placeholder_id", "");
-	this.ensureDefault("button_placeholder", null);
-	this.ensureDefault("button_cursor", SWFUpload.CURSOR.ARROW);
-	this.ensureDefault("button_window_mode", SWFUpload.WINDOW_MODE.WINDOW);
-	
-	// Debug Settings
-	this.ensureDefault("debug", false);
-	this.settings.debug_enabled = this.settings.debug;	// Here to maintain v2 API
-	
-	// Event Handlers
-	this.settings.return_upload_start_handler = this.returnUploadStart;
-	this.ensureDefault("swfupload_loaded_handler", null);
-	this.ensureDefault("file_dialog_start_handler", null);
-	this.ensureDefault("file_queued_handler", null);
-	this.ensureDefault("file_queue_error_handler", null);
-	this.ensureDefault("file_dialog_complete_handler", null);
-	
-	this.ensureDefault("upload_start_handler", null);
-	this.ensureDefault("upload_progress_handler", null);
-	this.ensureDefault("upload_error_handler", null);
-	this.ensureDefault("upload_success_handler", null);
-	this.ensureDefault("upload_complete_handler", null);
-	
-	this.ensureDefault("button_action_handler", null);
-	
-	this.ensureDefault("debug_handler", this.debugMessage);
-
-	this.ensureDefault("custom_settings", {});
-
-	// Other settings
-	this.customSettings = this.settings.custom_settings;
-	
-	// Update the flash url if needed
-	if (!!this.settings.prevent_swf_caching) {
-		this.settings.flash_url = this.settings.flash_url + (this.settings.flash_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
-	}
-	
-	if (!this.settings.preserve_relative_urls) {
-		this.settings.upload_url = SWFUpload.completeURL(this.settings.upload_url);
-		this.settings.button_image_url = SWFUpload.completeURL(this.settings.button_image_url);
-	}
-	
-	delete this.ensureDefault;
-};
-
-// Private: loadFlash replaces the button_placeholder element with the flash movie.
-SWFUpload.prototype.loadFlash = function () {
-	var targetElement, tempParent, wrapperType;
-
-	// Make sure an element with the ID we are going to use doesn't already exist
-	if (document.getElementById(this.movieName) !== null) {
-		throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
-	}
-
-	// Get the element where we will be placing the flash movie
-	targetElement = document.getElementById(this.settings.button_placeholder_id) || this.settings.button_placeholder;
-
-	if (targetElement == undefined) {
-		throw "Could not find the placeholder element: " + this.settings.button_placeholder_id;
-	}
-
-	wrapperType = (targetElement.currentStyle && targetElement.currentStyle["display"] || window.getComputedStyle && document.defaultView.getComputedStyle(targetElement, null).getPropertyValue("display")) !== "block" ? "span" : "div";
-	
-	// Append the container and load the flash
-	tempParent = document.createElement(wrapperType);
-	tempParent.innerHTML = this.getFlashHTML();	// Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
-	
-	// Experiment -- try to get the movie element immediately
-	var els = tempParent.getElementsByTagName("object");	// FIXME - JSLint if this works
-	if (!els || els.length > 1 || els.length === 0) {
-		// Oh crap...bail
-	} else if (els.length === 1) {
-		this.movieElement = els[0];
-		this.debug("Got the movie. WOOT!");
-	}
-	
-	targetElement.parentNode.replaceChild(tempParent.firstChild, targetElement);
-
-	// Fix IE Flash/Form bug
-	if (window[this.movieName] == undefined) {
-		window[this.movieName] = this.getMovieElement();
-	}
-	
-};
-
-// Private: getFlashHTML generates the object tag needed to embed the flash in to the document
-SWFUpload.prototype.getFlashHTML = function () {
-	// Flash Satay object syntax: http://www.alistapart.com/articles/flashsatay
-	return ['<object id="', this.movieName, '" type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
-				'<param name="wmode" value="', this.settings.button_window_mode, '" />',
-				'<param name="movie" value="', this.settings.flash_url, '" />',
-				'<param name="quality" value="high" />',
-				'<param name="menu" value="false" />',
-				'<param name="allowScriptAccess" value="always" />',
-				'<param name="flashvars" value="' + this.getFlashVars() + '" />',
-				'</object>'].join("");
-};
-
-// Private: getFlashVars builds the parameter string that will be passed
-// to flash in the flashvars param.
-SWFUpload.prototype.getFlashVars = function () {
-	// Build a string from the post param object
-	var httpSuccessString, paramString;
-	
-	paramString = this.buildParamString();
-	httpSuccessString = this.settings.http_success.join(",");
-
-	// Build the parameter string
-	return ["movieName=", encodeURIComponent(this.movieName),
-			"&amp;uploadURL=", encodeURIComponent(this.settings.upload_url),
-			"&amp;useQueryString=", encodeURIComponent(this.settings.use_query_string),
-			"&amp;requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
-			"&amp;httpSuccess=", encodeURIComponent(httpSuccessString),
-			"&amp;assumeSuccessTimeout=", encodeURIComponent(this.settings.assume_success_timeout),
-			"&amp;params=", encodeURIComponent(paramString),
-			"&amp;filePostName=", encodeURIComponent(this.settings.file_post_name),
-			"&amp;fileTypes=", encodeURIComponent(this.settings.file_types),
-			"&amp;fileTypesDescription=", encodeURIComponent(this.settings.file_types_description),
-			"&amp;fileSizeLimit=", encodeURIComponent(this.settings.file_size_limit),
-			"&amp;fileUploadLimit=", encodeURIComponent(this.settings.file_upload_limit),
-			"&amp;fileQueueLimit=", encodeURIComponent(this.settings.file_queue_limit),
-			"&amp;debugEnabled=", encodeURIComponent(this.settings.debug_enabled),
-			"&amp;buttonImageURL=", encodeURIComponent(this.settings.button_image_url),
-			"&amp;buttonWidth=", encodeURIComponent(this.settings.button_width),
-			"&amp;buttonHeight=", encodeURIComponent(this.settings.button_height),
-			"&amp;buttonText=", encodeURIComponent(this.settings.button_text),
-			"&amp;buttonTextTopPadding=", encodeURIComponent(this.settings.button_text_top_padding),
-			"&amp;buttonTextLeftPadding=", encodeURIComponent(this.settings.button_text_left_padding),
-			"&amp;buttonTextStyle=", encodeURIComponent(this.settings.button_text_style),
-			"&amp;buttonAction=", encodeURIComponent(this.settings.button_action),
-			"&amp;buttonDisabled=", encodeURIComponent(this.settings.button_disabled),
-			"&amp;buttonCursor=", encodeURIComponent(this.settings.button_cursor)
-		].join("");
-};
-
-// Public: get retrieves the DOM reference to the Flash element added by SWFUpload
-// The element is cached after the first lookup
-SWFUpload.prototype.getMovieElement = function () {
-	if (this.movieElement == undefined) {
-		this.movieElement = document.getElementById(this.movieName);
-	}
-
-	if (this.movieElement === null) {
-		throw "Could not find Flash element";
-	}
-	
-	return this.movieElement;
-};
-
-// Private: buildParamString takes the name/value pairs in the post_params setting object
-// and joins them up in to a string formatted "name=value&amp;name=value"
-SWFUpload.prototype.buildParamString = function () {
-	var name, postParams, paramStringPairs = [];
-	
-	postParams = this.settings.post_params; 
-
-	if (typeof(postParams) === "object") {
-		for (name in postParams) {
-			if (postParams.hasOwnProperty(name)) {
-				paramStringPairs.push(encodeURIComponent(name.toString()) + "=" + encodeURIComponent(postParams[name].toString()));
-			}
-		}
-	}
-
-	return paramStringPairs.join("&amp;");
-};
-
-// Public: Used to remove a SWFUpload instance from the page. This method strives to remove
-// all references to the SWF, and other objects so memory is properly freed.
-// Returns true if everything was destroyed. Returns a false if a failure occurs leaving SWFUpload in an inconsistant state.
-// Credits: Major improvements provided by steffen
-SWFUpload.prototype.destroy = function () {
-	var movieElement;
-	
-	try {
-		// Make sure Flash is done before we try to remove it
-		this.cancelUpload(null, false);
-		
-		// Stop the external interface check from running
-		this.callFlash("StopExternalInterfaceCheck");
-		
-		movieElement = this.cleanUp();
-
-		// Remove the SWFUpload DOM nodes
-		if (movieElement) {
-			// Remove the Movie Element from the page
-			try {
-				movieElement.parentNode.removeChild(movieElement);
-			} catch (ex) {}
-		}
-
-		// Remove IE form fix reference
-		window[this.movieName] = null;
-
-		// Destroy other references
-		SWFUpload.instances[this.movieName] = null;
-		delete SWFUpload.instances[this.movieName];
-
-		this.movieElement = null;
-		this.settings = null;
-		this.customSettings = null;
-		this.eventQueue = null;
-		this.movieName = null;
-		
-		
-		return true;
-	} catch (ex2) {
-		return false;
-	}
-};
-
-
-// Public: displayDebugInfo prints out settings and configuration
-// information about this SWFUpload instance.
-// This function (and any references to it) can be deleted when placing
-// SWFUpload in production.
-SWFUpload.prototype.displayDebugInfo = function () {
-	this.debug(
-		[
-			"---SWFUpload Instance Info---\n",
-			"Version: ", SWFUpload.version, "\n",
-			"Movie Name: ", this.movieName, "\n",
-			"Settings:\n",
-			"\t", "upload_url:               ", this.settings.upload_url, "\n",
-			"\t", "flash_url:                ", this.settings.flash_url, "\n",
-			"\t", "use_query_string:         ", this.settings.use_query_string.toString(), "\n",
-			"\t", "requeue_on_error:         ", this.settings.requeue_on_error.toString(), "\n",
-			"\t", "http_success:             ", this.settings.http_success.join(", "), "\n",
-			"\t", "assume_success_timeout:   ", this.settings.assume_success_timeout, "\n",
-			"\t", "file_post_name:           ", this.settings.file_post_name, "\n",
-			"\t", "post_params:              ", this.settings.post_params.toString(), "\n",
-			"\t", "file_types:               ", this.settings.file_types, "\n",
-			"\t", "file_types_description:   ", this.settings.file_types_description, "\n",
-			"\t", "file_size_limit:          ", this.settings.file_size_limit, "\n",
-			"\t", "file_upload_limit:        ", this.settings.file_upload_limit, "\n",
-			"\t", "file_queue_limit:         ", this.settings.file_queue_limit, "\n",
-			"\t", "debug:                    ", this.settings.debug.toString(), "\n",
-
-			"\t", "prevent_swf_caching:      ", this.settings.prevent_swf_caching.toString(), "\n",
-
-			"\t", "button_placeholder_id:    ", this.settings.button_placeholder_id.toString(), "\n",
-			"\t", "button_placeholder:       ", (this.settings.button_placeholder ? "Set" : "Not Set"), "\n",
-			"\t", "button_image_url:         ", this.settings.button_image_url.toString(), "\n",
-			"\t", "button_width:             ", this.settings.button_width.toString(), "\n",
-			"\t", "button_height:            ", this.settings.button_height.toString(), "\n",
-			"\t", "button_text:              ", this.settings.button_text.toString(), "\n",
-			"\t", "button_text_style:        ", this.settings.button_text_style.toString(), "\n",
-			"\t", "button_text_top_padding:  ", this.settings.button_text_top_padding.toString(), "\n",
-			"\t", "button_text_left_padding: ", this.settings.button_text_left_padding.toString(), "\n",
-			"\t", "button_action:            ", this.settings.button_action.toString(), "\n",
-			"\t", "button_disabled:          ", this.settings.button_disabled.toString(), "\n",
-
-			"\t", "custom_settings:          ", this.settings.custom_settings.toString(), "\n",
-			"Event Handlers:\n",
-			"\t", "swfupload_loaded_handler assigned:  ", (typeof this.settings.swfupload_loaded_handler === "function").toString(), "\n",
-			"\t", "file_dialog_start_handler assigned: ", (typeof this.settings.file_dialog_start_handler === "function").toString(), "\n",
-			"\t", "file_queued_handler assigned:       ", (typeof this.settings.file_queued_handler === "function").toString(), "\n",
-			"\t", "file_queue_error_handler assigned:  ", (typeof this.settings.file_queue_error_handler === "function").toString(), "\n",
-			"\t", "upload_start_handler assigned:      ", (typeof this.settings.upload_start_handler === "function").toString(), "\n",
-			"\t", "upload_progress_handler assigned:   ", (typeof this.settings.upload_progress_handler === "function").toString(), "\n",
-			"\t", "upload_error_handler assigned:      ", (typeof this.settings.upload_error_handler === "function").toString(), "\n",
-			"\t", "upload_success_handler assigned:    ", (typeof this.settings.upload_success_handler === "function").toString(), "\n",
-			"\t", "upload_complete_handler assigned:   ", (typeof this.settings.upload_complete_handler === "function").toString(), "\n",
-			"\t", "debug_handler assigned:             ", (typeof this.settings.debug_handler === "function").toString(), "\n"
-		].join("")
-	);
-};
-
-/* Note: addSetting and getSetting are no longer used by SWFUpload but are included
-	the maintain v2 API compatibility
-*/
-// Public: (Deprecated) addSetting adds a setting value. If the value given is undefined or null then the default_value is used.
-SWFUpload.prototype.addSetting = function (name, value, default_value) {
-    if (value == undefined) {
-        return (this.settings[name] = default_value);
-    } else {
-        return (this.settings[name] = value);
-	}
-};
-
-// Public: (Deprecated) getSetting gets a setting. Returns an empty string if the setting was not found.
-SWFUpload.prototype.getSetting = function (name) {
-    if (this.settings[name] != undefined) {
-        return this.settings[name];
-	}
-
-    return "";
-};
-
-
-
-// Private: callFlash handles function calls made to the Flash element.
-// Calls are made with a setTimeout for some functions to work around
-// bugs in the ExternalInterface library.
-SWFUpload.prototype.callFlash = function (functionName, argumentArray) {
-	var movieElement, returnValue, returnString;
-	
-	argumentArray = argumentArray || [];
-	movieElement = this.getMovieElement();
-
-	// Flash's method if calling ExternalInterface methods (code adapted from MooTools).
-	try {
-		if (movieElement && movieElement.CallFunction) {
-			returnString = movieElement.CallFunction('<invoke name="' + functionName + '" returntype="javascript">' + __flash__argumentsToXML(argumentArray, 0) + '</invoke>');
-			returnValue = eval(returnString);
-		} else {
-			this.debug("Can't call flash because the movie wasn't found.");
-		}
-	} catch (ex) {
-		this.debug("Exception calling flash: " + ex.message);
-	}
-	
-	// Unescape file post param values
-	if (returnValue != undefined && typeof returnValue.post === "object") {
-		returnValue = this.unescapeFilePostParams(returnValue);
-	}
-	
-	return returnValue;
-};
-
-/* *****************************
-	-- Flash control methods --
-	Your UI should use these
-	to operate SWFUpload
-   ***************************** */
-
-// WARNING: this function does not work in Flash Player 10
-// Public: selectFile causes a File Selection Dialog window to appear.  This
-// dialog only allows 1 file to be selected.
-SWFUpload.prototype.selectFile = function () {
-	this.callFlash("SelectFile");
-};
-
-// WARNING: this function does not work in Flash Player 10
-// Public: selectFiles causes a File Selection Dialog window to appear/ This
-// dialog allows the user to select any number of files
-// Flash Bug Warning: Flash limits the number of selectable files based on the combined length of the file names.
-// If the selection name length is too long the dialog will fail in an unpredictable manner.  There is no work-around
-// for this bug.
-SWFUpload.prototype.selectFiles = function () {
-	this.callFlash("SelectFiles");
-};
-
-
-// Public: startUpload starts uploading the first file in the queue unless
-// the optional parameter 'fileID' specifies the ID 
-SWFUpload.prototype.startUpload = function (fileID) {
-	this.callFlash("StartUpload", [fileID]);
-};
-
-// Public: startUpload starts uploading the first file in the queue unless
-// the optional parameter 'fileID' specifies the ID 
-SWFUpload.prototype.startResizedUpload = function (fileID, width, height, encoding, quality) {
-	this.callFlash("StartUpload", [fileID, { "width": width, "height" : height, "encoding" : encoding, "quality" : quality }]);
-};
-
-// Public: cancelUpload cancels any queued file.  The fileID parameter may be the file ID or index.
-// If you do not specify a fileID the current uploading file or first file in the queue is cancelled.
-// If you do not want the uploadError event to trigger you can specify false for the triggerErrorEvent parameter.
-SWFUpload.prototype.cancelUpload = function (fileID, triggerErrorEvent) {
-	if (triggerErrorEvent !== false) {
-		triggerErrorEvent = true;
-	}
-	this.callFlash("CancelUpload", [fileID, triggerErrorEvent]);
-};
-
-// Public: stopUpload stops the current upload and requeues the file at the beginning of the queue.
-// If nothing is currently uploading then nothing happens.
-SWFUpload.prototype.stopUpload = function () {
-	this.callFlash("StopUpload");
-};
-
-
-// Public: requeueUpload requeues any file. If the file is requeued or already queued true is returned.
-// If the file is not found or is currently uploading false is returned.  Requeuing a file bypasses the
-// file size, queue size, upload limit and other queue checks.  Certain files can't be requeued (e.g, invalid or zero bytes files).
-SWFUpload.prototype.requeueUpload = function (indexOrFileID) {
-	return this.callFlash("RequeueUpload", [indexOrFileID]);
-};
-
-
-/* ************************
- * Settings methods
- *   These methods change the SWFUpload settings.
- *   SWFUpload settings should not be changed directly on the settings object
- *   since many of the settings need to be passed to Flash in order to take
- *   effect.
- * *********************** */
-
-// Public: getStats gets the file statistics object.
-SWFUpload.prototype.getStats = function () {
-	return this.callFlash("GetStats");
-};
-
-// Public: setStats changes the SWFUpload statistics.  You shouldn't need to 
-// change the statistics but you can.  Changing the statistics does not
-// affect SWFUpload accept for the successful_uploads count which is used
-// by the upload_limit setting to determine how many files the user may upload.
-SWFUpload.prototype.setStats = function (statsObject) {
-	this.callFlash("SetStats", [statsObject]);
-};
-
-// Public: getFile retrieves a File object by ID or Index.  If the file is
-// not found then 'null' is returned.
-SWFUpload.prototype.getFile = function (fileID) {
-	if (typeof(fileID) === "number") {
-		return this.callFlash("GetFileByIndex", [fileID]);
-	} else {
-		return this.callFlash("GetFile", [fileID]);
-	}
-};
-
-// Public: getFileFromQueue retrieves a File object by ID or Index.  If the file is
-// not found then 'null' is returned.
-SWFUpload.prototype.getQueueFile = function (fileID) {
-	if (typeof(fileID) === "number") {
-		return this.callFlash("GetFileByQueueIndex", [fileID]);
-	} else {
-		return this.callFlash("GetFile", [fileID]);
-	}
-};
-
-
-// Public: addFileParam sets a name/value pair that will be posted with the
-// file specified by the Files ID.  If the name already exists then the
-// exiting value will be overwritten.
-SWFUpload.prototype.addFileParam = function (fileID, name, value) {
-	return this.callFlash("AddFileParam", [fileID, name, value]);
-};
-
-// Public: removeFileParam removes a previously set (by addFileParam) name/value
-// pair from the specified file.
-SWFUpload.prototype.removeFileParam = function (fileID, name) {
-	this.callFlash("RemoveFileParam", [fileID, name]);
-};
-
-// Public: setUploadUrl changes the upload_url setting.
-SWFUpload.prototype.setUploadURL = function (url) {
-	this.settings.upload_url = url.toString();
-	this.callFlash("SetUploadURL", [url]);
-};
-
-// Public: setPostParams changes the post_params setting
-SWFUpload.prototype.setPostParams = function (paramsObject) {
-	this.settings.post_params = paramsObject;
-	this.callFlash("SetPostParams", [paramsObject]);
-};
-
-// Public: addPostParam adds post name/value pair.  Each name can have only one value.
-SWFUpload.prototype.addPostParam = function (name, value) {
-	this.settings.post_params[name] = value;
-	this.callFlash("SetPostParams", [this.settings.post_params]);
-};
-
-// Public: removePostParam deletes post name/value pair.
-SWFUpload.prototype.removePostParam = function (name) {
-	delete this.settings.post_params[name];
-	this.callFlash("SetPostParams", [this.settings.post_params]);
-};
-
-// Public: setFileTypes changes the file_types setting and the file_types_description setting
-SWFUpload.prototype.setFileTypes = function (types, description) {
-	this.settings.file_types = types;
-	this.settings.file_types_description = description;
-	this.callFlash("SetFileTypes", [types, description]);
-};
-
-// Public: setFileSizeLimit changes the file_size_limit setting
-SWFUpload.prototype.setFileSizeLimit = function (fileSizeLimit) {
-	this.settings.file_size_limit = fileSizeLimit;
-	this.callFlash("SetFileSizeLimit", [fileSizeLimit]);
-};
-
-// Public: setFileUploadLimit changes the file_upload_limit setting
-SWFUpload.prototype.setFileUploadLimit = function (fileUploadLimit) {
-	this.settings.file_upload_limit = fileUploadLimit;
-	this.callFlash("SetFileUploadLimit", [fileUploadLimit]);
-};
-
-// Public: setFileQueueLimit changes the file_queue_limit setting
-SWFUpload.prototype.setFileQueueLimit = function (fileQueueLimit) {
-	this.settings.file_queue_limit = fileQueueLimit;
-	this.callFlash("SetFileQueueLimit", [fileQueueLimit]);
-};
-
-// Public: setFilePostName changes the file_post_name setting
-SWFUpload.prototype.setFilePostName = function (filePostName) {
-	this.settings.file_post_name = filePostName;
-	this.callFlash("SetFilePostName", [filePostName]);
-};
-
-// Public: setUseQueryString changes the use_query_string setting
-SWFUpload.prototype.setUseQueryString = function (useQueryString) {
-	this.settings.use_query_string = useQueryString;
-	this.callFlash("SetUseQueryString", [useQueryString]);
-};
-
-// Public: setRequeueOnError changes the requeue_on_error setting
-SWFUpload.prototype.setRequeueOnError = function (requeueOnError) {
-	this.settings.requeue_on_error = requeueOnError;
-	this.callFlash("SetRequeueOnError", [requeueOnError]);
-};
-
-// Public: setHTTPSuccess changes the http_success setting
-SWFUpload.prototype.setHTTPSuccess = function (http_status_codes) {
-	if (typeof http_status_codes === "string") {
-		http_status_codes = http_status_codes.replace(" ", "").split(",");
-	}
-	
-	this.settings.http_success = http_status_codes;
-	this.callFlash("SetHTTPSuccess", [http_status_codes]);
-};
-
-// Public: setHTTPSuccess changes the http_success setting
-SWFUpload.prototype.setAssumeSuccessTimeout = function (timeout_seconds) {
-	this.settings.assume_success_timeout = timeout_seconds;
-	this.callFlash("SetAssumeSuccessTimeout", [timeout_seconds]);
-};
-
-// Public: setDebugEnabled changes the debug_enabled setting
-SWFUpload.prototype.setDebugEnabled = function (debugEnabled) {
-	this.settings.debug_enabled = debugEnabled;
-	this.callFlash("SetDebugEnabled", [debugEnabled]);
-};
-
-// Public: setButtonImageURL loads a button image sprite
-SWFUpload.prototype.setButtonImageURL = function (buttonImageURL) {
-	if (buttonImageURL == undefined) {
-		buttonImageURL = "";
-	}
-	
-	this.settings.button_image_url = buttonImageURL;
-	this.callFlash("SetButtonImageURL", [buttonImageURL]);
-};
-
-// Public: setButtonDimensions resizes the Flash Movie and button
-SWFUpload.prototype.setButtonDimensions = function (width, height) {
-	this.settings.button_width = width;
-	this.settings.button_height = height;
-	
-	var movie = this.getMovieElement();
-	if (movie != undefined) {
-		movie.style.width = width + "px";
-		movie.style.height = height + "px";
-	}
-	
-	this.callFlash("SetButtonDimensions", [width, height]);
-};
-// Public: setButtonText Changes the text overlaid on the button
-SWFUpload.prototype.setButtonText = function (html) {
-	this.settings.button_text = html;
-	this.callFlash("SetButtonText", [html]);
-};
-// Public: setButtonTextPadding changes the top and left padding of the text overlay
-SWFUpload.prototype.setButtonTextPadding = function (left, top) {
-	this.settings.button_text_top_padding = top;
-	this.settings.button_text_left_padding = left;
-	this.callFlash("SetButtonTextPadding", [left, top]);
-};
-
-// Public: setButtonTextStyle changes the CSS used to style the HTML/Text overlaid on the button
-SWFUpload.prototype.setButtonTextStyle = function (css) {
-	this.settings.button_text_style = css;
-	this.callFlash("SetButtonTextStyle", [css]);
-};
-// Public: setButtonDisabled disables/enables the button
-SWFUpload.prototype.setButtonDisabled = function (isDisabled) {
-	this.settings.button_disabled = isDisabled;
-	this.callFlash("SetButtonDisabled", [isDisabled]);
-};
-// Public: setButtonAction sets the action that occurs when the button is clicked
-SWFUpload.prototype.setButtonAction = function (buttonAction) {
-	this.settings.button_action = buttonAction;
-	this.callFlash("SetButtonAction", [buttonAction]);
-};
-
-// Public: setButtonCursor changes the mouse cursor displayed when hovering over the button
-SWFUpload.prototype.setButtonCursor = function (cursor) {
-	this.settings.button_cursor = cursor;
-	this.callFlash("SetButtonCursor", [cursor]);
-};
-
-
-/* *******************************
-	Flash Event Interfaces
-	These functions are used by Flash to trigger the various
-	events.
-	
-	All these functions a Private.
-	
-	Because the ExternalInterface library is buggy the event calls
-	are added to a queue and the queue then executed by a setTimeout.
-	This ensures that events are executed in a determinate order and that
-	the ExternalInterface bugs are avoided.
-******************************* */
-
-SWFUpload.prototype.queueEvent = function (handlerName, argumentArray) {
-	// Warning: Don't call this.debug inside here or you'll create an infinite loop
-	var self = this;
-	
-	if (argumentArray == undefined) {
-		argumentArray = [];
-	} else if (!(argumentArray instanceof Array)) {
-		argumentArray = [argumentArray];
-	}
-	
-	if (typeof this.settings[handlerName] === "function") {
-		// Queue the event
-		this.eventQueue.push(function () {
-			this.settings[handlerName].apply(this, argumentArray);
-		});
-		
-		// Execute the next queued event
-		setTimeout(function () {
-			self.executeNextEvent();
-		}, 0);
-		
-	} else if (this.settings[handlerName] !== null) {
-		throw "Event handler " + handlerName + " is unknown or is not a function";
-	}
-};
-
-// Private: Causes the next event in the queue to be executed.  Since events are queued using a setTimeout
-// we must queue them in order to garentee that they are executed in order.
-SWFUpload.prototype.executeNextEvent = function () {
-	// Warning: Don't call this.debug inside here or you'll create an infinite loop
-
-	var  f = this.eventQueue ? this.eventQueue.shift() : null;
-	if (typeof(f) === "function") {
-		f.apply(this);
-	}
-};
-
-// Private: unescapeFileParams is part of a workaround for a flash bug where objects passed through ExternalInterface cannot have
-// properties that contain characters that are not valid for JavaScript identifiers. To work around this
-// the Flash Component escapes the parameter names and we must unescape again before passing them along.
-SWFUpload.prototype.unescapeFilePostParams = function (file) {
-	var reg = /[$]([0-9a-f]{4})/i, unescapedPost = {}, uk, k, match;
-
-	if (file != undefined) {
-		for (k in file.post) {
-			if (file.post.hasOwnProperty(k)) {
-				uk = k;
-				while ((match = reg.exec(uk)) !== null) {
-					uk = uk.replace(match[0], String.fromCharCode(parseInt("0x" + match[1], 16)));
-				}
-				unescapedPost[uk] = file.post[k];
-			}
-		}
-
-		file.post = unescapedPost;
-	}
-
-	return file;
-};
-
-// Private: Called by Flash to see if JS can call in to Flash (test if External Interface is working)
-SWFUpload.prototype.testExternalInterface = function () {
-	try {
-		return this.callFlash("TestExternalInterface");
-	} catch (ex) {
-		return false;
-	}
-};
-
-// Private: This event is called by Flash when it has finished loading. Don't modify this.
-// Use the swfupload_loaded_handler event setting to execute custom code when SWFUpload has loaded.
-SWFUpload.prototype.flashReady = function () {
-	// Check that the movie element is loaded correctly with its ExternalInterface methods defined
-	var movieElement = this.getMovieElement();
-
-	if (!movieElement) {
-		this.debug("Flash called back ready but the flash movie can't be found.");
-		return;
-	}
-
-	this.cleanUp();
-	
-	this.queueEvent("swfupload_loaded_handler");
-};
-
-// Private: removes Flash added fuctions to the DOM node to prevent memory leaks in IE.
-// This function is called by Flash each time the ExternalInterface functions are created.
-SWFUpload.prototype.cleanUp = function () {
-	var key, movieElement = this.getMovieElement();
-	
-	// Pro-actively unhook all the Flash functions
-	try {
-		if (movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
-			this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");
-			for (key in movieElement) {
-				try {
-					if (typeof(movieElement[key]) === "function") {
-						movieElement[key] = null;
-					}
-				} catch (ex) {
-				}
-			}
-		}
-	} catch (ex1) {
-	
-	}
-
-	// Fix Flashes own cleanup code so if the SWF Movie was removed from the page
-	// it doesn't display errors.
-	window["__flash__removeCallback"] = function (instance, name) {
-		try {
-			if (instance) {
-				instance[name] = null;
-			}
-		} catch (flashEx) {
-		
-		}
-	};
-	
-	return movieElement;
-};
-
-/* When the button_action is set to JavaScript this event gets fired and executes the button_action_handler */
-SWFUpload.prototype.buttonAction = function () {
-	this.queueEvent("button_action_handler");
-};
-
-/* This is a chance to do something before the browse window opens */
-SWFUpload.prototype.fileDialogStart = function () {
-	this.queueEvent("file_dialog_start_handler");
-};
-
-
-/* Called when a file is successfully added to the queue. */
-SWFUpload.prototype.fileQueued = function (file) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("file_queued_handler", file);
-};
-
-
-/* Handle errors that occur when an attempt to queue a file fails. */
-SWFUpload.prototype.fileQueueError = function (file, errorCode, message) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("file_queue_error_handler", [file, errorCode, message]);
-};
-
-/* Called after the file dialog has closed and the selected files have been queued.
-	You could call startUpload here if you want the queued files to begin uploading immediately. */
-SWFUpload.prototype.fileDialogComplete = function (numFilesSelected, numFilesQueued, numFilesInQueue) {
-	this.queueEvent("file_dialog_complete_handler", [numFilesSelected, numFilesQueued, numFilesInQueue]);
-};
-
-SWFUpload.prototype.uploadStart = function (file) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("return_upload_start_handler", file);
-};
-
-SWFUpload.prototype.returnUploadStart = function (file) {
-	var returnValue;
-	if (typeof this.settings.upload_start_handler === "function") {
-		file = this.unescapeFilePostParams(file);
-		returnValue = this.settings.upload_start_handler.call(this, file);
-	} else if (this.settings.upload_start_handler != undefined) {
-		throw "upload_start_handler must be a function";
-	}
-
-	// Convert undefined to true so if nothing is returned from the upload_start_handler it is
-	// interpretted as 'true'.
-	if (returnValue === undefined) {
-		returnValue = true;
-	}
-	
-	returnValue = !!returnValue;
-	
-	this.callFlash("ReturnUploadStart", [returnValue]);
-};
-
-
-
-SWFUpload.prototype.uploadProgress = function (file, bytesComplete, bytesTotal) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("upload_progress_handler", [file, bytesComplete, bytesTotal]);
-};
-
-SWFUpload.prototype.uploadError = function (file, errorCode, message) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("upload_error_handler", [file, errorCode, message]);
-};
-
-SWFUpload.prototype.uploadSuccess = function (file, serverData, responseReceived) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("upload_success_handler", [file, serverData, responseReceived]);
-};
-
-SWFUpload.prototype.uploadComplete = function (file) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("upload_complete_handler", file);
-};
-
-/* Called by SWFUpload JavaScript and Flash functions when debug is enabled. By default it writes messages to the
-   internal debug console.  You can override this event and have messages written where you want. */
-SWFUpload.prototype.debug = function (message) {
-	this.queueEvent("debug_handler", message);
-};
-
-
-/* **********************************
-	Debug Console
-	The debug console is a self contained, in page location
-	for debug message to be sent.  The Debug Console adds
-	itself to the body if necessary.
-
-	The console is automatically scrolled as messages appear.
-	
-	If you are using your own debug handler or when you deploy to production and
-	have debug disabled you can remove these functions to reduce the file size
-	and complexity.
-********************************** */
-   
-// Private: debugMessage is the default debug_handler.  If you want to print debug messages
-// call the debug() function.  When overriding the function your own function should
-// check to see if the debug setting is true before outputting debug information.
-SWFUpload.prototype.debugMessage = function (message) {
-	var exceptionMessage, exceptionValues, key;
-
-	if (this.settings.debug) {
-		exceptionValues = [];
-
-		// Check for an exception object and print it nicely
-		if (typeof message === "object" && typeof message.name === "string" && typeof message.message === "string") {
-			for (key in message) {
-				if (message.hasOwnProperty(key)) {
-					exceptionValues.push(key + ": " + message[key]);
-				}
-			}
-			exceptionMessage = exceptionValues.join("\n") || "";
-			exceptionValues = exceptionMessage.split("\n");
-			exceptionMessage = "EXCEPTION: " + exceptionValues.join("\nEXCEPTION: ");
-			SWFUpload.Console.writeLine(exceptionMessage);
-		} else {
-			SWFUpload.Console.writeLine(message);
-		}
-	}
-};
-
-SWFUpload.Console = {};
-SWFUpload.Console.writeLine = function (message) {
-	var console, documentForm;
-
-	try {
-		console = document.getElementById("SWFUpload_Console");
-
-		if (!console) {
-			documentForm = document.createElement("form");
-			document.getElementsByTagName("body")[0].appendChild(documentForm);
-
-			console = document.createElement("textarea");
-			console.id = "SWFUpload_Console";
-			console.style.fontFamily = "monospace";
-			console.setAttribute("wrap", "off");
-			console.wrap = "off";
-			console.style.overflow = "auto";
-			console.style.width = "400px";
-			console.style.height = "450px";
-			
-			// ss fixes
-			console.style.position = "absolute";
-			console.style.top = "5px";
-			console.style.zIndex = "100";
-			
-			documentForm.appendChild(console);
-		}
-
-		console.value += message + "\n";
-
-		console.scrollTop = console.scrollHeight - console.clientHeight;
-	} catch (ex) {
-		alert("Exception: " + ex.name + " Message: " + ex.message);
-	}
-};
diff --git a/thirdparty/swfupload/swfupload.queue.js b/thirdparty/swfupload/swfupload.queue.js
deleted file mode 100755
index 69e619da..00000000
--- a/thirdparty/swfupload/swfupload.queue.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-	Queue Plug-in
-	
-	Features:
-		*Adds a cancelQueue() method for cancelling the entire queue.
-		*All queued files are uploaded when startUpload() is called.
-		*If false is returned from uploadComplete then the queue upload is stopped.
-		 If false is not returned (strict comparison) then the queue upload is continued.
-		*Adds a QueueComplete event that is fired when all the queued files have finished uploading.
-		 Set the event handler with the queue_complete_handler setting.
-		
-	*/
-
-var SWFUpload;
-if (typeof(SWFUpload) === "function") {
-	SWFUpload.queue = {};
-	
-	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
-		return function () {
-			if (typeof(oldInitSettings) === "function") {
-				oldInitSettings.call(this);
-			}
-			
-			this.queueSettings = {};
-			
-			this.queueSettings.queue_cancelled_flag = false;
-			this.queueSettings.queue_upload_count = 0;
-			
-			this.queueSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
-			this.queueSettings.user_upload_start_handler = this.settings.upload_start_handler;
-			this.settings.upload_complete_handler = SWFUpload.queue.uploadCompleteHandler;
-			this.settings.upload_start_handler = SWFUpload.queue.uploadStartHandler;
-			
-			this.settings.queue_complete_handler = this.settings.queue_complete_handler || null;
-		};
-	})(SWFUpload.prototype.initSettings);
-
-	SWFUpload.prototype.startUpload = function (fileID) {
-		this.queueSettings.queue_cancelled_flag = false;
-		this.callFlash("StartUpload", [fileID]);
-	};
-
-	SWFUpload.prototype.cancelQueue = function () {
-		this.queueSettings.queue_cancelled_flag = true;
-		this.stopUpload();
-		
-		var stats = this.getStats();
-		while (stats.files_queued > 0) {
-			this.cancelUpload();
-			stats = this.getStats();
-		}
-	};
-	
-	SWFUpload.queue.uploadStartHandler = function (file) {
-		var returnValue;
-		if (typeof(this.queueSettings.user_upload_start_handler) === "function") {
-			returnValue = this.queueSettings.user_upload_start_handler.call(this, file);
-		}
-		
-		// To prevent upload a real "FALSE" value must be returned, otherwise default to a real "TRUE" value.
-		returnValue = (returnValue === false) ? false : true;
-		
-		this.queueSettings.queue_cancelled_flag = !returnValue;
-
-		return returnValue;
-	};
-	
-	SWFUpload.queue.uploadCompleteHandler = function (file) {
-		var user_upload_complete_handler = this.queueSettings.user_upload_complete_handler;
-		var continueUpload;
-		
-		if (file.filestatus === SWFUpload.FILE_STATUS.COMPLETE) {
-			this.queueSettings.queue_upload_count++;
-		}
-
-		if (typeof(user_upload_complete_handler) === "function") {
-			continueUpload = (user_upload_complete_handler.call(this, file) === false) ? false : true;
-		} else if (file.filestatus === SWFUpload.FILE_STATUS.QUEUED) {
-			// If the file was stopped and re-queued don't restart the upload
-			continueUpload = false;
-		} else {
-			continueUpload = true;
-		}
-		
-		if (continueUpload) {
-			var stats = this.getStats();
-			if (stats.files_queued > 0 && this.queueSettings.queue_cancelled_flag === false) {
-				this.startUpload();
-			} else if (this.queueSettings.queue_cancelled_flag === false) {
-				this.queueEvent("queue_complete_handler", [this.queueSettings.queue_upload_count]);
-				this.queueSettings.queue_upload_count = 0;
-			} else {
-				this.queueSettings.queue_cancelled_flag = false;
-				this.queueSettings.queue_upload_count = 0;
-			}
-		}
-	};
-}
\ No newline at end of file
diff --git a/thirdparty/swfupload/swfupload.swf b/thirdparty/swfupload/swfupload.swf
deleted file mode 100755
index 71ff884c33caf257d0d4bc101027d4b0a974d42e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 33328
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
E+CYH~eE<Le


From ed4204b7faa2d38f07071d8101f86b1049a278ab Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Mon, 25 Jan 2010 21:57:31 +0000
Subject: [PATCH 137/483] BUGFIX Fixed incorrect lables "TOADD" etc in
 WidgetAreaEditor

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97507 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/WidgetAreaEditor.php     | 4 ----
 templates/WidgetAreaEditor.ss | 6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/code/WidgetAreaEditor.php b/code/WidgetAreaEditor.php
index 6fb7b829..86c73e00 100644
--- a/code/WidgetAreaEditor.php
+++ b/code/WidgetAreaEditor.php
@@ -13,11 +13,7 @@ class WidgetAreaEditor extends FormField {
 	public $ToAddTitle;
 
 	function __construct($name, $widgetClasses = array('Widget'), $maxWidgets = 0) {
-		$this->InUseTitle = _t('WidgetAreaEditor.ss', 'INUSE');
-		$this->AvailableTitle = _t('WidgetAreaEditor.ss', 'AVAILABLE');
-		$this->ToAddTitle = _t('WidgetAreaEditor.ss', 'TOADD');
 		$this->MaxWidgets = $maxWidgets;
-		
 		$this->widgetClasses = $widgetClasses;
 		
 		parent::__construct($name);
diff --git a/templates/WidgetAreaEditor.ss b/templates/WidgetAreaEditor.ss
index 450386d3..8268d06d 100644
--- a/templates/WidgetAreaEditor.ss
+++ b/templates/WidgetAreaEditor.ss
@@ -1,7 +1,7 @@
 <div class="WidgetAreaEditor" id="WidgetAreaEditor-$Name" name="$Name"<% if MaxWidgets %> maxwidgets="$MaxWidgets"<% end_if %>>
 	<input type="hidden" id="$Name" name="$IdxField" value="$Value" />
 	<div class="availableWidgetsHolder">
-		<h2>$AvailableTitle</h2>
+		<h2><% _t('AVAILABLE', 'Available Widgets') %></h2>
 		<p>&nbsp;</p>
 		<div class="availableWidgets" id="availableWidgets-$Name">
 			<% if AvailableWidgets %>
@@ -16,8 +16,8 @@
 		</div>
 	</div>
 	<div class="usedWidgetsHolder">
-		<h2>$InUseTitle</h2>
-		<p>$ToAddTitle</p>
+		<h2><% _t('INUSE', 'Widgets currently used') %></h2>
+		<p><% _t('TOADD', 'To add widgets, click on the purple header on the left') %></p>
 		
 		<div class="usedWidgets" id="usedWidgets-$Name">
 			<% if UsedWidgets %>

From f5e5461fd259f5896d68b9a9f834d9abfeb2c54c Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Mon, 25 Jan 2010 21:59:06 +0000
Subject: [PATCH 138/483] MINOR Fixed default wording of WidgetAreaEditor.TOADD
 "drag them here from the left"

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97509 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 templates/WidgetAreaEditor.ss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/WidgetAreaEditor.ss b/templates/WidgetAreaEditor.ss
index 8268d06d..335c8c65 100644
--- a/templates/WidgetAreaEditor.ss
+++ b/templates/WidgetAreaEditor.ss
@@ -17,7 +17,7 @@
 	</div>
 	<div class="usedWidgetsHolder">
 		<h2><% _t('INUSE', 'Widgets currently used') %></h2>
-		<p><% _t('TOADD', 'To add widgets, click on the purple header on the left') %></p>
+		<p><% _t('TOADD', 'To add widgets, drag them here from the left') %></p>
 		
 		<div class="usedWidgets" id="usedWidgets-$Name">
 			<% if UsedWidgets %>

From c9bf87fd1ac55de0069c6160bb1f9cdf27ccfee3 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Mon, 25 Jan 2010 22:37:21 +0000
Subject: [PATCH 139/483] MINOR Changed wording for WidgetAreaEditor.TOADD
 advising users to "click" instead of drag widgets

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97511 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 templates/WidgetAreaEditor.ss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/WidgetAreaEditor.ss b/templates/WidgetAreaEditor.ss
index 335c8c65..d6983eb9 100644
--- a/templates/WidgetAreaEditor.ss
+++ b/templates/WidgetAreaEditor.ss
@@ -17,7 +17,7 @@
 	</div>
 	<div class="usedWidgetsHolder">
 		<h2><% _t('INUSE', 'Widgets currently used') %></h2>
-		<p><% _t('TOADD', 'To add widgets, drag them here from the left') %></p>
+		<p><% _t('TOADD', 'To add widgets, click one on the left to add it here') %></p>
 		
 		<div class="usedWidgets" id="usedWidgets-$Name">
 			<% if UsedWidgets %>

From d02f174f420ad17010e3656cdd36f3a6e24d612f Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Tue, 26 Jan 2010 00:23:51 +0000
Subject: [PATCH 140/483] BUGFIX When adding a new widget by clicking one of
 the available widgets, add it to the top of the currently used widgets
 instead of the bottom

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97522 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/WidgetAreaEditor.js | 3 +--
 templates/WidgetAreaEditor.ss  | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/javascript/WidgetAreaEditor.js b/javascript/WidgetAreaEditor.js
index d8a61b71..448e2ea8 100644
--- a/javascript/WidgetAreaEditor.js
+++ b/javascript/WidgetAreaEditor.js
@@ -169,14 +169,13 @@ WidgetAreaEditorClass.prototype = {
 		widget = document.createElement('div');
 		widget.innerHTML = response.responseText.replace(/Widget\[0\]/gi, "Widget[new-" + (++$('usedWidgets-'+this.name).parentNode.parentNode.maxid) + "]");
 	
-		$('usedWidgets-'+this.name).appendChild(widget.childNodes[0]);
+		$('usedWidgetsStart-'+this.name).appendChild(widget.childNodes[0]);
 		$('usedWidgets-'+this.name).parentNode.parentNode.rewriteWidgetAreaAttributes();
 		UsedWidget.applyToChildren($('usedWidgets-'+this.name), 'div.Widget');
 		
 		// Repply some common form controls
 		WidgetTreeDropdownField.applyTo('div.usedWidgets .TreeDropdownField');
 		
-		
 		Sortable.create('usedWidgets-'+this.name, {
 			tag: 'div',
 			handle: 'handle',
diff --git a/templates/WidgetAreaEditor.ss b/templates/WidgetAreaEditor.ss
index d6983eb9..4a13f55a 100644
--- a/templates/WidgetAreaEditor.ss
+++ b/templates/WidgetAreaEditor.ss
@@ -20,6 +20,7 @@
 		<p><% _t('TOADD', 'To add widgets, click one on the left to add it here') %></p>
 		
 		<div class="usedWidgets" id="usedWidgets-$Name">
+			<div id="usedWidgetsStart-$Name"><!-- --></div>
 			<% if UsedWidgets %>
 				<% control UsedWidgets %>
 					$EditableSegment

From 4194aaeaac2d70436c0a2c7054456f9ecf877a9a Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Tue, 26 Jan 2010 00:28:35 +0000
Subject: [PATCH 141/483] ENHANCEMENT Adjusted "Available Widgets" column to be
 narrower than "Widgets currently used", allowing more space for configuring
 widgets

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97530 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/WidgetAreaEditor.css | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/css/WidgetAreaEditor.css b/css/WidgetAreaEditor.css
index 9b60ede6..035f3d10 100644
--- a/css/WidgetAreaEditor.css
+++ b/css/WidgetAreaEditor.css
@@ -1,6 +1,9 @@
-div.availableWidgetsHolder,
+div.availableWidgetsHolder {
+	width: 30%;
+}
+
 div.usedWidgetsHolder {
-	width: 49%;
+	width: 69%;
 }
 
 div.availableWidgetsHolder {

From d5d148c0d52fcfb68eadc46514a314d88993d5f8 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Tue, 26 Jan 2010 00:32:30 +0000
Subject: [PATCH 142/483] MINOR Removed end php tag from WidgetAreaEditor

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97532 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/WidgetAreaEditor.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/WidgetAreaEditor.php b/code/WidgetAreaEditor.php
index 86c73e00..230571b6 100644
--- a/code/WidgetAreaEditor.php
+++ b/code/WidgetAreaEditor.php
@@ -137,5 +137,4 @@ class WidgetAreaEditor extends FormField {
 			}
 		}
 	}
-}
-?>
+}
\ No newline at end of file

From 47f782c90701668d43ce31eea803c76cb96438e0 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Tue, 26 Jan 2010 01:18:47 +0000
Subject: [PATCH 143/483] MINOR Cursor is now a pointer for available widgets,
 as you need to click them to add to the available widget stack

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97540 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/WidgetAreaEditor.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/css/WidgetAreaEditor.css b/css/WidgetAreaEditor.css
index 035f3d10..d287095b 100644
--- a/css/WidgetAreaEditor.css
+++ b/css/WidgetAreaEditor.css
@@ -57,5 +57,10 @@ div.availableWidgets div.Widget h3 {
 	text-indent: 5px;
 	background: #000 url(../images/textures/obar-18.gif);
 	margin: 0;
-	cursor: move;
 }
+	div.usedWidgets div.Widget h3 {
+		cursor: move;
+	}
+	div.availableWidgets div.Widget h3 {
+		cursor: pointer;
+	}

From 334beaeedddaa17f392a37050b9acaf7e730a8e8 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Tue, 26 Jan 2010 01:19:45 +0000
Subject: [PATCH 144/483] BUGFIX Clicking available widgets now applies only to
 h3 elements BUGFIX Widgets are now prepended to the available widget stack by
 use of Insertion.Top

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97541 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/WidgetAreaEditor.js | 13 +++++++------
 templates/WidgetAreaEditor.ss  |  1 -
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/javascript/WidgetAreaEditor.js b/javascript/WidgetAreaEditor.js
index 448e2ea8..995cc2a4 100644
--- a/javascript/WidgetAreaEditor.js
+++ b/javascript/WidgetAreaEditor.js
@@ -15,8 +15,10 @@ WidgetAreaEditorClass.prototype = {
 				// Gotta change their ID's because otherwise we get clashes between two tabs
 				widget.id = widget.id + '-'+this.name;
 				if(widget.id) {
-					widget.onclick = function(event) {
-						parts = event.currentTarget.id.split('-');
+					// Clicking applies to the h3 element only, not the widget div itself
+					var header = widget.childNodes[1];
+					header.onclick = function(event) {
+						parts = event.currentTarget.parentNode.id.split('-');
 						var widgetArea = parts.pop();
 						var className = parts.pop();
 						$('WidgetAreaEditor-'+widgetArea).addWidget(className, widgetArea);
@@ -166,10 +168,9 @@ WidgetAreaEditorClass.prototype = {
 		var usedWidgets = $('usedWidgets-'+this.name).childNodes;
 		
 		// Give the widget a unique id
-		widget = document.createElement('div');
-		widget.innerHTML = response.responseText.replace(/Widget\[0\]/gi, "Widget[new-" + (++$('usedWidgets-'+this.name).parentNode.parentNode.maxid) + "]");
-	
-		$('usedWidgetsStart-'+this.name).appendChild(widget.childNodes[0]);
+		widgetContent = response.responseText.replace(/Widget\[0\]/gi, "Widget[new-" + (++$('usedWidgets-'+this.name).parentNode.parentNode.maxid) + "]");
+		new Insertion.Top($('usedWidgets-'+this.name), widgetContent);
+		
 		$('usedWidgets-'+this.name).parentNode.parentNode.rewriteWidgetAreaAttributes();
 		UsedWidget.applyToChildren($('usedWidgets-'+this.name), 'div.Widget');
 		
diff --git a/templates/WidgetAreaEditor.ss b/templates/WidgetAreaEditor.ss
index 4a13f55a..d6983eb9 100644
--- a/templates/WidgetAreaEditor.ss
+++ b/templates/WidgetAreaEditor.ss
@@ -20,7 +20,6 @@
 		<p><% _t('TOADD', 'To add widgets, click one on the left to add it here') %></p>
 		
 		<div class="usedWidgets" id="usedWidgets-$Name">
-			<div id="usedWidgetsStart-$Name"><!-- --></div>
 			<% if UsedWidgets %>
 				<% control UsedWidgets %>
 					$EditableSegment

From 7e92d844c13e41a1e53591bad56d2ca67da1617d Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Tue, 26 Jan 2010 01:53:43 +0000
Subject: [PATCH 145/483] BUGFIX Fixed widgets not being clickable to use them
 in IE

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97545 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/WidgetAreaEditor.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/javascript/WidgetAreaEditor.js b/javascript/WidgetAreaEditor.js
index 995cc2a4..51f5c573 100644
--- a/javascript/WidgetAreaEditor.js
+++ b/javascript/WidgetAreaEditor.js
@@ -14,16 +14,6 @@ WidgetAreaEditorClass.prototype = {
 			if (widget.nodeType == 1) {
 				// Gotta change their ID's because otherwise we get clashes between two tabs
 				widget.id = widget.id + '-'+this.name;
-				if(widget.id) {
-					// Clicking applies to the h3 element only, not the widget div itself
-					var header = widget.childNodes[1];
-					header.onclick = function(event) {
-						parts = event.currentTarget.parentNode.id.split('-');
-						var widgetArea = parts.pop();
-						var className = parts.pop();
-						$('WidgetAreaEditor-'+widgetArea).addWidget(className, widgetArea);
-					}
-				}
 			}
 		}
 	
@@ -248,6 +238,18 @@ UsedWidget.prototype = {
 	}
 }
 
+AvailableWidgetHeader = Class.create();
+AvailableWidgetHeader.prototype = {
+	onclick: function(event) {
+		parts = this.parentNode.id.split('-');
+		var widgetArea = parts.pop();
+		var className = parts.pop();
+		$('WidgetAreaEditor-'+widgetArea).addWidget(className, widgetArea);
+	}
+}
+
+AvailableWidgetHeader.applyTo('div.availableWidgets .Widget h3');
+
 WidgetTreeDropdownField = Class.extend('TreeDropdownField');
 WidgetTreeDropdownField.prototype = {
 	getName: function() {

From 16f9491f94242ee33034b44f5b09a3772b0f6f9d Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 26 Jan 2010 20:42:11 +0000
Subject: [PATCH 146/483] ENHANCEMENT Changed menu title from "Site Content" to
 "Pages" to be consistent with other menu labels ENHANCEMENT Changed tree root
 node in CMS to get title from SiteConfig rather than defaulting to "Site
 Content" ENHANCEMENT Changed tree panel headline in CMS from "Site Content
 and Structure" to "Page Tree" to stay consistent with new CMS menu title

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97597 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php                   | 2 +-
 code/LeftAndMain.php               | 8 ++++++--
 lang/en_US.php                     | 4 ++--
 templates/Includes/CMSMain_left.ss | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 44f1409e..bad3c804 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -18,7 +18,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 	// so that Director does not think they are actions of CMSMain
 	static $url_priority = 40;
 	
-	static $menu_title = 'Site Content';
+	static $menu_title = 'Pages';
 	
 	static $menu_priority = 10;
 	
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index b2b6ca1c..65b08b35 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -509,8 +509,12 @@ class LeftAndMain extends Controller {
 			$rootLink = $this->Link() . '0';
 			
 			// This lets us override the tree title with an extension
-			if($this->hasMethod('getCMSTreeTitle')) $treeTitle = $this->getCMSTreeTitle();
-			else $treeTitle =  _t('LeftAndMain.SITECONTENTLEFT',"Site Content",PR_HIGH,'Root node on left');
+			if($this->hasMethod('getCMSTreeTitle') && $customTreeTitle = $this->getCMSTreeTitle()) {
+				$treeTitle = $customTreeTitle;
+			} else {
+				$siteConfig = SiteConfig::current_site_config();
+				$treeTitle =  $siteConfig->Title;
+			}
 			
 			$siteTree = "<ul id=\"sitetree\" class=\"tree unformatted\"><li id=\"record-0\" class=\"Root nodelete\"><a href=\"$rootLink\"><strong>$treeTitle</strong></a>"
 				. $siteTree . "</li></ul>";
diff --git a/lang/en_US.php b/lang/en_US.php
index 68681201..66ba2137 100755
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -80,7 +80,7 @@ $lang['en_US']['CMSMain']['DESCREMOVED'] = 'and %s descendants';
 $lang['en_US']['CMSMain']['EMAIL'] = 'Email';
 $lang['en_US']['CMSMain']['GO'] = 'Go';
 $lang['en_US']['CMSMain']['MENUTITLE'] = array(
-	'Site Content',
+	'Pages',
 	100,
 	'Menu title'
 );
@@ -170,7 +170,7 @@ $lang['en_US']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Select the pages that
 $lang['en_US']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Show only changed pages';
 $lang['en_US']['CMSMain_left.ss']['SHOWUNPUB'] = 'Show unpublished versions';
 $lang['en_US']['CMSMain_left.ss']['SITECONTENT TITLE'] = array(
-	'Site Content and Structure',
+	'Page Tree',
 	PR_HIGH
 );
 $lang['en_US']['CMSMain_left.ss']['SITEREPORTS'] = 'Site Reports';
diff --git a/templates/Includes/CMSMain_left.ss b/templates/Includes/CMSMain_left.ss
index fec64957..31845425 100755
--- a/templates/Includes/CMSMain_left.ss
+++ b/templates/Includes/CMSMain_left.ss
@@ -4,7 +4,7 @@
 		<h2 id="heading_sitetree" class="selected">
 			<img id="sitetree_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" style="display:none;" title="<% _t('OPENBOX','click to open this box') %>" />
 			<img id="sitetree_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" title="<% _t('CLOSEBOX','click to close box') %>" />
-			<% _t('SITECONTENT TITLE','Site Content and Structure',PR_HIGH) %>
+			<% _t('SITECONTENT TITLE','Page Tree',PR_HIGH) %>
 		</h2>
 		<div id="sitetree_holder">
 			<div id="TreeTools">

From 5a071b4ef626da0fb168f36a01bafc605e1f13a1 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Tue, 26 Jan 2010 20:53:55 +0000
Subject: [PATCH 147/483] ENHANCEMENT: CMS Editor Upload panel now loads the
 root files directly and allows the user to upload to the root assets dir

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97601 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ThumbnailStripField.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/ThumbnailStripField.php b/code/ThumbnailStripField.php
index 6cad5859..bd81f7c4 100755
--- a/code/ThumbnailStripField.php
+++ b/code/ThumbnailStripField.php
@@ -49,15 +49,15 @@ class ThumbnailStripField extends FormField {
 
 			$whereSQL = '"ParentID" IN (' . implode(', ', $folderList) . ')';
 			if($searchText) $whereSQL .= " AND \"Filename\" LIKE '%$searchText%'";
-			
 			$images = DataObject::get('Image', $whereSQL, 'Title');
 			
 		} else {
+			$whereSQL = "\"ParentID\" = 0";
 			if($searchText) {
-				$whereSQL = "\"Filename\" LIKE '%$searchText%'";
-
-				$images = DataObject::get('Image', $whereSQL, 'Title');
+				$whereSQL = " AND \"Filename\" LIKE '%$searchText%'";
 			}
+			
+			$images = DataObject::get('Image', $whereSQL, 'Title');
 		}
 		
 		if($images) {

From e9cd3eba62d5c5d5406fa0b6ddc964c7bfd4a808 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Tue, 26 Jan 2010 20:54:33 +0000
Subject: [PATCH 148/483] ENHANCEMENT Added visual elements to aid in the
 usability of the WidgetAreaEditor MINOR Added better help text underneath
 "Available Widgets" and "Widgets currently used"

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97602 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/WidgetAreaEditor.css      |   3 ++-
 images/add-bg.png             | Bin 0 -> 777 bytes
 images/handled-bg.png         | Bin 0 -> 9922 bytes
 templates/WidgetAreaEditor.ss |   4 ++--
 4 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 images/add-bg.png
 create mode 100644 images/handled-bg.png

diff --git a/css/WidgetAreaEditor.css b/css/WidgetAreaEditor.css
index d287095b..f5ddbf1a 100644
--- a/css/WidgetAreaEditor.css
+++ b/css/WidgetAreaEditor.css
@@ -55,12 +55,13 @@ div.availableWidgets div.Widget h3 {
 	color: #fff;
 	line-height: 1.8;
 	text-indent: 5px;
-	background: #000 url(../images/textures/obar-18.gif);
 	margin: 0;
 }
 	div.usedWidgets div.Widget h3 {
 		cursor: move;
+		background: #000 url(../images/handled-bg.png) right top;
 	}
 	div.availableWidgets div.Widget h3 {
 		cursor: pointer;
+		background: #000 url(../images/add-bg.png) right top;
 	}
diff --git a/images/add-bg.png b/images/add-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..72ee947272ec76c3765810ce832183a8ac096db3
GIT binary patch
literal 777
zcmV+k1NQuhP)<h;3K|Lk000e1NJLTq00QX%001fo0{{R3Ir%jT0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzVo*#}Mas&}-{0TU)7R<g>4t}pV`OoT
zkeP6CeSd(7Sz2e3lbm&Sf_;97Raaz`l$}yjVAj^xcX@<+e1^rv$dHkln3<w_dxeCD
zk&%*`jgXn2p{SLYpQov>frO2Mg^$b4(0Y7_dwqyfR%5oeyLfqnkB^tDtg^biz<GIu
zwYR))aebDVp^c4}czlVKm7SB5oO^tSla!p7nWM(W%3fk_b#{Ptdxm>`hD}dgo}Z?Z
zm!P(`yK{AcZ*zdVyT5vShM1e9rKYV`S7Vu)qPMue%gfH1o20|U$)~8Vkdm97o~EIq
zsgRJFwYIx?dV`;#r*wIRQ&nPugN%KCiF9{@P*Pu%n4xlWeR+I_*x1=)WN>zPgW1~L
zQ&nV{nxSB1amvfkc6WliyuhHKsHdv3QB`A(kC<R)bg8PZl$M-*euqv_U3qzfl9QUI
zsIb7m#CUmvmzbY=e1@s2v6`Hui;b31i7piY00BKoL_t(|+U(cGasp8lMNx<lZ)gY*
zcXxMpcXxM}{|{7$RObswPVY6l(^Gr!o+|-x0v8j2(g8{bC>@Bqi@s?}hXcG%Z9Sb(
zI^@j+$AfJXw$cGf^M+wGwSGLa1hk!}M>WqDw6g`2&3P<Wx#f%jVXsLsVa9;4$5czH
zXOS@=EITveuDht8DIl%V@Aroas~7^}8XhW2MwtQnua}+W04qRWfX)E`0D!+Q5pV)Z
z2c-j)4p2G}e<NMRlnw_tT3@L@pmfN~e`^_TthJTy1{CF(rdhKeo{Zg;4owRgQKtiW
zyOa)PpDC8Q!68bAu(jlGd)Jf>VWBk3;YKy3L)c4J#MtWb89!1;>-2iPn;kblH>E?<
z_I*!TukEIEXj;0w^|>h>@_fGEH>JZFC>@jzP&)9xd<ifBG={6M<8%XB00000NkvXX
Hu0mjfzY%jL

literal 0
HcmV?d00001

diff --git a/images/handled-bg.png b/images/handled-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7c440b533ad2b595138122f436dc8931e8d1344
GIT binary patch
literal 9922
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
A9RL6T

literal 0
HcmV?d00001

diff --git a/templates/WidgetAreaEditor.ss b/templates/WidgetAreaEditor.ss
index d6983eb9..6e3854e7 100644
--- a/templates/WidgetAreaEditor.ss
+++ b/templates/WidgetAreaEditor.ss
@@ -2,7 +2,7 @@
 	<input type="hidden" id="$Name" name="$IdxField" value="$Value" />
 	<div class="availableWidgetsHolder">
 		<h2><% _t('AVAILABLE', 'Available Widgets') %></h2>
-		<p>&nbsp;</p>
+		<p><% _t('AVAILWIDGETS', 'Click a widget title below to use it on this page.') %></p>
 		<div class="availableWidgets" id="availableWidgets-$Name">
 			<% if AvailableWidgets %>
 				<% control AvailableWidgets %>
@@ -17,7 +17,7 @@
 	</div>
 	<div class="usedWidgetsHolder">
 		<h2><% _t('INUSE', 'Widgets currently used') %></h2>
-		<p><% _t('TOADD', 'To add widgets, click one on the left to add it here') %></p>
+		<p><% _t('TOSORT', 'To sort currently used widgets on this page, drag them up and down.') %></p>
 		
 		<div class="usedWidgets" id="usedWidgets-$Name">
 			<% if UsedWidgets %>

From 4a90c3e96f8553131d3f2488c06fb7136bc3142c Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Tue, 26 Jan 2010 20:57:37 +0000
Subject: [PATCH 149/483] BUGFIX: Fixed bug when user selects no folder and
 uses the search box it incorrectly doesnt append the where statements

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97603 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ThumbnailStripField.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/ThumbnailStripField.php b/code/ThumbnailStripField.php
index bd81f7c4..ed4eb758 100755
--- a/code/ThumbnailStripField.php
+++ b/code/ThumbnailStripField.php
@@ -54,7 +54,7 @@ class ThumbnailStripField extends FormField {
 		} else {
 			$whereSQL = "\"ParentID\" = 0";
 			if($searchText) {
-				$whereSQL = " AND \"Filename\" LIKE '%$searchText%'";
+				$whereSQL .= " AND \"Filename\" LIKE '%$searchText%'";
 			}
 			
 			$images = DataObject::get('Image', $whereSQL, 'Title');

From 9cf86ec8aff361e6c3827a79e92a224eca08ff42 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Tue, 26 Jan 2010 21:08:23 +0000
Subject: [PATCH 150/483] ENHANCEMENT Added hover states to "Available widgets"
 boxes in the CMS for usability

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97606 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/WidgetAreaEditor.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/css/WidgetAreaEditor.css b/css/WidgetAreaEditor.css
index f5ddbf1a..16038820 100644
--- a/css/WidgetAreaEditor.css
+++ b/css/WidgetAreaEditor.css
@@ -63,5 +63,9 @@ div.availableWidgets div.Widget h3 {
 	}
 	div.availableWidgets div.Widget h3 {
 		cursor: pointer;
-		background: #000 url(../images/add-bg.png) right top;
+		color: #444;
+		background: #ccc url(../images/add-bg.png) right top;
 	}
+		div.availableWidgets div.Widget h3:hover {
+			background: #ccc url(../images/add-bg.png) right 21px;
+		}

From 5f4a4326193f7fb714590a4101b0345f22a047ac Mon Sep 17 00:00:00 2001
From: Andreas Piening <andreas@silverstripe.com>
Date: Wed, 27 Jan 2010 22:23:55 +0000
Subject: [PATCH 151/483] MINOR: #4674 applied patch for special chars in
 folder titles

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97669 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index a53739ae..274d886c 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -608,7 +608,7 @@ JS;
 			return FormResponse::respond();
 		}
 		
-		$form->dataFieldByName('Title')->value = $form->dataFieldByName('Name')->value;
+		$form->dataFieldByName('Name')->Value = $form->dataFieldByName('Title')->Value();
 		
 		return parent::save($urlParams, $form);
 	}

From df2b51eda3828c1a7f263d4b4a86ba100c176f22 Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Wed, 27 Jan 2010 23:18:14 +0000
Subject: [PATCH 152/483] BUGFIX: the anchor dropdown now works in IE. Also
 fixes other anchor-related problems as described in ticket #4961

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97673 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/layout.css           |  24 ++++++++++++++++++++++++
 images/arrow_refresh.gif | Bin 0 -> 564 bytes
 2 files changed, 24 insertions(+)
 create mode 100644 images/arrow_refresh.gif

diff --git a/css/layout.css b/css/layout.css
index 360cfaca..7b43c1f8 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -642,7 +642,31 @@ iframe {
 	display: inline;
 }
 
+#Form_EditorToolbarLinkForm .buttonRefresh {
+	display:block;
+	border:1px solid #F0F0EE; 
+	width:20px; height:20px;
+	float: left;
+}
+#Form_EditorToolbarLinkForm a.buttonRefreshHover {
+	border: 1px solid #0A246A; 
+	background-color:#B2BBD0;
+}
 
+#Form_EditorToolbarLinkForm a.
+.defaultSkin .mceButtonDisabled .mceIcon {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}
+
+#Form_EditorToolbarLinkForm a.buttonRefresh span {
+	display: block;
+	width: 20px;
+	height: 20px;
+	background: transparent url(../../cms/images/arrow_refresh.gif) no-repeat;
+}
+
+#Form_EditorToolbarLinkForm select.hasRefreshButton {
+	width: 160px;
+}
+	
 #Form_EditorToolbarImageForm_Width,
 #Form_EditorToolbarImageForm_Height,
 #Form_EditorToolbarFlashForm_Width,
diff --git a/images/arrow_refresh.gif b/images/arrow_refresh.gif
new file mode 100644
index 0000000000000000000000000000000000000000..70941393fdaae65db16114855b7ab2f52bd181c1
GIT binary patch
literal 564
zcmZ?wbhEHb6k!lyI2O*JoG7o7te~2zq@Jd%nW3VUt)`Q!Zd9UUT&8DUZDdtvV$)!1
z*KF?4X6e*n?b2=Q)$Quj>+U(x(SL$x;3RL~X|5qt{rqRThfNO%ob4Gr&pULXZ}?)r
zq(#wD%L0;@#HKEfi(4I%u_7UUZCJ*t#OyW6Icrn%Hl(F)iB8`ZQ?@xjV`p5}?)aQN
z3Ay`{@(v`|>@BX_U)s2@s{UYQ<Dv4VLsiX(E1Qp0wjQbLJlxQJq@nw8bJvmP*5lQk
z$C|p2HTNBB>ptGvd%UghWNZJ)_WqL{6HawZJk>SnROgh_JyXy0PCMH_<6QsD^Al#B
zpET$ElsOls%)2;s{>5qYFHK)~X~vQ(vzK3=_kZAk;!hSvE{1vr9R?r(#R&uZ#D@B&
z=9bpB_Kwc3?pAT3o_Y;sIVn*kS*|W^Gmn5kUr!e+F}4m(=TIL%FE@J&V?m}4!w`Qb
z1zs)=VFAVtMN2Omex7D#hEC}|KJEz<P6?gq)YoaA>foxy(V=H+q9`M&YVBet(V=S|
u78<<T&D27kwL`-o$lu%D(MU~%rAx+dg2J>14w`Nk=V->9FbGs&um%8?87qJQ

literal 0
HcmV?d00001


From 51cb7f35f360f04c4f15d94a50892c7416bc2fe5 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 28 Jan 2010 05:09:47 +0000
Subject: [PATCH 153/483] BUGFIX: Don't rely on the current directory for any
 logic.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97727 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php                         |  4 ++--
 code/staticpublisher/FilesystemPublisher.php | 12 ++++++------
 tasks/RebuildStaticCacheTask.php             |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 65b08b35..c95d5df5 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -1020,8 +1020,8 @@ JS;
 	 * @return string
 	 */
 	public function CMSVersion() {
-		$sapphireVersionFile = file_get_contents('../sapphire/silverstripe_version');
-		$cmsVersionFile = file_get_contents('../cms/silverstripe_version');
+		$sapphireVersionFile = file_get_contents(BASE_PATH . '/sapphire/silverstripe_version');
+		$cmsVersionFile = file_get_contents(BASE_PATH . '/cms/silverstripe_version');
 
 		if(strstr($sapphireVersionFile, "/sapphire/trunk")) {
 			$sapphireVersion = "trunk";
diff --git a/code/staticpublisher/FilesystemPublisher.php b/code/staticpublisher/FilesystemPublisher.php
index fe8c7f5f..346b734b 100644
--- a/code/staticpublisher/FilesystemPublisher.php
+++ b/code/staticpublisher/FilesystemPublisher.php
@@ -183,7 +183,7 @@ class FilesystemPublisher extends StaticPublisher {
 		if(self::$static_base_url) Director::setBaseURL($currentBaseURL); 
 		if($this->fileExtension == 'php') SSViewer::setOption('rewriteHashlinks', true); 
 
-		$base = "../$this->destFolder";
+		$base = BASE_PATH . "/$this->destFolder";
 		foreach($files as $file) {
 			Filesystem::makeFolder("$base/$file[Folder]");
 			
@@ -201,7 +201,7 @@ class FilesystemPublisher extends StaticPublisher {
 	 * Generate the templated content for a PHP script that can serve up the given piece of content with the given age and expiry
 	 */
 	protected function generatePHPCacheFile($content, $age, $lastModified) {
-		$template = file_get_contents('../cms/code/staticpublisher/CachedPHPPage.tmpl');
+		$template = file_get_contents(BASE_PATH . '/cms/code/staticpublisher/CachedPHPPage.tmpl');
 		return str_replace(
 				array('**MAX_AGE**', '**LAST_MODIFIED**', '**CONTENT**'),
 				array((int)$age, $lastModified, $content),
@@ -211,7 +211,7 @@ class FilesystemPublisher extends StaticPublisher {
 	 * Generate the templated content for a PHP script that can serve up a 301 redirect to the given destionation
 	 */
 	protected function generatePHPCacheRedirection($destination) {
-		$template = file_get_contents('../cms/code/staticpublisher/CachedPHPRedirection.tmpl');
+		$template = file_get_contents(BASE_PATH . '/cms/code/staticpublisher/CachedPHPRedirection.tmpl');
 		return str_replace(
 				array('**DESTINATION**'),
 				array($destination),
@@ -219,7 +219,7 @@ class FilesystemPublisher extends StaticPublisher {
 	}
 	
 	public function getDestDir() {
-		return '../'.$this->destFolder;
+		return BASE_PATH . '/' . $this->destFolder;
 	}
 	
 	/**
@@ -227,7 +227,7 @@ class FilesystemPublisher extends StaticPublisher {
 	 * Only returns cache files that will actually map to a URL, based on urlsToPaths.
 	 */
 	public function getExistingStaticCacheFiles() {
-		$cacheDir = '../'.$this->destFolder;
+		$cacheDir = BASE_PATH . '/' . $this->destFolder;
 
 		$urlMapper = array_flip($this->urlsToPaths($this->owner->allPagesToCache()));
 		
@@ -236,7 +236,7 @@ class FilesystemPublisher extends StaticPublisher {
 		// Glob each dir, then glob each one of those
 		foreach(glob("$cacheDir/*", GLOB_ONLYDIR) as $cacheDir) {
 			foreach(glob($cacheDir.'/*') as $cacheFile) {
-				$mapKey = str_replace("../cache/","",$cacheFile);
+				$mapKey = str_replace(BASE_PATH . "/cache/","",$cacheFile);
 				if(isset($urlMapper[$mapKey])) {
 					$url = $urlMapper[$mapKey];
 					$output[$url] = $cacheFile;
diff --git a/tasks/RebuildStaticCacheTask.php b/tasks/RebuildStaticCacheTask.php
index aacdc185..74550659 100644
--- a/tasks/RebuildStaticCacheTask.php
+++ b/tasks/RebuildStaticCacheTask.php
@@ -72,7 +72,7 @@ class RebuildStaticCacheTask extends Controller {
 			
 			if (FilesystemPublisher::$domain_based_caching) {
 				// Glob each dir, then glob each one of those
-				foreach(glob('../cache/*', GLOB_ONLYDIR) as $cacheDir) {
+				foreach(glob(BASE_PATH . '/cache/*', GLOB_ONLYDIR) as $cacheDir) {
 					foreach(glob($cacheDir.'/*') as $cacheFile) {
 						$searchCacheFile = trim(str_replace($cacheBaseDir, '', $cacheFile), '\/');
 						if (!in_array($searchCacheFile, $mappedUrls)) {

From c8c8811f64031b320bbc55ff036e678ac8f9cf4b Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Thu, 28 Jan 2010 20:10:58 +0000
Subject: [PATCH 154/483] ENHANCEMENT adapt the page dropdown based off the
 allowedChildren values

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97745 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/CMSMain_left.js | 47 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js
index b00fe33c..b8deb67e 100755
--- a/javascript/CMSMain_left.js
+++ b/javascript/CMSMain_left.js
@@ -13,10 +13,25 @@ var addpageclass;
 addpageclass = Class.create();
 addpageclass.applyTo('#addpage');
 addpageclass.prototype = {
+	originalValues: new Array(),
 	initialize: function () {
 		Observable.applyTo($(_HANDLER_FORMS[this.id]));
 		this.getElementsByTagName('button')[0].onclick = returnFalse;
 		$(_HANDLER_FORMS[this.id]).onsubmit = this.form_submit;
+		
+		// Save the original page types in to this object
+		if ($(_HANDLER_FORMS.addpage).elements.PageType) {
+			var options = $(_HANDLER_FORMS.addpage).elements.PageType.options;
+			for(var i = 0; i < options.length; i++) {
+				this.originalValues.push({
+					'value': options[i].value,
+					'label': options[i].innerHTML,
+				});
+			}
+		
+			var selectedNode = $('sitetree').firstSelected();
+			if(selectedNode) this.showApplicableChildrenPageTypes(selectedNode.hints);
+		}
 	},
 	
 	onclick : function() {
@@ -40,7 +55,39 @@ addpageclass.prototype = {
 		return false;
 	},
 	
+	// Reset the page types dropdown to its original state
+	resetPageTypeOptions: function() {
+		var select = $(_HANDLER_FORMS.addpage).elements.PageType;
+		while (select.childNodes.length >= 1) {	select.removeChild(select.firstChild); } 
+		for(var i = 0; i < this.originalValues.length; i++) {
+			var option = document.createElement('option');
+			option.value = this.originalValues[i].value;
+			option.innerHTML = this.originalValues[i].label;
+			select.appendChild(option);
+		}
+	},
+	
+	// Hide the <option> elements in the new page <select> unless
+	// they are in the allowChildren array of the selected tree node
+	showApplicableChildrenPageTypes: function(hints) {
+		this.resetPageTypeOptions();
+		if (typeof hints.allowedChildren != 'undefined') {
+			var select = $(_HANDLER_FORMS.addpage).elements.PageType;
+			
+			var toRemove = new Array();
+			for(var i = 0; i < select.options.length; i++) {
+				var itemFound = false;
+				for(var j = 0; j < hints.allowedChildren.length; j++) {
+					if (select.options[i].value == hints.allowedChildren[j]) { itemFound = true; break; }
+				}
+				if (!itemFound) toRemove.push(select.options[i]);
+			}
+			for(var i = 0; i < toRemove.length; i++) { select.removeChild(toRemove[i]); }
+		}
+	},
+	
 	treeSelectionChanged : function(selectedNode) {
+		this.showApplicableChildrenPageTypes(selectedNode.hints);
 		$(_HANDLER_FORMS.addpage).elements.PageType.value = selectedNode.hints.defaultChild;
 	},
 	

From 39772cfcc449e14eaba6c206278e03804f1fa4af Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Thu, 28 Jan 2010 21:56:38 +0000
Subject: [PATCH 155/483] ENHANCEMENT: Select the uploaded image after
 uploading by default. #4962

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97765 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 274d886c..3d4725b2 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -219,6 +219,7 @@ JS
 			$status = "";
 		}
 
+		$fileObj = false;
 		foreach($newFiles as $newFile) {
 			$fileIDs[] = $newFile;
 			$fileObj = DataObject::get_one('File', "\"File\".\"ID\"=$newFile");
@@ -227,6 +228,24 @@ JS
 			$fileNames[] = $fileObj->Name;
 		}
 		
+		// workaround for content editors image upload.Passing an extra hidden field
+		// in the content editors view of 'UploadMode' @see HtmlEditorField
+		// this will be refactored for 2.5
+		if(isset($data['UploadMode']) && $data['UploadMode'] == "CMSEditor" && $fileObj) {
+			// we can use $fileObj considering that the uploader in the cmseditor can only upload
+			// one file at a time. Once refactored to multiple files this is going to have to be changed
+			$width = (is_a($fileObj, 'Image')) ? $fileObj->getWidth() : '100';
+			$height = (is_a($fileObj, 'Image')) ? $fileObj->getHeight() : '100';
+			
+			$values = array(
+				'Filename' => $fileObj->Filename,
+				'Width' => $width,
+				'Height' => $height
+			);
+			
+			return Convert::raw2json($values);
+		}
+		
 		$sFileIDs = implode(',', $fileIDs);
 		$sFileNames = implode(',', $fileNames);
 

From db94bc83e89fe641b2b8325f9597281dacb2d639 Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Thu, 28 Jan 2010 22:29:47 +0000
Subject: [PATCH 156/483] BUGFIX: removed unneccessary comma (it breaks the IE)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97775 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/CMSMain_left.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js
index b8deb67e..70937bf6 100755
--- a/javascript/CMSMain_left.js
+++ b/javascript/CMSMain_left.js
@@ -25,7 +25,7 @@ addpageclass.prototype = {
 			for(var i = 0; i < options.length; i++) {
 				this.originalValues.push({
 					'value': options[i].value,
-					'label': options[i].innerHTML,
+					'label': options[i].innerHTML
 				});
 			}
 		

From 3a61db6221b13f3f713e881785698007e8fa8c75 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Mon, 1 Feb 2010 06:46:01 +0000
Subject: [PATCH 157/483] BUGFIX: Don't let a user's theme break the CMS.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97909 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index c95d5df5..6b6c3a33 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -99,6 +99,10 @@ class LeftAndMain extends Controller {
 	function init() {
 		parent::init();
 		
+		// The user's theme shouldn't affect the CMS, if, for example, they have replaced
+		// TableListField.ss or Form.ss.
+		SSViewer::set_theme(null);
+		
 		// set language
 		$member = Member::currentUser();
 		if(!empty($member->Locale)) {

From 48a7c1ee87955524a65a128cfd538bde52fefe2c Mon Sep 17 00:00:00 2001
From: Frank Winkelmann <floydfox@hotmail.com>
Date: Tue, 2 Feb 2010 04:50:28 +0000
Subject: [PATCH 158/483] BUGFIX: Ticket #4805 added a canCreateTopLevel() if
 there is no parent object in CMSMain.php added testCreationOfTopLevelPage
 toCMSMainTest.php added the nessessary 'database entries' in the
 CMSMainTest.yml

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98001 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php      |  9 +++++++--
 tests/CMSMainTest.php | 20 ++++++++++++++++++++
 tests/CMSMainTest.yml | 18 +++++++++++++++++-
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index bad3c804..23172ff9 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -494,8 +494,13 @@ JS;
 		if(is_numeric($parent)) $parentObj = DataObject::get_by_id("SiteTree", $parent);
 		if(!$parentObj || !$parentObj->ID) $parent = 0;
 		
-		if($parentObj && !$parentObj->canAddChildren()) return Security::permissionFailure($this);
-		if(!singleton($className)->canCreate()) return Security::permissionFailure($this);
+		if($parentObj){
+			if(!$parentObj->canAddChildren()) return Security::permissionFailure($this);
+			if(!singleton($className)->canCreate()) return Security::permissionFailure($this);
+		}else{
+			if(!SiteConfig::current_site_config()->canCreateTopLevel())
+				return Security::permissionFailure($this);
+		}
 
 		$p = $this->getNewItem("new-$className-$parent".$suffix, false);
 		$p->Locale = $_REQUEST['Locale'];
diff --git a/tests/CMSMainTest.php b/tests/CMSMainTest.php
index 5de6d15c..266b6592 100644
--- a/tests/CMSMainTest.php
+++ b/tests/CMSMainTest.php
@@ -163,4 +163,24 @@ class CMSMainTest extends FunctionalTest {
 		$result = $this->get('admin/getfilteredsubtree?filter=CMSSiteTreeFilter_DeletedPages&ajax=1&ID=' . $id);
 		$this->assertEquals(200, $result->getStatusCode());
 	}
+	
+	function testCreationOfTopLevelPage(){
+		$cmsUser = $this->objFromFixture('Member', 'allcmssectionsuser');
+		$rootEditUser = $this->objFromFixture('Member', 'rootedituser');
+
+		// with insufficient permissions
+		$cmsUser->logIn();
+		$response = $this->post('admin/addpage', array('ParentID' => '0', 'PageType' => 'Page', 'Locale' => 'en_US'));
+		// should redirect, which is a permission error
+		$this->assertEquals(403, $response->getStatusCode(), 'Add TopLevel page must fail for normal user');
+
+		// with correct permissions
+		$rootEditUser->logIn();
+		$response = $this->post('admin/addpage', array('ParentID' => '0', 'PageType' => 'Page', 'Locale' => 'en_US'));
+		$this->assertEquals(302, $response->getStatusCode(), 'Must be a redirect on success');
+		$location=$response->getHeader('Location');
+		$this->assertContains('/show/',$location, 'Must redirect to /show/ the new page');
+		// TODO Logout
+		$this->session()->inst_set('loggedInAs', NULL);
+	}
 }
diff --git a/tests/CMSMainTest.yml b/tests/CMSMainTest.yml
index 2288554f..32285a2b 100644
--- a/tests/CMSMainTest.yml
+++ b/tests/CMSMainTest.yml
@@ -25,6 +25,8 @@ Group:
       Title: assetsonly
    allcmssections:
       Title: allcmssections
+   rooteditusers:
+      Title: rooteditusers
 Member:
    admin:
       Email: admin@example.com
@@ -36,6 +38,9 @@ Member:
    allcmssectionsuser:
       Email: allcmssectionsuser@test.com
       Groups: =>Group.allcmssections
+   rootedituser:
+      Email: rootedituser@test.com
+      Groups: =>Group.rooteditusers
 Permission:
    admin:
       Code: ADMIN
@@ -45,4 +50,15 @@ Permission:
       GroupID: =>Group.assetsonly
    allcmssections:
       Code: CMS_ACCESS_LeftAndMain
-      GroupID: =>Group.allcmssections
\ No newline at end of file
+      GroupID: =>Group.allcmssections
+   allcmssections2:
+      Code: CMS_ACCESS_LeftAndMain
+      GroupID: =>Group.rooteditusers
+SiteConfig:
+   siteconfig1:
+      EditorGroups: =>Group.rooteditusers
+      CanCreateTopLevelType: 'OnlyTheseUsers'
+SiteConfig_CreateTopLevelGroups:
+   createtoplevelgroups1:
+      siteconfigid:  1
+      GroupID: =>Group.rooteditusers

From f3d0a4f54ae72e4846e9aff493eae12eeabfd70d Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Tue, 2 Feb 2010 22:35:51 +0000
Subject: [PATCH 159/483] BUGFIX Fixed incorrect logic in
 CMSMain::generateTreeStylingJS() stopping different tree icons from working

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98018 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 23172ff9..d96b396a 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -264,9 +264,9 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 
 			$fileImage = ($option == "folder") ? $icon . '-openfolder.gif' : $icon . '-file.gif';
 			$openFolderImage = $icon . '-openfolder.gif';
-			if(!Director::fileExists($openFolderImage) || $option = "file") $openFolderImage = $fileImage;
+			if(!Director::fileExists($openFolderImage) || $option == "file") $openFolderImage = $fileImage;
 			$closedFolderImage = $icon . '-closedfolder.gif';
-			if(!Director::fileExists($closedFolderImage) || $option = "file") $closedFolderImage = $fileImage;
+			if(!Director::fileExists($closedFolderImage) || $option == "file") $closedFolderImage = $fileImage;
 
 			$js .= <<<JS
 				_TREE_ICONS['$class'] = {

From 80b35d15f2045928c0ad9d2178bff144c6f5822f Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Wed, 3 Feb 2010 00:57:45 +0000
Subject: [PATCH 160/483] MINOR fix permissions FEATURE add 'view site tree as'
 functionality.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98025 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php           | 2 +-
 code/CMSSiteTreeFilter.php | 2 +-
 code/SecurityAdmin.php     | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index d96b396a..35028f8c 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -1321,7 +1321,7 @@ JS;
 			'category' => _t('Permission.CMS_ACCESS_CATEGORY', 'CMS Access'),
 			'sort' => -100
 		);
-		
+
 		if (isset($perms['CMS_ACCESS_ModelAdmin'])) unset($perms['CMS_ACCESS_ModelAdmin']);
 		
 		return $perms;
diff --git a/code/CMSSiteTreeFilter.php b/code/CMSSiteTreeFilter.php
index 73e793c6..e4d58360 100644
--- a/code/CMSSiteTreeFilter.php
+++ b/code/CMSSiteTreeFilter.php
@@ -28,7 +28,7 @@ abstract class CMSSiteTreeFilter extends Object {
 		}
 
 		$leftAndMain = new CMSMain();
-		$tree = $leftAndMain->getSiteTreeFor('SiteTree', isset($_REQUEST['ID']) ? $_REQUEST['ID'] : 0, null, null, array($this, 'includeInTree'));
+		$tree = $leftAndMain->getSiteTreeFor('SiteTree', isset($_REQUEST['ID']) ? $_REQUEST['ID'] : 0, null, null, array($this, 'includeInTree'), count($this->ids));
 
 		// Trim off the outer tag
 		$tree = ereg_replace('^[ \t\r\n]*<ul[^>]*>','', $tree);
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 3a18553a..6400013a 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -57,6 +57,8 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 	public function getEditForm($id) {
 		$record = null;
 		
+		if (($id == 'root' || $id == 0) && $this->hasMethod('getRootForm')) return $this->getRootForm($this, 'EditForm');
+		
 		if($id && $id != 'root') {
 			$record = DataObject::get_by_id($this->stat('tree_class'), $id);
 		}

From da57175a2db84eee81855aea6ad600d2a92f2a68 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Wed, 3 Feb 2010 02:28:57 +0000
Subject: [PATCH 161/483] MINOR: visual tweaks to the widgets area including
 widget titles can now be spread over multiple lines and padding between
 columns. #4965

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98032 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/WidgetAreaEditor.css       |  13 +++++--------
 images/add-bg-hover.png        | Bin 0 -> 621 bytes
 images/add-bg.png              | Bin 777 -> 578 bytes
 templates/WidgetDescription.ss |   2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)
 create mode 100644 images/add-bg-hover.png

diff --git a/css/WidgetAreaEditor.css b/css/WidgetAreaEditor.css
index 16038820..b84d0779 100644
--- a/css/WidgetAreaEditor.css
+++ b/css/WidgetAreaEditor.css
@@ -3,7 +3,7 @@ div.availableWidgetsHolder {
 }
 
 div.usedWidgetsHolder {
-	width: 69%;
+	width: 66%;
 }
 
 div.availableWidgetsHolder {
@@ -14,10 +14,6 @@ div.usedWidgetsHolder {
 	float: right;
 }
 
-div.usedWidgets {
-	border: 1px #CCC dotted;
-	padding: 5px;
-}
 .NoWidgets {
 	padding: 50px; /* Make this nice and big and easily 'droppable' */
 }
@@ -54,7 +50,7 @@ div.availableWidgets div.Widget h3 {
 	font-size: 12px;
 	color: #fff;
 	line-height: 1.8;
-	text-indent: 5px;
+	padding: 0 5px;
 	margin: 0;
 }
 	div.usedWidgets div.Widget h3 {
@@ -64,8 +60,9 @@ div.availableWidgets div.Widget h3 {
 	div.availableWidgets div.Widget h3 {
 		cursor: pointer;
 		color: #444;
-		background: #ccc url(../images/add-bg.png) right top;
+		padding-right: 25px;
+		background: #ccc url(../images/add-bg.png) right center;
 	}
 		div.availableWidgets div.Widget h3:hover {
-			background: #ccc url(../images/add-bg.png) right 21px;
+			background: #ccc url(../images/add-bg-hover.png) right center;
 		}
diff --git a/images/add-bg-hover.png b/images/add-bg-hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..161876e56efbc60dae953cffa6e7729755f7fe43
GIT binary patch
literal 621
zcmeAS@N?(olHy`uVBq!ia0y~yV0sB;YjH3E$wt?pd>|!R;u=vBoS#-wo>-L1;Fyx1
zl&avFo0y&&l$w}QS$Hzl2B?eQ)5S5Q;?|oxyR(B6B@R4P%bZ<yL8Ii`Ec*kl3p;K_
z=!?3Br~j8zFBfDv7#%ppsc@5?QU}}82MbudT{o#Ndva;=dl_XxLE-G}mmhq7B2dKl
z{)?Zz-Jz2qtFIa|Gzd=I%EaKXn}H!i97shlGAxK?VA#S9q}DJnT+m}+xWx*j!oczj
zZ<&C~w88QXWsD44x<wfnG^@Tmx%pMv{Q9;1S>g-{EGd&Jw5IR=UXc0mW6|1sKobu1
zUE?i$Klyy>_3QiY?ArU|*V*4|pC6xncG+4+hLu~rMOp>E*QXzUG<E9q{L`zSpPw^h
z=1uF8dpo%qCM;9&dnE9Eecp?^D)+O#?*2aCuKwey%Qt1_$Zt1dP;d?82o&M9)1MxG
z`n_FDltrkH+>gIIi^UlfeAlLJzIa1ok6Bgt-m>QhFUfyC7t7FKvi0`dh5z^6?KyPN
z`S-cGwkv^RvMPPf<}LBtXKqwEa&n#1!&_Iij~@Qb{(LLQc7dvom;T-~^xRbK|L~F1
z%NrM!>t|orV{q8@_S54#s-BZNYyN#|{dwumn`@tef#eZvXFqfHj5+#e=gqUWv$g$t
z{-@8<ppB*s3c72<c7NYHH|u5bJ0^xDnZK`Idj1y}EE*T}7(k&23ZnmyA1^--G(<wu
vIeyh@pu+?g1ET>L-0;`{2l|0>MmC19)>ZSl{X1iT>4(A7)z4*}Q$iB}#{Chr

literal 0
HcmV?d00001

diff --git a/images/add-bg.png b/images/add-bg.png
index 72ee947272ec76c3765810ce832183a8ac096db3..b350dd2a0724b80b8ab97354b6ab63d817ca9122 100644
GIT binary patch
delta 527
zcmeBVJH#?Ul7oqXfuYegD1V}&M*R~{7srr_TW{{1^}oy@ao}OzYo^C)x6isXzHvUf
zId0F)ALZ2_lsH*rt$GE7pE}!~<SWa)er;o+fzgESm(y&{?^^Qm-sS3FOCzISerIQ7
zI525N6eGieSO$hI+(2p#1H%P928LU#Kq`!ZAw!&j;Vl!8(gw>nlrb{YZ|N2VD{$Bi
zq>geiGziJ^*zK+P`s?}60HBcf0x1#g#2?QdIRC$UJVPW~oFQT1)8MaJsTFp2?!K0v
zU$eW?u4hsFHa3PSs-BYyXPrBzJ@vtd4=-MS^xVF8<F;!vtl#hBW(ZiOG`~i#Kj)Kf
zlZDjV{jxH(|BU3)!=F2A*E2JCO?mp$V)kW?^yT;c&)3<!$=y2ZHPFQoBA!D1i(c%C
z|Nia%{)&G-K*w||`Chh|_qpPth4!qo)_dPwi@&}VWVnsK+HrYty?;M8ZMs$Q>q+72
zt#zewK=r9w%g%em&+}ikbmOlVj?e$?-F^Km&<6{A#J|UGTEo$lrF*C5-n-IU(&p#E
z!do|pUCG*eE^YhX$o1F%TgKnKd2_2N!vdX`Uyhb+UpY<kdn`kP(cOJfX?w!O86woc
v!HNhxRt8WQ0>c<eL4um0;s4|949pD6qk5Aj2bjzTMm>Y4tDnm{r-UW|QFH6e

delta 728
zcmV;}0w?{#1c?Ta83+Ra0024pH42d-D1Ty5OjJe6%FW;3-_z6A>FMc)hmd1ragLCg
zaB+QqfQeaJXOfegb#{V%eu!09WR#ShQd3~o*4KA=gnN93#l^^wk(rp8qI!FUgolxl
zlA4W>nV+Gkm6xBVsjq>Aje>=b%gxYwe205|h*DN#wzs=@d4rFSm#eI@y1c-7d4Ghp
zx4dt0eU_P_jg6Lge2JBnos*NCdwhqJl$@8DqsGR{USe)_c7SzzhI@U6O;22&pQe+S
zptiQVb9I4lbAY?Mzj}Lyn46=erma?2W0{(wx46H{%g&mcq{GC?r>L)xlAE2LrlF##
zkdT?Rw!3+HgP)<Nba{nSRbqmJjDLN8iF9{@P*Pu%n4xlWeR+I_*x1=)WN>zPgW1~L
zQ&nV{nxSB1amvfkc6WliyuhHKsHdv3QB`A(kC<R)bg8PZl$M-*euqv_U3qzfl9QUI
zsIb7m#CUmvmzbY=e1@s2v6`Hui;b31i7piY00BKoL_t(|+U(cGasp8lMSoF<5N~J*
z5O;TXcXxMpm;Vn`hg9baNKWrHyVFy9@SZCHZ~_+-fYJd<2PhqgyNkYQN{0iyPi;M&
zP&(wz1jmDI6SmR;N%MwbG_`&_vjnuAr$;r<7PPYkl+Af8SGnbk0b#F6F=57lu*XzO
zsb`TfAS^pG;;y@>pD7@%(tq#whYG700^%ATDoRF~0s60(o#g;4Kwp5)0RRAizb_GR
z0!jy^1C$O>IuL&&UB#3R2RK?^sXw4}$jg6g8E&k#mF@-<<(Q^fvmc&}-INYZ3mH+T
z19`iY4rQMymb$?qN{6tu<ZpY|ln!B`G|S;eHKjw?OIF0#>hT#rQbkDX^m@IU9XCHW
zr9;#9eNS1h?WS~STDrXTxhWm;e7@f|rNbF09h44GI`F@I2`~UOhO4jRbOTxd0000<
KMNUMnLSTZNl4vvl

diff --git a/templates/WidgetDescription.ss b/templates/WidgetDescription.ss
index dc3530ea..423f9907 100644
--- a/templates/WidgetDescription.ss
+++ b/templates/WidgetDescription.ss
@@ -1,5 +1,5 @@
 <div class="Widget" id="$ClassName">
-	<h3>$CMSTitle</h3>
+	<h3 title="<% _t('CLICKTOADDWIDGET', 'Click to add this widget') %>">$CMSTitle</h3>
 	<div class="widgetDescription">
 		<p>$Description</p>
 	</div>

From fd38303749aaa872cfc01057f11c906a6c7bf2b6 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:37:19 +0000
Subject: [PATCH 162/483] MINOR applied correct decorators MINOR Page.ss now
 takes advantage of the SiteConfig FEATURE audit trails MINOR fixed JS error
 around concurrent editing MINOR ability to disable sorting on tablelistfield
 MINOR added default timezone to static-main.php to avoid PHP warnings MINOR
 only display Roles tab on groups if there are roles in the system MINOR
 publishing activity report ENHANCEMENT ability to parameterize SSReport's
 (from r85903)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98156 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ReportAdmin.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index a1db6556..7e67141d 100755
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -171,7 +171,7 @@ class ReportAdmin extends LeftAndMain {
 				$ids[] = $obj->ID();
 			}
 		}
-		
+
 		if($id && in_array($id, $ids)) return $this->reportEditFormFor($id);
 		else return false;
 	}
@@ -197,12 +197,15 @@ class ReportAdmin extends LeftAndMain {
 		
 		$obj = new $reportClass();
 		if($obj) $fields = $obj->getCMSFields();
+		if($obj) $actions = $obj->getCMSActions();
 		
 		$idField = new HiddenField('ID');
 		$idField->setValue($id);
 		$fields->push($idField);
 		
 		$form = new Form($this, 'EditForm', $fields, $actions);
+
+		$form->loadDataFrom($_REQUEST);
 		
 		return $form;
 	}
@@ -227,6 +230,16 @@ class ReportAdmin extends LeftAndMain {
 		}
 		return false;
 	}
+	
+	public function updatereport() {
+		FormResponse::load_form($this->EditForm()->renderWith('Form'));
+		FormResponse::add("$('tab-Root_Report').onclick();");
+		return FormResponse::respond();
+	}
 }
 
+
+
+
+
 ?>

From 7a1e8591c8caf8a7077baad69dde79af6783b17d Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:39:25 +0000
Subject: [PATCH 163/483] MINOR when you delete a user from a group, they are
 also removed from any sub groups. (from r87119)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98158 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php      |  9 +++++++++
 code/MemberTableField.php | 11 +++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 6b6c3a33..ac4bbc83 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -712,6 +712,15 @@ JS;
 				FormResponse::add("\$('Form_EditForm').elements.URLSegment.value = \"$record->URLSegment\";");
 				FormResponse::add("\$('Form_EditForm_StageURLSegment').value = \"" . $record->AbsoluteLink() . "\";");
 			}
+			
+			if($virtualPages = DataObject::get("VirtualPage", "CopyContentFromID = $record->ID")) {
+				foreach($virtualPages as $page) {
+					if($page->ID != $record->ID) {
+						$title = Convert::raw2js($page->TreeTitle());
+						FormResponse::add("$('sitetree').setNodeTitle($page->ID, \"$title\");");
+					}
+				}
+			}
 
 			// If the 'Save & Publish' button was clicked, also publish the page
 			if (isset($urlParams['publish']) && $urlParams['publish'] == 1) {
diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index aaceb7db..0c4dfb06 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -385,9 +385,16 @@ class MemberTableField_ItemRequest extends ComplexTableField_ItemRequest {
 		if($this->ctf->Can('delete') !== true) {
 			return false;
 		}
-		
+
 		$groupID = $this->ctf->sourceID();
-		$this->dataObj()->Groups()->remove($groupID);
+		$group = DataObject::get_by_id('Group', $groupID);
+		
+		if ($group) {
+			foreach($group->getAllChildren() as $subGroup) {
+				$this->dataObj()->Groups()->remove($subGroup);
+			}
+			$this->dataObj()->Groups()->remove($groupID);
+		}
 	}
 	
 }

From ecbd5f89c071e35ced5736466b4d7899a4459a14 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:39:58 +0000
Subject: [PATCH 164/483] API CHANGE Security::permissionFailure(); will no
 longer tell the client side JS to show the login box if the user is already
 logged in ENHANCEMENT added canAddTopLevel permission to SiteConfig to
 determine which users/groups can add pages to the root of the sitetree. (from
 r87279)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98159 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/CMSMain_left.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js
index 70937bf6..51b8cfb6 100755
--- a/javascript/CMSMain_left.js
+++ b/javascript/CMSMain_left.js
@@ -128,21 +128,19 @@ addpageclass.prototype = {
 		
 			if( !_NEW_PAGES[parentID] )
 				_NEW_PAGES[parentID] = 1;
-		
+
 			var suffix = _NEW_PAGES[parentID]++;
 			Ajax.SubmitForm(_HANDLER_FORMS.addpage, "action_addpage", {
 				onSuccess : Ajax.Evaluator,
-				onFailure : this.showAddPageError,
+				onFailure : function(response) { if (response.status == 403) {
+					alert('You cannot add that page at that location.');
+				}},
 				extraData: '&Suffix=' + suffix
 			});
 		}
 		
 		return false;
 	},
-	
-	showAddPageError: function(response) {
-		errorMessage(ss.i18n._t('CMSMAIN.ERRORADDINGPAGE'), response);
-	}
 };
 
 /**

From 9563c650b4843a7a2745a13bb8651bb183b9a82b Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:40:05 +0000
Subject: [PATCH 165/483] MINOR updated detection for an empty report (from
 r87362)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98160 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SideReport.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/SideReport.php b/code/SideReport.php
index e9edab34..33b865b1 100755
--- a/code/SideReport.php
+++ b/code/SideReport.php
@@ -24,7 +24,7 @@ abstract class SideReport extends Object {
 		$records = $this->records();
 		$fieldsToShow = $this->fieldsToShow();
 		
-		if($records) {
+		if($records && count($records)) {
 			$result = "<ul class=\"$this->class\">\n";
 			
 			foreach($records as $record) {

From 09fcd25c18d25d77fa5e22e7167fb4f8a5e81f6b Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:40:29 +0000
Subject: [PATCH 166/483] MINOR apply a sitetree filter when changing subsites
 (from r87369)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98162 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/CMSMain_left.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js
index 51b8cfb6..fa52fae5 100755
--- a/javascript/CMSMain_left.js
+++ b/javascript/CMSMain_left.js
@@ -170,6 +170,9 @@ SiteTreeFilter.applyTo('#siteTreeFilterList');
 SiteTreeFilter.prototype = {
 	initialize: function () {
 	},
+	reapplyIfNeeded: function() {
+		if(this.options[this.selectedIndex].value != 'all') this.onchange();
+	},
 	onchange : function() {
 		var value = this.options[this.selectedIndex].value;
 		

From 7514bdcd6b592401ee1a6f8948a2d264e952a908 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:40:35 +0000
Subject: [PATCH 167/483] MINOR fixed IE JS errors (from r87420)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98163 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/CMSMain_left.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js
index fa52fae5..b1c60d9a 100755
--- a/javascript/CMSMain_left.js
+++ b/javascript/CMSMain_left.js
@@ -140,7 +140,7 @@ addpageclass.prototype = {
 		}
 		
 		return false;
-	},
+	}
 };
 
 /**

From 0fc5b6327036bacb0605bf3abcc3a5d35410586c Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:41:20 +0000
Subject: [PATCH 168/483] MINOR added locking to static publisher to avoid two
 queues running at the same time. (from r87792)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98164 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/SideReports.js        |  8 +++++---
 tasks/RebuildStaticCacheTask.php | 10 ++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/javascript/SideReports.js b/javascript/SideReports.js
index f1433541..fe943e15 100755
--- a/javascript/SideReports.js
+++ b/javascript/SideReports.js
@@ -86,9 +86,11 @@ SideReportRecord.prototype = {
 	},
 	
 	onclick : function(event) {
-		Event.stop(event);
-		$('sitetree').loadingNode = $('sitetree').getTreeNodeByIdx( this.getID() );
-		$('Form_EditForm').getPageFromServer(this.getID());
+		if (!this.getAttribute('reloadCMS')) {
+			Event.stop(event);
+			$('sitetree').loadingNode = $('sitetree').getTreeNodeByIdx( this.getID() );
+			$('Form_EditForm').getPageFromServer(this.getID());
+		}
 	},
 	getID : function() {
 		if(this.href.match(/\/([^\/]+)$/)) return parseInt(RegExp.$1);
diff --git a/tasks/RebuildStaticCacheTask.php b/tasks/RebuildStaticCacheTask.php
index 74550659..11018544 100644
--- a/tasks/RebuildStaticCacheTask.php
+++ b/tasks/RebuildStaticCacheTask.php
@@ -44,6 +44,11 @@ class RebuildStaticCacheTask extends Controller {
 		echo "Rebuilding cache.\nNOTE: Please ensure that this page ends with 'Done!' - if not, then something may have gone wrong.\n\n";
 		
 		$page = singleton('Page');
+		$cacheBaseDir = $page->getDestDir();
+		
+		if (file_exists($cacheBaseDir.'/lock') && !isset($_REQUEST['force'])) die("There already appears to be a publishing queue running. You can skip warning this by adding ?/&force to the URL.");
+		
+		touch($cacheBaseDir.'/lock');
 		
 		foreach($urls as $i => $url) {
 			if($url && !is_string($url)) {
@@ -68,8 +73,6 @@ class RebuildStaticCacheTask extends Controller {
 		if(!isset($_GET['urls']) && $start == 0 && file_exists("../cache")) {
 			echo "Removing stale cache files... \n";
 			flush();
-			$cacheBaseDir = $page->getDestDir();
-			
 			if (FilesystemPublisher::$domain_based_caching) {
 				// Glob each dir, then glob each one of those
 				foreach(glob(BASE_PATH . '/cache/*', GLOB_ONLYDIR) as $cacheDir) {
@@ -89,6 +92,9 @@ class RebuildStaticCacheTask extends Controller {
 		}
 		echo  "Rebuilding cache from " . sizeof($mappedUrls) . " urls...\n\n";
 		$page->extend('publishPages', $mappedUrls);
+		
+		if (file_exists($cacheBaseDir.'/lock')) unlink($cacheBaseDir.'/lock');
+		
 		echo "\n\n== Done! ==";
 	}
 	

From 5fdc153a192510925b2de06bfb77344ead8f954a Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:45:00 +0000
Subject: [PATCH 169/483] ENHANCEMENT: Performance improvement to CMS load time
 with many pages. (from r95490)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98165 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index ac4bbc83..c8af3ba3 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -488,7 +488,6 @@ class LeftAndMain extends Controller {
 		
 		// NOTE: SiteTree/CMSMain coupling :-(
 		SiteTree::prepopuplate_permission_cache('edit', $obj->markedNodeIDs());
-		SiteTree::prepopuplate_permission_cache('delete', $obj->markedNodeIDs());
 
 		// getChildrenAsUL is a flexible and complex way of traversing the tree
 		$titleEval = '

From 61a0240a549c5dd1cfa53705c9988b2511b470e1 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:45:53 +0000
Subject: [PATCH 170/483] BUGFIX: Fixed report pagination, with or without
 search params (from r95555)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98168 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ReportAdmin.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index 7e67141d..dc843090 100755
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -205,7 +205,15 @@ class ReportAdmin extends LeftAndMain {
 		
 		$form = new Form($this, 'EditForm', $fields, $actions);
 
-		$form->loadDataFrom($_REQUEST);
+		$form->loadDataFrom($_GET);
+
+		// Include search criteria in the form action so that pagination works
+		$filteredCriteria = array_merge($_GET, $_POST);
+		foreach(array('ID','url','ajax','ctf','update','action_updatereport','SecurityID') as $notAParam) {
+			unset($filteredCriteria[$notAParam]);
+		}
+
+		$form->setFormAction($this->Link() . '/EditForm?' . http_build_query($filteredCriteria));
 		
 		return $form;
 	}

From ec4320555139d322b4cb1d95f46a201a309fb231 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:46:13 +0000
Subject: [PATCH 171/483] BUGFIX: Fixed bug with report search fields not
 showing the value that you just searched for. (from r95567)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98170 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ReportAdmin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index dc843090..323435b4 100755
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -205,7 +205,7 @@ class ReportAdmin extends LeftAndMain {
 		
 		$form = new Form($this, 'EditForm', $fields, $actions);
 
-		$form->loadDataFrom($_GET);
+		$form->loadDataFrom($_REQUEST);
 
 		// Include search criteria in the form action so that pagination works
 		$filteredCriteria = array_merge($_GET, $_POST);

From 104171087b6a8a94debc26bbe2c1c5315e45e52d Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:46:55 +0000
Subject: [PATCH 172/483] MINOR: Nicer date formatting (from r95761)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98171 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php      | 2 +-
 code/CommentAdmin.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 35028f8c..9adc4ef2 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -1311,7 +1311,7 @@ JS;
 					'CMSMain.ACCESS', 
 					"Access to %s",
 					PR_MEDIUM,
-					"Item in permission selection identifying the admin section, with title and classname. Example: Access to Files & Images"
+					"Item in permission selection identifying the admin section. Example: Access to 'Files & Images'"
 				), $title, null),
 				'category' => _t('Permission.CMS_ACCESS_CATEGORY', 'CMS Access')
 			);
diff --git a/code/CommentAdmin.php b/code/CommentAdmin.php
index 3e7b4df5..8c2cd112 100644
--- a/code/CommentAdmin.php
+++ b/code/CommentAdmin.php
@@ -85,6 +85,9 @@ class CommentAdmin extends LeftAndMain {
 		$idField = new HiddenField('ID', '', $section);
 		$table = new CommentTableField($this, "Comments", "PageComment", $section, $tableFields, $popupFields, array($filter));
 		$table->setParentClass(false);
+		$table->setFieldCasting(array(
+			'Created' => 'SSDatetime->Nice'
+		));
 
 		$fields = new FieldSet(
 			new TabSet(	'Root',

From c05cdf8dc1da3f3bcda169cbe7a2515674c1fc70 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:47:00 +0000
Subject: [PATCH 173/483] Nicer dates (from r95776)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98172 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CommentAdmin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/CommentAdmin.php b/code/CommentAdmin.php
index 8c2cd112..0f20f991 100644
--- a/code/CommentAdmin.php
+++ b/code/CommentAdmin.php
@@ -86,7 +86,7 @@ class CommentAdmin extends LeftAndMain {
 		$table = new CommentTableField($this, "Comments", "PageComment", $section, $tableFields, $popupFields, array($filter));
 		$table->setParentClass(false);
 		$table->setFieldCasting(array(
-			'Created' => 'SSDatetime->Nice'
+			'Created' => 'SSDatetime->Full'
 		));
 
 		$fields = new FieldSet(

From 0782c0de4dff7e43fe6ebc8d30aba7196371d136 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:47:18 +0000
Subject: [PATCH 174/483] ENHANCEMENT: Improved look and feel for report
 filtering ENHANCEMNT: Added export and print buttons to reports (from r95815)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98173 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ReportAdmin.php            |  4 ++--
 css/cms_right.css               | 13 +++++++++++++
 javascript/LeftAndMain.js       |  5 +++++
 javascript/ReportAdmin_right.js |  7 +++++--
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index 323435b4..b72ccec2 100755
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -214,6 +214,7 @@ class ReportAdmin extends LeftAndMain {
 		}
 
 		$form->setFormAction($this->Link() . '/EditForm?' . http_build_query($filteredCriteria));
+		$form->setTemplate('ReportAdminForm');
 		
 		return $form;
 	}
@@ -240,8 +241,7 @@ class ReportAdmin extends LeftAndMain {
 	}
 	
 	public function updatereport() {
-		FormResponse::load_form($this->EditForm()->renderWith('Form'));
-		FormResponse::add("$('tab-Root_Report').onclick();");
+		FormResponse::load_form($this->EditForm()->forTemplate());
 		return FormResponse::respond();
 	}
 }
diff --git a/css/cms_right.css b/css/cms_right.css
index 0ff55828..b4a20294 100644
--- a/css/cms_right.css
+++ b/css/cms_right.css
@@ -233,6 +233,19 @@
 	clear: left;
 }
 
+/**
+ * Non-tabbed scrolling area that can be used in place of tabs in LeftAndMAin
+ */
+.right #ScrollPanel {
+	background: #fff;
+	clear: left;
+	overflow: auto;
+	border: 1px solid #aaa;
+	position: relative;
+	top: 0;
+	padding: 10px;
+}
+
 /**
  * RHS Action Parameters boxes
  */
diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index a71ca9a2..18c540bd 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -156,6 +156,11 @@ window.ontabschanged = function() {
 			fitToParent(_TAB_DIVS_ON_PAGE[i], 30);
 		}
 	}
+	
+	// Non-tab alternative
+	if($('ScrollPanel')) {
+		fitToParent('ScrollPanel', 0);
+	}
 }
 
 window.onresize = function(init) {
diff --git a/javascript/ReportAdmin_right.js b/javascript/ReportAdmin_right.js
index 99bf1172..31a6bbe8 100755
--- a/javascript/ReportAdmin_right.js
+++ b/javascript/ReportAdmin_right.js
@@ -11,6 +11,10 @@ Behaviour.register({
 		 */
 		prepareForm : function() {
 			ajaxActionsAtTop('Form_EditForm', 'form_actions', 'right');
+
+			// Custom code for reports section - link the search button to ajax
+			var updateReportButtonHolder = $('action_updatereport');
+			if(updateReportButtonHolder) prepareAjaxActions(updateReportButtonHolder, 'Form_EditForm');
 		},
 		
 		/**
@@ -107,7 +111,6 @@ Behaviour.register({
 			this.resetElements();
 				
 			window.ontabschanged();
-			
 		}
 	}
-});
+});
\ No newline at end of file

From a6308abc71abb7fcce933887c11bc269469dd171 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:47:31 +0000
Subject: [PATCH 175/483] MINOR: Added missing template from r95815 (from
 r95822)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98174 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 templates/ReportAdminForm.ss | 41 ++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 templates/ReportAdminForm.ss

diff --git a/templates/ReportAdminForm.ss b/templates/ReportAdminForm.ss
new file mode 100644
index 00000000..f342bb0f
--- /dev/null
+++ b/templates/ReportAdminForm.ss
@@ -0,0 +1,41 @@
+<form $FormAttributes>
+
+	
+	<p style="display: none;" class="message " id="Form_EditForm_error"/>
+	
+	<fieldset>
+
+		<div id="ScrollPanel">
+			$FieldMap.ReportTitle.FieldHolder
+			$FieldMap.ReportDescription.FieldHolder
+		
+			<!-- Filters -->
+			
+			<div style="border-bottom: 1px #AAA solid"><b>Filter by</b></div>
+			
+			<% control FieldMap.Filters %>
+			<% control Children %>
+			<div style="float: left; margin: 5px 10px 10px 0; height: 35px">
+				<label for="$ID" style="font-weight: bold; display: block">$Title</label>
+				$Field
+			</div>
+			<% end_control %>
+			<% end_control %>
+			
+			<div id="action_updatereport" style="float: left; margin: 1px 10px 10px 0">
+			<br />
+			$FieldMap.action_updatereport.Field
+			</div>
+			
+			<div style="clear: both">&nbsp;</div>
+			
+			$FieldMap.ReportContent.FieldHolder
+			
+			<% control HiddenFields %>$Field<% end_control %>
+			
+		</div>
+			
+		
+		<div class="clear"><!-- --></div>
+	</fieldset>
+</form>
\ No newline at end of file

From 1b32326b9e35df335c00c213d029ed8ef8091308 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:48:04 +0000
Subject: [PATCH 176/483] API CHANGE: Added explicit registration of reports
 with SSReport::register() (from r95857)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98175 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ReportAdmin.php | 82 ++++++--------------------------------------
 1 file changed, 11 insertions(+), 71 deletions(-)

diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index b72ccec2..42ef58ff 100755
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -37,37 +37,6 @@ class ReportAdmin extends LeftAndMain {
 		Requirements::block(SAPPHIRE_DIR . '/javascript/HtmlEditorField.js');
 	}
 	
-	/**
-	* Returns an array of all the reports classnames that could be shown on this site 
-	* to any user. Base class is not included in the response.
-	* It does not perform filtering based on canView(). 
-	*
-	* @return An array of report class-names, i.e.:
-	*         array("AllOrdersReport","CurrentOrdersReport","UnprintedOrderReport")
-	*/
-	public function getReportClassNames() {
-
-		$baseClass  = 'SS_Report';		
-		$response   = array();
-		
-		// get all sub-classnames (incl. base classname).
-		$classNames = ClassInfo::subclassesFor( $baseClass );
-		
-		// drop base className
-		$classNames = array_diff($classNames, array($baseClass));
-		
-		// drop report classes, which are not initiatable.
-		foreach($classNames as $className) {
-			
-			// Remove abstract classes
-			$classReflection = new ReflectionClass($className);
-			if($classReflection->isInstantiable() ) {
-				$response[] = $className;
-			}			
-		}
-		return $response;
-	}
-	
 	/**
 	 * Does the parent permission checks, but also
 	 * makes sure that instantiatable subclasses of
@@ -78,23 +47,16 @@ class ReportAdmin extends LeftAndMain {
 	 * @return boolean
 	 */
 	function canView($member = null) {
-		if(!$member && $member !== FALSE) {
-			$member = Member::currentUser();
-		}
+		if(!$member && $member !== FALSE) $member = Member::currentUser();
 		
 		if(!parent::canView($member)) return false;
 		
 		$hasViewableSubclasses = false;
-		$subClasses = array_values( $this->getReportClassNames() );
-
-		foreach($subClasses as $subclass) {
-
-			if(singleton($subclass)->canView()) {
-				$hasViewableSubclasses = true;
-			}
-				
+		foreach($this->Reports() as $report) {
+			if($report->canView($member)) return true;
 		}
-		return $hasViewableSubclasses;
+		
+		return false;
 	}
 	
 	/**
@@ -104,18 +66,7 @@ class ReportAdmin extends LeftAndMain {
 	 * @return DataObjectSet
 	 */
 	public function Reports() {
-		$processedReports = array();
-		$subClasses = $this->getReportClassNames();
-		
-		if($subClasses) {
-			foreach($subClasses as $subClass) {
-				$processedReports[] = new $subClass();
-			}
-		}
-		
-		$reports = new DataObjectSet($processedReports);
-		
-		return $reports;
+		return new DataObjectSet(SSReport::get_reports('ReportAdmin'));
 	}
 	
 	/**
@@ -161,19 +112,14 @@ class ReportAdmin extends LeftAndMain {
 	 * @return Form
 	 */
 	public function EditForm() {
-		$ids = array();
 		$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : Session::get('currentPage');
-		$subClasses = $this->getReportClassNames();
 		
-		if($subClasses) {
-			foreach($subClasses as $subClass) {
-				$obj = new $subClass();
-				$ids[] = $obj->ID();
+		if($id) {
+			foreach($this->Reports() as $report) {
+				if($id == $report->ID()) return $this->reportEditFormFor($id);
 			}
 		}
-
-		if($id && in_array($id, $ids)) return $this->reportEditFormFor($id);
-		else return false;
+		return false;
 	}
 	
 	/**
@@ -231,13 +177,7 @@ class ReportAdmin extends LeftAndMain {
 	 * @return boolean
 	 */
 	public static function has_reports() {
-		$subClasses = $this->getReportClassNames();
-		if($subClasses) {
-			foreach($subClasses as $subClass) {
-				return true;
-			}
-		}
-		return false;
+		return sizeof(SSReport::get_reports('ReportAdmin')) > 0;
 	}
 	
 	public function updatereport() {

From a5753ad5efd83613a42a703d9af066639b415b78 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:50:38 +0000
Subject: [PATCH 177/483] API CHANGE: Removed SideReport class, use SSReport as
 the base-class for them instead. API CHANGE: Use
 SSReport::register(SideReport) to explicitly register reports on the LHS of
 the content view. BUGFIX: Updated all cms side reports to use SSReport as the
 base class. (from r95884)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98176 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 _config.php         |  10 ++-
 code/CMSMain.php    |  38 ++++----
 code/SideReport.php | 206 ++++++++++++++++++++++++++------------------
 3 files changed, 152 insertions(+), 102 deletions(-)

diff --git a/_config.php b/_config.php
index aa1fa5c2..9246eebb 100644
--- a/_config.php
+++ b/_config.php
@@ -50,5 +50,13 @@ HtmlEditorConfig::get('cms')->insertButtonsAfter ('advcode', 'fullscreen', 'sepa
 HtmlEditorConfig::get('cms')->removeButtons('tablecontrols');
 HtmlEditorConfig::get('cms')->addButtonsToLine(3, 'tablecontrols');
 
+// Register default side reports
+SSReport::register("SideReport", "SideReport_ToDo");
+SSReport::register("SideReport", "SideReport_BrokenRedirectorPages");
+SSReport::register("SideReport", "SideReport_BrokenVirtualPages");
+SSReport::register("SideReport", "SideReport_BrokenFiles");
+SSReport::register("SideReport", "SideReport_BrokenLinks");
+SSReport::register("SideReport", "SideReport_RecentlyEdited");
+SSReport::register("SideReport", "SideReport_EmptyPages");
 
-?>
+?>
\ No newline at end of file
diff --git a/code/CMSMain.php b/code/CMSMain.php
index 9adc4ef2..0b5ed4e0 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -660,18 +660,18 @@ JS;
 			Director::redirectBack();
 		}
 	}
+	
+	function SideReports() {
+		return SSReport::get_reports('SideReport');
+	}
 
 	/*
 	 * Return a dropdown for selecting reports
 	 */
 	function ReportSelector() {
-		$reports = ClassInfo::subclassesFor("SideReport");
-
 		// $options[""] = _t('CMSMain.CHOOSEREPORT',"(Choose a report)");
-		foreach($reports as $report) {
-			if($report != 'SideReport' && singleton($report)->canView()) {
-				$options[singleton($report)->group()][singleton($report)->sort()][$report] = singleton($report)->title();
-			}
+		foreach($this->SideReports() as $report) {
+			if($report->canView()) $options[$report->ID()] = $report->title();
 		}
 		
 		$finalOptions = array();
@@ -687,17 +687,15 @@ JS;
 		return new GroupedDropdownField("ReportSelector", _t('CMSMain.REPORT', 'Report'),$finalOptions);
 	}
 	function ReportFormParameters() {
-		$reports = ClassInfo::subclassesFor("SideReport");
-
 		$forms = array();
-		foreach($reports as $report) {
-			if ($report != 'SideReport' && singleton($report)->canView()) {
-				if ($fieldset = singleton($report)->getParameterFields()) {
+		foreach($this->SideReports() as $report) {
+			if ($report->canView()) {
+				if ($fieldset = $report->parameterFields()) {
 					$formHtml = '';
 					foreach($fieldset as $field) {
 						$formHtml .= $field->FieldHolder();
 					}
-					$forms[$report] = $formHtml;
+					$forms[$report->ID()] = $formHtml;
 				}
 			}
 		}
@@ -713,10 +711,20 @@ JS;
 	 */
 	function sidereport() {
 		$reportClass = $this->urlParams['ID'];
-		$report = ClassInfo::exists($reportClass) ? new $reportClass() : false;
-		$report->setParams($this->request->requestVars());
-		return $report ? $report->getHTML() : false;
+		$reports = $this->SideReports();
+		if(isset($reports[$reportClass])) {
+			$report = $reports[$reportClass];
+			if($report) {
+				$view = new SideReportView($this, $report);
+				$view->setParameters($this->request->requestVars());
+				return $view->forTemplate();
+			} else {
+				return false;
+			}
+		}
 	}
+	
+	
 	/**
 	 * Get the versions of the current page
 	 */
diff --git a/code/SideReport.php b/code/SideReport.php
index 33b865b1..1b635480 100755
--- a/code/SideReport.php
+++ b/code/SideReport.php
@@ -1,16 +1,17 @@
 <?php
+
 /**
- * Base class for the small reports that appear in the left hand site of the Site Content section of the CMS.
- * Create subclasses of this class to build new reports.
- * @package cms
- * @subpackage content
+ * Renderer for showing SideReports in CMSMain
  */
-abstract class SideReport extends Object {
-	protected $params = array();
+class SideReportView extends ViewableData {
+	protected $controller, $report;
+	protected $parameters;
 	
-	abstract function records();
-	abstract function fieldsToShow();
-	abstract function title();
+	function __construct($controller, $report) {
+		$this->controller = $controller;
+		$this->report = $report;
+		parent::__construct();
+	}
 	
 	function group() {
 		return 'Other';
@@ -20,47 +21,22 @@ abstract class SideReport extends Object {
 		return 0;
 	}
 	
-	function getHTML() {
-		$records = $this->records();
-		$fieldsToShow = $this->fieldsToShow();
+	function setParameters($parameters) {
+		$this->parameters = $parameters;
+	}
+	
+	function forTemplate() {
+		$records = $this->report->records($this->parameters);
+		$columns = $this->report->columns();
 		
-		if($records && count($records)) {
+		if($records && $records->Count()) {
 			$result = "<ul class=\"$this->class\">\n";
 			
 			foreach($records as $record) {
 				$result .= "<li>\n";
-				foreach($fieldsToShow as $fieldTitle => $fieldInfo) {
-					if(isset($fieldInfo['source'])) {
-						$fieldSource = $fieldInfo['source'];
-						
-					// Legacy format for the input data
-					} else {
-						$fieldSource = $fieldInfo;
-						$fieldInfo = array(
-							'link' => true,
-							'newline' => false,
-						);
-					}
-					
-					$val = isset($fieldInfo['prefix']) ? $fieldInfo['prefix'] : '';
-					
-					$fieldName = ereg_replace('[^A-Za-z0-9]+','',$fieldTitle);
-					if(is_string($fieldSource)) {
-						$val .= Convert::raw2xml($record->$fieldSource);
-					} else {
-						$val .= $record->XML_val($fieldSource[0], $fieldSource[1]);
-					}
-					
-					if(isset($fieldInfo['newline']) && $fieldInfo['newline']) $result .= "<br>";
-					
-					if(isset($fieldInfo['link']) && $fieldInfo['link']) {
-						$link = ($fieldInfo['link'] === true) ? "admin/show/$record->ID" : $fieldInfo['link'];
-						$result .= "<a class=\"$fieldName\" href=\"$link\">$val</a>";
-					} else {
-						$result .= "<span class=\"$fieldName\">$val</span>";
-					}
-					
-					$val .= isset($fieldInfo['suffix']) ? $fieldInfo['suffix'] : '';
+				foreach($columns as $source => $info) {
+					if(is_string($info)) $info = array('title' => $info);
+					$result .= $this->formatValue($record, $source, $info);
 				}
 				$result .= "\n</li>\n";
 			}
@@ -69,48 +45,70 @@ abstract class SideReport extends Object {
 			$result = "<p class=\"message notice\">" . 
 				sprintf(
 					_t('SideReport.REPEMPTY','The %s report is empty.',PR_MEDIUM,'%s is a report title'),
-					$this->title()
+					$this->report->title()
 				) 
 				. "</p>";
 		}
 		return $result;
 	}
 	
-	function setParams($params) {
-		$this->params = $params;
-	}
-	
-	// if your batchaction has parameters, return a fieldset here
-	function getParameterFields() {
-		return false;
-	}
-	
-	function canView() {
-		return true;
+	protected function formatValue($record, $source, $info) {
+		// Field sources
+		//if(is_string($source)) {
+			$val = Convert::raw2xml($record->$source);
+		//} else {
+		//	$val = $record->val($source[0], $source[1]);
+		//}
+		
+		// Formatting, a la TableListField
+		if(!empty($info['formatting'])) {
+			$format = str_replace('$value', "__VAL__", $info['formatting']);
+			$format = preg_replace('/\$([A-Za-z0-9-_]+)/','$record->$1', $format);
+			$format = str_replace('__VAL__', '$val', $format);
+			$val = eval('return "' . $format . '";');
+		}
+
+		$prefix = empty($info['newline']) ? "" : "<br>";
+
+		
+		$cssClass = ereg_replace('[^A-Za-z0-9]+','',$info['title']);
+		if(isset($info['link']) && $info['link']) {
+			$link = ($info['link'] === true) ? "admin/show/$record->ID" : $info['link'];
+			return $prefix . "<a class=\"$cssClass\" href=\"$link\">$val</a>";
+		} else {
+			return $prefix . "<span class=\"$cssClass\">$val</span>";
+		}
+
 	}
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////
+
 /**
  * Content side-report listing empty pages
  * @package cms
  * @subpackage content
  */
-class SideReport_EmptyPages extends SideReport {
+class SideReport_EmptyPages extends SS_Report {
 	function title() {
 		return _t('SideReport.EMPTYPAGES',"Pages with no content");
 	}
+
 	function group() {
 		return "Content reports";
 	}
 	function sort() {
 		return 100;
 	}
-	function records($params = null) {
+	function sourceRecords($params = null) {
 		return DataObject::get("SiteTree", "\"Content\" = '' OR \"Content\" IS NULL OR \"Content\" LIKE '<p></p>' OR \"Content\" LIKE '<p>&nbsp;</p>'", '"Title"');
 	}
-	function fieldsToShow() {
+	function columns() {
 		return array(
-			"Title" => array("NestedTitle", array("2")),
+			"Title" => array(
+				"title" => "Title", // todo: use NestedTitle(2)
+				"link" => true,
+			),
 		);
 	}
 }
@@ -120,7 +118,7 @@ class SideReport_EmptyPages extends SideReport {
  * @package cms
  * @subpackage content
  */
-class SideReport_RecentlyEdited extends SideReport {
+class SideReport_RecentlyEdited extends SS_Report {
 	function title() {
 		return _t('SideReport.LAST2WEEKS',"Pages edited in the last 2 weeks");
 	}
@@ -130,13 +128,16 @@ class SideReport_RecentlyEdited extends SideReport {
 	function sort() {
 		return 200;
 	}
-	function records($params = null) {
+	function sourceRecords($params = null) {
 		$threshold = strtotime('-14 days', SS_Datetime::now()->Format('U'));
 		return DataObject::get("SiteTree", "\"SiteTree\".\"LastEdited\" > '".date("Y-m-d H:i:s", $threshold)."'", "\"SiteTree\".\"LastEdited\" DESC");
 	}
-	function fieldsToShow() {
+	function columns() {
 		return array(
-			"Title" => array("NestedTitle", array("2")),
+			"Title" => array(
+				"title" => "Title", // todo: use NestedTitle(2)
+				"link" => true,
+			),
 		);
 	}
 }
@@ -173,14 +174,14 @@ class SideReport_ToDo extends SideReport {
  * @package cms
  * @subpackage content
  */
-class SideReport_BrokenLinks extends SideReport {
+class SideReport_BrokenLinks extends SS_Report {
 	function title() {
 		return _t('SideReport.BROKENLINKS',"Pages with broken links");
 	}
 	function group() {
 		return "Broken links reports";
 	}
-	function records($params = null) {
+	function sourceRecords($params = null) {
 		// Get class names for page types that are not virtual pages or redirector pages
 		$classes = array_diff(ClassInfo::subclassesFor('SiteTree'), ClassInfo::subclassesFor('VirtualPage'), ClassInfo::subclassesFor('RedirectorPage'));
 		$classNames = "'".join("','", $classes)."'";
@@ -189,12 +190,15 @@ class SideReport_BrokenLinks extends SideReport {
 		else $ret = DataObject::get('SiteTree', "ClassName IN ($classNames) AND HasBrokenLink = 1");
 		return $ret;
 	}
-	function fieldsToShow() {
+	function columns() {
 		return array(
-			"Title" => array("NestedTitle", array("2")),
+			"Title" => array(
+				"title" => "Title", // todo: use NestedTitle(2)
+				"link" => true,
+			),
 		);
 	}
-	function getParameterFields() {
+	function parameterFields() {
 		return new FieldSet(
 			new CheckboxField('OnLive', 'Check live site')
 		);
@@ -207,14 +211,14 @@ class SideReport_BrokenLinks extends SideReport {
  * @package cms
  * @subpackage content
  */
-class SideReport_BrokenFiles extends SideReport {
+class SideReport_BrokenFiles extends SS_Report {
 	function title() {
 		return _t('SideReport.BROKENFILES',"Pages with broken files");
 	}
 	function group() {
 		return "Broken links reports";
 	}
-	function records($params = null) {
+	function sourceRecords($params = null) {
 		// Get class names for page types that are not virtual pages or redirector pages
 		$classes = array_diff(ClassInfo::subclassesFor('SiteTree'), ClassInfo::subclassesFor('VirtualPage'), ClassInfo::subclassesFor('RedirectorPage'));
 		$classNames = "'".join("','", $classes)."'";
@@ -223,52 +227,58 @@ class SideReport_BrokenFiles extends SideReport {
 		else $ret = DataObject::get('SiteTree', "ClassName IN ($classNames) AND HasBrokenFile = 1");
 		return $ret;
 	}
-	function fieldsToShow() {
+	function columns() {
 		return array(
-			"Title" => array("NestedTitle", array("2")),
+			"Title" => array(
+				"title" => "Title", // todo: use NestedTitle(2)
+				"link" => true,
+			),
 		);
 	}
-	function getParameterFields() {
+	function parameterFields() {
 		return new FieldSet(
 			new CheckboxField('OnLive', 'Check live site')
 		);
 	}
 }
 
-class SideReport_BrokenVirtualPages extends SideReport {
+class SideReport_BrokenVirtualPages extends SS_Report {
 	function title() {
 		return _t('SideReport.BROKENVIRTUALPAGES', 'VirtualPages pointing to deleted pages');
 	}
 	function group() {
 		return "Broken links reports";
 	}
-	function records($params = null) {
+	function sourceRecords($params = null) {
 		$classNames = "'".join("','", ClassInfo::subclassesFor('VirtualPage'))."'";
 		if (isset($_REQUEST['OnLive'])) $ret = Versioned::get_by_stage('SiteTree', 'Live', "ClassName IN ($classNames) AND HasBrokenLink = 1");
 		else $ret = DataObject::get('SiteTree', "ClassName IN ($classNames) AND HasBrokenLink = 1");
 		return $ret;
 	}
 	
-	function fieldsToShow() {
+	function columns() {
 		return array(
-			"Title" => array("NestedTitle", array("2")),
+			"Title" => array(
+				"title" => "Title", // todo: use NestedTitle(2)
+				"link" => true,
+			),
 		);
 	}
-	function getParameterFields() {
+	function parameterFields() {
 		return new FieldSet(
 			new CheckboxField('OnLive', 'Check live site')
 		);
 	}
 }
 
-class SideReport_BrokenRedirectorPages extends SideReport {
+class SideReport_BrokenRedirectorPages extends SS_Report {
 	function title() {
 		return _t('SideReport.BROKENREDIRECTORPAGES', 'RedirectorPages pointing to deleted pages');
 	}
 	function group() {
 		return "Broken links reports";
 	}
-	function records($params = null) {
+	function sourceRecords($params = null) {
 		$classNames = "'".join("','", ClassInfo::subclassesFor('RedirectorPage'))."'";
 		
 		if (isset($_REQUEST['OnLive'])) $ret = Versioned::get_by_stage('SiteTree', 'Live', "ClassName IN ($classNames) AND HasBrokenLink = 1");
@@ -276,14 +286,38 @@ class SideReport_BrokenRedirectorPages extends SideReport {
 		return $ret;
 	}
 	
-	function fieldsToShow() {
+	function columns() {
 		return array(
-			"Title" => array("NestedTitle", array("2")),
+			"Title" => array(
+				"title" => "Title", // todo: use NestedTitle(2)
+				"link" => true,
+			),
 		);
 	}
-	function getParameterFields() {
+	function parameterFields() {
 		return new FieldSet(
 			new CheckboxField('OnLive', 'Check live site')
 		);
 	}
-}
\ No newline at end of file
+}
+
+class SideReport_ToDo extends SS_Report {
+	function title() {
+		return _t('SideReport.TODO',"To do");
+	}
+	function sourceRecords($params = null) {
+		return DataObject::get("SiteTree", "\"SiteTree\".\"ToDo\" IS NOT NULL AND \"SiteTree\".\"ToDo\" <> ''", "\"SiteTree\".\"LastEdited\" DESC");
+	}
+	function columns() {
+		return array(
+			"Title" => array(
+				"title" => "Title", // todo: use NestedTitle(2)
+				"link" => true,
+			),
+			"ToDo" => array(
+				"title" => "ToDo",
+				"newline" => true,
+			), 
+		);
+	}
+}

From b50917db00cd74e48d3436256f11c7b9a6cc4734 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:50:47 +0000
Subject: [PATCH 178/483] BUGFIX: Only list reports in admin/reports that you
 can actually view (from r95885)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98177 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ReportAdmin.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index 42ef58ff..0084e37e 100755
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -66,7 +66,11 @@ class ReportAdmin extends LeftAndMain {
 	 * @return DataObjectSet
 	 */
 	public function Reports() {
-		return new DataObjectSet(SSReport::get_reports('ReportAdmin'));
+ 		$output = new DataObjectSet();
+		foreach(SSReport::get_reports('ReportAdmin') as $report) {
+			if($report->canView()) $output->push($report);
+		}
+		return $output;
 	}
 	
 	/**

From 49244234d417a770cd7a9b150829ef667b023824 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:50:58 +0000
Subject: [PATCH 179/483] ENHANCEMENT: Removed broken links reports from
 sidebar (in anticipation of adding them to the main reporting area) (from
 r95954)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98179 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 _config.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/_config.php b/_config.php
index 9246eebb..e726d066 100644
--- a/_config.php
+++ b/_config.php
@@ -51,12 +51,9 @@ HtmlEditorConfig::get('cms')->removeButtons('tablecontrols');
 HtmlEditorConfig::get('cms')->addButtonsToLine(3, 'tablecontrols');
 
 // Register default side reports
-SSReport::register("SideReport", "SideReport_ToDo");
-SSReport::register("SideReport", "SideReport_BrokenRedirectorPages");
-SSReport::register("SideReport", "SideReport_BrokenVirtualPages");
-SSReport::register("SideReport", "SideReport_BrokenFiles");
-SSReport::register("SideReport", "SideReport_BrokenLinks");
 SSReport::register("SideReport", "SideReport_RecentlyEdited");
 SSReport::register("SideReport", "SideReport_EmptyPages");
+SSReport::register("SideReport", "SideReport_ToDo");
+
 
 ?>
\ No newline at end of file

From cc89bc68e9f9d910a69940109787c878aa9bb35b Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:51:32 +0000
Subject: [PATCH 180/483] BUGFIX: Don't throw an error if there are no report
 filters. ENHANCEMENT: Allow for custom generation of SSReport::ID() for
 parameterised reports. MINOR: Added SSReport::dataClass() accessor. BUGFIX:
 Don't randomise the order of reports with the same priority. (from r95955)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98180 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ReportAdmin.php         | 11 +++++------
 templates/ReportAdminForm.ss |  4 ++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index 0084e37e..ce6a24c9 100755
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -92,7 +92,7 @@ class ReportAdmin extends LeftAndMain {
 	 * @return unknown
 	 */
 	protected function showWithEditForm($params, $editForm) {
-		if(isset($params['ID'])) Session::set('currentPage', $params['ID']);
+		if(isset($params['ID'])) Session::set('currentReport', $params['ID']);
 		if(isset($params['OtherID'])) Session::set('currentOtherID', $params['OtherID']);
 		
 		if(Director::is_ajax()) {
@@ -116,7 +116,7 @@ class ReportAdmin extends LeftAndMain {
 	 * @return Form
 	 */
 	public function EditForm() {
-		$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : Session::get('currentPage');
+		$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : Session::get('currentReport');
 		
 		if($id) {
 			foreach($this->Reports() as $report) {
@@ -142,10 +142,9 @@ class ReportAdmin extends LeftAndMain {
 		$fields = new FieldSet();
 		$actions = new FieldSet();
 		
-		if(is_numeric($id)) $page = DataObject::get_by_id('SiteTree', $id);
-		$reportClass = is_object($page) ? 'SS_Report_' . $page->ClassName : $id;
-		
-		$obj = new $reportClass();
+		$reports = SSReport::get_reports('ReportAdmin');
+		$obj = $reports[$id];
+
 		if($obj) $fields = $obj->getCMSFields();
 		if($obj) $actions = $obj->getCMSActions();
 		
diff --git a/templates/ReportAdminForm.ss b/templates/ReportAdminForm.ss
index f342bb0f..41e208e8 100644
--- a/templates/ReportAdminForm.ss
+++ b/templates/ReportAdminForm.ss
@@ -11,6 +11,7 @@
 		
 			<!-- Filters -->
 			
+			<% if FieldMap.Filters.Children %>
 			<div style="border-bottom: 1px #AAA solid"><b>Filter by</b></div>
 			
 			<% control FieldMap.Filters %>
@@ -24,10 +25,13 @@
 			
 			<div id="action_updatereport" style="float: left; margin: 1px 10px 10px 0">
 			<br />
+			<% if FieldMap.action_updatereport %>
 			$FieldMap.action_updatereport.Field
+			<% end_if %>
 			</div>
 			
 			<div style="clear: both">&nbsp;</div>
+			<% end_if %>
 			
 			$FieldMap.ReportContent.FieldHolder
 			

From 16162517b3f5e89eb3dfebedb57aea1ef40bd4b9 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:51:42 +0000
Subject: [PATCH 181/483] ENHANCEMENT: Improved TableListField header styling.
 (from r96029)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98181 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 images/bullet_arrow_down.png | Bin 201 -> 147 bytes
 images/bullet_arrow_up.png   | Bin 201 -> 140 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/images/bullet_arrow_down.png b/images/bullet_arrow_down.png
index 9b23c06d7b4f4689dc8c9fd4e9d4d1f199fe376f..7f33a1e10a56421ebb40f4c111d8168331de6737 100755
GIT binary patch
literal 147
zcmeAS@N?(olHy`uVBq!ia0vp^>_E)J!2%>%=H$-?Qc<2Rjv*Yf$q5Sb268|CcRy4=
z%-{B&=f1?g+Vr3QdS`aGH}*C*KNLTFe74T~sr7dfA3sZ}IQZei@AV39Y;7xr;@=e)
x+x+?$ocu^xVS3}jkVogAu0OU}ZsH3ThPB5PDtvjTx&v)t@O1TaS?83{1OQ!cIspIx

literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^zbpD<_bdI{u9mbgZg
z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-%M_H=O!(Kw&{<9vg>5sxM-`@i?U
z_W%6<>VNmY^FQu?=k0EK8(;qS{{MRQfQxhfe|^4DBSLrMi_=~IrT?G*6aRH>fZ%Fr
xHSdzT`JeW`iC!n;=N{%MvhUm!=_W-^hCUIl<$=usRzPbQJYD@<);T3K0RSKzPZ9tC

diff --git a/images/bullet_arrow_up.png b/images/bullet_arrow_up.png
index 24df0f42129c291ddb3dd50c8ba2884dc23a2c43..af5639c41850f0e7a34e85d70f340ea5d5800498 100755
GIT binary patch
literal 140
zcmeAS@N?(olHy`uVBq!ia0vp^>_E)J!2%>%=H$-?Qo)`sjv*Yf$q5Sta;8T7t(quv
zLO_kJEmTPUy>Um)o{Nkk2{Ec4AM;6@s~_fWYrkKgX<WPS^qI5gJ~TH@ZfyVj*lJpT
o%z4RuhBfS5e^P!d^_!&3AX+39r241k3D9^3Pgg&ebxsLQ04Q}ZaR2}S

literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^zbpD<_bdI{u9mbgZg
z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-%M_H=O!(Kw&{<9vg>5sxM7Y}K&+
zaVqV>2dg?$?}z`N|7UG5-|D8TLf!k;{Mi5T|C#@x_qjwjYRvdu`ttwR|Kb1QzwCco
x|Ef}l>({^Sf7bts|6%{R{?h*$`OZ2jjF;IsFRaMi76-J3!PC{xWt~$(698OLQAz*+


From a78dee1362e3d496804c4c519759b598b2da615b Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:51:50 +0000
Subject: [PATCH 182/483] BUGFIX: Removed unnecessary '?' from report URLs when
 there are no search criteria (from r96052)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98182 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ReportAdmin.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index ce6a24c9..37650814 100755
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -162,7 +162,9 @@ class ReportAdmin extends LeftAndMain {
 			unset($filteredCriteria[$notAParam]);
 		}
 
-		$form->setFormAction($this->Link() . '/EditForm?' . http_build_query($filteredCriteria));
+		$formLink = $this->Link() . '/EditForm';
+		if($filteredCriteria) $formLink .= '?' . http_build_query($filteredCriteria);
+		$form->setFormAction($formLink);
 		$form->setTemplate('ReportAdminForm');
 		
 		return $form;

From d05c92122686bc1ae849e8b8b1662e840bed844b Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:51:55 +0000
Subject: [PATCH 183/483] BUGFIX: Add horizontal scrolling to reports when
 necessary. (from r96075)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98183 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 templates/ReportAdminForm.ss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/ReportAdminForm.ss b/templates/ReportAdminForm.ss
index 41e208e8..798b5be6 100644
--- a/templates/ReportAdminForm.ss
+++ b/templates/ReportAdminForm.ss
@@ -3,9 +3,9 @@
 	
 	<p style="display: none;" class="message " id="Form_EditForm_error"/>
 	
-	<fieldset>
 
 		<div id="ScrollPanel">
+		<fieldset>
 			$FieldMap.ReportTitle.FieldHolder
 			$FieldMap.ReportDescription.FieldHolder
 		
@@ -37,9 +37,9 @@
 			
 			<% control HiddenFields %>$Field<% end_control %>
 			
+			</fieldset>
 		</div>
 			
 		
 		<div class="clear"><!-- --></div>
-	</fieldset>
 </form>
\ No newline at end of file

From 4cde27dccf7cd42814927f87b4f428652b64d256 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:52:03 +0000
Subject: [PATCH 184/483] BUGFIX: Add horizontal scrolling to reports when
 necessary. (from r96085)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98184 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/LeftAndMain.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index 18c540bd..749d94fd 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -139,7 +139,7 @@ window.ontabschanged = function() {
 		return;
 
 	var fs = formEl.getElementsByTagName('fieldset')[0];
-	if(fs) fs.style.height = formEl.style.height;
+	if(fs && fs.parentNode == formEl) fs.style.height = formEl.style.height;
 
 	// var divs = document.getElementsBySelector('#Form_EditForm div');
 	/*for(i=0;i<divs.length;i++) {

From 9406cd7c9a31c6ded6509eff0096e5ab4c6cbcac Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:52:17 +0000
Subject: [PATCH 185/483] BUGFIX: Add horizontal scrolling to reports when
 necessary. (from r96086)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98185 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/layout.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/css/layout.css b/css/layout.css
index 7b43c1f8..78446905 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -116,6 +116,10 @@ form#Form_EditForm fieldset, form#Form_AddForm fieldset {
 	height: 100%;
 	border: none;
 }
+form#Form_EditForm #ScrollPanel fieldset, form#Form_AddForm #ScrollPanel fieldset {
+	height: auto;
+}
+
 body.stillLoading select {
 	display: none;
 }

From 0ffe4f7d5eb7a1040837bc594cdde0a2c1d7974c Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:52:24 +0000
Subject: [PATCH 186/483] MINOR: Correct sidebar report order. (from r96090)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98186 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 _config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_config.php b/_config.php
index e726d066..82bcd7d3 100644
--- a/_config.php
+++ b/_config.php
@@ -51,8 +51,8 @@ HtmlEditorConfig::get('cms')->removeButtons('tablecontrols');
 HtmlEditorConfig::get('cms')->addButtonsToLine(3, 'tablecontrols');
 
 // Register default side reports
-SSReport::register("SideReport", "SideReport_RecentlyEdited");
 SSReport::register("SideReport", "SideReport_EmptyPages");
+SSReport::register("SideReport", "SideReport_RecentlyEdited");
 SSReport::register("SideReport", "SideReport_ToDo");
 
 

From dee3b20ccdcd0e04dab209524eea7864559d2b7b Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:52:34 +0000
Subject: [PATCH 187/483] MINOR added broken links report (from r96139)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98187 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 _config.php                        |  4 +-
 code/reports/BrokenLinksReport.php | 88 ++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 code/reports/BrokenLinksReport.php

diff --git a/_config.php b/_config.php
index 82bcd7d3..98bfb724 100644
--- a/_config.php
+++ b/_config.php
@@ -54,6 +54,8 @@ HtmlEditorConfig::get('cms')->addButtonsToLine(3, 'tablecontrols');
 SSReport::register("SideReport", "SideReport_EmptyPages");
 SSReport::register("SideReport", "SideReport_RecentlyEdited");
 SSReport::register("SideReport", "SideReport_ToDo");
+if (class_exists('Subsite')) SSReport::register('ReportAdmin', 'SubsiteReportWrapper("BrokenLinksReport")',-20);
+else SSReport::register('ReportAdmin', 'BrokenLinksReport',-20);
 
 
-?>
\ No newline at end of file
+?>
diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
new file mode 100644
index 00000000..ce37e427
--- /dev/null
+++ b/code/reports/BrokenLinksReport.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * Content side-report listing pages with broken links
+ * @package cms
+ * @subpackage content
+ */
+
+class BrokenLinksReport extends SSReport {
+	function title() {
+		return _t('BrokenLinksReport.BROKENLINKS',"Pages with broken links");
+	}
+	function sourceRecords($params = null) {
+		// Get class names for page types that are not virtual pages or redirector pages
+		$classes = array_diff(ClassInfo::subclassesFor('SiteTree'), ClassInfo::subclassesFor('VirtualPage'), ClassInfo::subclassesFor('RedirectorPage'));
+		$classNames = "'".join("','", $classes)."'";
+		
+		if (isset($_REQUEST['OnLive'])) $ret = Versioned::get_by_stage('SiteTree', 'Live', "ClassName IN ($classNames) AND (HasBrokenLink = 1 OR HasBrokenFile = 1)");
+		else $ret = DataObject::get('SiteTree', "ClassName IN ($classNames) AND (HasBrokenFile = 1 OR HasBrokenLink = 1)");
+		
+		$returnSet = new DataObjectSet();
+		if ($ret) foreach($ret as $record) {
+			$reason = false;
+			$isRedirectorPage = in_array($record->ClassName, ClassInfo::subclassesFor('RedirectorPage'));
+			$isVirtualPage = in_array($record->ClassName, ClassInfo::subclassesFor('VirtualPage'));
+			
+			if ($isVirtualPage) {
+				if ($record->HasBrokenLink) {
+					$reason = "redirector page pointing to non-existant page";
+					$reasonCodes = array("VPBROKENLINK");
+				}
+			} else if ($isRedirectorPage) {
+				if ($record->HasBrokenLink) {
+					$reason = "redirector page pointing to non-existant page";
+					$reasonCodes = array("RPBROKENLINK");
+				}
+			} else {
+				if ($record->HasBrokenLink && $record->HasBrokenFile) {
+					$reason = "has broken link and file";
+					$reasonCodes = array("BROKENFILE", "BROKENLINK");
+				} else if ($record->HasBrokenLink && !$record->HasBrokenFile) {
+					$reason = "has broken link";
+					$reasonCodes = array("BROKENLINK");
+				} else if (!$record->HasBrokenLink && $record->HasBrokenFile) {
+					$reason = "has broken file";
+					$reasonCodes = array("BROKENFILE");
+				}
+			}
+			
+			if ($reason) {
+				if ($params['Reason'] && !in_array($params['Reason'], $reasonCodes)) continue;
+				$record->BrokenReason = $reason;
+				$returnSet->push($record);
+			}
+		}
+		
+		return $returnSet;
+	}
+	function columns() {
+		$fields = array(
+			"Title" => array(
+				"title" => "Title",
+				'formatting' => '<a href=\"admin/show/$ID\" title=\"Edit page\">$value</a>'
+			),
+			"BrokenReason" => array(
+				"title" => "Reason"
+			),
+			'AbsoluteLink' => array(
+				'title' => 'Links',
+				'formatting' => '$value " . ($AbsoluteLiveLink ? "<a href=\"$AbsoluteLiveLink\">(live)</a>" : "") . " <a href=\"$value?stage=Stage\">(draft)</a>'
+			)
+		);
+		
+		return $fields;
+	}
+	function parameterFields() {
+		return new FieldSet(
+			new CheckboxField('OnLive', 'Check live site'),
+			new DropdownField('Reason', 'Problem to check', array(
+				'' => 'Any',
+				'BROKENFILE' => 'Broken file',
+				'BROKENLINK' => 'Broken link',
+				'VPBROKENLINK' => 'Virtual page pointing to invalid source',
+				'RPBROKENLINK' => 'Redirector page pointing to invalid destination',
+			))
+		);
+	}
+}

From 5e8fc6c92000573ea55933f99f0a21c58f0225e7 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:52:47 +0000
Subject: [PATCH 188/483] MINOR improved wording on reports (from r96258)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98189 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/reports/BrokenLinksReport.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
index ce37e427..04405b03 100644
--- a/code/reports/BrokenLinksReport.php
+++ b/code/reports/BrokenLinksReport.php
@@ -11,12 +11,8 @@ class BrokenLinksReport extends SSReport {
 		return _t('BrokenLinksReport.BROKENLINKS',"Pages with broken links");
 	}
 	function sourceRecords($params = null) {
-		// Get class names for page types that are not virtual pages or redirector pages
-		$classes = array_diff(ClassInfo::subclassesFor('SiteTree'), ClassInfo::subclassesFor('VirtualPage'), ClassInfo::subclassesFor('RedirectorPage'));
-		$classNames = "'".join("','", $classes)."'";
-		
-		if (isset($_REQUEST['OnLive'])) $ret = Versioned::get_by_stage('SiteTree', 'Live', "ClassName IN ($classNames) AND (HasBrokenLink = 1 OR HasBrokenFile = 1)");
-		else $ret = DataObject::get('SiteTree', "ClassName IN ($classNames) AND (HasBrokenFile = 1 OR HasBrokenLink = 1)");
+		if (isset($_REQUEST['OnLive'])) $ret = Versioned::get_by_stage('SiteTree', 'Live', "(HasBrokenLink = 1 OR HasBrokenFile = 1)");
+		else $ret = DataObject::get('SiteTree', "(HasBrokenFile = 1 OR HasBrokenLink = 1)");
 		
 		$returnSet = new DataObjectSet();
 		if ($ret) foreach($ret as $record) {
@@ -26,7 +22,7 @@ class BrokenLinksReport extends SSReport {
 			
 			if ($isVirtualPage) {
 				if ($record->HasBrokenLink) {
-					$reason = "redirector page pointing to non-existant page";
+					$reason = "virtual page pointing to non-existant page";
 					$reasonCodes = array("VPBROKENLINK");
 				}
 			} else if ($isRedirectorPage) {

From 63580a4b13bb7fb63523fa0ba867e06709ad0c5d Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:53:07 +0000
Subject: [PATCH 189/483] API CHANGE: Added SideReportWrapper to help you
 tailor report columns for the side reports. API CHANGE: Allow use of
 'casting' option on side report columns. API CHANGE: Make 'title' optional on
 side report columns. (from r96272)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98191 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SideReport.php | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/code/SideReport.php b/code/SideReport.php
index 1b635480..5acb22d5 100755
--- a/code/SideReport.php
+++ b/code/SideReport.php
@@ -60,6 +60,12 @@ class SideReportView extends ViewableData {
 		//	$val = $record->val($source[0], $source[1]);
 		//}
 		
+		// Casting, a la TableListField.  We're deep-calling a helper method on TableListField that
+		// should probably be pushed elsewhere...
+		if(!empty($info['casting'])) {
+			$val = TableListField::getCastedValue($val, $info['casting']);
+		}
+		
 		// Formatting, a la TableListField
 		if(!empty($info['formatting'])) {
 			$format = str_replace('$value', "__VAL__", $info['formatting']);
@@ -71,17 +77,37 @@ class SideReportView extends ViewableData {
 		$prefix = empty($info['newline']) ? "" : "<br>";
 
 		
-		$cssClass = ereg_replace('[^A-Za-z0-9]+','',$info['title']);
+		$classClause = "";
+		if(isset($info['title'])) {
+			$cssClass = ereg_replace('[^A-Za-z0-9]+','',$info['title']);
+			$classClause = "class=\"$cssClass\"";
+		}
+		
 		if(isset($info['link']) && $info['link']) {
 			$link = ($info['link'] === true) ? "admin/show/$record->ID" : $info['link'];
-			return $prefix . "<a class=\"$cssClass\" href=\"$link\">$val</a>";
+			return $prefix . "<a $classClause href=\"$link\">$val</a>";
 		} else {
-			return $prefix . "<span class=\"$cssClass\">$val</span>";
+			return $prefix . "<span $classClause>$val</span>";
 		}
 
 	}
 }
 
+/**
+ * A report wrapper that makes it easier to define slightly different behaviour for side-reports.
+ * 
+ * This report wrapper will use sideReportColumns() for the report columns, instead of columns().
+ */
+class SideReportWrapper extends SSReportWrapper {
+	function columns() {
+		if($this->baseReport->hasMethod('sideReportColumns')) {
+			return $this->baseReport->sideReportColumns();
+		} else {
+			return parent::columns();
+		}
+	}
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**

From 4982aac955d0ccf30f8280666e3bb8aab4cc46e5 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:53:16 +0000
Subject: [PATCH 190/483] MINOR remove sort direction when running canSortBy.
 Also added test coverage for this. (from r96428)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98192 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/SSReportTest.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 tests/SSReportTest.php

diff --git a/tests/SSReportTest.php b/tests/SSReportTest.php
new file mode 100644
index 00000000..2f637e44
--- /dev/null
+++ b/tests/SSReportTest.php
@@ -0,0 +1,27 @@
+<?php
+
+class SSReportTest extends SapphireTest {
+	
+	function testCanSortBy() {
+		$report = new SSReportTest_FakeTest();
+		$this->assertTrue($report->sourceQuery(array())->canSortBy('Title ASC'));
+		$this->assertTrue($report->sourceQuery(array())->canSortBy('Title DESC'));
+		$this->assertTrue($report->sourceQuery(array())->canSortBy('Title'));
+	}
+}
+
+class SSReportTest_FakeTest extends SSReport implements TestOnly {
+	function title() {
+		return 'Report title';
+	}
+	function columns() {
+		return array(
+			"Title" => array(
+				"title" => "Page Title"
+			)
+		);
+	}
+	function sourceRecords($params, $sort, $limit) {
+		return new DataObjectSet();
+	}
+}
\ No newline at end of file

From 1215f6f1f5aeeea13200b9e5390fb2e72e4f763f Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:53:22 +0000
Subject: [PATCH 191/483] MINOR typo fixes, adding missing columns (from
 r96433)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98193 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/reports/BrokenLinksReport.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
index 04405b03..35b08bc7 100644
--- a/code/reports/BrokenLinksReport.php
+++ b/code/reports/BrokenLinksReport.php
@@ -8,7 +8,7 @@
 
 class BrokenLinksReport extends SSReport {
 	function title() {
-		return _t('BrokenLinksReport.BROKENLINKS',"Pages with broken links");
+		return _t('BrokenLinksReport.BROKENLINKS',"Broken links report");
 	}
 	function sourceRecords($params = null) {
 		if (isset($_REQUEST['OnLive'])) $ret = Versioned::get_by_stage('SiteTree', 'Live', "(HasBrokenLink = 1 OR HasBrokenFile = 1)");
@@ -22,12 +22,12 @@ class BrokenLinksReport extends SSReport {
 			
 			if ($isVirtualPage) {
 				if ($record->HasBrokenLink) {
-					$reason = "virtual page pointing to non-existant page";
+					$reason = "virtual page pointing to non-existent page";
 					$reasonCodes = array("VPBROKENLINK");
 				}
 			} else if ($isRedirectorPage) {
 				if ($record->HasBrokenLink) {
-					$reason = "redirector page pointing to non-existant page";
+					$reason = "redirector page pointing to non-existent page";
 					$reasonCodes = array("RPBROKENLINK");
 				}
 			} else {
@@ -44,7 +44,7 @@ class BrokenLinksReport extends SSReport {
 			}
 			
 			if ($reason) {
-				if ($params['Reason'] && !in_array($params['Reason'], $reasonCodes)) continue;
+				if (isset($params['Reason']) && $params['Reason'] && !in_array($params['Reason'], $reasonCodes)) continue;
 				$record->BrokenReason = $reason;
 				$returnSet->push($record);
 			}
@@ -58,11 +58,15 @@ class BrokenLinksReport extends SSReport {
 				"title" => "Title",
 				'formatting' => '<a href=\"admin/show/$ID\" title=\"Edit page\">$value</a>'
 			),
+			"LastEdited" => array(
+				"title" => "Date ".(isset($_REQUEST['OnLive'])?'published':'last modified'),
+				'casting' => 'SSDatetime->Full'
+			),
 			"BrokenReason" => array(
-				"title" => "Reason"
+				"title" => "Problem type"
 			),
 			'AbsoluteLink' => array(
-				'title' => 'Links',
+				'title' => 'URL',
 				'formatting' => '$value " . ($AbsoluteLiveLink ? "<a href=\"$AbsoluteLiveLink\">(live)</a>" : "") . " <a href=\"$value?stage=Stage\">(draft)</a>'
 			)
 		);

From 8ab939ca16610a674df538b9afc4b96a314c75bc Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:53:28 +0000
Subject: [PATCH 192/483] MINOR make site checking clearer on broken links
 report (from r96456)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98195 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/reports/BrokenLinksReport.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
index 35b08bc7..b3620bc8 100644
--- a/code/reports/BrokenLinksReport.php
+++ b/code/reports/BrokenLinksReport.php
@@ -11,7 +11,7 @@ class BrokenLinksReport extends SSReport {
 		return _t('BrokenLinksReport.BROKENLINKS',"Broken links report");
 	}
 	function sourceRecords($params = null) {
-		if (isset($_REQUEST['OnLive'])) $ret = Versioned::get_by_stage('SiteTree', 'Live', "(HasBrokenLink = 1 OR HasBrokenFile = 1)");
+		if (!isset($_REQUEST['CheckSite']) || $params['CheckSite'] == 'Published') $ret = Versioned::get_by_stage('SiteTree', 'Live', "(HasBrokenLink = 1 OR HasBrokenFile = 1)");
 		else $ret = DataObject::get('SiteTree', "(HasBrokenFile = 1 OR HasBrokenLink = 1)");
 		
 		$returnSet = new DataObjectSet();
@@ -59,7 +59,7 @@ class BrokenLinksReport extends SSReport {
 				'formatting' => '<a href=\"admin/show/$ID\" title=\"Edit page\">$value</a>'
 			),
 			"LastEdited" => array(
-				"title" => "Date ".(isset($_REQUEST['OnLive'])?'published':'last modified'),
+				"title" => "Date ".(isset($_REQUEST['CheckSite']) && ($_REQUEST['CheckSite'] == 'Draft')?'last modified':'published'),
 				'casting' => 'SSDatetime->Full'
 			),
 			"BrokenReason" => array(
@@ -75,7 +75,10 @@ class BrokenLinksReport extends SSReport {
 	}
 	function parameterFields() {
 		return new FieldSet(
-			new CheckboxField('OnLive', 'Check live site'),
+			new DropdownField('CheckSite', 'Check site', array(
+				'Published' => 'Published Site',
+				'Draft' => 'Draft Site'
+			)),
 			new DropdownField('Reason', 'Problem to check', array(
 				'' => 'Any',
 				'BROKENFILE' => 'Broken file',

From 7bc486a5123e3d5564e29e9204275adb8a1e2f2d Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:53:36 +0000
Subject: [PATCH 193/483] MINOR fix sorting in this report. (from r96481)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98196 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/reports/BrokenLinksReport.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
index b3620bc8..30d88a2f 100644
--- a/code/reports/BrokenLinksReport.php
+++ b/code/reports/BrokenLinksReport.php
@@ -10,9 +10,10 @@ class BrokenLinksReport extends SSReport {
 	function title() {
 		return _t('BrokenLinksReport.BROKENLINKS',"Broken links report");
 	}
-	function sourceRecords($params = null) {
-		if (!isset($_REQUEST['CheckSite']) || $params['CheckSite'] == 'Published') $ret = Versioned::get_by_stage('SiteTree', 'Live', "(HasBrokenLink = 1 OR HasBrokenFile = 1)");
-		else $ret = DataObject::get('SiteTree', "(HasBrokenFile = 1 OR HasBrokenLink = 1)");
+	function sourceRecords($params, $sort, $limit) {
+		if(!$sort || !in_array(preg_replace('/(\s+?)(A|DE)SC$/', '', $sort), array('Title','LastEdited'))) $sort = "LastEdited ASC";
+		if (!isset($_REQUEST['CheckSite']) || $params['CheckSite'] == 'Published') $ret = Versioned::get_by_stage('SiteTree', 'Live', "(HasBrokenLink = 1 OR HasBrokenFile = 1)", $sort);
+		else $ret = DataObject::get('SiteTree', "(HasBrokenFile = 1 OR HasBrokenLink = 1)", $sort);
 		
 		$returnSet = new DataObjectSet();
 		if ($ret) foreach($ret as $record) {

From f288815ab407e40e71d31671eac3c885a3393e80 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:53:42 +0000
Subject: [PATCH 194/483] MINOR using better sorting api (from r96483)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98197 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/reports/BrokenLinksReport.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
index 30d88a2f..62b1b3cf 100644
--- a/code/reports/BrokenLinksReport.php
+++ b/code/reports/BrokenLinksReport.php
@@ -11,9 +11,8 @@ class BrokenLinksReport extends SSReport {
 		return _t('BrokenLinksReport.BROKENLINKS',"Broken links report");
 	}
 	function sourceRecords($params, $sort, $limit) {
-		if(!$sort || !in_array(preg_replace('/(\s+?)(A|DE)SC$/', '', $sort), array('Title','LastEdited'))) $sort = "LastEdited ASC";
-		if (!isset($_REQUEST['CheckSite']) || $params['CheckSite'] == 'Published') $ret = Versioned::get_by_stage('SiteTree', 'Live', "(HasBrokenLink = 1 OR HasBrokenFile = 1)", $sort);
-		else $ret = DataObject::get('SiteTree', "(HasBrokenFile = 1 OR HasBrokenLink = 1)", $sort);
+		if (!isset($_REQUEST['CheckSite']) || $params['CheckSite'] == 'Published') $ret = Versioned::get_by_stage('SiteTree', 'Live', "(HasBrokenLink = 1 OR HasBrokenFile = 1)");
+		else $ret = DataObject::get('SiteTree', "(HasBrokenFile = 1 OR HasBrokenLink = 1)");
 		
 		$returnSet = new DataObjectSet();
 		if ($ret) foreach($ret as $record) {
@@ -51,6 +50,8 @@ class BrokenLinksReport extends SSReport {
 			}
 		}
 		
+		if ($sort) $returnSet->sort($sort);
+		
 		return $returnSet;
 	}
 	function columns() {

From 602e5ae671d032e9ff6f5e97721aaf4b08d057d6 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:53:48 +0000
Subject: [PATCH 195/483] MINOR: Fixed side report tests to suit new report
 system. (from r96646)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98198 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/SideReportTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/SideReportTest.php b/tests/SideReportTest.php
index 5964c10e..35b78135 100755
--- a/tests/SideReportTest.php
+++ b/tests/SideReportTest.php
@@ -31,9 +31,9 @@ class SideReportTest extends SapphireTest {
 		$r = new SideReport_RecentlyEdited();
 		
 		// check if contains only elements not older than $daysAgo days
-		$this->assertNotNull($r->records());
-		$this->assertContains($after->ID, $r->records()->column('ID'));
-		$this->assertNotContains($before->ID, $r->records()->column('ID'));
+		$this->assertNotNull($r->records(array()));
+		$this->assertContains($after->ID, $r->records(array())->column('ID'));
+		$this->assertNotContains($before->ID, $r->records(array())->column('ID'));
 		
 		SS_DateTime::clear_mock_now();
 	}

From 0b20bd4e51a78fd9db04faf1c72cac9fb8b825c3 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:54:04 +0000
Subject: [PATCH 196/483] MINOR: Change page title heading to "Page name" for
 consistency in CSV export (from r96925)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98200 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/reports/BrokenLinksReport.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
index 62b1b3cf..32dbc907 100644
--- a/code/reports/BrokenLinksReport.php
+++ b/code/reports/BrokenLinksReport.php
@@ -57,7 +57,7 @@ class BrokenLinksReport extends SSReport {
 	function columns() {
 		$fields = array(
 			"Title" => array(
-				"title" => "Title",
+				"title" => "Page name",
 				'formatting' => '<a href=\"admin/show/$ID\" title=\"Edit page\">$value</a>'
 			),
 			"LastEdited" => array(

From f9d6dc126900f2629d0997351eda5fb1e5bece07 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:55:03 +0000
Subject: [PATCH 197/483] BUGFIX: Improvements to sorting of columns on broken
 links report (from r96979)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98202 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/reports/BrokenLinksReport.php | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
index 32dbc907..3a9b48bf 100644
--- a/code/reports/BrokenLinksReport.php
+++ b/code/reports/BrokenLinksReport.php
@@ -11,8 +11,23 @@ class BrokenLinksReport extends SSReport {
 		return _t('BrokenLinksReport.BROKENLINKS',"Broken links report");
 	}
 	function sourceRecords($params, $sort, $limit) {
-		if (!isset($_REQUEST['CheckSite']) || $params['CheckSite'] == 'Published') $ret = Versioned::get_by_stage('SiteTree', 'Live', "(HasBrokenLink = 1 OR HasBrokenFile = 1)");
-		else $ret = DataObject::get('SiteTree', "(HasBrokenFile = 1 OR HasBrokenLink = 1)");
+		$join = '';
+		if($sort) {
+			$parts = explode(' ', $sort);
+			$field = $parts[0];
+			$direction = $parts[1];
+			
+			if($field == 'AbsoluteLink') {
+				$sort = 'URLSegment ' . $direction;
+			}
+			
+			if($field == 'Subsite.Title') {
+				$join = 'LEFT JOIN "Subsite" ON "Subsite"."ID" = "SiteTree"."SubsiteID"';
+			}
+		}
+		
+		if (!isset($_REQUEST['CheckSite']) || $params['CheckSite'] == 'Published') $ret = Versioned::get_by_stage('SiteTree', 'Live', "(HasBrokenLink = 1 OR HasBrokenFile = 1)", $sort, $join, $limit);
+		else $ret = DataObject::get('SiteTree', "(HasBrokenFile = 1 OR HasBrokenLink = 1)", $sort, $join, $limit);
 		
 		$returnSet = new DataObjectSet();
 		if ($ret) foreach($ret as $record) {
@@ -50,7 +65,7 @@ class BrokenLinksReport extends SSReport {
 			}
 		}
 		
-		if ($sort) $returnSet->sort($sort);
+		//if ($sort) $returnSet->sort($sort);
 		
 		return $returnSet;
 	}

From 93ae487e55117329f3dde39e41ea760bd22115c1 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:55:09 +0000
Subject: [PATCH 198/483] BUGFIX: Fix broken reasons sorting (from r96985)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98203 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/reports/BrokenLinksReport.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
index 3a9b48bf..27baae2c 100644
--- a/code/reports/BrokenLinksReport.php
+++ b/code/reports/BrokenLinksReport.php
@@ -19,10 +19,10 @@ class BrokenLinksReport extends SSReport {
 			
 			if($field == 'AbsoluteLink') {
 				$sort = 'URLSegment ' . $direction;
-			}
-			
-			if($field == 'Subsite.Title') {
+			} elseif($field == 'Subsite.Title') {
 				$join = 'LEFT JOIN "Subsite" ON "Subsite"."ID" = "SiteTree"."SubsiteID"';
+			} elseif($field == 'BrokenReason') {
+				$sort = "HasBrokenLink ASC, HasBrokenFile ASC";
 			}
 		}
 		

From 21a9fec0ba33740a40342c07854f721c11d2f8ba Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:55:19 +0000
Subject: [PATCH 199/483] BUGFIX: Allow changing direction in broken link type
 (from r96987)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98204 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/reports/BrokenLinksReport.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
index 27baae2c..608254d8 100644
--- a/code/reports/BrokenLinksReport.php
+++ b/code/reports/BrokenLinksReport.php
@@ -22,7 +22,7 @@ class BrokenLinksReport extends SSReport {
 			} elseif($field == 'Subsite.Title') {
 				$join = 'LEFT JOIN "Subsite" ON "Subsite"."ID" = "SiteTree"."SubsiteID"';
 			} elseif($field == 'BrokenReason') {
-				$sort = "HasBrokenLink ASC, HasBrokenFile ASC";
+				$sort = "HasBrokenLink $direction, HasBrokenFile $direction";
 			}
 		}
 		

From faa812e45ba3df0d183a6617ba5650dbf16040ce Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:55:28 +0000
Subject: [PATCH 200/483] BUGFIX: Better broken reason sorting (from r96989)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98205 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/reports/BrokenLinksReport.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
index 608254d8..9f77ee41 100644
--- a/code/reports/BrokenLinksReport.php
+++ b/code/reports/BrokenLinksReport.php
@@ -12,6 +12,7 @@ class BrokenLinksReport extends SSReport {
 	}
 	function sourceRecords($params, $sort, $limit) {
 		$join = '';
+		$sortBrokenReason = false;
 		if($sort) {
 			$parts = explode(' ', $sort);
 			$field = $parts[0];
@@ -22,7 +23,8 @@ class BrokenLinksReport extends SSReport {
 			} elseif($field == 'Subsite.Title') {
 				$join = 'LEFT JOIN "Subsite" ON "Subsite"."ID" = "SiteTree"."SubsiteID"';
 			} elseif($field == 'BrokenReason') {
-				$sort = "HasBrokenLink $direction, HasBrokenFile $direction";
+				$sortBrokenReason = true;
+				$sort = '';
 			}
 		}
 		
@@ -65,7 +67,7 @@ class BrokenLinksReport extends SSReport {
 			}
 		}
 		
-		//if ($sort) $returnSet->sort($sort);
+		if($sortBrokenReason) $returnSet->sort('BrokenReason', $direction);
 		
 		return $returnSet;
 	}

From 70683263509275b4058d2e27f2ba99b67db80f42 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:55:33 +0000
Subject: [PATCH 201/483] MINOR fix dropdown labels (from r97063)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98206 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/reports/BrokenLinksReport.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
index 9f77ee41..2f7f8a64 100644
--- a/code/reports/BrokenLinksReport.php
+++ b/code/reports/BrokenLinksReport.php
@@ -102,8 +102,8 @@ class BrokenLinksReport extends SSReport {
 				'' => 'Any',
 				'BROKENFILE' => 'Broken file',
 				'BROKENLINK' => 'Broken link',
-				'VPBROKENLINK' => 'Virtual page pointing to invalid source',
-				'RPBROKENLINK' => 'Redirector page pointing to invalid destination',
+				'VPBROKENLINK' => 'Virtual page pointing to non-existent page',
+				'RPBROKENLINK' => 'Redirector page pointing to non-existent page',
 			))
 		);
 	}

From f9769c5b0a29a6b2ff3eec24396c01c236e4124d Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:55:46 +0000
Subject: [PATCH 202/483] MINOR set Print flag correctly on TLF MINOR custom
 print template for SSReport TLF's that exposes the report title, and filters
 set (from r97138)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98208 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ReportAdmin.php                      | 16 ++++++++++++++
 templates/SSReportTableField_printable.ss | 26 +++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 templates/SSReportTableField_printable.ss

diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index 37650814..1b1be86b 100755
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -126,6 +126,22 @@ class ReportAdmin extends LeftAndMain {
 		return false;
 	}
 	
+	/**
+	 * Get the current report
+	 *
+	 * @return SSReport
+	 */
+	public function CurrentReport() {
+		$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : Session::get('currentReport');
+		
+		if($id) {
+			foreach($this->Reports() as $report) {
+				if($id == $report->ID()) return $report;
+			}
+		}
+		return false;
+	}
+	
 	/**
 	 * Return a Form instance with fields for the
 	 * particular report currently viewed.
diff --git a/templates/SSReportTableField_printable.ss b/templates/SSReportTableField_printable.ss
new file mode 100644
index 00000000..20b68052
--- /dev/null
+++ b/templates/SSReportTableField_printable.ss
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
+<head>
+<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+<% base_tag %>
+<title>Print</title>
+</head>
+
+<!-- <body onload="window.print();"> -->
+<body>
+	<% control Form.Controller %>
+		<h1 style="margin-bottom: 0">$CurrentReport.Title</h1>
+		<% control CurrentReport.getCmsFields %>
+			<% if Name == Filters %>
+				<h2 style="margin-bottom: 0; margin-top: 0;">Filters</h2>
+				<ul style="margin-top: 0">
+				<% control FieldSet %>
+					<li>$Title = $performReadonlyTransformation.Field</li>
+				<% end_control %>
+				</ul>
+			<% end_if %>
+		<% end_control %>
+	<% end_control %>
+	<% include TableListField %>
+</body>
+</html>
\ No newline at end of file

From 8eef5a7d993f986f649107e9acce2673b756dc3e Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:56:02 +0000
Subject: [PATCH 203/483] MINOR add pretty warning colors to expiring content
 warning (from r97151)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98210 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/cms_right.css | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/css/cms_right.css b/css/cms_right.css
index b4a20294..8e2b0853 100644
--- a/css/cms_right.css
+++ b/css/cms_right.css
@@ -373,6 +373,15 @@
 			max-height: 300px;
 			overflow: auto;
 		}
+		
+	.warningBox {
+		padding: 2px 20px 10px 20px;
+		border: 2px solid #ff8e8e;
+		color: #c80700;
+		background: #ffe9e9;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	}
 
 /**
  * TableField Subclasses

From ba0adbc48dabe300ded779c28f67e09f5193f17a Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:56:16 +0000
Subject: [PATCH 204/483] ENHANCEMENT batchactions can now implement
 confirmationDialog() to provide a custom confirmation dialog to the front
 end. MINOR added above confiration to batch setting expiry (from r97215)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98211 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSBatchActionHandler.php | 22 ++++++++++
 javascript/CMSMain_left.js     | 74 ++++++++++++++++++++--------------
 2 files changed, 66 insertions(+), 30 deletions(-)

diff --git a/code/CMSBatchActionHandler.php b/code/CMSBatchActionHandler.php
index e4ae65d4..ff8f1617 100644
--- a/code/CMSBatchActionHandler.php
+++ b/code/CMSBatchActionHandler.php
@@ -14,6 +14,7 @@ class CMSBatchActionHandler extends RequestHandler {
 	
 	static $url_handlers = array(
 		'$BatchAction/applicablepages' => 'handleApplicablePages',
+		'$BatchAction/confirmation' => 'handleConfirmation',
 		'$BatchAction' => 'handleAction',
 	);
 	
@@ -104,6 +105,27 @@ class CMSBatchActionHandler extends RequestHandler {
 		return $response;
 	}
 	
+	function handleConfirmation($request) {
+		// Find the action handler
+		$actions = Object::get_static($this->class, 'batch_actions');
+		$actionClass = $actions[$request->param('BatchAction')];
+		$actionHandler = new $actionClass();
+
+		// Sanitise ID list and query the database for apges
+		$ids = split(' *, *', trim($request->requestVar('csvIDs')));
+		foreach($ids as $k => $id) $ids[$k] = (int)$id;
+		$ids = array_filter($ids);
+		
+		if($actionHandler->hasMethod('confirmationDialog')) {
+			$response = new HTTPResponse(json_encode($actionHandler->confirmationDialog($ids)));
+		} else {
+			$response = new HTTPResponse(json_encode(array('alert' => false)));
+		}
+		
+		$response->addHeader("Content-type", "application/json");
+		return $response;
+	}
+	
 	/**
 	 * Return a DataObjectSet of ArrayData objects containing the following pieces of info
 	 * about each batch action:
diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js
index b1c60d9a..8b1f2b7d 100755
--- a/javascript/CMSMain_left.js
+++ b/javascript/CMSMain_left.js
@@ -537,8 +537,6 @@ Behaviour.register({
 	}
 });
 
-
-
 /**
  * Publish selected pages action
  */
@@ -550,42 +548,58 @@ publishpage.prototype = {
 		if(csvIDs) {		
 			var optionEl = $('choose_batch_action').options[$('choose_batch_action').selectedIndex];
 			var actionText = optionEl.text;
-			var optionParams = eval(optionEl.className);
-			var ingText = optionParams.doingText;
-
-			// Confirmation
-			if(!confirm("You have " + batchActionGlobals.count() + " pages selected.\n\nDo your really want to " + actionText.toLowerCase() + "?")) {
-				return false;
-			}
-
-			this.elements.csvIDs.value = csvIDs;
-
-			// Select form submission URL
-			this.action = $('choose_batch_action').value;
 			
-			// Loading indicator
-			statusMessage(ingText);
-			$('batchactions_go').className = 'loading';
-			
-			// Don't show actions that have failed from the previous execution
-			batchActionGlobals.removeFailures();
-			
-			// Submit form
-			Ajax.SubmitForm(this, null, {
-				onSuccess :  function(response) {
-					Ajax.Evaluator(response);
-					$('batchactions_go').className = '';
-					batchActionGlobals.deselectAll();
-				},
-				onFailure : function(response) {
-					errorMessage('Error ' + ingText, response);
+			var confirmationURL = $('choose_batch_action').value + '/confirmation?csvIDs=' + csvIDs;
+			jQuery.getJSON(confirmationURL, function(data) {
+				// If a custom alert has been provided, show that.
+				// otherwise, show the default one
+				if (data.alert) {
+					if (!confirm(data.content)) return false;
+				} else {
+					if(!confirm("You have " + batchActionGlobals.count() + " pages selected.\n\nDo your really want to " + actionText.toLowerCase() + "?")) {
+						return false;
+					}
 				}
+				
+				$('batchactions_options').submitform();
 			});
 		} else {
 			alert(ss.i18n._t('CMSMAIN.SELECTONEPAGE'));
 		}
 
 		return false;
+	},
+	
+	submitform: function() {
+		csvIDs = batchActionGlobals.getCsvIds();
+
+		var optionEl = $('choose_batch_action').options[$('choose_batch_action').selectedIndex];
+		var optionParams = eval(optionEl.className);
+		var ingText = optionParams.doingText;
+			
+		this.elements.csvIDs.value = csvIDs;
+
+		// Select form submission URL
+		this.action = $('choose_batch_action').value;
+
+		// Loading indicator
+		statusMessage(ingText);
+		$('batchactions_go').className = 'loading';
+
+		// Don't show actions that have failed from the previous execution
+		batchActionGlobals.removeFailures();
+
+		// Submit form
+		Ajax.SubmitForm(this, null, {
+			onSuccess :  function(response) {
+				Ajax.Evaluator(response);
+				$('batchactions_go').className = '';
+				batchActionGlobals.deselectAll();
+			},
+			onFailure : function(response) {
+				errorMessage('Error ' + ingText, response);
+			}
+		});
 	}
 };
 

From 983849449ed36fd0a359732a6dea6fe4e4779d2b Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 05:00:19 +0000
Subject: [PATCH 205/483] API CHANGE: Introduced new API for SS_Report

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98215 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 _config.php            |  10 +-
 code/Report.php        | 472 +++++++++++++++++++++++++++++++++++++----
 tests/SSReportTest.php |   2 +-
 3 files changed, 436 insertions(+), 48 deletions(-)

diff --git a/_config.php b/_config.php
index 98bfb724..b73ceed1 100644
--- a/_config.php
+++ b/_config.php
@@ -51,11 +51,11 @@ HtmlEditorConfig::get('cms')->removeButtons('tablecontrols');
 HtmlEditorConfig::get('cms')->addButtonsToLine(3, 'tablecontrols');
 
 // Register default side reports
-SSReport::register("SideReport", "SideReport_EmptyPages");
-SSReport::register("SideReport", "SideReport_RecentlyEdited");
-SSReport::register("SideReport", "SideReport_ToDo");
-if (class_exists('Subsite')) SSReport::register('ReportAdmin', 'SubsiteReportWrapper("BrokenLinksReport")',-20);
-else SSReport::register('ReportAdmin', 'BrokenLinksReport',-20);
+SS_Report::register("SideReport", "SideReport_EmptyPages");
+SS_Report::register("SideReport", "SideReport_RecentlyEdited");
+SS_Report::register("SideReport", "SideReport_ToDo");
+if (class_exists('Subsite')) SS_Report::register('ReportAdmin', 'SubsiteReportWrapper("BrokenLinksReport")',-20);
+else SS_Report::register('ReportAdmin', 'BrokenLinksReport',-20);
 
 
 ?>
diff --git a/code/Report.php b/code/Report.php
index 71ff6ade..3fab8221 100644
--- a/code/Report.php
+++ b/code/Report.php
@@ -1,32 +1,52 @@
 <?php
 /**
- * Base "abstract" class for all Report classes
- * viewable in the Reports top menu section of CMS.
+ * Base "abstract" class creating reports on your data.
  * 
- * To include your own report into the ReportAdmin
- * of the CMS, your subclass of SS_Report should
- * overload these:
+ * Creating reports
+ * ================
  * 
- * @link SS_Report::$title
- * @link SS_Report::$description
- * @link SS_Report->getReportField()
+ * Creating a new report is a matter overloading a few key methods
  * 
- * getReportField() should return a FormField instance,
- * such as a ComplexTableField, or TableListField. This
- * is the "meat" of the report, as it's designed to
- * show the actual data for the function of the report.
- * For example, if this was a report that should show
- * all orders that aren't printed, then it would show
- * a TableListField listing orders that have the property
- * "Unprinted = 1".
+ *  {@link title()}: Return the title - i18n is your responsibility
+ *  {@link description()}: Return the description - i18n is your responsibility
+ *  {@link sourceQuery()}: Return a DataObjectSet of the search results
+ *  {@link columns()}: Return information about the columns in this report.
+ *  {@link parameterFields()}: Return a FieldSet of the fields that can be used to filter this
+ *  report.
  * 
- * @see ReportAdmin for where SS_Report instances are
- * used in the CMS.
+ * If you can't express your report as a query, you can implement the this method instead:
+ * 
+ *     // Return an array of fields that can be used to sort the data
+ *     public function sourceRecords($params, $sort, $limit) { ... }
+ * 
+ * The $sort value will be set to the corresponding key of the columns() array.  If you wish to
+ * make only a subset of the columns sortable, then you can override `sortColumns()` to return a
+ * subset of the array keys.
+ * 
+ * Note that this implementation is less efficient and should only be used when necessary.
+ * 
+ * If you wish to modify the report in more extreme ways, you could overload these methods instead.
+ * 
+ * {@link getReportField()}: Return a FormField in the place where your report's TableListField
+ * usually appears.
+ * {@link getCMSFields()}: Return the FieldSet representing the complete right-hand area of the 
+ * report, including the title, description, parameter fields, and results.
+ * 
+ * Showing reports to the user
+ * ===========================
+ * 
+ * Right now, all subclasses of SSReport will be shown in the ReportAdmin.  However, we are planning
+ * on adding an explicit registration mechanism, so that you can decide which reports go in the
+ * report admin, and which go elsewhere (such as the side panel in the CMS).
  * 
  * @package cms
  * @subpackage reports
  */
 class SS_Report extends ViewableData {
+	/**
+	 * Report registry populated by {@link SSReport::register()}
+	 */
+	private static $registered_reports = array();
 
 	/**
 	 * This is the title of the report,
@@ -44,6 +64,98 @@ class SS_Report extends ViewableData {
 	 * @var string
 	 */
 	protected $description = '';
+	
+	/**
+	 * The class of object being managed by this report.
+	 * Set by overriding in your subclass.
+	 */
+	protected $dataClass = 'SiteTree';
+	
+	/**
+	 * Return the title of this report.
+	 * 
+	 * You have two ways of specifying the description:
+	 *  - overriding description(), which lets you support i18n 
+	 *  - defining the $description property
+	 */
+	function title() {
+		return $this->title;
+	}
+	
+	/**
+	 * Return the description of this report.
+	 * 
+	 * You have two ways of specifying the description:
+	 *  - overriding description(), which lets you support i18n 
+	 *  - defining the $description property
+	 */
+	function description() {
+		return $this->description;
+	}
+	
+	/**
+	 * Return a FieldSet specifying the search criteria for this report.
+	 * 
+	 * Override this method to define search criteria.
+	 */
+	function parameterFields() {
+		return null;
+	}
+
+	/**
+	 * Return the {@link SQLQuery} that provides your report data.
+	 */
+	function sourceQuery($params) {
+		if($this->hasMethod('sourceRecords')) {
+			$query = new SSReport_FakeQuery($this, 'sourceRecords', $params);
+			$query->setSortColumnMethod('sortColumns');
+			return $query;
+		} else {
+			user_error("Please override sourceQuery()/sourceRecords() and columns() or, if necessary, override getReportField()", E_USER_ERROR);
+		}
+	}
+	
+	/**
+	 * Return a DataObjectSet records for this report.
+	 */
+	function records($params) {
+		if($this->hasMethod('sourceRecords')) return $this->sourceRecords($params, null, null);
+		else {
+			$query = $this->sourceQuery();
+			return singleton($this->dataClass())->buildDataObjectSet($query->execute(), "DataObjectSet", $query);
+		}
+	}
+
+	/**
+	 * Return an map of columns for your report.
+	 *  - The map keys will be the source columns for your report (in TableListField dot syntax)
+	 *  - The values can either be a string (the column title), or a map containing the following
+	 *    column parameters:
+	 *    - title: The column title
+	 *    - formatting: A formatting string passed to {@link TableListField::setFieldFormatting()}
+	 */
+	function columns() {
+		user_error("Please override sourceQuery() and columns() or, if necessary, override getReportField()", E_USER_ERROR);
+	}
+	
+	function sortColumns() {
+		return array_keys($this->columns());
+	}
+	
+	/**
+	 * Return the number of records in this report with no filters applied.
+	 */
+	function count() {
+		return (int)$this->sourceQuery(array())->unlimitedRowCount();
+	}
+	
+	/**
+	 * Return the data class for this report
+	 */
+	function dataClass() {
+		return $this->dataClass;
+	}
+
 
 	/**
 	 * Returns a FieldSet with which to create the CMS editing form.
@@ -51,24 +163,93 @@ class SS_Report extends ViewableData {
 	 * data objects.
 	 *
 	 * @uses getReportField() to render a table, or similar field for the report. This
-	 * method should be defined on the SS_Report subclasses.
+	 * method should be defined on the SSReport subclasses.
 	 *
 	 * @return FieldSet
 	 */
 	function getCMSFields() {
 		$fields = new FieldSet(
-			new TabSet('Root',
-				new Tab('Report',
-					new LiteralField('ReportTitle', "<h3>{$this->title}</h3>"),
-					new LiteralField('ReportDescription', "<p>{$this->description}</p>"),
-					$this->getReportField()
-				)
-			)
+			new LiteralField('ReportTitle', "<h3>{$this->title()}</h3><p>All times are in the server timezone, unless otherwise specified</p>")
 		);
+		
+		// $fields->push();
+		
+		if($this->description) $fields->push(
+			new LiteralField('ReportDescription', "<p>{$this->description}</p>"));
+			
+		// Add search fields is available
+		if($params = $this->parameterFields()) {
+			$filters = new FieldGroup('Filters');
+			foreach($params as $param) {
+				if ($param instanceof HiddenField) $fields->push($param);
+				else $filters->push($param);
+			}
+			$fields->push($filters);
 
+			// Add a search button
+			$fields->push(new FormAction('updatereport', 'Filter'));
+		}
+		
+		$fields->push($this->getReportField());
+		
+		$this->extend('updateCMSFields', $fields);
+		
 		return $fields;
 	}
 	
+	function getCMSActions() {
+		// getCMSActions() can be extended with updateCMSActions() on a decorator
+		$actions = new FieldSet();
+		$this->extend('updateCMSActions', $actions);
+		return $actions;
+	}
+	
+	/**
+	 * Return a field, such as a {@link ComplexTableField} that is
+	 * used to show and manipulate data relating to this report.
+	 * 
+	 * Generally, you should override {@link columns()} and {@link records()} to make your report,
+	 * but if they aren't sufficiently flexible, then you can override this method.
+	 *
+	 * @return FormField subclass
+	 */
+	function getReportField() {
+		$columnTitles = array();
+		$fieldFormatting = array();
+		$csvFieldFormatting = array();
+		$fieldCasting = array();
+		
+		// Parse the column information
+		foreach($this->columns() as $source => $info) {
+			if(is_string($info)) $info = array('title' => $info);
+			
+			if(isset($info['formatting'])) $fieldFormatting[$source] = $info['formatting'];
+			if(isset($info['csvFormatting'])) $csvFieldFormatting[$source] = $info['csvFormatting'];
+			if(isset($info['casting'])) $fieldCasting[$source] = $info['casting'];
+			$columnTitles[$source] = isset($info['title']) ? $info['title'] : $source;
+		}
+		
+		// To do: implement pagination
+		$query = $this->sourceQuery($_REQUEST);
+			
+		$tlf = new TableListField('ReportContent', $this->dataClass(), $columnTitles);
+		$tlf->setCustomQuery($query);
+		$tlf->setShowPagination(true);
+		$tlf->setPageSize(50);
+		$tlf->setPermissions(array('export', 'print'));
+		
+		// Hack to figure out if we are printing
+		if (isset($_REQUEST['url']) && array_pop(explode('/', $_REQUEST['url'])) == 'printall') {
+			$tlf->setTemplate('SSReportTableField');
+		}
+		
+		if($fieldFormatting) $tlf->setFieldFormatting($fieldFormatting);
+		if($csvFieldFormatting) $tlf->setCSVFieldFormatting($csvFieldFormatting);
+		if($fieldCasting) $tlf->setFieldCasting($fieldCasting);
+
+		return $tlf;
+	}
+	
 	/**
 	 * @param Member $member
 	 * @return boolean
@@ -80,19 +261,7 @@ class SS_Report extends ViewableData {
 		
 		return true;
 	}
-
-	/**
-	 * Return a field, such as a {@link ComplexTableField} that is
-	 * used to show and manipulate data relating to this report.
-	 *
-	 * For example, if this were an "Unprinted Orders" report, this
-	 * field would return a table that shows all Orders with "Unprinted = 1".
-	 *
-	 * @return FormField subclass
-	 */
-	function getReportField() {
-		user_error('Please implement getReportField() on ' . $this->class, E_USER_ERROR);
-	}
+	
 
 	/**
 	 * Return the name of this report, which
@@ -103,9 +272,9 @@ class SS_Report extends ViewableData {
 	 * @return string
 	 */
 	function TreeTitle() {
-		return $this->title;
+		return $this->title();/* . ' (' . $this->count() . ')'; - this is too slow atm */
 	}
-
+	
 	/**
 	 * Return the ID of this Report class.
 	 * Because it doesn't have a number, we
@@ -116,7 +285,226 @@ class SS_Report extends ViewableData {
 	function ID() {
 		return $this->class;
 	}
+	
+	/////////////////////////////////////////////////////////////////////////////////////////////
+	
+	/**
+	 * Register a report.
+	 * @param $list The list to add the report to: "ReportAdmin" or "SideReports"
+	 * @param $reportClass The class of the report to add.
+	 * @param $priority The priority.  Higher numbers will appear furhter up in the reports list.
+	 * The default value is zero.
+	 */
+	static function register($list, $reportClass, $priority = 0) {
+		if(strpos($reportClass, '(') === false && (!class_exists($reportClass) || !is_subclass_of($reportClass,'SSReport'))) {
+			user_error("SSReport::register(): '$reportClass' is not a subclass of SSReport", E_USER_WARNING);
+			return;
+		}
+		
+		self::$registered_reports[$list][$reportClass] = $priority;
+	}
+	
+	/**
+	 * Unregister a report, removing it from the list
+	 */
+	static function unregister($list, $identifier) {
+		unset(self::$registered_reports[$list][$reportClass]);
+	}
+	
+	/**
+	 * Return the SSReport objects making up the given list.
+	 * @return An array of SSReport objects
+	 */
+	static function get_reports($list) {
+		$output = array();
+
+		if(isset(self::$registered_reports[$list])) {
+			$listItems = self::$registered_reports[$list];
+
+			// Sort by priority, preserving internal order of items with the same priority
+			$groupedItems = array();
+			foreach($listItems as $k => $v) {
+				$groupedItems[$v][] = $k;
+			}
+			krsort($groupedItems);
+			$sortedListItems = call_user_func_array('array_merge', $groupedItems);
+			
+			foreach($sortedListItems as $report) {
+				if(strpos($report,'(') === false) $reportObj = new $report;
+				else $reportObj = eval("return new $report;");
+
+				$output[$reportObj->ID()] = $reportObj;
+			} 
+		}
+		
+		return $output;
+	}
 
 }
 
-?>
\ No newline at end of file
+/**
+ * This is an object that can be used to dress up a more complex querying mechanism in the clothing
+ * of a SQLQuery object.  This means that you can inject it into a TableListField.
+ * 
+ * Use it like this:
+ * 
+ *     function sourceQuery($params) {
+ *         return new SSReport_FakeQuery($this, 'sourceRecords', $params)
+ *     }
+ *     function sourceRecords($params, $sort, $limit) {
+ *         // Do some stuff
+ *         // Return a DataObjectSet of actual objects.
+ *     }
+ * 
+ * This object is used by the default implementation of sourceQuery() on SSReport, to make use of
+ * a sourceReords() method if one exists.
+ */
+class SSReport_FakeQuery extends SQLQuery {
+	public $orderby;
+	public $limit;
+	
+	protected $obj, $method, $params;
+	
+	function __construct($obj, $method, $params) {
+		$this->obj = $obj;
+		$this->method = $method;
+		$this->params = $params;
+	}
+	
+	/**
+	 * Provide a method that will return a list of columns that can be used to sort.
+	 */
+	function setSortColumnMethod($sortColMethod) {
+		$this->sortColMethod = $sortColMethod;
+	}
+
+	function limit($limit) {
+		$this->limit = $limit;
+	}
+	
+	function unlimitedRowCount() {
+		$source = $this->obj->{$this->method}($this->params, null, null);
+		return $source ? $source->Count() : 0;
+	}
+	
+	function execute() {
+		$output = array();
+		$source = $this->obj->{$this->method}($this->params, $this->orderby, $this->limit);
+		if($source) foreach($source as $item) {
+			$mapItem = $item->toMap();
+			$mapItem['RecordClassName'] = get_class($item);
+			$output[] = $mapItem;
+		}
+		return $output;
+	}
+	
+	function canSortBy($fieldName) {
+		$fieldName = preg_replace('/(\s+?)(A|DE)SC$/', '', $fieldName);
+		if($this->sortColMethod) {
+			$columns = $this->obj->{$this->sortColMethod}();
+			return in_array($fieldName, $columns);
+		} else {
+			return false;
+		}
+	}
+}
+
+/**
+ * SSReportWrapper is a base class for creating report wappers.
+ * 
+ * Wrappers encapsulate an existing report to alter their behaviour - they are implementations of
+ * the standard GoF decorator pattern.
+ * 
+ * This base class ensure that, by default, wrappers behave in the same way as the report that is
+ * being wrapped.  You should override any methods that need to behave differently in your subclass
+ * of SSReportWrapper.
+ * 
+ * It also makes calls to 2 empty methods that you can override {@link beforeQuery()} and
+ * {@link afterQuery()}
+ */
+
+abstract class SSReportWrapper extends SSReport {
+	protected $baseReport;
+
+	function __construct($baseReport) {
+		$this->baseReport = is_string($baseReport) ? new $baseReport : $baseReport;
+		$this->dataClass = $this->baseReport->dataClass();
+		parent::__construct();
+	}
+
+	function ID() {
+		return get_class($this->baseReport) . '_' . get_class($this);
+	}
+
+	///////////////////////////////////////////////////////////////////////////////////////////
+	// Filtering
+
+	function parameterFields() {
+		return $this->baseReport->parameterFields();
+	}
+
+	///////////////////////////////////////////////////////////////////////////////////////////
+	// Columns
+
+	function columns() {
+		return $this->baseReport->columns();
+	}
+
+	///////////////////////////////////////////////////////////////////////////////////////////
+	// Querying
+
+	/**
+	 * Override this method to perform some actions prior to querying.
+	 */
+	function beforeQuery($params) {
+	}
+
+	/**
+	 * Override this method to perform some actions after querying.
+	 */
+	function afterQuery() {
+	}
+
+	function sourceQuery($params) {
+		if($this->baseReport->hasMethod('sourceRecords')) {
+			// The default implementation will create a fake query from our sourceRecords() method
+			return parent::sourceQuery($params);
+
+		} else if($this->baseReport->hasMethod('sourceQuery')) {
+			$this->beforeQuery($params);
+			$query = $this->baseReport->sourceQuery($params);
+			$this->afterQuery();
+			return $query;
+
+		} else {
+			user_error("Please override sourceQuery()/sourceRecords() and columns() in your base report", E_USER_ERROR);
+		}
+
+	}
+
+	function sourceRecords($params, $sort, $limit) {
+		$this->beforeQuery($params);
+		$records = $this->baseReport->sourceRecords($params, $sort, $limit);
+		$this->afterQuery();
+		return $records;
+	}
+
+
+	///////////////////////////////////////////////////////////////////////////////////////////
+	// Pass-through
+
+	function title() {
+		return $this->baseReport->title();
+	}
+
+	function description() {
+		return $this->baseReport->title();
+	}
+
+	function canView() {
+		return $this->baseReport->canView();
+	}
+	
+}
+
+?>
diff --git a/tests/SSReportTest.php b/tests/SSReportTest.php
index 2f637e44..14ec8a8e 100644
--- a/tests/SSReportTest.php
+++ b/tests/SSReportTest.php
@@ -10,7 +10,7 @@ class SSReportTest extends SapphireTest {
 	}
 }
 
-class SSReportTest_FakeTest extends SSReport implements TestOnly {
+class SSReportTest_FakeTest extends SS_Report implements TestOnly {
 	function title() {
 		return 'Report title';
 	}

From 2ff2d288410cc3ec63ab0d021469edff6874757e Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 05:11:02 +0000
Subject: [PATCH 206/483] BUGFIX: More fixes renaming SSReport to SS_Report

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98218 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php                   |  2 +-
 code/Report.php                    | 28 ++++++++++++-------------
 code/ReportAdmin.php               |  8 ++++----
 code/SideReport.php                | 33 ++++++------------------------
 code/reports/BrokenLinksReport.php |  2 +-
 5 files changed, 26 insertions(+), 47 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 0b5ed4e0..4f620ad3 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -662,7 +662,7 @@ JS;
 	}
 	
 	function SideReports() {
-		return SSReport::get_reports('SideReport');
+		return SS_Report::get_reports('SideReport');
 	}
 
 	/*
diff --git a/code/Report.php b/code/Report.php
index 3fab8221..2491dfe9 100644
--- a/code/Report.php
+++ b/code/Report.php
@@ -35,7 +35,7 @@
  * Showing reports to the user
  * ===========================
  * 
- * Right now, all subclasses of SSReport will be shown in the ReportAdmin.  However, we are planning
+ * Right now, all subclasses of SS_Report will be shown in the ReportAdmin.  However, we are planning
  * on adding an explicit registration mechanism, so that you can decide which reports go in the
  * report admin, and which go elsewhere (such as the side panel in the CMS).
  * 
@@ -44,7 +44,7 @@
  */
 class SS_Report extends ViewableData {
 	/**
-	 * Report registry populated by {@link SSReport::register()}
+	 * Report registry populated by {@link SS_Report::register()}
 	 */
 	private static $registered_reports = array();
 
@@ -107,7 +107,7 @@ class SS_Report extends ViewableData {
 	 */
 	function sourceQuery($params) {
 		if($this->hasMethod('sourceRecords')) {
-			$query = new SSReport_FakeQuery($this, 'sourceRecords', $params);
+			$query = new SS_Report_FakeQuery($this, 'sourceRecords', $params);
 			$query->setSortColumnMethod('sortColumns');
 			return $query;
 		} else {
@@ -163,7 +163,7 @@ class SS_Report extends ViewableData {
 	 * data objects.
 	 *
 	 * @uses getReportField() to render a table, or similar field for the report. This
-	 * method should be defined on the SSReport subclasses.
+	 * method should be defined on the SS_Report subclasses.
 	 *
 	 * @return FieldSet
 	 */
@@ -296,8 +296,8 @@ class SS_Report extends ViewableData {
 	 * The default value is zero.
 	 */
 	static function register($list, $reportClass, $priority = 0) {
-		if(strpos($reportClass, '(') === false && (!class_exists($reportClass) || !is_subclass_of($reportClass,'SSReport'))) {
-			user_error("SSReport::register(): '$reportClass' is not a subclass of SSReport", E_USER_WARNING);
+		if(strpos($reportClass, '(') === false && (!class_exists($reportClass) || !is_subclass_of($reportClass,'SS_Report'))) {
+			user_error("SS_Report::register(): '$reportClass' is not a subclass of SS_Report", E_USER_WARNING);
 			return;
 		}
 		
@@ -312,8 +312,8 @@ class SS_Report extends ViewableData {
 	}
 	
 	/**
-	 * Return the SSReport objects making up the given list.
-	 * @return An array of SSReport objects
+	 * Return the SS_Report objects making up the given list.
+	 * @return An array of SS_Report objects
 	 */
 	static function get_reports($list) {
 		$output = array();
@@ -349,17 +349,17 @@ class SS_Report extends ViewableData {
  * Use it like this:
  * 
  *     function sourceQuery($params) {
- *         return new SSReport_FakeQuery($this, 'sourceRecords', $params)
+ *         return new SS_Report_FakeQuery($this, 'sourceRecords', $params)
  *     }
  *     function sourceRecords($params, $sort, $limit) {
  *         // Do some stuff
  *         // Return a DataObjectSet of actual objects.
  *     }
  * 
- * This object is used by the default implementation of sourceQuery() on SSReport, to make use of
+ * This object is used by the default implementation of sourceQuery() on SS_Report, to make use of
  * a sourceReords() method if one exists.
  */
-class SSReport_FakeQuery extends SQLQuery {
+class SS_Report_FakeQuery extends SQLQuery {
 	public $orderby;
 	public $limit;
 	
@@ -410,20 +410,20 @@ class SSReport_FakeQuery extends SQLQuery {
 }
 
 /**
- * SSReportWrapper is a base class for creating report wappers.
+ * SS_ReportWrapper is a base class for creating report wappers.
  * 
  * Wrappers encapsulate an existing report to alter their behaviour - they are implementations of
  * the standard GoF decorator pattern.
  * 
  * This base class ensure that, by default, wrappers behave in the same way as the report that is
  * being wrapped.  You should override any methods that need to behave differently in your subclass
- * of SSReportWrapper.
+ * of SS_ReportWrapper.
  * 
  * It also makes calls to 2 empty methods that you can override {@link beforeQuery()} and
  * {@link afterQuery()}
  */
 
-abstract class SSReportWrapper extends SSReport {
+abstract class SS_ReportWrapper extends SS_Report {
 	protected $baseReport;
 
 	function __construct($baseReport) {
diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index 1b1be86b..e1ab28c5 100755
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -67,7 +67,7 @@ class ReportAdmin extends LeftAndMain {
 	 */
 	public function Reports() {
  		$output = new DataObjectSet();
-		foreach(SSReport::get_reports('ReportAdmin') as $report) {
+		foreach(SS_Report::get_reports('ReportAdmin') as $report) {
 			if($report->canView()) $output->push($report);
 		}
 		return $output;
@@ -129,7 +129,7 @@ class ReportAdmin extends LeftAndMain {
 	/**
 	 * Get the current report
 	 *
-	 * @return SSReport
+	 * @return SS_Report
 	 */
 	public function CurrentReport() {
 		$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : Session::get('currentReport');
@@ -158,7 +158,7 @@ class ReportAdmin extends LeftAndMain {
 		$fields = new FieldSet();
 		$actions = new FieldSet();
 		
-		$reports = SSReport::get_reports('ReportAdmin');
+		$reports = SS_Report::get_reports('ReportAdmin');
 		$obj = $reports[$id];
 
 		if($obj) $fields = $obj->getCMSFields();
@@ -198,7 +198,7 @@ class ReportAdmin extends LeftAndMain {
 	 * @return boolean
 	 */
 	public static function has_reports() {
-		return sizeof(SSReport::get_reports('ReportAdmin')) > 0;
+		return sizeof(SS_Report::get_reports('ReportAdmin')) > 0;
 	}
 	
 	public function updatereport() {
diff --git a/code/SideReport.php b/code/SideReport.php
index 5acb22d5..192108f4 100755
--- a/code/SideReport.php
+++ b/code/SideReport.php
@@ -98,7 +98,7 @@ class SideReportView extends ViewableData {
  * 
  * This report wrapper will use sideReportColumns() for the report columns, instead of columns().
  */
-class SideReportWrapper extends SSReportWrapper {
+class SideReportWrapper extends SS_ReportWrapper {
 	function columns() {
 		if($this->baseReport->hasMethod('sideReportColumns')) {
 			return $this->baseReport->sideReportColumns();
@@ -168,7 +168,7 @@ class SideReport_RecentlyEdited extends SS_Report {
 	}
 }
 
-class SideReport_ToDo extends SideReport {
+class SideReport_ToDo extends SS_Report {
 	function title() {
 		return _t('SideReport.TODO',"Pages with To Do items");
 	}
@@ -178,17 +178,17 @@ class SideReport_ToDo extends SideReport {
 	function sort() {
 		return 0;
 	}
-	function records($params = null) {
+	function sourceRecords($params = null) {
 		return DataObject::get("SiteTree", "\"SiteTree\".\"ToDo\" IS NOT NULL AND \"SiteTree\".\"ToDo\" <> ''", "\"SiteTree\".\"LastEdited\" DESC");
 	}
-	function fieldsToShow() {
+	function columns() {
 		return array(
 			"Title" => array(
-				"source" => array("NestedTitle", array("2")),
+				"title" => "Title", // todo: use NestedTitle(2)
 				"link" => true,
 			),
 			"ToDo" => array(
-				"source" => "ToDo",
+				"title" => "ToDo",
 				"newline" => true,
 			), 
 		);
@@ -326,24 +326,3 @@ class SideReport_BrokenRedirectorPages extends SS_Report {
 		);
 	}
 }
-
-class SideReport_ToDo extends SS_Report {
-	function title() {
-		return _t('SideReport.TODO',"To do");
-	}
-	function sourceRecords($params = null) {
-		return DataObject::get("SiteTree", "\"SiteTree\".\"ToDo\" IS NOT NULL AND \"SiteTree\".\"ToDo\" <> ''", "\"SiteTree\".\"LastEdited\" DESC");
-	}
-	function columns() {
-		return array(
-			"Title" => array(
-				"title" => "Title", // todo: use NestedTitle(2)
-				"link" => true,
-			),
-			"ToDo" => array(
-				"title" => "ToDo",
-				"newline" => true,
-			), 
-		);
-	}
-}
diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
index 2f7f8a64..f72a5265 100644
--- a/code/reports/BrokenLinksReport.php
+++ b/code/reports/BrokenLinksReport.php
@@ -6,7 +6,7 @@
  * @subpackage content
  */
 
-class BrokenLinksReport extends SSReport {
+class BrokenLinksReport extends SS_Report {
 	function title() {
 		return _t('BrokenLinksReport.BROKENLINKS',"Broken links report");
 	}

From a17feb75faaf39f50242e7a1b9cbeee777ae5de1 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 05:31:25 +0000
Subject: [PATCH 207/483] BUGFIX: Fixed side report seelctor

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98226 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 4f620ad3..1d1eb557 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -671,7 +671,9 @@ JS;
 	function ReportSelector() {
 		// $options[""] = _t('CMSMain.CHOOSEREPORT',"(Choose a report)");
 		foreach($this->SideReports() as $report) {
-			if($report->canView()) $options[$report->ID()] = $report->title();
+			if($report->canView()) {
+			 	$options[$report->group()][$report->sort()][get_class($report)] = $report->title();
+			}
 		}
 		
 		$finalOptions = array();

From 06007f4455369bb3879a5298ab57efaf7d67bd26 Mon Sep 17 00:00:00 2001
From: Andrew O'Neil <andy@andyofniall.net>
Date: Thu, 4 Feb 2010 22:45:47 +0000
Subject: [PATCH 208/483] BUGFIX: Check for SubsiteReportWrapper class, not
 Subsite, so the CMS still works with older versions of Subsites

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98257 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 _config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_config.php b/_config.php
index b73ceed1..8c17feb2 100644
--- a/_config.php
+++ b/_config.php
@@ -54,7 +54,7 @@ HtmlEditorConfig::get('cms')->addButtonsToLine(3, 'tablecontrols');
 SS_Report::register("SideReport", "SideReport_EmptyPages");
 SS_Report::register("SideReport", "SideReport_RecentlyEdited");
 SS_Report::register("SideReport", "SideReport_ToDo");
-if (class_exists('Subsite')) SS_Report::register('ReportAdmin', 'SubsiteReportWrapper("BrokenLinksReport")',-20);
+if (class_exists('SubsiteReportWrapper')) SS_Report::register('ReportAdmin', 'SubsiteReportWrapper("BrokenLinksReport")',-20);
 else SS_Report::register('ReportAdmin', 'BrokenLinksReport',-20);
 
 

From 5c0df5d6912dd73cd378f042083fdba3781acb82 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Fri, 5 Feb 2010 00:28:16 +0000
Subject: [PATCH 209/483] MINOR: Only clear theme in CMS if we're not
 redirecting to the login form (better for testing).

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98264 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index c8af3ba3..85c5575f 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -99,10 +99,6 @@ class LeftAndMain extends Controller {
 	function init() {
 		parent::init();
 		
-		// The user's theme shouldn't affect the CMS, if, for example, they have replaced
-		// TableListField.ss or Form.ss.
-		SSViewer::set_theme(null);
-		
 		// set language
 		$member = Member::currentUser();
 		if(!empty($member->Locale)) {
@@ -295,6 +291,10 @@ class LeftAndMain extends Controller {
 
 		$dummy = null;
 		$this->extend('init', $dummy);
+
+		// The user's theme shouldn't affect the CMS, if, for example, they have replaced
+		// TableListField.ss or Form.ss.
+		SSViewer::set_theme(null);
 	}
 
 	//------------------------------------------------------------------------------------------//

From 8a3ac76d0b5cc7dd97be8ec23996c0b858d4be64 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 5 Feb 2010 01:27:14 +0000
Subject: [PATCH 210/483] MINOR Documentation

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98284 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SideReport.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/code/SideReport.php b/code/SideReport.php
index 192108f4..0bdca8ff 100755
--- a/code/SideReport.php
+++ b/code/SideReport.php
@@ -2,6 +2,9 @@
 
 /**
  * Renderer for showing SideReports in CMSMain
+ * 
+ * @package cms
+ * @subpackage content
  */
 class SideReportView extends ViewableData {
 	protected $controller, $report;
@@ -97,6 +100,9 @@ class SideReportView extends ViewableData {
  * A report wrapper that makes it easier to define slightly different behaviour for side-reports.
  * 
  * This report wrapper will use sideReportColumns() for the report columns, instead of columns().
+ * 
+ * @package cms
+ * @subpackage content
  */
 class SideReportWrapper extends SS_ReportWrapper {
 	function columns() {
@@ -112,6 +118,7 @@ class SideReportWrapper extends SS_ReportWrapper {
 
 /**
  * Content side-report listing empty pages
+ * 
  * @package cms
  * @subpackage content
  */
@@ -168,6 +175,10 @@ class SideReport_RecentlyEdited extends SS_Report {
 	}
 }
 
+/**
+ * @package cms
+ * @subpackage content
+ */
 class SideReport_ToDo extends SS_Report {
 	function title() {
 		return _t('SideReport.TODO',"Pages with To Do items");

From dc1557345847f047f379dde4de29c39635995409 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 5 Feb 2010 01:27:29 +0000
Subject: [PATCH 211/483] MINOR Fixed SS_HTTPResponse references in
 CMSBatchActionHandler

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98285 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSBatchActionHandler.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/CMSBatchActionHandler.php b/code/CMSBatchActionHandler.php
index ff8f1617..ff53a0c5 100644
--- a/code/CMSBatchActionHandler.php
+++ b/code/CMSBatchActionHandler.php
@@ -117,9 +117,9 @@ class CMSBatchActionHandler extends RequestHandler {
 		$ids = array_filter($ids);
 		
 		if($actionHandler->hasMethod('confirmationDialog')) {
-			$response = new HTTPResponse(json_encode($actionHandler->confirmationDialog($ids)));
+			$response = new SS_HTTPResponse(json_encode($actionHandler->confirmationDialog($ids)));
 		} else {
-			$response = new HTTPResponse(json_encode(array('alert' => false)));
+			$response = new SS_HTTPResponse(json_encode(array('alert' => false)));
 		}
 		
 		$response->addHeader("Content-type", "application/json");

From b2d2220d22b20611c270ede444f56abab1b63633 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Sun, 7 Feb 2010 22:54:30 +0000
Subject: [PATCH 212/483] MINOR Removed arguments to
 Hierarchy::getDescendantIDList() calls, as the method does not have any

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98341 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php             | 2 +-
 code/ThumbnailStripField.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 1d1eb557..f584db12 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -564,7 +564,7 @@ JS;
 		
 		// before deleting the records, get the descendants of this tree
 		if($record) {
-			$descendantIDs = $record->getDescendantIDList('SiteTree');
+			$descendantIDs = $record->getDescendantIDList();
 
 			// then delete them from the live site too
 			$descendantsRemoved = 0;
diff --git a/code/ThumbnailStripField.php b/code/ThumbnailStripField.php
index ed4eb758..441add29 100755
--- a/code/ThumbnailStripField.php
+++ b/code/ThumbnailStripField.php
@@ -44,7 +44,7 @@ class ThumbnailStripField extends FormField {
 		$folder = DataObject::get_by_id('Folder', (int) $_GET['folderID']);
 		
 		if($folder) {
-			$folderList = $folder->getDescendantIDList('Folder');
+			$folderList = $folder->getDescendantIDList();
 			array_unshift($folderList, $folder->ID);
 
 			$whereSQL = '"ParentID" IN (' . implode(', ', $folderList) . ')';

From d5b2d4012330db10f13b4bdc978c713a23d64dae Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Mon, 8 Feb 2010 03:09:59 +0000
Subject: [PATCH 213/483] MINOR Removed argument to getDescendantIDList() in
 ThumbnailStripField that doesn't exist on the method

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98390 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ThumbnailStripField.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/ThumbnailStripField.php b/code/ThumbnailStripField.php
index 441add29..93347c18 100755
--- a/code/ThumbnailStripField.php
+++ b/code/ThumbnailStripField.php
@@ -112,7 +112,7 @@ class ThumbnailStripField extends FormField {
 		$folder = DataObject::get_by_id("Folder", (int) $_GET['folderID']);
 		
 		if($folder) {
-			$folderList = $folder->getDescendantIDList('Folder');
+			$folderList = $folder->getDescendantIDList();
 			array_unshift($folderList, $folder->ID);
 			
 			$whereSQL = "\"ParentID\" IN (" . implode(', ', $folderList) . ") AND \"Filename\" LIKE '%.swf'";

From 166b5fb95b0ca0fdd0718b9584a9c0e15b55e02b Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Mon, 8 Feb 2010 23:13:42 +0000
Subject: [PATCH 214/483] FEATURE: Add HTMLCleaner abstract class, and
 Diff::cleanHTML()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98469 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/Diff.php        | 36 ++++++++++++++++++++++++++++++++++--
 code/HTMLCleaner.php | 14 ++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 code/HTMLCleaner.php

diff --git a/code/Diff.php b/code/Diff.php
index ef2825e6..9964c5f8 100755
--- a/code/Diff.php
+++ b/code/Diff.php
@@ -529,6 +529,8 @@ class _DiffEngine
  */
 class Diff
 {
+	public static $html_cleaner_class = null;
+
     var $edits;
 
     /**
@@ -660,6 +662,36 @@ class Diff
     
  
  
+ 	/**
+	 *  Attempt to clean invalid HTML, which messes up diffs.
+	 *  This checks for various methods and cleans code if possible.
+	 *
+	 *  NB: By default, only extremely simple tidying is performed,
+	 *  by passing through DomDocument::loadHTML and saveXML
+	 *  You will either need to install the php_tidy module
+	 *		See: http://www.php.net/manual/en/tidy.installation.php
+	 *		See also: http://htmlpurifier.org
+	 *
+	 * @param string $content HTML content
+	 * @param object $cleaner Optional instance of a HTMLCleaner class to
+	 * 	use, overriding self::$html_cleaner_class
+	 */
+	static function cleanHTML($content, $cleaner=null) {
+		if (!$cleaner)) {
+			if (class_exists(self::$html_cleaner_class)) {
+				$cleaner = new self::$html_cleaner_class;
+			}
+		}
+		if ($cleaner) {
+			$content = $cleaner->cleanHTML($content);
+		} else {
+			// At most basic level of cleaning, use DOMDocument to save valid XML.
+			$doc = new SS_HTMLValue($content);
+			$content = $doc->getContent();
+		}
+		return $content;
+	}
+
 	static function compareHTML($from, $to) {
 		// First split up the content into words and tags
 		$set1 = self::getHTMLChunks($from);
@@ -750,7 +782,7 @@ class Diff
 			}
 		}		
 		// echo "<p>" . htmlentities($content) . "</p>";
-		return $content;
+		return self::cleanHTML($content);
 	}
 	static function getHTMLChunks($content) {
 		$content = str_replace(array("&nbsp;","<", ">"),array(" "," <", "> "),$content);
@@ -833,4 +865,4 @@ extends Diff
     }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/code/HTMLCleaner.php b/code/HTMLCleaner.php
new file mode 100644
index 00000000..9e85e10c
--- /dev/null
+++ b/code/HTMLCleaner.php
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * Base class for HTML cleaning classes.
+ */
+abstract class HTMLCleaner  extends Object {
+	/**
+	 * Passed $content, return HTML that has been tidied.
+	 * @return string $content HTML, tidied
+	 */
+	public abstract function cleanHTML($content);
+}
+
+?>

From 4192dcdf0763c0288fa97ccf6ad0e65590b64ec6 Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Mon, 8 Feb 2010 23:17:28 +0000
Subject: [PATCH 215/483] MINOR: Fix documentation for Diff::cleanHTML

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98477 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/Diff.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/Diff.php b/code/Diff.php
index 9964c5f8..c33d3570 100755
--- a/code/Diff.php
+++ b/code/Diff.php
@@ -664,13 +664,10 @@ class Diff
  
  	/**
 	 *  Attempt to clean invalid HTML, which messes up diffs.
-	 *  This checks for various methods and cleans code if possible.
+	 *  This cleans code if possible, using an instance of HTMLCleaner
 	 *
 	 *  NB: By default, only extremely simple tidying is performed,
 	 *  by passing through DomDocument::loadHTML and saveXML
-	 *  You will either need to install the php_tidy module
-	 *		See: http://www.php.net/manual/en/tidy.installation.php
-	 *		See also: http://htmlpurifier.org
 	 *
 	 * @param string $content HTML content
 	 * @param object $cleaner Optional instance of a HTMLCleaner class to

From 16e194120353e4e46f179754e60d382816c04b42 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Mon, 8 Feb 2010 23:35:52 +0000
Subject: [PATCH 216/483] MINOR Removed double brackets from Diff::cleanHTML()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98480 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/Diff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/Diff.php b/code/Diff.php
index c33d3570..b7c5f9d9 100755
--- a/code/Diff.php
+++ b/code/Diff.php
@@ -674,7 +674,7 @@ class Diff
 	 * 	use, overriding self::$html_cleaner_class
 	 */
 	static function cleanHTML($content, $cleaner=null) {
-		if (!$cleaner)) {
+		if (!$cleaner) {
 			if (class_exists(self::$html_cleaner_class)) {
 				$cleaner = new self::$html_cleaner_class;
 			}

From a94ddab4cd0b07597bcdd0a9dd909e65d7b822f7 Mon Sep 17 00:00:00 2001
From: Carlos Barberis <carlos@silverstripe.com>
Date: Wed, 10 Feb 2010 21:53:07 +0000
Subject: [PATCH 217/483] BUGFIX: Closing TinyMCE image, link or flash panel
 when loading form (ticket #4907)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98690 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/ModelAdmin.js | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/javascript/ModelAdmin.js b/javascript/ModelAdmin.js
index 80dedaa4..32294ea8 100644
--- a/javascript/ModelAdmin.js
+++ b/javascript/ModelAdmin.js
@@ -33,6 +33,11 @@ $(document).ready(function() {
 	    $(this).addClass('loading');
 	});
 	
+	$('input[name=action_search]').livequery('click', function() {
+		$('#contentPanel').fn('closeRightPanel');
+	});
+	
+	
 	$("#right").scroll( function () {
 		positionActionArea();
 	});
@@ -88,7 +93,7 @@ $(document).ready(function() {
 	 */
 	$('#SearchForm_holder .tab form:not(#Form_ImportForm)').submit(function () {
 	    var $form = $(this);
-	
+		$('#contentPanel').fn('closeRightPanel');
 		// @todo TinyMCE coupling
 		tinymce_removeAll();
 
@@ -283,11 +288,28 @@ $(document).ready(function() {
 		$('#' + $(this).attr('href').replace(/.*#/,'')).toggle();
 		return false;
 	});
-
+	
+	
 	////////////////////////////////////////////////////////////////// 
 	// Helper functions
 	////////////////////////////////////////////////////////////////// 
 	
+	$('#contentPanel').fn({
+		/**
+		* Close TinyMCE image, link or flash panel.
+		* this function is called everytime a new search, back or add new DataObject are clicked
+		**/
+		closeRightPanel: function(){
+			if($('#contentPanel').is(':visible')) {
+				$('#contentPanel').hide();
+				$('#Form_EditorToolbarImageForm').hide();
+				$('#Form_EditorToolbarFlashForm').hide();
+				$('#Form_EditorToolbarLinkForm').hide();
+			}
+		}
+		
+	})
+	
     $('#ModelAdminPanel').fn({
         /**
          * Load a detail editing form into the main edit panel
@@ -296,7 +318,7 @@ $(document).ready(function() {
         loadForm: function(url, successCallback) {
 			// @todo TinyMCE coupling
 			tinymce_removeAll();
-	
+			$('#contentPanel').fn('closeRightPanel');
     	    $('#right #ModelAdminPanel').load(url, standardStatusHandler(function(result) {
 				if(typeof(successCallback) == 'function') successCallback.apply();
 				if(!this.future || !this.future.length) {
@@ -310,7 +332,9 @@ $(document).ready(function() {
 				if(window.onresize) window.onresize();
     		}));
     	},
+
     	
+		
     	startHistory: function(url, data) {
     	    this.history = [];
     	    $(this).fn('addHistory', url, data);

From a08c77c360b659d361795a88f4c04606a56f25be Mon Sep 17 00:00:00 2001
From: Geoff Munn <geoff@silverstripe.com>
Date: Wed, 10 Feb 2010 21:59:57 +0000
Subject: [PATCH 218/483] BUGFIX: columns quoted properly

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98694 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 85c5575f..77bd75cc 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -712,7 +712,7 @@ JS;
 				FormResponse::add("\$('Form_EditForm_StageURLSegment').value = \"" . $record->AbsoluteLink() . "\";");
 			}
 			
-			if($virtualPages = DataObject::get("VirtualPage", "CopyContentFromID = $record->ID")) {
+			if($virtualPages = DataObject::get("VirtualPage", "\"CopyContentFromID\" = $record->ID")) {
 				foreach($virtualPages as $page) {
 					if($page->ID != $record->ID) {
 						$title = Convert::raw2js($page->TreeTitle());

From a9d6dec5ecd3d8d1d7379bd097130216160ca606 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 11 Feb 2010 00:43:23 +0000
Subject: [PATCH 219/483] FEATURE Import members and their group assignments
 from CSV in admin/security through the new MemberImportForm class (merged
 from r98708)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98732 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberImportForm.php         | 84 +++++++++++++++++++++++++++++++
 code/SecurityAdmin.php            | 48 +++++++++++++++++-
 javascript/SecurityAdmin_right.js | 29 ++++++++++-
 tests/MemberImportFormTest.php    | 21 ++++++++
 tests/MemberImportFormTest.yml    |  3 ++
 5 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 code/MemberImportForm.php
 create mode 100644 tests/MemberImportFormTest.php
 create mode 100644 tests/MemberImportFormTest.yml

diff --git a/code/MemberImportForm.php b/code/MemberImportForm.php
new file mode 100644
index 00000000..85da09a8
--- /dev/null
+++ b/code/MemberImportForm.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Imports {@link Member} records by CSV upload, as defined in
+ * {@link MemberCsvBulkLoader}.
+ * 
+ * @package cms
+ * @subpackage batchactions
+ */
+class MemberImportForm extends Form {
+	
+	/**
+	 * @var Group Optional group relation
+	 */
+	protected $group;
+	
+	function __construct($controller, $name, $fields = null, $actions = null, $validator = null) {
+		if(!$fields) {
+			$fields = new FieldSet(
+				$fileField = new FileField(
+					'CsvFile', 
+					_t(
+						'SecurityAdmin_MemberImportForm.FileFieldLabel', 
+						'CSV File <small>(Allowed extensions: *.csv)</small>'
+					)
+				)
+			);
+			$fileField->setAllowedExtensions(array('csv'));
+		}
+		
+		if(!$actions) $actions = new FieldSet(
+			new FormAction('doImport', _t('SecurityAdmin_MemberImportForm.BtnImport', 'Import'))
+		);
+		
+		if(!$validator) $validator = new RequiredFields('CsvFile');
+		
+		
+		parent::__construct($controller, $name, $fields, $actions, $validator);
+	}
+	
+	function doImport($data, $form) {
+		$loader = new MemberCsvBulkLoader();
+		
+		// optionally set group relation
+		if($this->group) $loader->setGroups(array($this->group));
+		
+		// load file
+		$result = $loader->load($data['CsvFile']['tmp_name']);
+		
+		// result message
+		$msgArr = array();
+		if($result->CreatedCount()) $msgArr[] = sprintf(
+			_t('MemberImportForm.ResultCreated', 'Created %d members'),
+			$result->CreatedCount()
+		);
+		if($result->UpdatedCount()) $msgArr[] = sprintf(
+			_t('MemberImportForm.ResultUpdated', 'Updated %d members'),
+			$result->UpdatedCount()
+		);
+		if($result->DeletedCount()) $msgArr[] = sprintf(
+			_t('MemberImportForm.ResultDeleted', 'Deleted %d members'),
+			$result->DeletedCount()
+		);
+		$msg = ($msgArr) ? implode(',', $msgArr) : _t('MemberImportForm.ResultNone', 'No changes');
+	
+		$this->sessionMessage($msg, 'good');
+		
+		Director::redirectBack();
+	}
+	
+	/**
+	 * @param $group Group
+	 */
+	function setGroup($group) {
+		$this->group = $group;
+	}
+	
+	/**
+	 * @return Group
+	 */
+	function getGroup($group) {
+		return $this->group;
+	}
+}
+?>
\ No newline at end of file
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 6400013a..784caf75 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -24,7 +24,9 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		'savemember',
 		'AddRecordForm',
 		'MemberForm',
-		'EditForm'
+		'EditForm',
+		'MemberImportForm',
+		'memberimport'
 	);
 
 	/**
@@ -75,6 +77,21 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		$form = new Form($this, "EditForm", $fields, $actions);
 		$form->loadDataFrom($record);
 		
+		$fields = $form->Fields();
+
+		if($fields->hasTabSet()) {
+			$fields->findOrMakeTab('Root.Import',_t('Group.IMPORTTABTITLE', 'Import'));
+			$fields->addFieldToTab('Root.Import', 
+				new LiteralField(
+					'MemberImportFormIframe', 
+					sprintf(
+						'<iframe src="%s" id="MemberImportFormIframe" width="100%%" height="400px" border="0"></iframe>',
+						$this->Link('memberimport')
+					)
+				)
+			);
+		}
+		
 		if(!$record->canEdit()) {
 			$readonlyFields = $form->Fields()->makeReadonly();
 			$form->setFields($readonlyFields);
@@ -86,6 +103,35 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		
 		return $form;
 	}
+	
+	public function memberimport() {
+		Requirements::clear();
+		Requirements::css(SAPPHIRE_DIR . '/css/Form.css');
+		Requirements::css(CMS_DIR . '/css/typography.css');
+		Requirements::css(CMS_DIR . '/css/cms_right.css');
+		
+		Requirements::javascript(CMS_DIR . '/javascript/MemberImportForm.js');
+		
+		return $this->renderWith('BlankPage', array(
+			'Form' => $this->MemberImportForm()
+		));
+	}
+	
+	/**
+	 * @see SecurityAdmin_MemberImportForm
+	 * 
+	 * @return Form
+	 */
+	public function MemberImportForm() {
+		$group = $this->currentPage();
+		$form = new MemberImportForm(
+			$this,
+			'MemberImportForm'
+		);
+		$form->setGroup($group);
+		
+		return $form;
+	}
 
 	public function AddRecordForm() {
 		$m = Object::create('MemberTableField',
diff --git a/javascript/SecurityAdmin_right.js b/javascript/SecurityAdmin_right.js
index 03daad63..e9e8e163 100755
--- a/javascript/SecurityAdmin_right.js
+++ b/javascript/SecurityAdmin_right.js
@@ -6,4 +6,31 @@ function action_addmember_right() {
 	var tables = document.getElementsBySelector('#Form_EditForm div.MemberTableField table');
 	var addLinks = document.getElementsBySelector('#Form_EditForm div.MemberTableField a.addlink');
 	memberTableFields[0].openPopup(null,addLinks[0].href,tables[0]);
-}
\ No newline at end of file
+}
+
+(function($) {
+	$(document).ready(function() {
+		var refreshAfterImport = function(e) {
+			// Check for a message <div>, an indication that the form has been submitted.
+			var existingFormMessage = $($(this).contents()).find('.message');
+			if(existingFormMessage && existingFormMessage.html()) {
+				// Refresh member listing
+				var memberTableField = $(window.parent.document).find('#Form_EditForm_Members').get(0);
+				if(memberTableField) memberTableField.refresh();
+
+				// Refresh tree
+				var tree = $(window.parent.document).find('#sitetree').get(0);
+				if(tree) tree.reload();
+			}
+		};
+
+		/**
+		 * Refresh the member listing every time the import iframe is loaded,
+		 * which is most likely a form submission.
+		 */
+		$('#MemberImportFormIframe,#GroupImportFormIframe').livequery(
+			'load',
+			refreshAfterImport
+		);
+	})
+})(jQuery);
\ No newline at end of file
diff --git a/tests/MemberImportFormTest.php b/tests/MemberImportFormTest.php
new file mode 100644
index 00000000..4426a951
--- /dev/null
+++ b/tests/MemberImportFormTest.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package cms
+ * @subpackage tests
+ */
+class MemberImportFormTest extends SapphireTest {
+	
+	function testLoad() {
+		$form = new MemberImportForm(
+			new Controller(),
+			'Form'
+		);
+		$data = array(
+			'CsvFile' => array(
+				'tmp_name' => 'cms/tests/MemberImportFormTest.yml'
+			)
+		);
+		$form->doImport($data, $form);
+	}
+	
+}
\ No newline at end of file
diff --git a/tests/MemberImportFormTest.yml b/tests/MemberImportFormTest.yml
new file mode 100644
index 00000000..94463f79
--- /dev/null
+++ b/tests/MemberImportFormTest.yml
@@ -0,0 +1,3 @@
+FirstName,Surname,Email,Password,PasswordEncryption,Salt,PasswordExpiry,Groups
+author1_first,author1_last,author1@test.com,21bb196c4d488023cb4e4b9df5f687c9a4d40172,sha1_v2.4,c23a94a878aa825cee69136bfd6185a874bc68801257978194,,existinggroup
+author2_first,author2_last,author2@test.com,069b6b22dcaded75c045b7e5ceb5d1dd743f9cac,sha1_v2.4,7e8ea602668b5631bac4baaf7174f9966b6d34571257978210,,"existinggroup,newgroup"
\ No newline at end of file

From 6103522ad21e6135525d071d42eef0cd12e6435e Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 11 Feb 2010 00:45:19 +0000
Subject: [PATCH 220/483] MINOR Defensive scripting in LeftAndMain.Tree.js
 (merged from r98709)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98733 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/LeftAndMain_left.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/LeftAndMain_left.js b/javascript/LeftAndMain_left.js
index 7289dbd2..90302581 100755
--- a/javascript/LeftAndMain_left.js
+++ b/javascript/LeftAndMain_left.js
@@ -59,7 +59,7 @@ TreeAPI.prototype = {
 			onSuccess: function(response){
 				self.innerHTML = response.responseText;
 				self.castAsTreeNode(self.firstChild);
-				if (options.onSuccess) options.onSuccess(response);
+				if (options && options.onSuccess) options.onSuccess(response);
 			},
 			onFailure: function(response){
 				errorMessage('error loading tree', response);

From c38a898de3797685bc68d97d2327bff97868f5e9 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 11 Feb 2010 01:02:34 +0000
Subject: [PATCH 221/483] ENHANCEMENT Allowing custom 'root forms' when id
 values '0' or 'root' are passed from the tree selection. (rewritten from
 r98710)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98735 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php   | 34 +++++++++++++++++++++++++++++++++-
 code/SecurityAdmin.php | 22 +++++++---------------
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 77bd75cc..ef74f2fd 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -509,7 +509,7 @@ class LeftAndMain extends Controller {
 		// Wrap the root if needs be.
 
 		if(!$rootID) {
-			$rootLink = $this->Link() . '0';
+			$rootLink = $this->Link('show') . '/root';
 			
 			// This lets us override the tree title with an extension
 			if($this->hasMethod('getCMSTreeTitle') && $customTreeTitle = $this->getCMSTreeTitle()) {
@@ -939,10 +939,42 @@ JS;
 				
 			}
 		}
+
 		FormResponse::add($script);
 
 		return FormResponse::respond();
 	}
+		
+	/**
+	 * Returns a placeholder form, used by {@link getEditForm()} if no record is selected.
+	 * Our javascript logic always requires a form to be present in the CMS interface.
+	 * 
+	 * @return Form
+	 */
+	function EmptyForm() {
+		$form = new Form(
+			$this, 
+			"EditForm", 
+			new FieldSet(
+				new HeaderField(
+					'WelcomeHeader',
+					$this->getApplicationName()
+				),
+				new LiteralField(
+					'WelcomeText',
+					sprintf('<p id="WelcomeMessage">%s %s. %s</p>',
+						_t('LeftAndMain_right.ss.WELCOMETO','Welcome to'),
+						$this->getApplicationName(),
+						_t('CHOOSEPAGE','Please choose an item from the left.')
+					)
+				)
+			), 
+			new FieldSet()
+		);
+		$form->unsetValidator();
+		
+		return $form;
+	}
 
 	public function EditForm() {
 		// Include JavaScript to ensure HtmlEditorField works.
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 784caf75..d97656e9 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -59,7 +59,12 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 	public function getEditForm($id) {
 		$record = null;
 		
-		if (($id == 'root' || $id == 0) && $this->hasMethod('getRootForm')) return $this->getRootForm($this, 'EditForm');
+		if (($id == 'root' || $id == 0)) {
+			$form = $this->RootForm();
+			$this->extend('augmentRootForm', $form);
+			
+			return $form;
+		}
 		
 		if($id && $id != 'root') {
 			$record = DataObject::get_by_id($this->stat('tree_class'), $id);
@@ -77,20 +82,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		$form = new Form($this, "EditForm", $fields, $actions);
 		$form->loadDataFrom($record);
 		
-		$fields = $form->Fields();
-
-		if($fields->hasTabSet()) {
-			$fields->findOrMakeTab('Root.Import',_t('Group.IMPORTTABTITLE', 'Import'));
-			$fields->addFieldToTab('Root.Import', 
-				new LiteralField(
-					'MemberImportFormIframe', 
-					sprintf(
-						'<iframe src="%s" id="MemberImportFormIframe" width="100%%" height="400px" border="0"></iframe>',
-						$this->Link('memberimport')
-					)
-				)
-			);
-		}
+		
 		
 		if(!$record->canEdit()) {
 			$readonlyFields = $form->Fields()->makeReadonly();

From a7c0797a9d75b9475dc1f185d0d4f5b5abc8a339 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 11 Feb 2010 01:20:20 +0000
Subject: [PATCH 222/483] FEATURE Import groups from CSV in admin/security
 through the new GroupImportForm class (and GroupCsvBulkLoader) (merged and
 rewritten from r98711)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98736 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php      |  2 +
 code/CMSMain.php         |  5 +++
 code/GroupImportForm.php | 68 ++++++++++++++++++++++++++++++++++
 code/SecurityAdmin.php   | 80 ++++++++++++++++++++++++++++++++++++----
 4 files changed, 147 insertions(+), 8 deletions(-)
 create mode 100644 code/GroupImportForm.php

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 3d4725b2..1067f4a3 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -310,6 +310,8 @@ HTML;
 				$form->makeReadonly();
 			}
 
+			$this->extend('updateEditForm', $form);
+
 			return $form;
 		}
 	}
diff --git a/code/CMSMain.php b/code/CMSMain.php
index f584db12..85ed7daf 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -457,6 +457,8 @@ JS;
 				$readonlyFields = $form->Fields()->makeReadonly();
 				$form->setFields($readonlyFields);
 			}
+			
+			$this->extend('updateEditForm', $form);
 
 			return $form;
 		} if ($id == 0) {
@@ -467,6 +469,9 @@ JS;
 			} 
 			$form = new Form($this, "EditForm", $fields, $siteConfig->getFormActions());
 			$form->loadDataFrom($siteConfig);
+			
+			$this->extend('updateEditForm', $form);
+			
 			return $form;
 		} else if($id) {
 			return new Form($this, "EditForm", new FieldSet(
diff --git a/code/GroupImportForm.php b/code/GroupImportForm.php
new file mode 100644
index 00000000..b5f55eab
--- /dev/null
+++ b/code/GroupImportForm.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Imports {@link Group} records by CSV upload, as defined in
+ * {@link GroupCsvBulkLoader}.
+ * 
+ * @package cms
+ * @subpackage batchactions
+ */
+class GroupImportForm extends Form {
+	
+	/**
+	 * @var Group Optional group relation
+	 */
+	protected $group;
+	
+	function __construct($controller, $name, $fields = null, $actions = null, $validator = null) {
+		if(!$fields) {
+			$fields = new FieldSet(
+				$fileField = new FileField(
+					'CsvFile', 
+					_t(
+						'SecurityAdmin_MemberImportForm.FileFieldLabel', 
+						'CSV File <small>(Allowed extensions: *.csv)</small>'
+					)
+				)
+			);
+			$fileField->setAllowedExtensions(array('csv'));
+		}
+		
+		if(!$actions) $actions = new FieldSet(
+			new FormAction('doImport', _t('SecurityAdmin_MemberImportForm.BtnImport', 'Import'))
+		);
+		
+		if(!$validator) $validator = new RequiredFields('CsvFile');
+		
+		
+		parent::__construct($controller, $name, $fields, $actions, $validator);
+	}
+	
+	function doImport($data, $form) {
+		$loader = new GroupCsvBulkLoader();
+		
+		// load file
+		$result = $loader->load($data['CsvFile']['tmp_name']);
+		
+		// result message
+		$msgArr = array();
+		if($result->CreatedCount()) $msgArr[] = sprintf(
+			_t('GroupImportForm.ResultCreated', 'Created %d groups'),
+			$result->CreatedCount()
+		);
+		if($result->UpdatedCount()) $msgArr[] = sprintf(
+			_t('GroupImportForm.ResultUpdated', 'Updated %d groups'),
+			$result->UpdatedCount()
+		);
+		if($result->DeletedCount()) $msgArr[] = sprintf(
+			_t('GroupImportForm.ResultDeleted', 'Deleted %d groups'),
+			$result->DeletedCount()
+		);
+		$msg = ($msgArr) ? implode(',', $msgArr) : _t('MemberImportForm.ResultNone', 'No changes');
+	
+		$this->sessionMessage($msg, 'good');
+		
+		Director::redirectBack();
+	}
+	
+}
+?>
\ No newline at end of file
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index d97656e9..516b9818 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -26,7 +26,9 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		'MemberForm',
 		'EditForm',
 		'MemberImportForm',
-		'memberimport'
+		'memberimport',
+		'GroupImportForm',
+		'groupimport',
 	);
 
 	/**
@@ -59,13 +61,37 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 	public function getEditForm($id) {
 		$record = null;
 		
+		// Root form
 		if (($id == 'root' || $id == 0)) {
-			$form = $this->RootForm();
-			$this->extend('augmentRootForm', $form);
+			$fields = new FieldSet(
+				new TabSet(
+					'Root',
+					new Tab('Import', _t('SecurityAdmin.TABIMPORT', 'Import'),
+						new LiteralField(
+							'GroupImportFormIframe', 
+							sprintf(
+								'<iframe src="%s" id="GroupImportFormIframe" width="100%%" height="400px" border="0"></iframe>',
+								$this->Link('groupimport')
+							)
+						)
+					)
+				),
+				// necessary for tree node selection in LeftAndMain.EditForm.js
+				new HiddenField('ID', false, 0)
+			);
+
+			$actions = new FieldSet();
+
+			$form = new Form(
+				$this,
+				'EditForm',
+				$fields,
+				$actions
+			);
 			
 			return $form;
 		}
-		
+
 		if($id && $id != 'root') {
 			$record = DataObject::get_by_id($this->stat('tree_class'), $id);
 		}
@@ -74,16 +100,27 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		
 		$fields = $record->getCMSFields();
 		
+		if($fields->hasTabSet()) {
+			$fields->findOrMakeTab('Root.Import',_t('Group.IMPORTTABTITLE', 'Import'));
+			$fields->addFieldToTab('Root.Import', 
+				new LiteralField(
+					'MemberImportFormIframe', 
+					sprintf(
+						'<iframe src="%s" id="MemberImportFormIframe" width="100%%" height="400px" border="0"></iframe>',
+						$this->Link('memberimport')
+					)
+				)
+			);
+		}
+		
 		$actions = new FieldSet(
 			new FormAction('addmember',_t('SecurityAdmin.ADDMEMBER','Add Member')),
 			new FormAction('save',_t('SecurityAdmin.SAVE','Save'))
 		);
-
+		
 		$form = new Form($this, "EditForm", $fields, $actions);
 		$form->loadDataFrom($record);
 		
-		
-		
 		if(!$record->canEdit()) {
 			$readonlyFields = $form->Fields()->makeReadonly();
 			$form->setFields($readonlyFields);
@@ -92,7 +129,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		// Filter permissions
 		$permissionField = $form->Fields()->dataFieldByName('Permissions');
 		if($permissionField) $permissionField->setHiddenPermissions(self::$hidden_permissions);
-		
+
 		return $form;
 	}
 	
@@ -124,6 +161,33 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		
 		return $form;
 	}
+		
+	public function groupimport() {
+		Requirements::clear();
+		Requirements::css(SAPPHIRE_DIR . '/css/Form.css');
+		Requirements::css(CMS_DIR . '/css/typography.css');
+		Requirements::css(CMS_DIR . '/css/cms_right.css');
+		
+		Requirements::javascript(CMS_DIR . '/javascript/MemberImportForm.js');
+		
+		return $this->renderWith('BlankPage', array(
+			'Form' => $this->GroupImportForm()
+		));
+	}
+	
+	/**
+	 * @see SecurityAdmin_MemberImportForm
+	 * 
+	 * @return Form
+	 */
+	public function GroupImportForm() {
+		$form = new GroupImportForm(
+			$this,
+			'GroupImportForm'
+		);
+		
+		return $form;
+	}
 
 	public function AddRecordForm() {
 		$m = Object::create('MemberTableField',

From acece9ed3a2c92c12062f76ac0b01bb4d3cff9fa Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 11 Feb 2010 01:21:45 +0000
Subject: [PATCH 223/483] ENHANCEMENT Allow extension of
 LeftAndMain->getEditForm() (and subclasses) through a new updateEditForm()
 hook (see r98736 for additions to AssetAdmin and CMSMain)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98737 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SecurityAdmin.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 516b9818..17aa4ac4 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -89,6 +89,8 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 				$actions
 			);
 			
+			$this->extend('updateEditForm', $form);
+			
 			return $form;
 		}
 
@@ -130,6 +132,8 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		$permissionField = $form->Fields()->dataFieldByName('Permissions');
 		if($permissionField) $permissionField->setHiddenPermissions(self::$hidden_permissions);
 
+		$this->extend('updateEditForm', $form);
+
 		return $form;
 	}
 	

From 905da3febfd41418e37b7e60d9b433d3a981fff8 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 11 Feb 2010 02:35:16 +0000
Subject: [PATCH 224/483] ENHANCEMENT Added help texts for MemberImportForm and
 GroupImportForm (merged and rewritten from r98750)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98756 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/GroupImportForm.php       | 24 ++++++++++++++++-
 code/MemberImportForm.php      | 23 ++++++++++++++++
 code/SecurityAdmin.php         | 10 +++++--
 css/MemberImportForm.css       | 25 +++++++++++++++++
 javascript/MemberImportForm.js | 13 +++++++++
 lang/en_US.php                 | 49 +++++++++++++++++++++++++++++-----
 6 files changed, 134 insertions(+), 10 deletions(-)
 create mode 100644 css/MemberImportForm.css
 create mode 100644 javascript/MemberImportForm.js

diff --git a/code/GroupImportForm.php b/code/GroupImportForm.php
index b5f55eab..a514247d 100644
--- a/code/GroupImportForm.php
+++ b/code/GroupImportForm.php
@@ -15,7 +15,28 @@ class GroupImportForm extends Form {
 	
 	function __construct($controller, $name, $fields = null, $actions = null, $validator = null) {
 		if(!$fields) {
+			$helpHtml = _t(
+				'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>'
+			);
+			$helpHtml .= _t(
+				'GroupImportForm.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>');
+			
+			$importer = new GroupCsvBulkLoader();
+			$importSpec = $importer->getImportSpec();
+			$helpHtml = sprintf($helpHtml, implode(', ', array_keys($importSpec['fields'])));
+			
 			$fields = new FieldSet(
+				new LiteralField('Help', $helpHtml),
 				$fileField = new FileField(
 					'CsvFile', 
 					_t(
@@ -33,8 +54,9 @@ class GroupImportForm extends Form {
 		
 		if(!$validator) $validator = new RequiredFields('CsvFile');
 		
-		
 		parent::__construct($controller, $name, $fields, $actions, $validator);
+		
+		$this->addExtraClass('import-form');
 	}
 	
 	function doImport($data, $form) {
diff --git a/code/MemberImportForm.php b/code/MemberImportForm.php
index 85da09a8..d3df83c5 100644
--- a/code/MemberImportForm.php
+++ b/code/MemberImportForm.php
@@ -15,7 +15,27 @@ class MemberImportForm extends Form {
 	
 	function __construct($controller, $name, $fields = null, $actions = null, $validator = null) {
 		if(!$fields) {
+			$helpHtml = _t(
+				'MemberImportForm.Help1', 
+				'<p>Import members in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
+			);
+			$helpHtml .= _t(
+				'MemberImportForm.Help2', 
+'<div class="advanced">
+	<h4>Advanced usage</h4>
+	<ul>
+	<li>Allowed columns: <em>%s</em></li>
+	<li>Existing members 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>');
+			
+			$importer = new MemberCsvBulkLoader();
+			$importSpec = $importer->getImportSpec();
+			$helpHtml = sprintf($helpHtml, implode(', ', array_keys($importSpec['fields'])));
+			
 			$fields = new FieldSet(
+				new LiteralField('Help', $helpHtml),
 				$fileField = new FileField(
 					'CsvFile', 
 					_t(
@@ -35,6 +55,9 @@ class MemberImportForm extends Form {
 		
 		
 		parent::__construct($controller, $name, $fields, $actions, $validator);
+		
+		Requirements::javascript(CMS_DIR . '/javascript/MemberImportForm.js');
+		$this->addExtraClass('import-form');
 	}
 	
 	function doImport($data, $form) {
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 17aa4ac4..d14dfc06 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -142,7 +142,10 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		Requirements::css(SAPPHIRE_DIR . '/css/Form.css');
 		Requirements::css(CMS_DIR . '/css/typography.css');
 		Requirements::css(CMS_DIR . '/css/cms_right.css');
-		
+		Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
+		Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/jquery_improvements.js');
+		Requirements::css(CMS_DIR . '/css/MemberImportForm.css');
 		Requirements::javascript(CMS_DIR . '/javascript/MemberImportForm.js');
 		
 		return $this->renderWith('BlankPage', array(
@@ -171,7 +174,10 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		Requirements::css(SAPPHIRE_DIR . '/css/Form.css');
 		Requirements::css(CMS_DIR . '/css/typography.css');
 		Requirements::css(CMS_DIR . '/css/cms_right.css');
-		
+		Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
+		Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/jquery_improvements.js');
+		Requirements::css(CMS_DIR . '/css/MemberImportForm.css');
 		Requirements::javascript(CMS_DIR . '/javascript/MemberImportForm.js');
 		
 		return $this->renderWith('BlankPage', array(
diff --git a/css/MemberImportForm.css b/css/MemberImportForm.css
new file mode 100644
index 00000000..16927ddf
--- /dev/null
+++ b/css/MemberImportForm.css
@@ -0,0 +1,25 @@
+* {
+	font-size:12px;
+}
+
+body {
+	margin: 0;
+	padding: 0;
+}
+
+form.import-form {
+	margin: 0;
+}
+
+	form.import-form #CsvFile .middleColumn {
+		background: none !important;
+	}
+
+	form.import-form .advanced h4 {
+		margin-bottom: .5em;
+	}
+	
+	form.import-form .Actions {
+		text-align: left;
+		border: 0;
+	}
\ No newline at end of file
diff --git a/javascript/MemberImportForm.js b/javascript/MemberImportForm.js
new file mode 100644
index 00000000..a8ff81a9
--- /dev/null
+++ b/javascript/MemberImportForm.js
@@ -0,0 +1,13 @@
+(function($) {
+$(document).ready(function() {
+	$('.import-form .advanced').hide();
+	
+	$('.import-form a.toggle-advanced').livequery(
+		'click', 
+		function(e) {
+			$(this).parents('form:eq(0)').find('.advanced').toggle();
+			return false;
+		}
+	);
+});
+}(jQuery));
\ No newline at end of file
diff --git a/lang/en_US.php b/lang/en_US.php
index 66ba2137..3978dd99 100755
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -2,6 +2,7 @@
 
 global $lang;
 
+$lang['en_US']['']['CHOOSEPAGE'] = 'Please choose an item from the left.';
 $lang['en_US']['AssetAdmin']['CHOOSEFILE'] = 'Choose file: ';
 $lang['en_US']['AssetAdmin']['DELETEDX'] = 'Deleted %s files.%s';
 $lang['en_US']['AssetAdmin']['FILESREADY'] = 'Files ready to upload:';
@@ -57,6 +58,7 @@ $lang['en_US']['AssetTableField.ss']['DELFILE'] = 'Delete this file';
 $lang['en_US']['AssetTableField.ss']['DRAGTOFOLDER'] = 'Drag to folder on left to move file';
 $lang['en_US']['AssetTableField.ss']['EDIT'] = 'Edit asset';
 $lang['en_US']['AssetTableField.ss']['SHOW'] = 'Show asset';
+$lang['en_US']['BrokenLinksReport']['BROKENLINKS'] = 'Broken links report';
 $lang['en_US']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = 'Deleted %d pages from the draft site, %d failures';
 $lang['en_US']['CMSBatchActions']['DELETED_PAGES'] = 'Deleted %d pages from the published site, %d failures';
 $lang['en_US']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Delete from draft site';
@@ -69,7 +71,7 @@ $lang['en_US']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publish';
 $lang['en_US']['CMSMain']['ACCESS'] = array(
 	'Access to %s',
 	PR_MEDIUM,
-	'Item in permission selection identifying the admin section, with title and classname. Example: Access to Files & Images'
+	'Item in permission selection identifying the admin section. Example: Access to \'Files & Images\''
 );
 $lang['en_US']['CMSMain']['ACCESSALLINTERFACES'] = 'Access to all CMS sections';
 $lang['en_US']['CMSMain']['CANCEL'] = 'Cancel';
@@ -226,6 +228,20 @@ $lang['en_US']['CommentTableField.ss']['NOITEMSFOUND'] = 'No items found';
 $lang['en_US']['CommentTableField.ss']['SPAM'] = 'spam';
 $lang['en_US']['ComplexTableField']['CLOSEPOPUP'] = 'Close Popup';
 $lang['en_US']['ComplexTableField']['SUCCESSADD'] = 'Added %s %s %s';
+$lang['en_US']['Group']['IMPORTTABTITLE'] = 'Import';
+$lang['en_US']['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>';
+$lang['en_US']['GroupImportForm']['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>';
+$lang['en_US']['GroupImportForm']['ResultCreated'] = 'Created %d groups';
+$lang['en_US']['GroupImportForm']['ResultDeleted'] = 'Deleted %d groups';
+$lang['en_US']['GroupImportForm']['ResultUpdated'] = 'Updated %d groups';
 $lang['en_US']['ImageEditor.ss']['ACTIONS'] = 'actions';
 $lang['en_US']['ImageEditor.ss']['ADJUST'] = 'adjust';
 $lang['en_US']['ImageEditor.ss']['APPLY'] = 'apply';
@@ -263,11 +279,6 @@ $lang['en_US']['LeftAndMain']['PLEASESAVE'] = 'Please Save Page: This page could
 $lang['en_US']['LeftAndMain']['REQUESTERROR'] = 'Error in request';
 $lang['en_US']['LeftAndMain']['SAVED'] = 'saved';
 $lang['en_US']['LeftAndMain']['SAVEDUP'] = 'Saved';
-$lang['en_US']['LeftAndMain']['SITECONTENTLEFT'] = array(
-	'Site Content',
-	PR_HIGH,
-	'Root node on left'
-);
 $lang['en_US']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = array(
 	'Published \'%s\' successfully',
 	PR_MEDIUM,
@@ -296,6 +307,7 @@ $lang['en_US']['LeftAndMain.ss']['SSWEB'] = 'Silverstripe Website';
 $lang['en_US']['LeftAndMain.ss']['VIEWINDRAFT'] = 'View the Page in the Draft Site';
 $lang['en_US']['LeftAndMain.ss']['VIEWINPUBLISHED'] = 'View the Page in the Published Site';
 $lang['en_US']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Page view:';
+$lang['en_US']['LeftAndMain_right.ss']['WELCOMETO'] = 'Welcome to';
 $lang['en_US']['MathSpamProtection']['EIGHT'] = 'eight';
 $lang['en_US']['MathSpamProtection']['EIGHTEEN'] = 'eighteen';
 $lang['en_US']['MathSpamProtection']['ELEVEN'] = 'eleven';
@@ -316,6 +328,19 @@ $lang['en_US']['MathSpamProtection']['TWELVE'] = 'twelve';
 $lang['en_US']['MathSpamProtection']['TWO'] = 'two';
 $lang['en_US']['MathSpamProtection']['WHATIS'] = 'What is %s plus %s?';
 $lang['en_US']['MathSpamProtection']['ZERO'] = 'zero';
+$lang['en_US']['MemberImportForm']['Help1'] = '<p>Import members in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>';
+$lang['en_US']['MemberImportForm']['Help2'] = '<div class="advanced">
+	<h4>Advanced usage</h4>
+	<ul>
+	<li>Allowed columns: <em>%s</em></li>
+	<li>Existing members 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>';
+$lang['en_US']['MemberImportForm']['ResultCreated'] = 'Created %d members';
+$lang['en_US']['MemberImportForm']['ResultDeleted'] = 'Deleted %d members';
+$lang['en_US']['MemberImportForm']['ResultNone'] = 'No changes';
+$lang['en_US']['MemberImportForm']['ResultUpdated'] = 'Updated %d members';
 $lang['en_US']['MemberList.ss']['FILTER'] = array(
 	'Filter',
 	50,
@@ -464,6 +489,9 @@ $lang['en_US']['SecurityAdmin']['MENUTITLE'] = array(
 $lang['en_US']['SecurityAdmin']['NEWGROUP'] = 'New Group';
 $lang['en_US']['SecurityAdmin']['SAVE'] = 'Save';
 $lang['en_US']['SecurityAdmin']['SGROUPS'] = 'Security Groups';
+$lang['en_US']['SecurityAdmin']['TABIMPORT'] = 'Import';
+$lang['en_US']['SecurityAdmin_MemberImportForm']['BtnImport'] = 'Import';
+$lang['en_US']['SecurityAdmin_MemberImportForm']['FileFieldLabel'] = 'CSV File <small>(Allowed extensions: *.csv)</small>';
 $lang['en_US']['SecurityAdmin_left.ss']['CREATE'] = 'Create';
 $lang['en_US']['SecurityAdmin_left.ss']['DEL'] = 'Delete';
 $lang['en_US']['SecurityAdmin_left.ss']['DELGROUPS'] = 'Delete the selected groups';
@@ -500,6 +528,9 @@ $lang['en_US']['StaticExporter']['BASEURL'] = 'Base URL';
 $lang['en_US']['StaticExporter']['EXPORTTO'] = 'Export to that folder';
 $lang['en_US']['StaticExporter']['FOLDEREXPORT'] = 'Folder to export to';
 $lang['en_US']['StaticExporter']['NAME'] = 'Static exporter';
+$lang['en_US']['TableListField.ss']['NOITEMSFOUND'] = 'No items found';
+$lang['en_US']['TableListField.ss']['SORTASC'] = 'Sort in ascending order';
+$lang['en_US']['TableListField.ss']['SORTDESC'] = 'Sort in descending order';
 $lang['en_US']['TableListField_PageControls.ss']['DISPLAYING'] = 'Displaying';
 $lang['en_US']['TableListField_PageControls.ss']['OF'] = 'of';
 $lang['en_US']['TableListField_PageControls.ss']['TO'] = 'to';
@@ -518,8 +549,12 @@ $lang['en_US']['ViewArchivedEmail.ss']['HAVEASKED'] = array(
 	30,
 	'Followed by a date'
 );
-$lang['en_US']['WidgetAreaEditor']['ss'] = 'TOADD';
+$lang['en_US']['WidgetAreaEditor.ss']['AVAILABLE'] = 'Available Widgets';
+$lang['en_US']['WidgetAreaEditor.ss']['AVAILWIDGETS'] = 'Click a widget title below to use it on this page.';
+$lang['en_US']['WidgetAreaEditor.ss']['INUSE'] = 'Widgets currently used';
 $lang['en_US']['WidgetAreaEditor.ss']['NOAVAIL'] = 'There are currently no widgets available.';
+$lang['en_US']['WidgetAreaEditor.ss']['TOSORT'] = 'To sort currently used widgets on this page, drag them up and down.';
+$lang['en_US']['WidgetDescription.ss']['CLICKTOADDWIDGET'] = 'Click to add this widget';
 $lang['en_US']['WidgetEditor.ss']['DELETE'] = 'Delete';
 
 ?>
\ No newline at end of file

From afdc77b2936af7b12b79c3035b111f3ae99ef24e Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 12 Feb 2010 02:07:28 +0000
Subject: [PATCH 225/483] MINOR Moved ul.tree rules from cms/css/cms_left.css
 to sapphire/javascript/tree/tree.css (particularly around multiselect tickbox
 styling) (see r98854)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98855 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/cms_left.css | 53 ------------------------------------------------
 1 file changed, 53 deletions(-)

diff --git a/css/cms_left.css b/css/cms_left.css
index 4935eebc..359d9f9d 100644
--- a/css/cms_left.css
+++ b/css/cms_left.css
@@ -76,10 +76,6 @@
 	font-weight: bold;
 }
 
-
-ul.tree span.a {
-	cursor: pointer;
-}
 .filefolderhover span.a, 
 ul.tree span.a.over {
 	background-color: #FFFFBB !important;
@@ -89,59 +85,11 @@ ul.tree span.a.over {
 	background-position: 100px 50%;
 }
 
-
-ul.tree span.a.current {
-	font-weight: bold;
-	background-color: #EEEEFF !important;
-	border-top: 1px #CCCCFF solid;
-	border-bottom: 1px #CCCCFF solid;	
-	/* these push the highlight out to the left of the window */
-	margin-left: -100px;
-	padding-left: 100px;
-	background-position: 100px 50%;
-	/*position: relative;*/
-}
-
-ul.tree span.a.loading span.b span.c a {
-	background-image: url(../images/network-save.gif) !important;
-	margin-left: -3px;
-	padding-left: 21px;
-	background-position : 2px 2px;
-}
-
-ul.tree.multiselect span.a span.b a {
-	background-image: url(../images/tickbox-unticked.gif) !important;
-}
-
-ul.tree.multiselect span.a.nodelete span.b a {
-	background-image: url(../images/tickbox-canttick.gif) !important;
-}
-ul.tree.multiselect span.a.treeloading span.b a {
-	background-image: url(../images/tickbox-greyedout.gif) !important;
-}
-ul.tree.multiselect span.a.failed span.b a {
-	background-image: url(../images/tickbox-fail.gif) !important;
-}
-
-
-ul.tree.multiselect span.a.selected span.b span.c a {
-	background-image: url(../images/tickbox-ticked.gif) !important;
-}
-
-/* Span-B: Plus/Minus icon */
-ul.tree.multiselect li.selected span.a.children span.b, 
-ul.tree.multiselect li.selected span.a.unexpanded span.b {
-	background-image: none;
-	cursor: default;
-}
-
-
 ul.tree span.a a.notinmenu, ul.tree span.a a.notinmenu *,
 #publication_key span.notinmenu {
 	color: #77A;
 }
 
-
 ul.tree span.a a.disabled {
 	color: #999;
 	cursor: pointer;
@@ -153,7 +101,6 @@ ul.tree span.a a.disabled {
 		cursor: pointer;
 	}
 	
-
 ul.tree .deleted {
 	color: red;
 	text-decoration: line-through;

From f72fb26b4ca5db19d65a4ded423ea40fc040c0aa Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Mon, 15 Feb 2010 01:58:05 +0000
Subject: [PATCH 226/483] BUGFIX fix for #5076

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98957 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/FilesystemPublisherTest.php | 37 +++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/tests/FilesystemPublisherTest.php b/tests/FilesystemPublisherTest.php
index efef7815..26ca5fde 100644
--- a/tests/FilesystemPublisherTest.php
+++ b/tests/FilesystemPublisherTest.php
@@ -6,6 +6,15 @@
  * @subpackage tests
  */
 class FilesystemPublisherTest extends SapphireTest {
+	function setup() {
+		parent::setup();
+		SiteTree::$write_homepage_map = false;
+	}
+	
+	function teardown() {
+		parent::teardown();
+		SiteTree::$write_homepage_map = true;
+	}
 	
 	/**
 	 * Simple test to ensure that FileSystemPublisher::__construct()
@@ -23,4 +32,32 @@ class FilesystemPublisherTest extends SapphireTest {
 		$this->assertEquals($fsp->class, 'FilesystemPublisher');
 	}
 	
+	function testHomepageMapIsCorrect() {
+		$p1 = new Page();
+		$p1->URLSegment = strtolower(__CLASS__).'-page-1';
+		$p1->HomepageForDomain = '';
+		$p1->write();
+		$p1->doPublish();
+		$p2 = new Page();
+		$p2->URLSegment = strtolower(__CLASS__).'-page-2';
+		$p2->HomepageForDomain = 'domain1';
+		$p2->write();
+		$p2->doPublish();
+		$p3 = new Page();
+		$p3->URLSegment = strtolower(__CLASS__).'-page-3';
+		$p3->HomepageForDomain = 'domain2,domain3';
+		$p3->write();
+		$p3->doPublish();
+		
+		$map = SiteTree::generate_homepage_domain_map();
+		
+		$validMap = array(
+			'domain1' => strtolower(__CLASS__).'-page-2',
+			'domain2' => strtolower(__CLASS__).'-page-3',
+			'domain3' => strtolower(__CLASS__).'-page-3',
+		);
+		
+		$this->assertEquals($map, $validMap, 'Homepage/domain map is correct');
+	}
+	
 }
\ No newline at end of file

From 3c3b8b40de1cb54a03f0870903e5e7cb5da0af9d Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Mon, 15 Feb 2010 20:11:56 +0000
Subject: [PATCH 227/483] MINOR disable real-time static publishing

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99008 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/staticpublisher/StaticPublisher.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/staticpublisher/StaticPublisher.php b/code/staticpublisher/StaticPublisher.php
index afc9f14b..95f70943 100644
--- a/code/staticpublisher/StaticPublisher.php
+++ b/code/staticpublisher/StaticPublisher.php
@@ -13,7 +13,8 @@ abstract class StaticPublisher extends DataObjectDecorator {
 	
 	// Realtime static publishing... the second a page
 	// is saved, it is written to the cache
-	static $disable_realtime = false;
+	// @todo this is currently disabled until template problems can be fixed
+	static $disable_realtime = true;
 	
 	abstract function publishPages($pages);
 	abstract function unpublishPages($pages);

From c9b2355efe503b245d90ca9ed41e7eb924dd685b Mon Sep 17 00:00:00 2001
From: Carlos Barberis <carlos@silverstripe.com>
Date: Tue, 16 Feb 2010 01:15:20 +0000
Subject: [PATCH 228/483] BUGFIX: fixed query to get number of unmoderated
 comments

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99060 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CommentAdmin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/CommentAdmin.php b/code/CommentAdmin.php
index 0f20f991..2e650eaa 100644
--- a/code/CommentAdmin.php
+++ b/code/CommentAdmin.php
@@ -285,7 +285,7 @@ JS;
 	 * Return the number of unmoderated comments
 	 */
 	function NumUnmoderated() {
-		return DB::query("SELECT COUNT(*) FROM \"PageComment\" WHERE \"IsSpam\"=0 AND \"NeedsModeration\"=0")->value();
+		return DB::query("SELECT COUNT(*) FROM \"PageComment\" WHERE \"IsSpam\"=0 AND \"NeedsModeration\"=1")->value();
 	}
 
 	/**

From a0c8e9e1eb602ece3251467743c73de41768b6ad Mon Sep 17 00:00:00 2001
From: Carlos Barberis <carlos@silverstripe.com>
Date: Tue, 16 Feb 2010 01:20:15 +0000
Subject: [PATCH 229/483] ENHANCEMENT: CommentAdmin unitest

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99066 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/CommentAdminTest.php | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 tests/CommentAdminTest.php

diff --git a/tests/CommentAdminTest.php b/tests/CommentAdminTest.php
new file mode 100644
index 00000000..c86ea1b7
--- /dev/null
+++ b/tests/CommentAdminTest.php
@@ -0,0 +1,36 @@
+<?php
+
+class CommentAdminTest extends FunctionalTest {
+	
+	static $fixture_file = 'cms/tests/CMSMainTest.yml';
+	
+	function testNumModerated() {
+		
+		$comm = new CommentAdmin();
+		$resp = $comm->NumModerated();
+		$this->assertEquals(1, $resp);
+	}
+	
+	function testNumUnmoderated(){
+		
+		$comm = new CommentAdmin();
+		$resp = $comm->NumUnmoderated();
+		$this->assertEquals(1, $resp);
+	}
+	
+	function testNumSpam(){
+		
+		$comm = new CommentAdmin();
+		$resp = $comm->NumSpam();
+		$this->assertEquals(0, $resp);
+	}
+	
+	function testacceptmarked(){
+		$id = $this->idFromFixture('PageComment', 'Comment1');
+		$this->logInWithPermssion('ADMIN');
+		$result = $this->get('admin/comments/EditForm/field/Comments/item/2/delete');
+		$this->assertEquals(200, $result->getStatusCode());
+	}
+	
+}
+?>
\ No newline at end of file

From 554ea629dc0c4e52023c38f0a752b321c4658b7f Mon Sep 17 00:00:00 2001
From: Carlos Barberis <carlos@silverstripe.com>
Date: Tue, 16 Feb 2010 01:22:55 +0000
Subject: [PATCH 230/483] ENHANCEMENT: added PageComment for CommentAdminTest

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99069 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/CMSMainTest.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/CMSMainTest.yml b/tests/CMSMainTest.yml
index 32285a2b..088d3596 100644
--- a/tests/CMSMainTest.yml
+++ b/tests/CMSMainTest.yml
@@ -62,3 +62,14 @@ SiteConfig_CreateTopLevelGroups:
    createtoplevelgroups1:
       siteconfigid:  1
       GroupID: =>Group.rooteditusers
+PageComment:
+    Comment1:
+        Name: Person
+        Comment: Very cool page
+        NeedsModeration: 1
+        EmailAddress: person@server.com
+    Comment2:
+        Name: Someone
+        Comment: I am a person
+        NeedsModeration: 0
+        EmailAddress: someone@somewhere.com
\ No newline at end of file

From 801161369e992b2491a97a520089edf84317b587 Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Tue, 16 Feb 2010 02:12:07 +0000
Subject: [PATCH 231/483] MINOR make static caching smarter around cacheSubdirs

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99076 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/staticpublisher/FilesystemPublisher.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/staticpublisher/FilesystemPublisher.php b/code/staticpublisher/FilesystemPublisher.php
index 346b734b..a7d62ea2 100644
--- a/code/staticpublisher/FilesystemPublisher.php
+++ b/code/staticpublisher/FilesystemPublisher.php
@@ -96,7 +96,7 @@ class FilesystemPublisher extends StaticPublisher {
 		$currentBaseURL = Director::baseURL();
 		if(self::$static_base_url) Director::setBaseURL(self::$static_base_url);
 		if($this->fileExtension == 'php') SSViewer::setOption('rewriteHashlinks', 'php'); 
-		if(StaticPublisher::echo_progress()) echo "Publishing to " . self::$static_base_url . "\n";		
+		if(StaticPublisher::echo_progress()) echo $this->class.": Publishing to " . self::$static_base_url . "\n";		
 		$files = array();
 		$i = 0;
 		$totalURLs = sizeof($urls);

From 3377198bc4ee0e7dc4d91d046bb6a54fe2423a61 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 03:01:30 +0000
Subject: [PATCH 232/483] MINOR Added Requirements for SilverStripeNavigator
 (see r99080)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99098 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index ef74f2fd..0e16b9d8 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -219,6 +219,10 @@ class LeftAndMain extends Controller {
 		Requirements::javascript(CMS_DIR . '/javascript/LangSelector.js');
 		Requirements::javascript(CMS_DIR . '/javascript/TranslationTab.js');
 		
+		// navigator
+		Requirements::css(SAPPHIRE_DIR . '/css/SilverStripeNavigator.css');
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/SilverStripeNavigator.js');
+		
 		Requirements::themedCSS('typography');
 
 		foreach (self::$extra_requirements['javascript'] as $file) {
@@ -1087,6 +1091,16 @@ JS;
 			return "cms: $cmsVersion, sapphire: $sapphireVersion";
 		}
 	}
+	
+	/**
+	 * @return array
+	 */
+	function SwitchView() { 
+		if($page = $this->currentPage()) { 
+			$nav = SilverStripeNavigator::get_for_record($page); 
+			return $nav['items']; 
+		} 
+	}
 
 	/**
 	 * The application name. Customisable by calling

From 032ce7f60b3467e98c2ce4480b98130619057117 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 03:36:58 +0000
Subject: [PATCH 233/483] MINOR pingStatus ping frequency reduced MINOR updated
 lang file for SiteConfig MINOR improved documentation in StaticPublisher
 MINOR improved documentation in CMSMain surrounding reports and siteconfig
 MINOR migrated headers in SiteConfig to i18n'd (from r86429)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99112 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php                         | 13 +++++++++++++
 code/staticpublisher/StaticPublisher.php |  6 ++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 85ed7daf..42249ead 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -350,6 +350,13 @@ JS;
 		return $result;
 	}
 
+	/**
+	 * Save the current sites {@link SiteConfig} into the database
+	 *
+	 * @param array $data 
+	 * @param Form $form 
+	 * @return FormResponse
+	 */
 	function save_siteconfig($data, $form) {
 		$siteConfig = SiteConfig::current_site_config();
 		$form->saveInto($siteConfig);
@@ -693,6 +700,12 @@ JS;
 		
 		return new GroupedDropdownField("ReportSelector", _t('CMSMain.REPORT', 'Report'),$finalOptions);
 	}
+	
+	/**
+	 * Generate the parameter HTML for SideReports that have params
+	 *
+	 * @return LiteralField
+	 */
 	function ReportFormParameters() {
 		$forms = array();
 		foreach($this->SideReports() as $report) {
diff --git a/code/staticpublisher/StaticPublisher.php b/code/staticpublisher/StaticPublisher.php
index 95f70943..087b72a5 100644
--- a/code/staticpublisher/StaticPublisher.php
+++ b/code/staticpublisher/StaticPublisher.php
@@ -11,8 +11,10 @@ abstract class StaticPublisher extends DataObjectDecorator {
 	 */
 	static $echo_progress = false;
 	
-	// Realtime static publishing... the second a page
-	// is saved, it is written to the cache
+	/**
+	 * Realtime static publishing... the second a page
+    * is saved, it is written to the cache 
+	 */
 	// @todo this is currently disabled until template problems can be fixed
 	static $disable_realtime = true;
 	

From 2462a9cde9d7ab254c55547af248e6496a9c1e85 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 03:41:33 +0000
Subject: [PATCH 234/483] MINOR add the ability to link-check the live table
 too (from r89473) (from r95310)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99113 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SideReport.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/code/SideReport.php b/code/SideReport.php
index 0bdca8ff..6dbddfc9 100755
--- a/code/SideReport.php
+++ b/code/SideReport.php
@@ -235,7 +235,7 @@ class SideReport_BrokenLinks extends SS_Report {
 			),
 		);
 	}
-	function parameterFields() {
+	function getParameterFields() {
 		return new FieldSet(
 			new CheckboxField('OnLive', 'Check live site')
 		);
@@ -272,11 +272,13 @@ class SideReport_BrokenFiles extends SS_Report {
 			),
 		);
 	}
-	function parameterFields() {
+
+	function getParameterFields() {
 		return new FieldSet(
 			new CheckboxField('OnLive', 'Check live site')
 		);
 	}
+
 }
 
 class SideReport_BrokenVirtualPages extends SS_Report {
@@ -301,7 +303,8 @@ class SideReport_BrokenVirtualPages extends SS_Report {
 			),
 		);
 	}
-	function parameterFields() {
+
+	function getParameterFields() {
 		return new FieldSet(
 			new CheckboxField('OnLive', 'Check live site')
 		);
@@ -331,7 +334,8 @@ class SideReport_BrokenRedirectorPages extends SS_Report {
 			),
 		);
 	}
-	function parameterFields() {
+	
+	function getParameterFields() {
 		return new FieldSet(
 			new CheckboxField('OnLive', 'Check live site')
 		);

From 8d359d170393379df9622188eeba5e6f9c26c63d Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 03:45:20 +0000
Subject: [PATCH 235/483] APICHANGE: Use the same navigator items in the CMS
 that are used on the frontend (from r97395)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99114 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php                |  7 +++++
 code/LeftAndMain.php            |  9 +++++-
 css/layout.css                  |  3 +-
 javascript/LeftAndMain_right.js | 50 +++++----------------------------
 templates/LeftAndMain.ss        |  7 ++---
 5 files changed, 25 insertions(+), 51 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 42249ead..2989f917 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -117,6 +117,13 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 	function ShowSwitchView() {
 		return true;
 	}
+	
+	function SwitchView() {
+		if($page = $this->currentPage()) {
+			$nav = $page->getNavigatorItems();
+			return $nav['items'];
+		}
+	}
 
 	//------------------------------------------------------------------------------------------//
 	// Main controllers
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 0e16b9d8..7d477c4a 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -361,7 +361,14 @@ class LeftAndMain extends Controller {
 		}
 
 		$form = $this->EditForm();
-		if ($form) return $form->formHtmlContent();
+		if ($form) {
+			$content =  $form->formHtmlContent();
+			if($this->ShowSwitchView()) {
+				$content .= '<div id="AjaxSwitchView">' . $this->SwitchView() . '</div>';
+			}
+			
+			return $content;
+		}
 		else return "";
 	}
 	public function getLastFormIn($html) {
diff --git a/css/layout.css b/css/layout.css
index 78446905..785b8314 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -276,7 +276,6 @@ body.stillLoading select {
 	bottom: 0;
 	left: 0;
 	height: 23px;
-	overflow: hidden;
 	background: #4d4e5a url(../images/textures/footerBg.gif) repeat-x left top;
 }
 
@@ -720,4 +719,4 @@ iframe {
 	.message.bad {
 		background-color: #FF8080;
 		border-color: #FF0000;
-	}
\ No newline at end of file
+	}
diff --git a/javascript/LeftAndMain_right.js b/javascript/LeftAndMain_right.js
index 75214ab7..bdce0c4e 100755
--- a/javascript/LeftAndMain_right.js
+++ b/javascript/LeftAndMain_right.js
@@ -23,6 +23,13 @@ CMSForm.prototype = {
 	 */
 	prepareForm : function() {
 		ajaxActionsAtTop(this.id, 'form_actions_' + this.formName, this.formName);
+		
+		// Update the nav items down the bottom
+		if($('AjaxSwitchView')) {
+			$('SwitchView').innerHTML = $('AjaxSwitchView').innerHTML;
+			$('AjaxSwitchView').innerHTML = '';
+			Behaviour.apply('SwitchView'); // This is needed so calendar still works
+		}
 	},
 	
 	/**
@@ -395,49 +402,6 @@ function autoSave(confirmation, callAfter) {
 	}
 }
 
-
-StageLink = Class.create();
-StageLink.prototype = {
-	initialize: function(getVars, urlField) {
-		this.getVars = getVars;
-		this.urlField = urlField;
-		
-		var boundNewPage = this.newPage.bind(this);
-		
-		$('Form_EditForm').observeMethod('PageLoaded', boundNewPage);
-		$('Form_EditForm').observeMethod('PageSaved', boundNewPage);
-		$('Form_EditForm').observeMethod('PagePublished', boundNewPage);
-		$('Form_EditForm').observeMethod('PageUnpublished', boundNewPage);
-
-		this.newPage();
-	},
-	newPage : function() {
-		var linkField = $('Form_EditForm').elements[this.urlField];
-		var linkVal = linkField ? linkField.value : null;
-		if(linkVal) {
-			if(this.id != 'viewArchivedSite') this.style.display = '';
-			this.href = linkVal + this.getVars;
-		} else {
-			if(this.id != 'viewArchivedSite') this.style.display = 'none';
-		}
-		if($('Form_EditForm_Locale')) {
-			this.href += "&locale=" + $('Form_EditForm_Locale').value;
-		}
-	},
-	onclick : function() {
-		var w = window.open(this.href, windowName('site'));
-		w.focus();
-		return false;
-	},
-	baseURL : function() {
-		return document.getElementsByTagName('base')[0].href;
-	}
-}
-
-StageLink.applyTo('#viewStageSite', '?stage=Stage', 'StageURLSegment');
-StageLink.applyTo('#viewLiveSite', '?stage=Live', 'LiveURLSegment');
-StageLink.applyTo('#viewArchivedSite', '', 'URLSegment');
-
 window.name = windowName('cms');
 
 /**
diff --git a/templates/LeftAndMain.ss b/templates/LeftAndMain.ss
index 130a4137..d7fc7429 100644
--- a/templates/LeftAndMain.ss
+++ b/templates/LeftAndMain.ss
@@ -48,13 +48,10 @@
 			<div id="switchView" class="bottomTabs">
 				<% if ShowSwitchView %>
 					<div class="blank"> <% _t('VIEWPAGEIN','Page view:') %> </div>
-					<span class="current" title="<% _t('EDITINCMS', 'Edit this page in the CMS') %>"><% _t('EDIT','Edit') %></span>
-					<a id="viewStageSite" title="<% _t('VIEWINDRAFT', 'View the Page in the Draft Site') %>" href="home/?stage=Stage"><% _t('DRAFTS','Draft Site') %></a>
-				    <a id="viewLiveSite" title="<% _t('VIEWINPUBLISHED', 'View the Page in the Published Site') %>" href="home/?stage=Live"><% _t('PUBLIS','Published Site') %></a>
-				<a style="display: none; margin-left: 20px;" id="viewArchivedSite" href="home/"><% _t('ARCHS','Archived Site') %></a>
+					<span id="SwitchView">$SwitchView</div>
 				<% end_if %>
 			</div>
 		</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>

From 70f489485713256920fd3875ffa6272e7b5e7082 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 03:45:39 +0000
Subject: [PATCH 236/483] BUGFIX: Fixed bug in r97395 (from r97508)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99115 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 7d477c4a..a5ac01b3 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -301,6 +301,17 @@ class LeftAndMain extends Controller {
 		SSViewer::set_theme(null);
 	}
 
+	
+	/**
+	 * If this is set to true, the "switchView" context in the
+	 * template is shown, with links to the staging and publish site.
+	 *
+	 * @return boolean
+	 */
+	function ShowSwitchView() {
+		return false;
+	}
+
 	//------------------------------------------------------------------------------------------//
 	// Main controllers
 

From bf2924e1597d80adc7305de5e0ac2ffa2d3607af Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 03:45:47 +0000
Subject: [PATCH 237/483] BUGFIX: Fix navigator links not opening in new
 windows. (from r97510)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99116 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 2989f917..8f3759dc 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -121,6 +121,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 	function SwitchView() {
 		if($page = $this->currentPage()) {
 			$nav = $page->getNavigatorItems();
+			Requirements::customScript("window.name = windowName('cms');");
 			return $nav['items'];
 		}
 	}

From 8302f97ffcd6f867b435712f811444ac9306e49f Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 04:00:59 +0000
Subject: [PATCH 238/483] FEATURE set file metadata on upload. (from r97780)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99117 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php                  | 77 ++++++++++++++++++++--------
 templates/AssetAdmin_uploadiframe.ss |  5 +-
 2 files changed, 61 insertions(+), 21 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 1067f4a3..025a78b9 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -102,6 +102,8 @@ JS
 		Requirements::javascript(CMS_DIR . "/javascript/LeftAndMain.js");
 		Requirements::javascript(CMS_DIR . "/thirdparty/multifile/multifile.js");
 		Requirements::css(CMS_DIR . "/thirdparty/multifile/multifile.css");
+		Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/jquery/jquery.js");
+		Requirements::javascript(SAPPHIRE_DIR . "/javascript/jquery_improvements.js");
 		Requirements::css(CMS_DIR . "/css/typography.css");
 		Requirements::css(CMS_DIR . "/css/layout.css");
 		Requirements::css(CMS_DIR . "/css/cms_left.css");
@@ -113,6 +115,23 @@ JS
 		return array( 'CanUpload' => $folder->canEdit());
 	}
 	
+	/**
+	 * @return String
+	 */
+	function UploadMetadataHtml() {
+		$fields = singleton('File')->uploadMetadataFields();
+
+		// Return HTML with markers for easy replacement
+		$fieldHtml = '';
+		foreach($fields as $field) $fieldHtml = $fieldHtml . $field->FieldHolder();
+		$fieldHtml = preg_replace('/(name|for|id)="(.+?)"/', '$1="$2[__X__]"', $fieldHtml);
+
+		// Icky hax to fix certain elements with fixed ids
+		$fieldHtml = preg_replace('/-([a-zA-Z0-9]+?)\[__X__\]/', '[__X__]-$1', $fieldHtml);
+
+		return $fieldHtml;
+	}
+	
 	/**
 	 * Return the form object shown in the uploadiframe.
 	 */
@@ -144,7 +163,6 @@ JS
 	 * It will save the uploaded files to /assets/ and create new File objects as required.
 	 */
 	function doUpload($data, $form) {
-		$processedFiles = array();
 		$newFiles = array();
 		$fileIDs = array();
 		$fileNames = array();
@@ -153,28 +171,35 @@ JS
 		$jsErrors = '';
 		$status = '';
 		$statusMessage = '';
+		$processedFiles = array();
+
+		foreach($data['Files'] as $param => $files) {
+			if(!is_array($files)) $files = array($files);
+			foreach($files as $key => $value) {
+				$processedFiles[$key][$param] = $value;
+			}
+		}
+		array_shift($processedFiles);
 		
-		if(!isset($data['Files'])) return Director::set_status_code("404");
-		
-		if(is_array($data['Files'])) {
-			foreach($data['Files'] as $param => $files) {
-				if(!is_array($files)) $files = array($files);
-				foreach($files as $key => $value) {
-					$processedFiles[$key][$param] = $value;
+		// Load POST data from arrays in to the correct dohickey.
+		$processedData = array();
+		foreach($data as $dataKey => $value) {
+			if ($dataKey == 'Files') continue;
+			if (is_array($value)) {
+				$i = 0;
+				foreach($value as $fileId => $dataValue) {
+					if (!isset($processedData[$i])) $processedData[$i] = array();
+					$processedData[$i][$dataKey] = $dataValue;
+					$i++;
 				}
 			}
-		} else {
-			$proccessedFiles[] = $data['Files'];
 		}
-		
-		// get the folder to upload to.
-		if(isset($data['FolderID']) && $data['FolderID'] && $data['FolderID'] != "root") {
-			$folder = DataObject::get_by_id('Folder', $data['FolderID']);
-		} else {
-			$folder = singleton('Folder');
-		}
-		
-		foreach($processedFiles as $tmpFile) {
+		$processedData = array_reverse($processedData);
+				
+		if($data['ID'] && $data['ID'] != 'root') $folder = DataObject::get_by_id("Folder", $data['ID']);
+		else $folder = singleton('Folder');
+
+		foreach($processedFiles as $filePostId => $tmpFile) {
 			if($tmpFile['error'] == UPLOAD_ERR_NO_TMP_DIR) {
 				$status = 'bad';
 				$statusMessage = _t('AssetAdmin.NOTEMP', 'There is no temporary folder for uploads. Please set upload_tmp_dir in php.ini.');
@@ -206,7 +231,19 @@ JS
 				}
 				
 				// move file to given folder
-				if($valid) $newFiles[] = $folder->addUploadToFolder($tmpFile);
+				if($valid) {
+					$newFile = $folder->addUploadToFolder($tmpFile);
+					
+					if (isset($processedData[$filePostId])) {
+						$fileObject = DataObject::get_by_id('File', $newFile);
+						$metadataForm = new Form($this, 'MetadataForm', $fileObject->uploadMetadataFields(), new FieldSet());
+						$metadataForm->loadDataFrom($processedData[$filePostId]);
+						$metadataForm->saveInto($fileObject);
+						$fileObject->write();
+					}
+					
+					$newFiles[] = $newFile;
+				}
 			}
 		}
 		
diff --git a/templates/AssetAdmin_uploadiframe.ss b/templates/AssetAdmin_uploadiframe.ss
index 71380543..0d13bead 100755
--- a/templates/AssetAdmin_uploadiframe.ss
+++ b/templates/AssetAdmin_uploadiframe.ss
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" style="overflow:auto">
 	<head>
 		<% base_tag %>
 		<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
@@ -21,6 +21,9 @@
 	<body>
 	<% if CanUpload %>
 		$UploadForm
+		<div id="metadataFormTemplate" style="display:none">
+			$UploadMetadataHtml
+		</div>
 	<% else %>
 		<% _t('PERMFAILED','You do not have permission to upload files into this folder.') %>
 	<% end_if %>

From 82f95ae415b8c81d94bf2ab5622c8590d52b31f9 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 04:02:14 +0000
Subject: [PATCH 239/483] MINOR fixed two reports with links that did not open
 in new windows (from r97816)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99118 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/reports/BrokenLinksReport.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
index f72a5265..61289b94 100644
--- a/code/reports/BrokenLinksReport.php
+++ b/code/reports/BrokenLinksReport.php
@@ -86,7 +86,7 @@ class BrokenLinksReport extends SS_Report {
 			),
 			'AbsoluteLink' => array(
 				'title' => 'URL',
-				'formatting' => '$value " . ($AbsoluteLiveLink ? "<a href=\"$AbsoluteLiveLink\">(live)</a>" : "") . " <a href=\"$value?stage=Stage\">(draft)</a>'
+				'formatting' => '$value " . ($AbsoluteLiveLink ? "<a target=\"_blank\" href=\"$AbsoluteLiveLink\">(live)</a>" : "") . " <a target=\"_blank\" href=\"$value?stage=Stage\">(draft)</a>'
 			)
 		);
 		

From 7ea8f1c7f47cfa1e67faa269fe77c4f56162ad1a Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 04:02:41 +0000
Subject: [PATCH 240/483] APICHANGE: Refactor Versioned so a single state is
 kept for stage, archived date, or any module specific reading modes (from
 r98161)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99119 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 8f3759dc..47499a1f 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -390,7 +390,7 @@ JS;
 				singleton($treeClass)->flushCache();
 
 				$record = DataObject::get_one( $treeClass, "\"$treeClass\".\"ID\" = $id");
-				if($record) Versioned::reading_stage(null);
+				if($record) Versioned::set_reading_mode('');
 			}
 			
 			// Then, try getting a deleted record

From 686f8a45dc6933092b9b71a34669a0c1a9efb61c Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 04:02:53 +0000
Subject: [PATCH 241/483] MINOR added LiveURLSegment to ignored field in change
 detection (from r98494)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99120 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/CMSMain_right.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/javascript/CMSMain_right.js b/javascript/CMSMain_right.js
index 5a49058a..05954935 100755
--- a/javascript/CMSMain_right.js
+++ b/javascript/CMSMain_right.js
@@ -98,7 +98,8 @@ Behaviour.register({
 	'#Form_EditForm' : {	
 		changeDetection_fieldsToIgnore : {
 			'restricted-chars[Form_EditForm_URLSegment]' : true,
-			'Sort' : true	
+			'Sort' : true,
+			'LiveURLSegment' : true
 		}
 	},
 

From 340230b9c93ecedc53d2f8bc0fc766d68511bc60 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 04:03:02 +0000
Subject: [PATCH 242/483] MINOR more unit tests around loose hierarchy (from
 r98509)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99121 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/CMSMainTest.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/CMSMainTest.php b/tests/CMSMainTest.php
index 266b6592..3eebd655 100644
--- a/tests/CMSMainTest.php
+++ b/tests/CMSMainTest.php
@@ -106,6 +106,24 @@ class CMSMainTest extends FunctionalTest {
 			
 			$this->assertTrue($page->getCMSFields(null) instanceof FieldSet);
 		}
+	}
+	
+	function testCanPublishPageWithUnpublishedParentWithStrictHierarchyOff() {
+		$this->logInWithPermssion('ADMIN');
+		
+		SiteTree::enforce_strict_hierarchy(true);
+		$parentPage = $this->objFromFixture('Page','page3');
+		$childPage = $this->objFromFixture('Page','page1');
+		
+		$parentPage->doUnpublish();
+		$childPage->doUnpublish();
+
+		$this->assertContains(
+			'action_publish',
+			$childPage->getCMSActions()->column('Name'),
+			'Can publish a page with an unpublished parent with strict hierarchy off'
+		);
+		SiteTree::enforce_strict_hierarchy(false);
 	}	
 
 	/**

From 7e6ae12b4cfe787e170d04e2c3441b87cf48868e Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 04:03:43 +0000
Subject: [PATCH 243/483] MINOR don't remember what report you had selected in
 ReportAdmin (from r98560)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99122 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ReportAdmin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index e1ab28c5..e4d913fa 100755
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -116,7 +116,7 @@ class ReportAdmin extends LeftAndMain {
 	 * @return Form
 	 */
 	public function EditForm() {
-		$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : Session::get('currentReport');
+		$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : null;
 		
 		if($id) {
 			foreach($this->Reports() as $report) {
@@ -132,7 +132,7 @@ class ReportAdmin extends LeftAndMain {
 	 * @return SS_Report
 	 */
 	public function CurrentReport() {
-		$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : Session::get('currentReport');
+		$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : null;
 		
 		if($id) {
 			foreach($this->Reports() as $report) {

From 9952e10abeb8c9751beefe98a026ffe4bcc961da Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 04:05:58 +0000
Subject: [PATCH 244/483] MINOR don't load a report by default (from r98561)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99123 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/ReportAdmin_left.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/javascript/ReportAdmin_left.js b/javascript/ReportAdmin_left.js
index 4ca13fbe..a34b5c91 100755
--- a/javascript/ReportAdmin_left.js
+++ b/javascript/ReportAdmin_left.js
@@ -45,11 +45,5 @@ function reloadSiteTree() {
 				
 		}	
 	});
-}
 
-appendLoader(function () {
-	if($('sitetree')) {
-		var selectedNode = $('sitetree').getElementsByTagName('li')[1];
-		//selectedNode.onselect();
-	}
-});
\ No newline at end of file
+}

From a57e18bbb62c7d103aefc2abab3308251c459e76 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 04:06:42 +0000
Subject: [PATCH 245/483] BUGFIX: Make sure navigation links update when
 urlsegment is changed (from r98649)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99124 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index a5ac01b3..591a4131 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -712,7 +712,8 @@ JS;
 			}
 
 			// HACK: This should be turned into somethign more general
-			if( ($record->class == 'VirtualPage' && $originalURLSegment != $record->URLSegment) ||
+			// Removed virtualpage test as we need to draft/published links when url is changed
+			if( (/*$record->class == 'VirtualPage' &&*/ $originalURLSegment != $record->URLSegment) ||
 				($originalClass != $record->ClassName) || self::$ForceReload == true) {
 				FormResponse::add("$('Form_EditForm').getPageFromServer($record->ID);");
 			}

From 61fac5b804df7c8189b6826118724c19983c7ba6 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 04:06:59 +0000
Subject: [PATCH 246/483] BUGFIX: Fixed cache prepopulation on sitetree load.
 (from r98651)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99125 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 591a4131..6736d2a7 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -509,7 +509,7 @@ class LeftAndMain extends Controller {
 		if($p = $this->currentPage()) $obj->markToExpose($p);
 		
 		// NOTE: SiteTree/CMSMain coupling :-(
-		SiteTree::prepopuplate_permission_cache('edit', $obj->markedNodeIDs());
+		SiteTree::prepopuplate_permission_cache('CanEditType', $obj->markedNodeIDs());
 
 		// getChildrenAsUL is a flexible and complex way of traversing the tree
 		$titleEval = '

From a7ede59221550f9e103d12670b560e1fed6da4ee Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 04:07:12 +0000
Subject: [PATCH 247/483] MINOR refactored setting/getting strict hierarchy
 setting. (from r98654)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99126 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/CMSMainTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/CMSMainTest.php b/tests/CMSMainTest.php
index 3eebd655..a6612090 100644
--- a/tests/CMSMainTest.php
+++ b/tests/CMSMainTest.php
@@ -111,7 +111,7 @@ class CMSMainTest extends FunctionalTest {
 	function testCanPublishPageWithUnpublishedParentWithStrictHierarchyOff() {
 		$this->logInWithPermssion('ADMIN');
 		
-		SiteTree::enforce_strict_hierarchy(true);
+		SiteTree::set_enforce_strict_hierarchy(true);
 		$parentPage = $this->objFromFixture('Page','page3');
 		$childPage = $this->objFromFixture('Page','page1');
 		
@@ -123,7 +123,7 @@ class CMSMainTest extends FunctionalTest {
 			$childPage->getCMSActions()->column('Name'),
 			'Can publish a page with an unpublished parent with strict hierarchy off'
 		);
-		SiteTree::enforce_strict_hierarchy(false);
+		SiteTree::set_enforce_strict_hierarchy(false);
 	}	
 
 	/**

From aea14859f97b6c8f71b3e797fbc35849ee931c58 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 04:07:21 +0000
Subject: [PATCH 248/483] MINOR: Bugfix in previous commit (from r98660)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99127 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 6736d2a7..e1827c91 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -509,7 +509,7 @@ class LeftAndMain extends Controller {
 		if($p = $this->currentPage()) $obj->markToExpose($p);
 		
 		// NOTE: SiteTree/CMSMain coupling :-(
-		SiteTree::prepopuplate_permission_cache('CanEditType', $obj->markedNodeIDs());
+		SiteTree::prepopuplate_permission_cache('CanEditType', $obj->markedNodeIDs(), 'SiteTree::can_edit_multiple');
 
 		// getChildrenAsUL is a flexible and complex way of traversing the tree
 		$titleEval = '

From b41c401223393b33ef8d7b1745b8fe74670de570 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 04:07:30 +0000
Subject: [PATCH 249/483] BUGFIX: Fix not being able to print/export reports
 (from r98684)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99128 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ReportAdmin.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index e4d913fa..dd3619f9 100755
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -116,7 +116,8 @@ class ReportAdmin extends LeftAndMain {
 	 * @return Form
 	 */
 	public function EditForm() {
-		$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : null;
+		// Return the report if the ID is sent by request, or we're specifically asking for the edit form
+		$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : ($this->getRequest()->latestParam('Action') == 'EditForm') ? Session::get('currentReport') : null;
 		
 		if($id) {
 			foreach($this->Reports() as $report) {
@@ -132,7 +133,7 @@ class ReportAdmin extends LeftAndMain {
 	 * @return SS_Report
 	 */
 	public function CurrentReport() {
-		$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : null;
+		$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : ($this->getRequest()->latestParam('Action') == 'EditForm') ? Session::get('currentReport') : null;
 		
 		if($id) {
 			foreach($this->Reports() as $report) {

From c941ca899aba43936e35918266440ff72c98fb53 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 04:14:40 +0000
Subject: [PATCH 250/483] MINOR Fixed merge error (see r99114)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99130 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 47499a1f..11156941 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -120,7 +120,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 	
 	function SwitchView() {
 		if($page = $this->currentPage()) {
-			$nav = $page->getNavigatorItems();
+			$nav = SilverStripeNavigator::get_for_record($page);
 			Requirements::customScript("window.name = windowName('cms');");
 			return $nav['items'];
 		}

From e65429d6a6dae2ff6853a4d3c8952080257436e2 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 05:20:00 +0000
Subject: [PATCH 251/483] MINOR Localized reports

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99137 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SideReport.php                | 24 +++++++-------
 code/reports/BrokenLinksReport.php | 51 +++++++++++++++++++-----------
 lang/en_US.php                     | 28 ++++++++++++----
 3 files changed, 66 insertions(+), 37 deletions(-)

diff --git a/code/SideReport.php b/code/SideReport.php
index 6dbddfc9..5dc8ae3a 100755
--- a/code/SideReport.php
+++ b/code/SideReport.php
@@ -17,7 +17,7 @@ class SideReportView extends ViewableData {
 	}
 	
 	function group() {
-		return 'Other';
+		return _t('SideReport.OtherGroupTitle', "Other");
 	}
 	
 	function sort() {
@@ -128,7 +128,7 @@ class SideReport_EmptyPages extends SS_Report {
 	}
 
 	function group() {
-		return "Content reports";
+		return _t('SideReport.ContentGroupTitle', "Content reports");
 	}
 	function sort() {
 		return 100;
@@ -156,7 +156,7 @@ class SideReport_RecentlyEdited extends SS_Report {
 		return _t('SideReport.LAST2WEEKS',"Pages edited in the last 2 weeks");
 	}
 	function group() {
-		return "Content reports";
+		return _t('SideReport.ContentGroupTitle', "Content reports");
 	}
 	function sort() {
 		return 200;
@@ -184,7 +184,7 @@ class SideReport_ToDo extends SS_Report {
 		return _t('SideReport.TODO',"Pages with To Do items");
 	}
 	function group() {
-		return "Content reports";
+		return _t('SideReport.ContentGroupTitle', "Content reports");
 	}
 	function sort() {
 		return 0;
@@ -216,7 +216,7 @@ class SideReport_BrokenLinks extends SS_Report {
 		return _t('SideReport.BROKENLINKS',"Pages with broken links");
 	}
 	function group() {
-		return "Broken links reports";
+		return _t('SideReport.BrokenLinksGroupTitle', "Broken links reports");
 	}
 	function sourceRecords($params = null) {
 		// Get class names for page types that are not virtual pages or redirector pages
@@ -237,7 +237,7 @@ class SideReport_BrokenLinks extends SS_Report {
 	}
 	function getParameterFields() {
 		return new FieldSet(
-			new CheckboxField('OnLive', 'Check live site')
+			new CheckboxField('OnLive', _t('SideReport.ParameterLiveCheckbox', 'Check live site'))
 		);
 	}
 }
@@ -253,7 +253,7 @@ class SideReport_BrokenFiles extends SS_Report {
 		return _t('SideReport.BROKENFILES',"Pages with broken files");
 	}
 	function group() {
-		return "Broken links reports";
+		return _t('SideReport.BrokenLinksGroupTitle', "Broken links reports");
 	}
 	function sourceRecords($params = null) {
 		// Get class names for page types that are not virtual pages or redirector pages
@@ -275,7 +275,7 @@ class SideReport_BrokenFiles extends SS_Report {
 
 	function getParameterFields() {
 		return new FieldSet(
-			new CheckboxField('OnLive', 'Check live site')
+			new CheckboxField('OnLive', _t('SideReport.ParameterLiveCheckbox', 'Check live site'))
 		);
 	}
 
@@ -286,7 +286,7 @@ class SideReport_BrokenVirtualPages extends SS_Report {
 		return _t('SideReport.BROKENVIRTUALPAGES', 'VirtualPages pointing to deleted pages');
 	}
 	function group() {
-		return "Broken links reports";
+		return _t('SideReport.BrokenLinksGroupTitle', "Broken links reports");
 	}
 	function sourceRecords($params = null) {
 		$classNames = "'".join("','", ClassInfo::subclassesFor('VirtualPage'))."'";
@@ -306,7 +306,7 @@ class SideReport_BrokenVirtualPages extends SS_Report {
 
 	function getParameterFields() {
 		return new FieldSet(
-			new CheckboxField('OnLive', 'Check live site')
+			new CheckboxField('OnLive', _t('SideReport.ParameterLiveCheckbox', 'Check live site'))
 		);
 	}
 }
@@ -316,7 +316,7 @@ class SideReport_BrokenRedirectorPages extends SS_Report {
 		return _t('SideReport.BROKENREDIRECTORPAGES', 'RedirectorPages pointing to deleted pages');
 	}
 	function group() {
-		return "Broken links reports";
+		return _t('SideReport.BrokenLinksGroupTitle', "Broken links reports");
 	}
 	function sourceRecords($params = null) {
 		$classNames = "'".join("','", ClassInfo::subclassesFor('RedirectorPage'))."'";
@@ -337,7 +337,7 @@ class SideReport_BrokenRedirectorPages extends SS_Report {
 	
 	function getParameterFields() {
 		return new FieldSet(
-			new CheckboxField('OnLive', 'Check live site')
+			new CheckboxField('OnLive', _t('SideReport.ParameterLiveCheckbox', 'Check live site'))
 		);
 	}
 }
diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
index 61289b94..488b4a03 100644
--- a/code/reports/BrokenLinksReport.php
+++ b/code/reports/BrokenLinksReport.php
@@ -7,9 +7,11 @@
  */
 
 class BrokenLinksReport extends SS_Report {
+
 	function title() {
 		return _t('BrokenLinksReport.BROKENLINKS',"Broken links report");
 	}
+	
 	function sourceRecords($params, $sort, $limit) {
 		$join = '';
 		$sortBrokenReason = false;
@@ -39,23 +41,23 @@ class BrokenLinksReport extends SS_Report {
 			
 			if ($isVirtualPage) {
 				if ($record->HasBrokenLink) {
-					$reason = "virtual page pointing to non-existent page";
+					$reason = _t('BrokenLinksReport.VirtualPageNonExistent', "virtual page pointing to non-existent page");
 					$reasonCodes = array("VPBROKENLINK");
 				}
 			} else if ($isRedirectorPage) {
 				if ($record->HasBrokenLink) {
-					$reason = "redirector page pointing to non-existent page";
+					$reason = _t('BrokenLinksReport.RedirectorNonExistent', "redirector page pointing to non-existent page");
 					$reasonCodes = array("RPBROKENLINK");
 				}
 			} else {
 				if ($record->HasBrokenLink && $record->HasBrokenFile) {
-					$reason = "has broken link and file";
+					$reason = _t('BrokenLinksReport.HasBrokenLinkAndFile', "has broken link and file");
 					$reasonCodes = array("BROKENFILE", "BROKENLINK");
 				} else if ($record->HasBrokenLink && !$record->HasBrokenFile) {
-					$reason = "has broken link";
+					$reason = _t('BrokenLinksReport.HasBrokenLink', "has broken link");
 					$reasonCodes = array("BROKENLINK");
 				} else if (!$record->HasBrokenLink && $record->HasBrokenFile) {
-					$reason = "has broken file";
+					$reason = _t('BrokenLinksReport.HasBrokenFile', "has broken file");
 					$reasonCodes = array("BROKENFILE");
 				}
 			}
@@ -72,20 +74,29 @@ class BrokenLinksReport extends SS_Report {
 		return $returnSet;
 	}
 	function columns() {
+		if(isset($_REQUEST['CheckSite']) && $_REQUEST['CheckSite'] == 'Draft') {
+			$dateTitle = _t('BrokenLinksReport.ColumnDateLastModified', 'Date last modified');
+		} else {
+			$dateTitle = _t('BrokenLinksReport.ColumnDateLastPublished', 'Date last published');
+		}
+		
 		$fields = array(
 			"Title" => array(
 				"title" => "Page name",
-				'formatting' => '<a href=\"admin/show/$ID\" title=\"Edit page\">$value</a>'
+				'formatting' => sprintf(
+					'<a href=\"admin/show/$ID\" title=\"%s\">$value</a>',
+					_t('BrokenLinksReport.HoverTitleEditPage', 'Edit page')
+				)
 			),
 			"LastEdited" => array(
-				"title" => "Date ".(isset($_REQUEST['CheckSite']) && ($_REQUEST['CheckSite'] == 'Draft')?'last modified':'published'),
+				"title" => $dateTitle,
 				'casting' => 'SSDatetime->Full'
 			),
 			"BrokenReason" => array(
-				"title" => "Problem type"
+				"title" => _t('BrokenLinksReport.ColumnProblemType', "Problem type")
 			),
 			'AbsoluteLink' => array(
-				'title' => 'URL',
+				'title' => _t('BrokenLinksReport.ColumnURL', 'URL'),
 				'formatting' => '$value " . ($AbsoluteLiveLink ? "<a target=\"_blank\" href=\"$AbsoluteLiveLink\">(live)</a>" : "") . " <a target=\"_blank\" href=\"$value?stage=Stage\">(draft)</a>'
 			)
 		);
@@ -95,16 +106,20 @@ class BrokenLinksReport extends SS_Report {
 	function parameterFields() {
 		return new FieldSet(
 			new DropdownField('CheckSite', 'Check site', array(
-				'Published' => 'Published Site',
-				'Draft' => 'Draft Site'
+				'Published' => _t('BrokenLinksReport.CheckSiteDropdownPublished', 'Published Site'),
+				'Draft' => _t('BrokenLinksReport.CheckSiteDropdownDraft', 'Draft Site')
 			)),
-			new DropdownField('Reason', 'Problem to check', array(
-				'' => 'Any',
-				'BROKENFILE' => 'Broken file',
-				'BROKENLINK' => 'Broken link',
-				'VPBROKENLINK' => 'Virtual page pointing to non-existent page',
-				'RPBROKENLINK' => 'Redirector page pointing to non-existent page',
-			))
+			new DropdownField(
+				'Reason', 
+				_t('BrokenLinksReport.ReasonDropdown', 'Problem to check'), 
+				array(
+					'' => 'Any',
+					'BROKENFILE' => _t('BrokenLinksReport.ReasonDropdownBROKENFILE', 'Broken file'),
+					'BROKENLINK' => _t('BrokenLinksReport.ReasonDropdownBROKENLINK', 'Broken link'),
+					'VPBROKENLINK' => _t('BrokenLinksReport.ReasonDropdownVPBROKENLINK', 'Virtual page pointing to non-existent page'),
+					'RPBROKENLINK' => _t('BrokenLinksReport.ReasonDropdownRPBROKENLINK', 'Redirector page pointing to non-existent page'),
+				)
+			)
 		);
 	}
 }
diff --git a/lang/en_US.php b/lang/en_US.php
index 3978dd99..9f489eea 100755
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -59,6 +59,23 @@ $lang['en_US']['AssetTableField.ss']['DRAGTOFOLDER'] = 'Drag to folder on left t
 $lang['en_US']['AssetTableField.ss']['EDIT'] = 'Edit asset';
 $lang['en_US']['AssetTableField.ss']['SHOW'] = 'Show asset';
 $lang['en_US']['BrokenLinksReport']['BROKENLINKS'] = 'Broken links report';
+$lang['en_US']['BrokenLinksReport']['CheckSiteDropdownDraft'] = 'Draft Site';
+$lang['en_US']['BrokenLinksReport']['CheckSiteDropdownPublished'] = 'Published Site';
+$lang['en_US']['BrokenLinksReport']['ColumnDateLastModified'] = 'Date last modified';
+$lang['en_US']['BrokenLinksReport']['ColumnDateLastPublished'] = 'Date last published';
+$lang['en_US']['BrokenLinksReport']['ColumnProblemType'] = 'Problem type';
+$lang['en_US']['BrokenLinksReport']['ColumnURL'] = 'URL';
+$lang['en_US']['BrokenLinksReport']['HasBrokenFile'] = 'has broken file';
+$lang['en_US']['BrokenLinksReport']['HasBrokenLink'] = 'has broken link';
+$lang['en_US']['BrokenLinksReport']['HasBrokenLinkAndFile'] = 'has broken link and file';
+$lang['en_US']['BrokenLinksReport']['HoverTitleEditPage'] = 'Edit page';
+$lang['en_US']['BrokenLinksReport']['ReasonDropdown'] = 'Problem to check';
+$lang['en_US']['BrokenLinksReport']['ReasonDropdownBROKENFILE'] = 'Broken file';
+$lang['en_US']['BrokenLinksReport']['ReasonDropdownBROKENLINK'] = 'Broken link';
+$lang['en_US']['BrokenLinksReport']['ReasonDropdownRPBROKENLINK'] = 'Redirector page pointing to non-existent page';
+$lang['en_US']['BrokenLinksReport']['ReasonDropdownVPBROKENLINK'] = 'Virtual page pointing to non-existent page';
+$lang['en_US']['BrokenLinksReport']['RedirectorNonExistent'] = 'redirector page pointing to non-existent page';
+$lang['en_US']['BrokenLinksReport']['VirtualPageNonExistent'] = 'virtual page pointing to non-existent page';
 $lang['en_US']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = 'Deleted %d pages from the draft site, %d failures';
 $lang['en_US']['CMSBatchActions']['DELETED_PAGES'] = 'Deleted %d pages from the published site, %d failures';
 $lang['en_US']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Delete from draft site';
@@ -287,10 +304,6 @@ $lang['en_US']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = array(
 $lang['en_US']['LeftAndMain']['STATUSTO'] = '  Status changed to \'%s\'';
 $lang['en_US']['LeftAndMain.ss']['APPVERSIONTEXT1'] = 'This is the';
 $lang['en_US']['LeftAndMain.ss']['APPVERSIONTEXT2'] = 'version that you are currently running, technically it\'s the CVS branch';
-$lang['en_US']['LeftAndMain.ss']['ARCHS'] = 'Archived Site';
-$lang['en_US']['LeftAndMain.ss']['DRAFTS'] = 'Draft Site';
-$lang['en_US']['LeftAndMain.ss']['EDIT'] = 'Edit';
-$lang['en_US']['LeftAndMain.ss']['EDITINCMS'] = 'Edit this page in the CMS';
 $lang['en_US']['LeftAndMain.ss']['EDITPROFILE'] = 'Profile';
 $lang['en_US']['LeftAndMain.ss']['LOADING'] = array(
 	'Loading...',
@@ -298,14 +311,11 @@ $lang['en_US']['LeftAndMain.ss']['LOADING'] = array(
 );
 $lang['en_US']['LeftAndMain.ss']['LOGGEDINAS'] = 'Logged in as';
 $lang['en_US']['LeftAndMain.ss']['LOGOUT'] = 'Log out';
-$lang['en_US']['LeftAndMain.ss']['PUBLIS'] = 'Published Site';
 $lang['en_US']['LeftAndMain.ss']['REQUIREJS'] = array(
 	'The CMS requires that you have JavaScript enabled.',
 	PR_HIGH
 );
 $lang['en_US']['LeftAndMain.ss']['SSWEB'] = 'Silverstripe Website';
-$lang['en_US']['LeftAndMain.ss']['VIEWINDRAFT'] = 'View the Page in the Draft Site';
-$lang['en_US']['LeftAndMain.ss']['VIEWINPUBLISHED'] = 'View the Page in the Published Site';
 $lang['en_US']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Page view:';
 $lang['en_US']['LeftAndMain_right.ss']['WELCOMETO'] = 'Welcome to';
 $lang['en_US']['MathSpamProtection']['EIGHT'] = 'eight';
@@ -516,8 +526,12 @@ $lang['en_US']['SideReport']['BROKENFILES'] = 'Pages with broken files';
 $lang['en_US']['SideReport']['BROKENLINKS'] = 'Pages with broken links';
 $lang['en_US']['SideReport']['BROKENREDIRECTORPAGES'] = 'RedirectorPages pointing to deleted pages';
 $lang['en_US']['SideReport']['BROKENVIRTUALPAGES'] = 'VirtualPages pointing to deleted pages';
+$lang['en_US']['SideReport']['BrokenLinksGroupTitle'] = 'Broken links reports';
+$lang['en_US']['SideReport']['ContentGroupTitle'] = 'Content reports';
 $lang['en_US']['SideReport']['EMPTYPAGES'] = 'Pages with no content';
 $lang['en_US']['SideReport']['LAST2WEEKS'] = 'Pages edited in the last 2 weeks';
+$lang['en_US']['SideReport']['OtherGroupTitle'] = 'Other';
+$lang['en_US']['SideReport']['ParameterLiveCheckbox'] = 'Check live site';
 $lang['en_US']['SideReport']['REPEMPTY'] = array(
 	'The %s report is empty.',
 	PR_MEDIUM,

From d61a3709727a4cb94254a8aa27701b20c6a6197f Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 20:11:57 +0000
Subject: [PATCH 252/483] MINOR Moved timezone coupling in SS_Report labels
 into timezoneawareness module

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99178 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/Report.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/Report.php b/code/Report.php
index 2491dfe9..38078a90 100644
--- a/code/Report.php
+++ b/code/Report.php
@@ -169,11 +169,12 @@ class SS_Report extends ViewableData {
 	 */
 	function getCMSFields() {
 		$fields = new FieldSet(
-			new LiteralField('ReportTitle', "<h3>{$this->title()}</h3><p>All times are in the server timezone, unless otherwise specified</p>")
+			new LiteralField(
+				'ReportTitle', 
+				 "<h3>{$this->title()}</h3>"
+			)
 		);
 		
-		// $fields->push();
-		
 		if($this->description) $fields->push(
 			new LiteralField('ReportDescription', "<p>{$this->description}</p>"));
 			

From 641a8fec7a1f7b941720dc66ad33f9f76593cc77 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 22:50:36 +0000
Subject: [PATCH 253/483] MINOR Fixed FilesystemPublisherTest to have
 self-contained extension settings, and not rely on static publishing being
 enable in mysite/_config.php already. Fixed login permissions for doPublish()
 calls in test case.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99347 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/FilesystemPublisherTest.php | 33 ++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/tests/FilesystemPublisherTest.php b/tests/FilesystemPublisherTest.php
index 26ca5fde..6c42f8b7 100644
--- a/tests/FilesystemPublisherTest.php
+++ b/tests/FilesystemPublisherTest.php
@@ -6,14 +6,21 @@
  * @subpackage tests
  */
 class FilesystemPublisherTest extends SapphireTest {
-	function setup() {
-		parent::setup();
+	
+	protected $usesDatabase = true;
+	
+	function setUp() {
+		parent::setUp();
+		
+		Object::add_extension("SiteTree", "FilesystemPublisher('../FilesystemPublisherTest-static-folder/')");
 		SiteTree::$write_homepage_map = false;
 	}
 	
-	function teardown() {
-		parent::teardown();
+	function tearDown() {
+		Object::remove_extension("SiteTree", "FilesystemPublisher");
 		SiteTree::$write_homepage_map = true;
+		
+		parent::tearDown();
 	}
 	
 	/**
@@ -32,7 +39,9 @@ class FilesystemPublisherTest extends SapphireTest {
 		$this->assertEquals($fsp->class, 'FilesystemPublisher');
 	}
 	
-	function testHomepageMapIsCorrect() {
+	function testHomepageMapIsWithStaticPublishing() {
+		$this->logInWithPermssion('ADMIN');
+		
 		$p1 = new Page();
 		$p1->URLSegment = strtolower(__CLASS__).'-page-1';
 		$p1->HomepageForDomain = '';
@@ -51,13 +60,15 @@ class FilesystemPublisherTest extends SapphireTest {
 		
 		$map = SiteTree::generate_homepage_domain_map();
 		
-		$validMap = array(
-			'domain1' => strtolower(__CLASS__).'-page-2',
-			'domain2' => strtolower(__CLASS__).'-page-3',
-			'domain3' => strtolower(__CLASS__).'-page-3',
+		$this->assertEquals(
+			$map, 
+			array(
+				'domain1' => strtolower(__CLASS__).'-page-2',
+				'domain2' => strtolower(__CLASS__).'-page-3',
+				'domain3' => strtolower(__CLASS__).'-page-3',
+			), 
+			'Homepage/domain map is correct when static publishing is enabled'
 		);
-		
-		$this->assertEquals($map, $validMap, 'Homepage/domain map is correct');
 	}
 	
 }
\ No newline at end of file

From 5484aaf01ae19ba38a8adaed9154e1d35497c890 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 23:10:24 +0000
Subject: [PATCH 254/483] MINOR Moved cms specific styling in
 CalendarDateField.css to cms/css/cms_right.css

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99362 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/cms_right.css | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/css/cms_right.css b/css/cms_right.css
index 8e2b0853..6b0a1d09 100644
--- a/css/cms_right.css
+++ b/css/cms_right.css
@@ -123,6 +123,7 @@
 	height: 21px;
 }
 
+
 .right form textarea,
 .right form input.text,
 .right form textarea.htmleditor {
@@ -214,6 +215,17 @@
 	width: auto;
 }
 
+#right form .calendardate, .calendardate {
+	position: relative;
+}
+#right form .calendardate input, .calendardate input {
+	width: 8em;
+}
+
+#SiteTreeFilterDate {
+	width: 68px;
+}
+
 /**
  * Tabs
  */

From 12761de90be1324e5dd80f25ddd2f755680d8338 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Feb 2010 23:10:25 +0000
Subject: [PATCH 255/483] MINOR Using DateField in
 CMSMain->SiteTreeFilterDateField(), as CalendarDateField is now deprecated

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99363 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 11156941..0de92eee 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -213,7 +213,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		return $filter_options;
 	}
 		public function SiteTreeFilterDateField() {
-			$dateField = new CalendarDateField('SiteTreeFilterDate');
+			$dateField = new DateField('SiteTreeFilterDate');
+			$dateField->setConfig('showcalendar', true);
 			return $dateField->Field();
 		}
 		public function SiteTreeFilterPageTypeField() {

From 1091dafdf0b52029c75922b9a3d8e954cb83978e Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Fri, 19 Feb 2010 00:32:16 +0000
Subject: [PATCH 256/483] BUGFIX: Correct StaticPublisher filenames, now works
 with nested URLS

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99465 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/staticpublisher/FilesystemPublisher.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/staticpublisher/FilesystemPublisher.php b/code/staticpublisher/FilesystemPublisher.php
index a7d62ea2..a02a788d 100644
--- a/code/staticpublisher/FilesystemPublisher.php
+++ b/code/staticpublisher/FilesystemPublisher.php
@@ -49,7 +49,13 @@ class FilesystemPublisher extends StaticPublisher {
 		foreach($urls as $url) {
 			$urlParts = @parse_url($url);
 			$urlParts['path'] = isset($urlParts['path']) ? $urlParts['path'] : '';
-			$urlSegment = preg_replace('/[^a-zA-Z0-9]/si', '_', trim($urlParts['path'], '/'));
+			// perform similar transformations to SiteTree::generateURLSegment()
+			$urlSegment = $urlParts['path'];
+			$urlSegment = str_replace('&amp;','-and-',$urlSegment);
+			$urlSegment = str_replace('&','-and-',$urlSegment);
+			$urlSegment = ereg_replace('[^A-Za-z0-9\/-]+','-',$urlSegment);
+			$urlSegment = ereg_replace('-+','-',$urlSegment);
+			$urlSegment = trim($urlSegment, '/');
 
 			$filename = $urlSegment ? "$urlSegment.$this->fileExtension" : "index.$this->fileExtension";
 
@@ -113,7 +119,7 @@ class FilesystemPublisher extends StaticPublisher {
 				echo " * Publishing page $i/$totalURLs: $url\n";
 				flush();
 			}
-			
+
 			Requirements::clear();
 			$response = Director::test(str_replace('+', ' ', $url));
 			Requirements::clear();

From dbec9a4c8a7f40a97271ab58c1ac308fefba807c Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 21 Feb 2010 21:35:33 +0000
Subject: [PATCH 257/483] MINOR Fixed SapphireTest->logInWithPermission()
 spelling

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99492 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/CMSMainTest.php             | 4 ++--
 tests/CommentAdminTest.php        | 2 +-
 tests/FilesystemPublisherTest.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/CMSMainTest.php b/tests/CMSMainTest.php
index a6612090..81249472 100644
--- a/tests/CMSMainTest.php
+++ b/tests/CMSMainTest.php
@@ -109,7 +109,7 @@ class CMSMainTest extends FunctionalTest {
 	}
 	
 	function testCanPublishPageWithUnpublishedParentWithStrictHierarchyOff() {
-		$this->logInWithPermssion('ADMIN');
+		$this->logInWithPermission('ADMIN');
 		
 		SiteTree::set_enforce_strict_hierarchy(true);
 		$parentPage = $this->objFromFixture('Page','page3');
@@ -177,7 +177,7 @@ class CMSMainTest extends FunctionalTest {
 	
 	function testDeletedPagesSiteTreeFilter() {
 		$id = $this->idFromFixture('Page', 'page3');
-		$this->logInWithPermssion('ADMIN');
+		$this->logInWithPermission('ADMIN');
 		$result = $this->get('admin/getfilteredsubtree?filter=CMSSiteTreeFilter_DeletedPages&ajax=1&ID=' . $id);
 		$this->assertEquals(200, $result->getStatusCode());
 	}
diff --git a/tests/CommentAdminTest.php b/tests/CommentAdminTest.php
index c86ea1b7..f534a41d 100644
--- a/tests/CommentAdminTest.php
+++ b/tests/CommentAdminTest.php
@@ -27,7 +27,7 @@ class CommentAdminTest extends FunctionalTest {
 	
 	function testacceptmarked(){
 		$id = $this->idFromFixture('PageComment', 'Comment1');
-		$this->logInWithPermssion('ADMIN');
+		$this->logInWithPermission('ADMIN');
 		$result = $this->get('admin/comments/EditForm/field/Comments/item/2/delete');
 		$this->assertEquals(200, $result->getStatusCode());
 	}
diff --git a/tests/FilesystemPublisherTest.php b/tests/FilesystemPublisherTest.php
index 6c42f8b7..4e9afb93 100644
--- a/tests/FilesystemPublisherTest.php
+++ b/tests/FilesystemPublisherTest.php
@@ -40,7 +40,7 @@ class FilesystemPublisherTest extends SapphireTest {
 	}
 	
 	function testHomepageMapIsWithStaticPublishing() {
-		$this->logInWithPermssion('ADMIN');
+		$this->logInWithPermission('ADMIN');
 		
 		$p1 = new Page();
 		$p1->URLSegment = strtolower(__CLASS__).'-page-1';

From 4539825a1b62cc7cb027b8f69a45aaca54fdb757 Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Sun, 21 Feb 2010 22:18:38 +0000
Subject: [PATCH 258/483] MINOR add pass thru group and sort methods

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99497 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/Report.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/code/Report.php b/code/Report.php
index 38078a90..14af6e7f 100644
--- a/code/Report.php
+++ b/code/Report.php
@@ -318,7 +318,6 @@ class SS_Report extends ViewableData {
 	 */
 	static function get_reports($list) {
 		$output = array();
-
 		if(isset(self::$registered_reports[$list])) {
 			$listItems = self::$registered_reports[$list];
 
@@ -497,6 +496,14 @@ abstract class SS_ReportWrapper extends SS_Report {
 	function title() {
 		return $this->baseReport->title();
 	}
+	
+	function group() {
+		return $this->baseReport->hasMethod('group') ? $this->baseReport->group() : 'Group';
+	}
+	
+	function sort() {
+		return $this->baseReport->hasMethod('sort') ? $this->baseReport->sort() : 0;
+	}
 
 	function description() {
 		return $this->baseReport->title();

From 5b36ce5cc0bd8f85a442a4fdb0cb6a60b7857167 Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Sun, 21 Feb 2010 22:39:44 +0000
Subject: [PATCH 259/483] BUGFIX use the correct method for retrieving the
 report ID

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99506 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 0de92eee..8e4ee6c3 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -693,7 +693,7 @@ JS;
 		// $options[""] = _t('CMSMain.CHOOSEREPORT',"(Choose a report)");
 		foreach($this->SideReports() as $report) {
 			if($report->canView()) {
-			 	$options[$report->group()][$report->sort()][get_class($report)] = $report->title();
+			 	$options[$report->group()][$report->sort()][$report->ID()] = $report->title();
 			}
 		}
 		

From 411d0de4a23a6683a2ca3f2e7bc671fee373c34e Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Mon, 22 Feb 2010 02:51:11 +0000
Subject: [PATCH 260/483] BUGFIX: Remove buttons from display if you load a CMS
 page that should have no buttons - reverts bug caused by r96551 and fixes the
 issue it was trying to solve.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99553 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/LeftAndMain.js       | 6 +++---
 javascript/ReportAdmin_right.js | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index 749d94fd..536a9fde 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -266,10 +266,10 @@ function ajaxActionsAtTop(formName, actionHolderName, tabName) {
 	var actions = document.getElementsBySelector('#' + formName + ' .Actions')[0];
 	var holder = $(actionHolderName);
 
+	if ( holder && holder != actions ) {
+		holder.parentNode.removeChild(holder);
+	}
 	if(actions) {
-		if ( holder ) {
-			holder.parentNode.removeChild(holder);
-		}
 		
 		actions.id = actionHolderName;
 		actions.className = 'ajaxActions';
diff --git a/javascript/ReportAdmin_right.js b/javascript/ReportAdmin_right.js
index 31a6bbe8..42879eb7 100755
--- a/javascript/ReportAdmin_right.js
+++ b/javascript/ReportAdmin_right.js
@@ -1,6 +1,5 @@
-
 Behaviour.register({
-	'#Form_EditForm' : {
+	'body.ReportAdmin #Form_EditForm' : {
 		initialise : function() {
       		this.openTab = null;
 			this.prepareForm();

From 273cc2e9304fc1962efb91205280a8fd226a7a75 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Mon, 22 Feb 2010 03:59:15 +0000
Subject: [PATCH 261/483] BUGFIX: Pages that you can't edit should always be
 grey, even if there are unpublished changes.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99572 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/cms_left.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/cms_left.css b/css/cms_left.css
index 359d9f9d..3597396b 100644
--- a/css/cms_left.css
+++ b/css/cms_left.css
@@ -94,7 +94,7 @@ ul.tree span.a a.disabled {
 	color: #999;
 	cursor: pointer;
 }
-	ul.tree span.a a.disabled * {
+	ul.tree span.a a.disabled *, ul.tree span.a a.disabled.notinmenu *, ul.tree span.a a.disabled span.modified {
 		padding: 0;
 		background: none;
 		color: #999;

From 54d4d66f72e47da63508183973d7864238ddbe63 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Mon, 22 Feb 2010 05:27:17 +0000
Subject: [PATCH 262/483] BUGFIX: Debugged and simplified Access tab javascript

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99594 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/SitetreeAccess.js | 66 ++++++------------------------------
 1 file changed, 11 insertions(+), 55 deletions(-)

diff --git a/javascript/SitetreeAccess.js b/javascript/SitetreeAccess.js
index 2652b256..d25d70dc 100644
--- a/javascript/SitetreeAccess.js
+++ b/javascript/SitetreeAccess.js
@@ -1,63 +1,19 @@
 /**
  * UI behaviour for the "Access" tab
- *
- * Adapted from the forum module "ForumAccess.js" file.
- *
- * @author Markus Lanthaler <markus@silverstripe.com>
  */
 
-ViewersGroupHide = function() {
-	$('ViewerGroups').style.display = "none";
-}
-EditorsGroupHide = function() {
-	$('EditorGroups').style.display = "none";
-}
-
-Behaviour.register({
-	'#Form_EditForm_CanViewType_OnlyTheseUsers': {
-
-		onclick: function() {
-			$('ViewerGroups').style.display = "block";
-		},
-
+var siteTreeAccessHandler = function(canField, groupsField) {
+	var output = {}
+	output['#Form_EditForm_' + canField + ' input'] = {
 		initialize: function() {
-			if($('Form_EditForm_CanViewType_OnlyTheseUsers')) {
-				if($('Form_EditForm_CanViewType_OnlyTheseUsers').checked)
-					$('ViewerGroups').style.display = "block";
-				else
-					$('ViewerGroups').style.display = "none";
-			}
-		}
-	},
-	'#Form_EditForm_CanViewType_Anyone': {
-		onclick: ViewersGroupHide
-	},
-	'#Form_EditForm_CanViewType_LoggedInUsers': {
-		onclick: ViewersGroupHide
-	},
-	'#Form_EditForm_CanViewType_Inherit': {
-		onclick: ViewersGroupHide
-	},
-	
-	'#Form_EditForm_CanEditType_OnlyTheseUsers': {
-		
-		onclick: function() {
-			$('EditorGroups').style.display = "block";
+			if(this.checked) this.click();
 		},
-
-		initialize: function() {
-			if($('Form_EditForm_CanEditType_OnlyTheseUsers')) {
-				if($('Form_EditForm_CanEditType_OnlyTheseUsers').checked)
-					$('EditorGroups').style.display = "block";
-				else
-					$('EditorGroups').style.display = "none";
-			}
+		onclick: function() {
+			$(groupsField).style.display = (this.value == 'OnlyTheseUsers') ? 'block' : 'none';
 		}
-	},
-	'#Form_EditForm_CanEditType_LoggedInUsers': {
-		onclick: EditorsGroupHide
-	},
-	'#Form_EditForm_CanEditType_Inherit': {
-		onclick: EditorsGroupHide
 	}
-});
\ No newline at end of file
+	return output;
+};
+
+Behaviour.register(siteTreeAccessHandler('CanViewType', 'ViewerGroups'));
+Behaviour.register(siteTreeAccessHandler('CanEditType', 'EditorGroups'));
\ No newline at end of file

From 0a137a4840e9795475696bd5957329787fe517db Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 23 Feb 2010 01:37:15 +0000
Subject: [PATCH 263/483] ENHANCEMENT Making  setting optional in
 MemberTableField. Field instances without  will list all members unfiltered,
 and remove members from the database rather than the group relation.
 ENHANCEMENT Allow disabling of 'inline add' formfields in a MemberTableField
 through setPermissions(array('inlineadd')) (from r98825)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99677 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberTableField.php              |  81 +++++++++++++++++---
 templates/Includes/MemberTableField.ss |  14 ++--
 tests/MemberTableFieldTest.php         | 101 +++++++++++++++++++++++++
 tests/MemberTableFieldTest.yml         |  27 +++++++
 4 files changed, 206 insertions(+), 17 deletions(-)
 create mode 100644 tests/MemberTableFieldTest.php
 create mode 100644 tests/MemberTableFieldTest.yml

diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index 0c4dfb06..4ce8be34 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -30,6 +30,8 @@ class MemberTableField extends ComplexTableField {
 
 	public $popupClass = 'MemberTableField_Popup';
 	
+	public $itemClass = 'MemberTableField_Item';
+	
 	static $data_class = 'Member';
 	
 	/**
@@ -37,6 +39,15 @@ class MemberTableField extends ComplexTableField {
 	 * @var int 
 	 */ 
 	public static $page_size = 20; 
+	
+	protected $permissions = array(
+		"add",
+		"edit",
+		"show",
+		"delete",
+		'inlineadd'
+		//"export",
+	);
 
 	/**
 	 * Constructor method for MemberTableField.
@@ -47,7 +58,7 @@ class MemberTableField extends ComplexTableField {
 	 * @param DataObjectSet $members Optional set of Members to set as the source items for this field
 	 * @param boolean $hidePassword Hide the password field or not in the summary?
 	 */
-	function __construct($controller, $name, $group, $members = null, $hidePassword = true) {
+	function __construct($controller, $name, $group = null, $members = null, $hidePassword = true) {
 		$sourceClass = self::$data_class;
 		$SNG_member = singleton($sourceClass);
 		$fieldList = $SNG_member->summaryFields();
@@ -64,7 +75,7 @@ class MemberTableField extends ComplexTableField {
 			} elseif(is_numeric($group)) {
 				$this->group = DataObject::get_by_id('Group', $group);
 			}
-		} else if(isset($_REQUEST['ctf']) && is_numeric($_REQUEST['ctf'][$this->Name()]["ID"])) {
+		} else if(isset($_REQUEST['ctf'][$this->Name()]["ID"]) && is_numeric($_REQUEST['ctf'][$this->Name()]["ID"])) {
 			$this->group = DataObject::get_by_id('Group', $_REQUEST['ctf'][$this->Name()]["ID"]);
 		}
 
@@ -76,7 +87,7 @@ class MemberTableField extends ComplexTableField {
 		
 		// @todo shouldn't this use $this->group? It's unclear exactly
 		// what group it should be customising the custom Member set with.
-		if($members) {
+		if($members && $group) {
 			$this->setCustomSourceItems($this->memberListWithGroupID($members, $group));
 		}
 
@@ -240,6 +251,17 @@ class MemberTableField extends ComplexTableField {
 		$this->group = $group;
 	}
 	
+	/**
+	 * @return Group
+	 */
+	function getGroup() {
+		return $this->group;
+	}
+	
+	function setController($controller) {
+		$this->controller = $controller;
+	}
+
 	function GetControllerName() {
 		return $this->controller->class;
 	}
@@ -329,6 +351,7 @@ class MemberTableField extends ComplexTableField {
 		$start = isset($_REQUEST['ctf'][$this->Name()]['start']) ? $_REQUEST['ctf'][$this->Name()]['start'] : 0; 
 		
 		$this->sourceItems = false;
+
 		if($this->group) {
 			$this->sourceItems = $this->group->Members( 
 				$this->pageSize, // limit 
@@ -336,6 +359,13 @@ class MemberTableField extends ComplexTableField {
 				$this->sourceFilter,
 				$this->sourceSort
 			);	
+		} else {
+			$this->sourceItems = DataObject::get(self::$data_class,
+				$this->sourceFilter,
+				$this->sourceSort,
+				null,
+				array('limit' => $this->pageSize, 'start' => $start)
+			);
 		}
 		// Because we are not used $this->upagedSourceItems any more, and the DataObjectSet is usually the source
 		// that a large member set runs out of memory. we disable it here.
@@ -377,6 +407,33 @@ class MemberTableField_Popup extends ComplexTableField_Popup {
 
 }
 
+class MemberTableField_Item extends ComplexTableField_Item {
+
+	function Actions() {
+		$actions = parent::Actions();
+		
+		foreach($actions as $action) {
+			if($action->Name == 'delete') {
+				if($this->parent->getGroup()) {
+					$action->TitleText = _t('MemberTableField.DeleteTitleText',
+						'Delete from this group',
+						PR_MEDIUM,
+						'Delete button hover text'
+					);
+				} else {
+					$action->TitleText = _t('MemberTableField.DeleteTitleTextDatabase',
+						'Delete from database and all groups',
+						PR_MEDIUM,
+						'Delete button hover text'
+					);
+				}
+			}
+		}
+
+		return $actions;
+	}
+}
+
 class MemberTableField_ItemRequest extends ComplexTableField_ItemRequest {
 	/**
 	 * Deleting an item from a member table field should just remove that member from the group
@@ -386,17 +443,21 @@ class MemberTableField_ItemRequest extends ComplexTableField_ItemRequest {
 			return false;
 		}
 
-		$groupID = $this->ctf->sourceID();
-		$group = DataObject::get_by_id('Group', $groupID);
-		
-		if ($group) {
+		// if a group limitation is set on the table, remove relation.
+		// otherwise remove the record from the database
+		if($this->ctf->getGroup()) {
+			$groupID = $this->ctf->sourceID();
+			$group = DataObject::get_by_id('Group', $groupID);
+			
+			// Remove from group and all child groups
 			foreach($group->getAllChildren() as $subGroup) {
 				$this->dataObj()->Groups()->remove($subGroup);
 			}
 			$this->dataObj()->Groups()->remove($groupID);
-		}
+		} else {
+			$this->dataObj()->delete();
+		}	
 	}
-	
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/templates/Includes/MemberTableField.ss b/templates/Includes/MemberTableField.ss
index 409247ba..434077ae 100755
--- a/templates/Includes/MemberTableField.ss
+++ b/templates/Includes/MemberTableField.ss
@@ -17,12 +17,13 @@
 				</tr>
 			</thead>
 			<tfoot>
-				<% if can(add) %>
-				 <tr class="addtogrouprow">
-					<% if Markable %><td width="18">&nbsp;</dh><% end_if %>
-					$AddRecordForm.CellFields
-					<td class="actions" colspan="3">$AddRecordForm.CellActions</td>
-				</tr>
+				<% if Can(inlineadd) %>
+					<tr class="addtogrouprow">
+						<% if Markable %><td width="18">&nbsp;</dh><% end_if %>
+						$AddRecordForm.CellFields
+						<td class="actions" colspan="3">$AddRecordForm.CellActions</td>
+					</tr>
+				<% end_if %>
 				<tr style="display: none;">
 					<% if Markable %><td width="18">&nbsp;</td><% end_if %>
 					<td colspan="$ItemCount">
@@ -32,7 +33,6 @@
 					<% if Can(edit) %><td width="18">&nbsp;</td><% end_if %>
 					<% if Can(delete) %><td width="18">&nbsp;</td><% end_if %>
 				</tr>
-				<% end_if %>
 			</tfoot>
 			<tbody>
 				<% if Items %>
diff --git a/tests/MemberTableFieldTest.php b/tests/MemberTableFieldTest.php
new file mode 100644
index 00000000..253d99c7
--- /dev/null
+++ b/tests/MemberTableFieldTest.php
@@ -0,0 +1,101 @@
+<?php
+class MemberTableFieldTest extends SapphireTest {
+	static $fixture_file = 'cms/tests/MemberTableFieldTest.yml';
+	
+	function testLimitsToMembersInGroup() {
+		$member1 = $this->objFromFixture('Member', 'member1');
+		$member2 = $this->objFromFixture('Member', 'member2');
+		$member3 = $this->objFromFixture('Member', 'member3');
+		$group1 = $this->objFromFixture('Group', 'group1');
+		
+		$tf = new MemberTableField(
+			$this,
+			"Members",
+			$group1
+		);
+		$members = $tf->sourceItems();
+		
+		$this->assertContains($member1->ID, $members->column('ID'),
+			'Members in the associated group are listed'
+		);
+		$this->assertContains($member2->ID, $members->column('ID'),
+			'Members in children groups are listed as well'
+		);
+		$this->assertNotContains($member3->ID, $members->column('ID'),
+			'Members in other groups are filtered out'
+		);
+	}
+	
+	function testShowsAllMembersWithoutGroupParameter() {
+		$member1 = $this->objFromFixture('Member', 'member1');
+		$member2 = $this->objFromFixture('Member', 'member2');
+		$member3 = $this->objFromFixture('Member', 'member3');
+		$group1 = $this->objFromFixture('Group', 'group1');
+		
+		$tf = new MemberTableField(
+			$this,
+			"Members"
+			// no group assignment
+		);
+		$members = $tf->sourceItems();
+		
+		$this->assertContains($member1->ID, $members->column('ID'),
+			'Members in the associated group are listed'
+		);
+		$this->assertContains($member2->ID, $members->column('ID'),
+			'Members in children groups are listed as well'
+		);
+		$this->assertContains($member3->ID, $members->column('ID'),
+			'Members in other groups are listed'
+		);
+	}
+	
+	function testDeleteWithGroupOnlyDeletesRelation() {
+		$member1 = $this->objFromFixture('Member', 'member1');
+		$group1 = $this->objFromFixture('Group', 'group1');
+		
+		$tf = new MemberTableField(
+			$this,
+			"Members",
+			$group1
+		);
+		$tfItem = new MemberTableField_ItemRequest($tf, $member1->ID);
+		$tfItem->delete();
+
+		$group1->flushCache();
+		
+		$this->assertNotContains($member1->ID, $group1->Members()->column('ID'),
+			'Member relation to group is removed'
+		);
+		$this->assertType(
+			'DataObject',
+			DataObject::get_by_id('Member', $member1->ID),
+			'Member record still exists'
+		);
+	}
+	
+	function testDeleteWithoutGroupDeletesFromDatabase() {
+		$member1 = $this->objFromFixture('Member', 'member1');
+		$member1ID = $member1->ID;
+		$group1 = $this->objFromFixture('Group', 'group1');
+		
+		$tf = new MemberTableField(
+			$this,
+			"Members"
+			// no group assignment
+		);
+		$tfItem = new MemberTableField_ItemRequest($tf, $member1->ID);
+		$tfItem->delete();
+
+		$group1->flushCache();
+		
+		$this->assertNotContains($member1->ID, $group1->Members()->column('ID'),
+			'Member relation to group is removed'
+		);
+		DataObject::flush_and_destroy_cache();
+		$this->assertFalse(
+			DataObject::get_by_id('Member', $member1ID),
+			'Member record is removed from database'
+		);
+	}
+}
\ No newline at end of file
diff --git a/tests/MemberTableFieldTest.yml b/tests/MemberTableFieldTest.yml
new file mode 100644
index 00000000..ee85785d
--- /dev/null
+++ b/tests/MemberTableFieldTest.yml
@@ -0,0 +1,27 @@
+Group:
+  admin:
+    Title: Administrators
+  group1:
+    Title: Group1
+  group1_child:
+    Title: Group1 Child
+    Parent: =>Group.group1
+  group2:
+    Title: Group2
+Member:
+  admin:
+    Email: admin@example.com
+    Groups: =>Group.admin
+  member1:
+    Email: member1@test.com
+    Groups: =>Group.group1
+  member2:
+    Email: member2@test.com
+    Groups: =>Group.group1_child
+  member3:
+    Email: member3@test.com
+    Groups: =>Group.group2
+Permission:
+  admin:
+    Code: ADMIN
+    GroupID: =>Group.admin
\ No newline at end of file

From 9624757e14f6afdf2de0d670b16d650b47091e24 Mon Sep 17 00:00:00 2001
From: Carlos Barberis <carlos@silverstripe.com>
Date: Tue, 23 Feb 2010 01:57:55 +0000
Subject: [PATCH 264/483] ENHANCEMENT: added new PageCommnet to yml so we have
 different amounts of moderated/unmodereated BUGFIX: really testing
 deletemarked now.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99679 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/CMSMainTest.yml      |  8 +++++++-
 tests/CommentAdminTest.php | 13 ++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/tests/CMSMainTest.yml b/tests/CMSMainTest.yml
index 088d3596..0f09a7ff 100644
--- a/tests/CMSMainTest.yml
+++ b/tests/CMSMainTest.yml
@@ -64,6 +64,7 @@ SiteConfig_CreateTopLevelGroups:
       GroupID: =>Group.rooteditusers
 PageComment:
     Comment1:
+        ID: 8
         Name: Person
         Comment: Very cool page
         NeedsModeration: 1
@@ -72,4 +73,9 @@ PageComment:
         Name: Someone
         Comment: I am a person
         NeedsModeration: 0
-        EmailAddress: someone@somewhere.com
\ No newline at end of file
+        EmailAddress: someone@somewhere.com
+    Comment3:
+        Name: Me
+        Comment: I like this comment
+        NeedsModeration: 1
+        EmailAddress: me@test.co.nz
\ No newline at end of file
diff --git a/tests/CommentAdminTest.php b/tests/CommentAdminTest.php
index f534a41d..5eebdc4a 100644
--- a/tests/CommentAdminTest.php
+++ b/tests/CommentAdminTest.php
@@ -15,7 +15,7 @@ class CommentAdminTest extends FunctionalTest {
 		
 		$comm = new CommentAdmin();
 		$resp = $comm->NumUnmoderated();
-		$this->assertEquals(1, $resp);
+		$this->assertEquals(2, $resp);
 	}
 	
 	function testNumSpam(){
@@ -25,11 +25,14 @@ class CommentAdminTest extends FunctionalTest {
 		$this->assertEquals(0, $resp);
 	}
 	
-	function testacceptmarked(){
-		$id = $this->idFromFixture('PageComment', 'Comment1');
+	function testdeletemarked(){
+		$comm = $this->objFromFixture('PageComment', 'Comment1');
+		$id = $comm->ID;
 		$this->logInWithPermission('ADMIN');
-		$result = $this->get('admin/comments/EditForm/field/Comments/item/2/delete');
-		$this->assertEquals(200, $result->getStatusCode());
+		$result = $this->get("admin/comments/EditForm/field/Comments/item/$id/delete");
+		$checkComm = DataObject::get_by_id('PageComment',$id);
+
+		$this->assertEquals(0, $checkComm->ID);
 	}
 	
 }

From 033d27ac3f8d4ccae2578774d46fdf445299698f Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 23 Feb 2010 03:32:18 +0000
Subject: [PATCH 265/483] MINOR Moved ul.tree rules from cms/css/cms_left.css
 to sapphire/javascript/tree/tree.css (particularly around multiselect tickbox
 styling) (see r98854) (merged from r98855) (from r98865)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99686 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php            |  31 +++++---
 code/SecurityAdmin.php      | 154 +++++++++++++++++++++---------------
 tests/SecurityAdminTest.php |  10 +--
 3 files changed, 112 insertions(+), 83 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 8e4ee6c3..8417f720 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -477,18 +477,8 @@ JS;
 			$this->extend('updateEditForm', $form);
 
 			return $form;
-		} if ($id == 0) {
-			$siteConfig = SiteConfig::current_site_config();
-			$fields = $siteConfig->getFormFields(); 
-			if(Object::has_extension('SiteConfig',"Translatable")){ 
-				$fields->push(new HiddenField('Locale','', $siteConfig->Locale ));       
-			} 
-			$form = new Form($this, "EditForm", $fields, $siteConfig->getFormActions());
-			$form->loadDataFrom($siteConfig);
-			
-			$this->extend('updateEditForm', $form);
-			
-			return $form;
+		} if ($id == 0 || $id == 'root') {
+			$form = $this->RootForm();
 		} else if($id) {
 			return new Form($this, "EditForm", new FieldSet(
 				new LabelField('PageDoesntExistLabel',_t('CMSMain.PAGENOTEXISTS',"This page doesn't exist"))), new FieldSet());
@@ -496,7 +486,22 @@ JS;
 		}
 	}
 
-
+	/**
+	 * @return Form
+	 */
+	function RootForm() {
+		$siteConfig = SiteConfig::current_site_config();
+		$fields = $siteConfig->getFormFields(); 
+		if(Object::has_extension('SiteConfig',"Translatable")){ 
+			$fields->push(new HiddenField('Locale','', $siteConfig->Locale ));       
+		} 
+		$form = new Form($this, "EditForm", $fields, $siteConfig->getFormActions());
+		$form->loadDataFrom($siteConfig);
+		
+		$this->extend('updateEditForm', $form);
+		
+		return $form;
+	}
 
 	//------------------------------------------------------------------------------------------//
 	// Data saving handlers
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index d14dfc06..7482519f 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -29,6 +29,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		'memberimport',
 		'GroupImportForm',
 		'groupimport',
+		'RootForm'
 	);
 
 	/**
@@ -57,82 +58,105 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		Requirements::javascript(THIRDPARTY_DIR . "/greybox/AmiJS.js");
 		Requirements::javascript(THIRDPARTY_DIR . "/greybox/greybox.js");
 	}
+	
+	function getEditForm($id = null) {
+		if(!$id) $id = $this->currentPageID();
 
-	public function getEditForm($id) {
-		$record = null;
+		if($id && $id != 'root') {
+			$record = DataObject::get_by_id($this->stat('tree_class'), $id);
+			if(!$record) return false;
+		}		
+
+		if($id && is_numeric($id)) {
+			$fields = $record->getCMSFields();
+
+			if($fields->hasTabSet()) {
+				$fields->findOrMakeTab('Root.Import',_t('Group.IMPORTTABTITLE', 'Import'));
+				$fields->addFieldToTab('Root.Import', 
+					new LiteralField(
+						'MemberImportFormIframe', 
+						sprintf(
+							'<iframe src="%s" id="MemberImportFormIframe" width="100%%" height="400px" border="0"></iframe>',
+							$this->Link('memberimport')
+						)
+					)
+				);
+			}
 		
-		// Root form
-		if (($id == 'root' || $id == 0)) {
-			$fields = new FieldSet(
-				new TabSet(
-					'Root',
-					new Tab('Import', _t('SecurityAdmin.TABIMPORT', 'Import'),
-						new LiteralField(
-							'GroupImportFormIframe', 
-							sprintf(
-								'<iframe src="%s" id="GroupImportFormIframe" width="100%%" height="400px" border="0"></iframe>',
-								$this->Link('groupimport')
+			$actions = new FieldSet(
+				new FormAction('addmember',_t('SecurityAdmin.ADDMEMBER','Add Member')),
+				new FormAction('save',_t('SecurityAdmin.SAVE','Save'))
+			);
+			
+			$form = new Form($this, "EditForm", $fields, $actions);
+			$form->loadDataFrom($record);
+
+			if(!$record->canEdit()) {
+				$readonlyFields = $form->Fields()->makeReadonly();
+				$form->setFields($readonlyFields);
+			}
+		
+			// Filter permissions
+			$permissionField = $form->Fields()->dataFieldByName('Permissions');
+			if($permissionField) $permissionField->setHiddenPermissions(self::$hidden_permissions);
+			
+			$this->extend('updateEditForm', $form);
+		} else {
+			$form = $this->RootForm();
+		}
+		
+		return $form;
+	}
+
+	/**
+	 * @return FieldSet
+	 */
+	function RootForm() {
+		$memberList = new MemberTableField(
+			$this,
+			"Members"
+		);
+		// unset 'inlineadd' permission, we don't want inline addition
+		$memberList->setPermissions(array('show', 'edit', 'delete', 'add'));
+		$memberList->setRelationAutoSetting(false);
+		
+		$fields = new FieldSet(
+			new TabSet(
+				'Root',
+				new Tab('Members', singleton('Member')->i18n_plural_name(),
+					$memberList,
+					new LiteralField('MembersCautionText', 
+						sprintf('<p class="caution-remove"><strong>%s</strong></p>',
+							_t(
+								'SecurityAdmin.MemberListCaution', 
+								'Caution: Removing members from this list will remove them from all groups and the database'
 							)
 						)
 					)
 				),
-				// necessary for tree node selection in LeftAndMain.EditForm.js
-				new HiddenField('ID', false, 0)
-			);
-
-			$actions = new FieldSet();
-
-			$form = new Form(
-				$this,
-				'EditForm',
-				$fields,
-				$actions
-			);
-			
-			$this->extend('updateEditForm', $form);
-			
-			return $form;
-		}
-
-		if($id && $id != 'root') {
-			$record = DataObject::get_by_id($this->stat('tree_class'), $id);
-		}
-		
-		if(!$record) return false;
-		
-		$fields = $record->getCMSFields();
-		
-		if($fields->hasTabSet()) {
-			$fields->findOrMakeTab('Root.Import',_t('Group.IMPORTTABTITLE', 'Import'));
-			$fields->addFieldToTab('Root.Import', 
-				new LiteralField(
-					'MemberImportFormIframe', 
-					sprintf(
-						'<iframe src="%s" id="MemberImportFormIframe" width="100%%" height="400px" border="0"></iframe>',
-						$this->Link('memberimport')
+				new Tab('Import', _t('SecurityAdmin.TABIMPORT', 'Import'),
+					new LiteralField(
+						'GroupImportFormIframe', 
+						sprintf(
+							'<iframe src="%s" id="GroupImportFormIframe" width="100%%" height="400px" border="0"></iframe>',
+							$this->Link('groupimport')
+						)
 					)
 				)
-			);
-		}
-		
+			),
+			// necessary for tree node selection in LeftAndMain.EditForm.js
+			new HiddenField('ID', false, 0)
+		);
 		$actions = new FieldSet(
-			new FormAction('addmember',_t('SecurityAdmin.ADDMEMBER','Add Member')),
-			new FormAction('save',_t('SecurityAdmin.SAVE','Save'))
+			new FormAction('addmember',_t('SecurityAdmin.ADDMEMBER','Add Member'))
 		);
 		
-		$form = new Form($this, "EditForm", $fields, $actions);
-		$form->loadDataFrom($record);
-		
-		if(!$record->canEdit()) {
-			$readonlyFields = $form->Fields()->makeReadonly();
-			$form->setFields($readonlyFields);
-		}
-		
-		// Filter permissions
-		$permissionField = $form->Fields()->dataFieldByName('Permissions');
-		if($permissionField) $permissionField->setHiddenPermissions(self::$hidden_permissions);
-
-		$this->extend('updateEditForm', $form);
+		$form = new Form(
+			$this,
+			'EditForm',
+			$fields,
+			$actions
+		);
 
 		return $form;
 	}
diff --git a/tests/SecurityAdminTest.php b/tests/SecurityAdminTest.php
index 086c5b22..796502a3 100644
--- a/tests/SecurityAdminTest.php
+++ b/tests/SecurityAdminTest.php
@@ -10,13 +10,13 @@ class SecurityAdminTest extends FunctionalTest {
 		$this->session()->inst_set('loggedInAs', $this->idFromFixture('Member', 'admin'));
 		
 		/* First, open the applicable group */
-		$this->get('admin/security/getitem?ID=' . $this->idFromFixture('Group','admin'));
+		$this->get('admin/security/show/' . $this->idFromFixture('Group','admin'));
 		$this->assertRegExp('/<input[^>]+id="Form_EditForm_Title"[^>]+value="Administrators"[^>]*>/',$this->content());
 		
 		/* Then load the export page */
-		$this->get('admin/security//EditForm/field/Members/export');
+		$this->get('admin/security/EditForm/field/Members/export');
 		$lines = preg_split('/\n/', $this->content());
-		
+
 		$this->assertEquals(count($lines), 3, "Export with members has one content row");
 		$this->assertRegExp('/"","","admin@example.com"/', $lines[1], "Member values are correctly exported");
 	}
@@ -25,11 +25,11 @@ class SecurityAdminTest extends FunctionalTest {
 		$this->session()->inst_set('loggedInAs', $this->idFromFixture('Member', 'admin'));
 		
 		/* First, open the applicable group */
-		$this->get('admin/security/getitem?ID=' . $this->idFromFixture('Group','empty'));
+		$this->get('admin/security/show/' . $this->idFromFixture('Group','empty'));
 		$this->assertRegExp('/<input[^>]+id="Form_EditForm_Title"[^>]+value="Empty Group"[^>]*>/',$this->content());
 		
 		/* Then load the export page */
-		$this->get('admin/security//EditForm/field/Members/export');
+		$this->get('admin/security/EditForm/field/Members/export');
 		$lines = preg_split('/\n/', $this->content());
 		
 		$this->assertEquals(count($lines), 2, "Empty export only has header fields and an empty row");

From 830fce69e9043e6f1b476b8611abddcff30f737d Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 23 Feb 2010 03:32:24 +0000
Subject: [PATCH 266/483] MINOR Moved generic .TreeDropdownField styling from
 cms/css/cms_right.css to sapphire/css/TreeDropdownField.css (from r98881)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99687 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/cms_right.css | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/css/cms_right.css b/css/cms_right.css
index 6b0a1d09..aade65e1 100644
--- a/css/cms_right.css
+++ b/css/cms_right.css
@@ -116,12 +116,6 @@
 	/*font-size: 11px;*/
 	width: 96%;
 }
-#right .TreeDropdownField {
-	width: 27.7em;
-	background: #fff;
-	font-size: 12px;
-	height: 21px;
-}
 
 
 .right form textarea,

From 8c67b1a01e737d6566ec1c588d8bca67e06e52ea Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 23 Feb 2010 03:34:28 +0000
Subject: [PATCH 267/483] ENHANCEMENT Saving MemberTableField through new
 'Groups' field added in Member->getCMSFields(). (from r98882)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99688 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberTableField.php | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index 4ce8be34..a0554638 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -304,14 +304,19 @@ class MemberTableField extends ComplexTableField {
 	 *
 	 * @return string
 	 */
-	function saveComplexTableField($data, $form, $params) {
+	function saveComplexTableField($data, $form, $params) {		
 		$className = $this->sourceClass();
 		$childData = new $className();
 		
 		$form->saveInto($childData);
 		$childData->write();
 
-		$childData->Groups()->add($data['GroupID']);
+		// Only write group if no specific assignments have been set
+		if(isset($data['Groups']) && $data['Groups']) {
+			$childData->Groups()->setByIDList(explode(',', $data['Groups']));
+		} else {
+			$childData->Groups()->add($data['GroupID']);
+		}
 		
 		$closeLink = sprintf(
 			'<small><a href="' . $_SERVER['HTTP_REFERER'] . '" onclick="javascript:window.top.GB_hide(); return false;">(%s)</a></small>',
@@ -395,6 +400,16 @@ class MemberTableField extends ComplexTableField {
  * @subpackage security
  */
 class MemberTableField_Popup extends ComplexTableField_Popup {
+
+	function __construct($controller, $name, $fields, $validator, $readonly, $dataObject) {
+		$group = ($controller instanceof MemberTableField) ? $controller->getGroup() : $controller->getParent()->getGroup();
+		if($group) {
+			$groupsField = $fields->dataFieldByName('Groups');
+			if($groupsField) $groupsField->setValue($group->ID);
+		}
+		
+		parent::__construct($controller, $name, $fields, $validator, $readonly, $dataObject);
+	}
 	
 	function forTemplate() {
 		$ret = parent::forTemplate();
@@ -435,6 +450,20 @@ class MemberTableField_Item extends ComplexTableField_Item {
 }
 
 class MemberTableField_ItemRequest extends ComplexTableField_ItemRequest {
+
+	function saveComplexTableField($data, $form, $request) {
+		parent::saveComplexTableField($data, $form, $request);
+		
+		$childData = $this->dataObj();
+		
+		// Only write group if no specific assignments have been set
+		if(isset($data['Groups']) && $data['Groups']) {
+			$childData->Groups()->setByIDList(explode(',', $data['Groups']));
+		} else {
+			$childData->Groups()->add($data['GroupID']);
+		}
+	}
+
 	/**
 	 * Deleting an item from a member table field should just remove that member from the group
 	 */
@@ -458,6 +487,10 @@ class MemberTableField_ItemRequest extends ComplexTableField_ItemRequest {
 			$this->dataObj()->delete();
 		}	
 	}
+	
+	function getParent() {
+		return $this->ctf;
+	}
 }
 
 ?>
\ No newline at end of file

From 7f3c14784fa1df261d21167842fc0437dd5598f3 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 23 Feb 2010 03:34:42 +0000
Subject: [PATCH 268/483] MINOR Fixed height of MemberTableField 'Groups' tab
 to allow enough room for TreeMultiSelectField expansion (from r98883)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99689 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberTableField.php | 1 +
 css/SecurityAdmin.css     | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index a0554638..cda10b77 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -414,6 +414,7 @@ class MemberTableField_Popup extends ComplexTableField_Popup {
 	function forTemplate() {
 		$ret = parent::forTemplate();
 		
+		Requirements::css(CMS_DIR . '/css/SecurityAdmin.css');
 		Requirements::javascript(CMS_DIR . '/javascript/MemberTableField.js');
 		Requirements::javascript(CMS_DIR . '/javascript/MemberTableField_popup.js');
 		
diff --git a/css/SecurityAdmin.css b/css/SecurityAdmin.css
index efb9c2b1..90a30cea 100644
--- a/css/SecurityAdmin.css
+++ b/css/SecurityAdmin.css
@@ -5,4 +5,10 @@
 
 #Form_EditForm_Permissions .Arg input {
 	text-align: right;
+}
+
+/* Ensure there's enough room in the tab for TreeMultiSelectField expansion */
+#MemberTableField_Popup_DetailForm #Groups,
+#MemberTableField_Popup_AddForm #Groups {
+	height: 250px;
 }
\ No newline at end of file

From f47e12f726cf302a3caff0d7f362e40e822eee37 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 23 Feb 2010 03:36:02 +0000
Subject: [PATCH 269/483] ENHANCEMENT Saving group relations on
 SecurityAdmin->EditForm()/RootForm() through TreeMultiselectField instead of
 hidden 'Group'/'GroupID' values (from r99579)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99690 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberTableField.php | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index cda10b77..93ce7090 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -308,15 +308,11 @@ class MemberTableField extends ComplexTableField {
 		$className = $this->sourceClass();
 		$childData = new $className();
 		
+		// Needs to write before saveInto() to ensure the 'Groups' TreeMultiselectField saves
+		$childData->write();
+		
 		$form->saveInto($childData);
 		$childData->write();
-
-		// Only write group if no specific assignments have been set
-		if(isset($data['Groups']) && $data['Groups']) {
-			$childData->Groups()->setByIDList(explode(',', $data['Groups']));
-		} else {
-			$childData->Groups()->add($data['GroupID']);
-		}
 		
 		$closeLink = sprintf(
 			'<small><a href="' . $_SERVER['HTTP_REFERER'] . '" onclick="javascript:window.top.GB_hide(); return false;">(%s)</a></small>',
@@ -452,19 +448,6 @@ class MemberTableField_Item extends ComplexTableField_Item {
 
 class MemberTableField_ItemRequest extends ComplexTableField_ItemRequest {
 
-	function saveComplexTableField($data, $form, $request) {
-		parent::saveComplexTableField($data, $form, $request);
-		
-		$childData = $this->dataObj();
-		
-		// Only write group if no specific assignments have been set
-		if(isset($data['Groups']) && $data['Groups']) {
-			$childData->Groups()->setByIDList(explode(',', $data['Groups']));
-		} else {
-			$childData->Groups()->add($data['GroupID']);
-		}
-	}
-
 	/**
 	 * Deleting an item from a member table field should just remove that member from the group
 	 */

From cc8c1e3031dc5b5694006c1d539ef07424044dba Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 23 Feb 2010 03:44:38 +0000
Subject: [PATCH 270/483]  ENHANCEMENT Disabling/checking permission checkboxes
 in admin/security when 'ADMIN' permission is selected

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99692 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/MemberTableField.js | 35 ++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/javascript/MemberTableField.js b/javascript/MemberTableField.js
index f376a882..f9ca0b49 100755
--- a/javascript/MemberTableField.js
+++ b/javascript/MemberTableField.js
@@ -279,3 +279,38 @@ MemberFilterButton.prototype = {
 Behaviour.register({
 	'#Form_EditForm div.MemberTableField table.data input.text' : AjaxMemberLookup
 });
+
+(function($) {
+	Behaviour.register({
+		/**
+		 * Automatically check and disable all checkboxes if ADMIN permissions are selected.
+		 * As they're disabled, any changes won't be submitted (which is intended behaviour),
+		 * checking all boxes is purely presentational.
+		 */
+		'#Permissions .valADMIN input': {
+			initialize: function() {
+				this.toggleCheckboxes();
+			},
+			onclick: function(e) {
+				this.toggleCheckboxes();
+			},
+			toggleCheckboxes: function() {
+				var checkboxes = $(this).parents('.field:eq(0)').find('.checkbox').not(this);
+
+				if($(this).is(':checked')) {
+					checkboxes.each(function() {
+						$(this).data('SecurityAdmin.oldChecked', $(this).attr('checked'));
+						$(this).data('SecurityAdmin.oldDisabled', $(this).attr('disabled'));
+						$(this).attr('disabled', 'disabled');
+						$(this).attr('checked', 'checked');
+					});
+				} else {
+					checkboxes.each(function() {
+						$(this).attr('checked', $(this).data('SecurityAdmin.oldChecked'));
+						$(this).attr('disabled', $(this).data('SecurityAdmin.oldDisabled'));
+					});
+				}
+			}
+		}
+	});
+}(jQuery));
\ No newline at end of file

From 7ffbefb6b15aa57e750984d9821b3df725ad333a Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 23 Feb 2010 03:46:51 +0000
Subject: [PATCH 271/483] BUGFIX Changed sitetree default selection in
 LeftAndMain.Tree.js to fire on window.load instead of document.ready()
 through entwine. We need to ensure behaviour.js bindings are available before
 BUGFIX Automatically selecting root node in CMS trees (necessary because now
 we actually have forms on the root node, and its a valid click target) (from
 r99605)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99693 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/LeftAndMain_left.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/javascript/LeftAndMain_left.js b/javascript/LeftAndMain_left.js
index 90302581..8d07c056 100755
--- a/javascript/LeftAndMain_left.js
+++ b/javascript/LeftAndMain_left.js
@@ -16,6 +16,17 @@ var _HANDLER_FORMS = {
 	search : 'search_options'
 };
 
+(function($) {
+	$(window).bind('load', function(e) {
+		// behaviour.js load handlers need to be fired before this event, so we artificially delay it
+		setTimeout(function() {
+			// make sure current ID of loaded form is actually selected in tree
+			var tree = $('#sitetree')[0], id = $('#Form_EditForm :input[name=ID]').val();
+			if(!id) id = 0;
+			tree.setCurrentByIdx(id);
+		}, 200);
+	});
+}(jQuery));
 
 /**
  * Overload this with a real context menu if necessary

From 9a5b429ad104eb2560d7133839e5d6fbdbaaa2d0 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 23 Feb 2010 04:56:19 +0000
Subject: [PATCH 272/483] BUGFIX Setting  ID explicitly in MemberTableField->
 to ensure getCsvQuery() correctly filters (the custom group filter was only
 implemented in sourceItems() before) (from r99684)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99711 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberTableField.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index 93ce7090..d6090c3f 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -101,6 +101,10 @@ class MemberTableField extends ComplexTableField {
 			}
 			$this->sourceFilter[] = '(' . implode(' OR ', $searchFilters) . ')';
 		}
+		
+		if($this->group) {
+			$this->sourceFilter[] = sprintf('"Group_Members"."GroupID" = %d', $this->group->ID);
+		}
 
 		$this->sourceJoin = " INNER JOIN \"Group_Members\" ON \"MemberID\"=\"Member\".\"ID\"";
 		$this->setFieldListCsv($csvFieldList);

From f088acf5e39019c8ceb3f43a60d5b853fd97ce50 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 23 Feb 2010 04:57:37 +0000
Subject: [PATCH 273/483] BUGFIX Fixed MemberTableField limiting of , wasnt
 taking children groups into account (regression from r99684) (from r99706)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99713 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberTableField.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index d6090c3f..3873f8b8 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -103,7 +103,10 @@ class MemberTableField extends ComplexTableField {
 		}
 		
 		if($this->group) {
-			$this->sourceFilter[] = sprintf('"Group_Members"."GroupID" = %d', $this->group->ID);
+			$this->sourceFilter[] = sprintf(
+				'"Group_Members"."GroupID" IN (%s)', 
+				implode(',', array_merge($this->group->AllChildren()->column('ID'), array($this->group->ID)))
+			);
 		}
 
 		$this->sourceJoin = " INNER JOIN \"Group_Members\" ON \"MemberID\"=\"Member\".\"ID\"";

From a0c69ad63f8fca198f00483b1468161ea2cc3353 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 23 Feb 2010 04:57:43 +0000
Subject: [PATCH 274/483] MINOR Fixed MemberTableField regression from r99706
 (from r99710)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99714 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberTableField.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index 3873f8b8..deb4cc56 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -103,9 +103,11 @@ class MemberTableField extends ComplexTableField {
 		}
 		
 		if($this->group) {
+			$groupIDs = array($this->group->ID);
+			if($this->group->AllChildren()) $groupIDs = array_merge($groupIDs, $this->group->AllChildren()->column('ID'));
 			$this->sourceFilter[] = sprintf(
 				'"Group_Members"."GroupID" IN (%s)', 
-				implode(',', array_merge($this->group->AllChildren()->column('ID'), array($this->group->ID)))
+				implode(',', $groupIDs)
 			);
 		}
 

From a11effb33a7f228ccff65f5be937330ea4556438 Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Wed, 24 Feb 2010 02:00:06 +0000
Subject: [PATCH 275/483] BUGFIX make siteconfig work again

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99779 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 8417f720..e459429f 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -478,7 +478,7 @@ JS;
 
 			return $form;
 		} if ($id == 0 || $id == 'root') {
-			$form = $this->RootForm();
+			return $this->RootForm();
 		} else if($id) {
 			return new Form($this, "EditForm", new FieldSet(
 				new LabelField('PageDoesntExistLabel',_t('CMSMain.PAGENOTEXISTS',"This page doesn't exist"))), new FieldSet());
@@ -499,7 +499,7 @@ JS;
 		$form->loadDataFrom($siteConfig);
 		
 		$this->extend('updateEditForm', $form);
-		
+
 		return $form;
 	}
 

From 6b1f258c449fdae780f062edd485c59f93c6f69d Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 24 Feb 2010 02:50:47 +0000
Subject: [PATCH 276/483] BUGFIX #5073: Fixed CMS version indicator for alpha
 and beta versions.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99789 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php      | 29 +++++++++++++++--------------
 tests/LeftAndMainTest.php | 19 +++++++++++++++++++
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index e1827c91..ed47f71a 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -1089,20 +1089,9 @@ JS;
 	public function CMSVersion() {
 		$sapphireVersionFile = file_get_contents(BASE_PATH . '/sapphire/silverstripe_version');
 		$cmsVersionFile = file_get_contents(BASE_PATH . '/cms/silverstripe_version');
-
-		if(strstr($sapphireVersionFile, "/sapphire/trunk")) {
-			$sapphireVersion = "trunk";
-		} else {
-			preg_match("/sapphire\/(?:(?:branches)|(?:tags))(?:\/rc)?\/([A-Za-z0-9._-]+)\/silverstripe_version/", $sapphireVersionFile, $matches);
-			$sapphireVersion = ($matches) ? $matches[1] : null;
-		}
-
-		if(strstr($cmsVersionFile, "/cms/trunk")) {
-			$cmsVersion = "trunk";
-		} else {
-			preg_match("/cms\/(?:(?:branches)|(?:tags))(?:\/rc)?\/([A-Za-z0-9._-]+)\/silverstripe_version/", $cmsVersionFile, $matches);
-			$cmsVersion = ($matches) ? $matches[1] : null;
-		}
+		
+		$sapphireVersion = $this->versionFromVersionFile($sapphireVersionFile);
+		$cmsVersion = $this->versionFromVersionFile($cmsVersionFile);
 
 		if($sapphireVersion == $cmsVersion) {
 			return $sapphireVersion;
@@ -1111,6 +1100,18 @@ JS;
 		}
 	}
 	
+	/**
+	 * Return the version from the content of a silverstripe_version file
+	 */
+	public function versionFromVersionFile($fileContent) {
+		if(preg_match('/\/trunk\/silverstripe_version/', $fileContent)) {
+			return "trunk";
+		} else {
+			preg_match("/\/(?:branches|tags\/rc|tags\/beta|tags\/alpha|tags)\/([A-Za-z0-9._-]+)\/silverstripe_version/", $fileContent, $matches);
+			return ($matches) ? $matches[1] : null;
+		}
+	}
+	
 	/**
 	 * @return array
 	 */
diff --git a/tests/LeftAndMainTest.php b/tests/LeftAndMainTest.php
index 6835f7c1..295cba3f 100644
--- a/tests/LeftAndMainTest.php
+++ b/tests/LeftAndMainTest.php
@@ -14,6 +14,25 @@ class LeftAndMainTest extends FunctionalTest {
 		CMSMenu::populate_menu();
 	}
 	
+	/**
+	 * Test that CMS versions can be interpreted appropriately
+	 */
+	public function testCMSVersion() {
+		$l = new LeftAndMain();
+		$this->assertEquals("2.4", $l->versionFromVersionFile(
+			'$URL: http://svn.silverstripe.com/open/modules/cms/branches/2.4/silverstripe_version $'));
+		$this->assertEquals("2.2.0", $l->versionFromVersionFile(
+			'$URL: http://svn.silverstripe.com/open/modules/cms/tags/2.2.0/silverstripe_version $'));
+		$this->assertEquals("trunk", $l->versionFromVersionFile(
+			'$URL: http://svn.silverstripe.com/open/modules/cms/trunk/silverstripe_version $'));
+		$this->assertEquals("2.4.0-alpha1", $l->versionFromVersionFile(
+			'$URL: http://svn.silverstripe.com/open/modules/cms/tags/alpha/2.4.0-alpha1/silverstripe_version $'));
+		$this->assertEquals("2.4.0-beta1", $l->versionFromVersionFile(
+			'$URL: http://svn.silverstripe.com/open/modules/cms/tags/beta/2.4.0-beta1/silverstripe_version $'));
+		$this->assertEquals("2.4.0-rc1", $l->versionFromVersionFile(
+			'$URL: http://svn.silverstripe.com/open/modules/cms/tags/rc/2.4.0-rc1/silverstripe_version $'));
+	}
+	
 	/**
 	 * Check that all subclasses of leftandmain can be accessed
 	 */

From 8fe62100c6fbfa2e0e99862c829e5f7d72558d33 Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Thu, 25 Feb 2010 02:32:23 +0000
Subject: [PATCH 277/483] BUGFIX: Use underscores in names of combined .js
 (#3581)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99887 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index ed47f71a..49ab34c7 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -241,7 +241,7 @@ class LeftAndMain extends Controller {
 
 		// Javascript combined files
 		Requirements::combine_files(
-			'assets/base.js',
+			'assets/_base.js',
 			array(
 				THIRDPARTY_DIR . '/prototype/prototype.js',
 				THIRDPARTY_DIR . '/behaviour/behaviour.js',
@@ -257,7 +257,7 @@ class LeftAndMain extends Controller {
 		);
 
 		Requirements::combine_files(
-			'assets/leftandmain.js',
+			'assets/_leftandmain.js',
 			array(
 				SAPPHIRE_DIR . '/javascript/loader.js',
 				CMS_DIR . '/javascript/hover.js',
@@ -278,7 +278,7 @@ class LeftAndMain extends Controller {
 		);
 
 		Requirements::combine_files(
-			'assets/cmsmain.js',
+			'assets/_cmsmain.js',
 			array(
 				CMS_DIR . '/javascript/CMSMain.js',
 				CMS_DIR . '/javascript/CMSMain_left.js',

From c69df0f2b1f6e47f2dd7329390fe1f3ee166ed49 Mon Sep 17 00:00:00 2001
From: Carlos Barberis <carlos@silverstripe.com>
Date: Thu, 25 Feb 2010 04:46:48 +0000
Subject: [PATCH 278/483] BUGFIX: action buttons always visible (not need to
 scroll) ticket 5051 BUGFIX: got rid of double scroll BUGFIX: do not show
 action buttons (delete/save) when showing result list ENHANCEMENT: fixed
 forward button underneath result form

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99942 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/ModelAdmin.css       | 14 ++++++++++----
 javascript/ModelAdmin.js | 40 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/css/ModelAdmin.css b/css/ModelAdmin.css
index 490209dc..0a45e1f2 100644
--- a/css/ModelAdmin.css
+++ b/css/ModelAdmin.css
@@ -67,7 +67,8 @@ body.ModelAdmin #ResultTable_holder {
 }
 
 body.ModelAdmin #right{
-	overflow:auto !important;
+	overflow:hidden !important;
+	
 }
 
 body.ModelAdmin #right #ModelAdminPanel {
@@ -130,10 +131,15 @@ body.ModelAdmin #statusMessage {
 	margin: 5px 0;
 }
 
+body.ModelAdmin #right .Actions {
+	position:absolute;
+	bottom:4px;
+}
+
 body.ModelAdmin #right .ajaxActions {
-	position: absolute;
-	right: 2px;
-	bottom: -25px;
+	position:absolute;
+	bottom:4px;
+	height: 30px;
 }
 
 #LeftPane .tab {
diff --git a/javascript/ModelAdmin.js b/javascript/ModelAdmin.js
index 32294ea8..a8adb673 100644
--- a/javascript/ModelAdmin.js
+++ b/javascript/ModelAdmin.js
@@ -23,7 +23,14 @@ $(document).ready(function() {
 	 * so it float to the right
 	 */
 	$('#Form_AddForm_action_doCreate').livequery(function(){
-		$(this).parent().addClass('ajaxActions');
+		if($(this)){
+			var parent = $(this).parent();
+			$("#right").append(parent);
+			
+			parent.addClass('ajaxActions');
+			parent.attr('id','form_actions_right');
+		}
+		
 	});
 	
     /*
@@ -35,6 +42,26 @@ $(document).ready(function() {
 	
 	$('input[name=action_search]').livequery('click', function() {
 		$('#contentPanel').fn('closeRightPanel');
+		if($('#Form_AddForm_action_doCreate')){
+			$('div[class=ajaxActions]').remove();
+		}
+	});
+	
+	/*
+	 * moves Forward button to the right and fixes it underneath result form.
+	*/
+	$('#Form_ResultsForm_action_goForward').livequery(function() {
+		$("#form_actions_right").append($(this));
+	});
+	
+	/*
+	 * we need an special case for results form since #ModelAdminPanel has overflow:hidden
+	 * it calculates the form height, gives it a padding and overflow auto, so we can scroll down.
+	*/
+	$('#Form_ResultsForm').livequery( function(){
+		var newModelAdminPanelHeight = $("#right").height()-$(".ajaxActions").height();
+		$('#Form_ResultsForm').height(newModelAdminPanelHeight);
+		$('#Form_ResultsForm').css('overflow','auto');
 	});
 	
 	
@@ -46,15 +73,22 @@ $(document).ready(function() {
 		positionActionArea();
 	});
 	
+	
 	/*
 	 * Make the status message and ajax action button fixed 
 	 */
 	function positionActionArea() {
+		var newModelAdminPanelHeight = $("#right").height()-$(".ajaxActions").height();
+		$('#ModelAdminPanel').height(newModelAdminPanelHeight);
+		$('#Form_ResultsForm').height(newModelAdminPanelHeight);
+		$('#ModelAdminPanel').css('padding-bottom','60px');
+		/*
 		if ( $.browser.msie && $.browser.version.indexOf("6.", 0)==0 ) {
 			newTopValue = $("#right").scrollTop()+$(window).height()-139;
 			$('.ajaxActions').css('top', newTopValue);
 			$('#statusMessage').css('top', newTopValue);
 		}
+		*/
 	}
 	
 	////////////////////////////////////////////////////////////////// 
@@ -326,6 +360,10 @@ $(document).ready(function() {
 			    }
 				if(!this.history || this.history.length <= 1) {
 				    $('#Form_EditForm_action_goBack, #Form_ResultsForm_action_goBack').hide();
+				
+					// we don't need save and delete button on result form
+					$('#Form_EditForm_action_doSave').hide();
+					$('#Form_EditForm_action_doDelete').hide();
 			    }
 				
     			Behaviour.apply(); // refreshes ComplexTableField

From f94ad4f9880c823d71ce70161d009a9697e0e275 Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Thu, 25 Feb 2010 06:41:52 +0000
Subject: [PATCH 279/483] BUGFIX: Fix #2138, notify Image Toolbar on TinyMCE
 node selection change

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99951 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/tinymce_ssbuttons/editor_plugin_src.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/javascript/tinymce_ssbuttons/editor_plugin_src.js b/javascript/tinymce_ssbuttons/editor_plugin_src.js
index 33c4e6dd..7f92b498 100644
--- a/javascript/tinymce_ssbuttons/editor_plugin_src.js
+++ b/javascript/tinymce_ssbuttons/editor_plugin_src.js
@@ -83,6 +83,7 @@
 			    $('Form_EditorToolbarLinkForm').updateSelection(ed);
 			    $('Form_EditorToolbarLinkForm').respondToNodeChange(ed);
 		    }
+		    $('Form_EditorToolbarImageForm').respondToNodeChange(ed);
 	        });
 	        ed.onKeyUp.add(function(ed, o) {
 	    	    $('Form_EditorToolbarLinkForm').updateSelection(ed);

From 55520f152355e192279295d00311b82e3fb33380 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 26 Feb 2010 01:15:30 +0000
Subject: [PATCH 280/483] BUGFIX Setting default $groups in
 MemberTableField::AddForm() in addition to
 MemberTableField_Popup::__construct() - this was broken by r99777

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99993 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberTableField.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index deb4cc56..32bc5cec 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -306,6 +306,18 @@ class MemberTableField extends ComplexTableField {
 			)
 		);
 	}
+	
+	function AddForm() {
+		$form = parent::AddForm();
+		
+		// Set default groups - also implemented in MemberTableField_Popup::__construct()
+		if($this->group) {
+			$groupsField = $form->Fields()->dataFieldByName('Groups');
+			if($groupsField) $groupsField->setValue($this->group->ID);
+		}
+		
+		return $form;
+	}
 
 	/**
 	 * Same behaviour as parent class, but adds the
@@ -408,6 +420,7 @@ class MemberTableField_Popup extends ComplexTableField_Popup {
 
 	function __construct($controller, $name, $fields, $validator, $readonly, $dataObject) {
 		$group = ($controller instanceof MemberTableField) ? $controller->getGroup() : $controller->getParent()->getGroup();
+		// Set default groups - also implemented in AddForm()
 		if($group) {
 			$groupsField = $fields->dataFieldByName('Groups');
 			if($groupsField) $groupsField->setValue($group->ID);

From 4dd3740682b5b4fe600313fab11eefd9db318c00 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Mon, 1 Mar 2010 01:18:01 +0000
Subject: [PATCH 281/483] ENHANCEMENT AssetAdmin now uses Upload_Validator
 instead of setting the rules directly on Upload

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100058 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 025a78b9..13a4fa65 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -218,9 +218,15 @@ JS
 				if(!File::$apply_restrictions_to_admin && Permission::check('ADMIN')) {
 					$valid = true;
 				} else {
+					
+					// Set up the validator instance with rules
+					$validator = new Upload_Validator();
+					$validator->setAllowedExtensions(File::$allowed_extensions);
+					$validator->setAllowedMaxFileSize(self::$allowed_max_file_size);
+					
+					// Do the upload validation with the rules
 					$upload = new Upload();
-					$upload->setAllowedExtensions(File::$allowed_extensions);
-					$upload->setAllowedMaxFileSize(self::$allowed_max_file_size);
+					$upload->setValidator($validator);
 					$valid = $upload->validate($tmpFile);
 					if(!$valid) {
 						$errors = $upload->getErrors();

From 681eff9eda070dcf7e1dc5334964446b3ef4d3da Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Tue, 2 Mar 2010 01:37:13 +0000
Subject: [PATCH 282/483] ENHANCEMENT: allow ordering of page commented to be
 configurabled

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100327 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/PageCommentInterface.php | 23 +++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index ae1b7716..b3dae5e0 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -54,6 +54,15 @@ class PageCommentInterface extends RequestHandler {
 	 */
 	static $show_comments_when_disabled = true;
 	
+	/**
+	 * Define how you want to order page comments by. By default order by newest
+	 * to oldest. 
+	 * 
+	 * @var String - used as $orderby in DB query
+	 * @since 2.4 
+	 */
+	static $order_comments_by = "\"Created\" DESC";
+	
 	/**
 	 * Create a new page comment interface
 	 * @param controller The controller that the interface is used on
@@ -97,8 +106,19 @@ class PageCommentInterface extends RequestHandler {
 	static function set_show_comments_when_disabled($state) {
 		self::$show_comments_when_disabled = $state;
 	}
+	
+	/**
+	 * See {@link PageCommentInterface::$order_comments_by}
+	 *
+	 * @param String
+	 */
+	static function set_order_comments_by($order) {
+		self::$order_comments_by = $order;
+	}
+	
 	/**
 	 * See {@link PageCommentInterface::$use_ajax_commenting}
+	 *
 	 * @param bool
 	 */
 	static function set_use_ajax_commenting($state) {
@@ -212,7 +232,8 @@ class PageCommentInterface extends RequestHandler {
 		
 		$spamfilter = isset($_GET['showspam']) ? '' : "AND \"IsSpam\" = 0";
 		$unmoderatedfilter = Permission::check('ADMIN') ? '' : "AND \"NeedsModeration\" = 0";
-		$comments =  DataObject::get("PageComment", "\"ParentID\" = '" . Convert::raw2sql($this->page->ID) . "' $spamfilter $unmoderatedfilter", '"Created" DESC', "", $limit);
+		$order = self::$order_comments_by;
+		$comments =  DataObject::get("PageComment", "\"ParentID\" = '" . Convert::raw2sql($this->page->ID) . "' $spamfilter $unmoderatedfilter", $order, "", $limit);
 		
 		if(is_null($comments)) {
 			return;

From b810f0ecbcf5c197d3b25796896bb92d47b0ef47 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Tue, 2 Mar 2010 02:35:55 +0000
Subject: [PATCH 283/483] BUGFIX #5023 AssetAdmin::sync() is now used to sync
 tasks, as it works when the user only has access to the AssetAdmin controller
 instead of going to dev/tasks/FilesystemSyncTask which can only be run by
 administrators or if the site is in dev mode

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100335 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php      | 5 +++++
 javascript/AssetAdmin.js | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 13a4fa65..6ccbef59 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -35,6 +35,7 @@ class AssetAdmin extends LeftAndMain {
 		'removefile',
 		'save',
 		'savefile',
+		'sync',
 		'uploadiframe',
 		'UploadForm',
 		'deleteUnusedThumbnails' => 'ADMIN'
@@ -481,6 +482,10 @@ HTML;
 JS;
 	}
 	
+	public function sync() {
+		echo Filesystem::sync();
+	}
+	
 	/**
 	 * Return the entire site tree as a nested UL.
 	 * @return string HTML for site tree
diff --git a/javascript/AssetAdmin.js b/javascript/AssetAdmin.js
index 0dcdcb51..4f8a4de0 100755
--- a/javascript/AssetAdmin.js
+++ b/javascript/AssetAdmin.js
@@ -342,7 +342,7 @@ FilesystemSyncClass.prototype = {
 	
 	onclick : function() {
 		statusMessage('Looking for new files');
-        new Ajax.Request('dev/tasks/FilesystemSyncTask', {
+        new Ajax.Request('admin/assets/sync', {
             onSuccess: function(t) {
                 statusMessage(t.responseText, "good");
             },

From 29c857d34c7ae5867ab9f1ba9f07cc156c28a69c Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Tue, 2 Mar 2010 20:37:25 +0000
Subject: [PATCH 284/483] MINOR add extendability to SecurityAdmin

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100360 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SecurityAdmin.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 7482519f..7d8797fd 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -151,13 +151,15 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 			new FormAction('addmember',_t('SecurityAdmin.ADDMEMBER','Add Member'))
 		);
 		
+		$this->extend('updateRootFormFields', $fields, $actions);
+		
 		$form = new Form(
 			$this,
 			'EditForm',
 			$fields,
 			$actions
 		);
-
+		
 		return $form;
 	}
 	

From 87a810755ed3875b3c0225d3a3c99bf3314b32a6 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Tue, 2 Mar 2010 22:07:34 +0000
Subject: [PATCH 285/483] BUGFIX: use localized prefix to compare group codes
 rather than hard coded english string. MINOR: updated lang file

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100370 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 lang/en_US.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lang/en_US.php b/lang/en_US.php
index 9f489eea..eb03770f 100755
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -374,6 +374,16 @@ $lang['en_US']['MemberList_Table.ss']['SN'] = 'Surname';
 $lang['en_US']['MemberTableField']['ADD'] = 'Add';
 $lang['en_US']['MemberTableField']['ADDEDTOGROUP'] = 'Added member to group';
 $lang['en_US']['MemberTableField']['ADDINGFIELD'] = 'Adding failed';
+$lang['en_US']['MemberTableField']['DeleteTitleText'] = array(
+	'Delete from this group',
+	PR_MEDIUM,
+	'Delete button hover text'
+);
+$lang['en_US']['MemberTableField']['DeleteTitleTextDatabase'] = array(
+	'Delete from database and all groups',
+	PR_MEDIUM,
+	'Delete button hover text'
+);
 $lang['en_US']['MemberTableField']['ERRORADDINGUSER'] = 'There was an error adding the user to the group: %s';
 $lang['en_US']['MemberTableField']['FILTER'] = 'Filter';
 $lang['en_US']['MemberTableField']['SEARCH'] = 'Search';
@@ -496,6 +506,7 @@ $lang['en_US']['SecurityAdmin']['MENUTITLE'] = array(
 	100,
 	'Menu title'
 );
+$lang['en_US']['SecurityAdmin']['MemberListCaution'] = 'Caution: Removing members from this list will remove them from all groups and the database';
 $lang['en_US']['SecurityAdmin']['NEWGROUP'] = 'New Group';
 $lang['en_US']['SecurityAdmin']['SAVE'] = 'Save';
 $lang['en_US']['SecurityAdmin']['SGROUPS'] = 'Security Groups';

From e1fc79444fded0ae1255ab73a69e4f6859d89a0e Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Tue, 2 Mar 2010 22:20:10 +0000
Subject: [PATCH 286/483] MINOR: added lang file for cs_CZ

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100372 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/lang/cs_CZ.js | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 javascript/lang/cs_CZ.js

diff --git a/javascript/lang/cs_CZ.js b/javascript/lang/cs_CZ.js
new file mode 100644
index 00000000..a08f12d4
--- /dev/null
+++ b/javascript/lang/cs_CZ.js
@@ -0,0 +1,28 @@
+if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
+	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
+} else {
+	ss.i18n.addDictionary('cs_CZ', {
+		'CMSMAIN.WARNINGSAVEPAGESBEFOREADDING' : "Musíte stránku uložit před přidáním další podstránky",
+		'CMSMAIN.CANTADDCHILDREN' : "Nemůžete přidat potomky do vybraného uzlu",
+		'CMSMAIN.ERRORADDINGPAGE' : 'Chyba při přidání stránky',
+		'CMSMAIN.FILTEREDTREE' : 'Filtrovaná struktúra k zobrazení pouze zmeněných stránek',
+		'CMSMAIN.ERRORFILTERPAGES' : 'Nemožné filtrovat struktúru k zobrazení pouze zmeněných stránek<br />%s',
+		'CMSMAIN.ERRORUNFILTER' : 'Nemožné filtrovat struktúru webu<br />%s',
+		'CMSMAIN.ERRORUNFILTER' : 'Nefiltrovaná struktura',
+		'CMSMAIN.PUBLISHINGPAGES' : 'Zveřejňování stránek...',
+		'CMSMAIN.SELECTONEPAGE' : "Prosím, vyberte nejméně 1 stránku.",
+		'CMSMAIN.ERRORPUBLISHING' : 'Chyba při zveřejňování stránek',
+		'CMSMAIN.REALLYDELETEPAGES' : "Skutečně chcete smazat %s označené stránky?",
+		'CMSMAIN.DELETINGPAGES' : 'Mazání stránek...',
+		'CMSMAIN.ERRORDELETINGPAGES': 'Chyba při mazání stránek',
+		'CMSMAIN.PUBLISHING' : 'Zveřejňování...',
+		'CMSMAIN.RESTORING': 'Obnovování...',
+		'CMSMAIN.ERRORREVERTING': 'Chybar převádění na živý obsah',
+		'CMSMAIN.SAVING' : 'ukládání...',
+		'ModelAdmin.SAVED': "Uloženo",
+		'ModelAdmin.REALLYDELETE': "Skutečně chcete smazat?",
+		'ModelAdmin.DELETED': "Smazáno",
+		'LeftAndMain.PAGEWASDELETED': "Tato stránka byla smazána. K editaci stránky, ji vyberte vlevo.",
+		'LeftAndMain.CONFIRMUNSAVED': "Určitě chcete opustit navigaci z této stránky?\n\nUPOZORNĚNÍ: Vaše změny nebyly uloženy.\n\nStlačte OK pro pokračovat, nebo Cancel, zůstanete na této stránce."
+	});
+}
\ No newline at end of file

From bed912822c90fc30cbf03466b65cd2a36983b71a Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Wed, 3 Mar 2010 02:19:07 +0000
Subject: [PATCH 287/483] BUGFIX #5135 LeftAndMain extra requirements loading
 for "themedcss" should use Requirements::themedCSS() not Requirements::css()
 - thanks Hamish!

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100394 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 49ab34c7..025a4e2b 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -234,7 +234,7 @@ class LeftAndMain extends Controller {
 		}
 		
 		foreach (self::$extra_requirements['themedcss'] as $file) {
-			Requirements::css($file[0], $file[1]);
+			Requirements::themedCSS($file[0], $file[1]);
 		}
 		
 		Requirements::customScript('Behaviour.addLoader(hideLoading);');

From df46043a67edd9176d62a53a8af5cc06e44797c5 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Thu, 4 Mar 2010 03:40:29 +0000
Subject: [PATCH 288/483] MINOR Replaced locations of Director::is_ajax() and
 Director::redirectBack() with instance method calls - the latter static
 function is deprecated

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100484 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php                        |  4 ++--
 code/CMSBatchActionHandler.php             |  4 ++--
 code/CMSMain.php                           |  8 ++++----
 code/GroupImportForm.php                   |  2 +-
 code/LeftAndMain.php                       | 11 +++++------
 code/MemberImportForm.php                  |  2 +-
 code/MemberTableField.php                  |  2 +-
 code/ModelAdmin.php                        | 15 ++++++++-------
 code/ReportAdmin.php                       |  2 +-
 code/sitefeatures/PageComment.php          | 20 ++++++++++----------
 code/sitefeatures/PageCommentInterface.php | 10 +++++-----
 11 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 6ccbef59..42ba389f 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -657,13 +657,13 @@ JS;
 			$file->delete();
 			$file->destroy();
 			
-			if(Director::is_ajax()) {
+			if($this->isAjax()) {
 				echo <<<JS
 				$('Form_EditForm_Files').removeFile($fileID);
 				statusMessage('removed file', 'good');
 JS;
 			} else {
-				Director::redirectBack();
+				$this->redirectBack();
 			}
 		} else {
 			user_error("AssetAdmin::removefile: Bad parameters: File=$fileID", E_USER_ERROR);
diff --git a/code/CMSBatchActionHandler.php b/code/CMSBatchActionHandler.php
index ff53a0c5..a5f4229b 100644
--- a/code/CMSBatchActionHandler.php
+++ b/code/CMSBatchActionHandler.php
@@ -49,8 +49,8 @@ class CMSBatchActionHandler extends RequestHandler {
 
 	function handleAction($request) {
 		// This method can't be called without ajax.
-		if(!Director::is_ajax()) {
-			Director::redirectBack();
+		if(!$this->parentController->isAjax()) {
+			$this->parentController->redirectBack();
 			return;
 		}
 
diff --git a/code/CMSMain.php b/code/CMSMain.php
index e459429f..d52b1f0e 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -668,7 +668,7 @@ JS;
 		$recordID = $record->ID;
 		$record->delete();
 		
-		if(Director::is_ajax()) {
+		if($this->isAjax()) {
 			// need a valid ID value even if the record doesn't have one in the database
 			// (its still present in the live tables)
 			$liveRecord = Versioned::get_one_by_stage('SiteTree', 'Live', "\"SiteTree_Live\".\"ID\" = $recordID");
@@ -683,7 +683,7 @@ JS;
 				return FormResponse::respond();
 			}			
 		} else {
-			Director::redirectBack();
+			$this->redirectBack();
 		}
 	}
 	
@@ -913,7 +913,7 @@ JS;
 
 			SSViewer::setOption('rewriteHashlinks', false);
 			
-			if(Director::is_ajax()) {
+			if($this->isAjax()) {
 				$result = $templateData->renderWith($this->class . '_right');
 				$parts = split('</?form[^>]*>', $result);
 				return $parts[sizeof($parts)-2];
@@ -997,7 +997,7 @@ JS;
 	}
 
 	function sendFormToBrowser($templateData) {
-		if(Director::is_ajax()) {
+		if($this->isAjax()) {
 			SSViewer::setOption('rewriteHashlinks', false);
 			$result = $this->customise($templateData)->renderWith($this->class . '_right');
 			$parts = split('</?form[^>]*>', $result);
diff --git a/code/GroupImportForm.php b/code/GroupImportForm.php
index a514247d..43233db9 100644
--- a/code/GroupImportForm.php
+++ b/code/GroupImportForm.php
@@ -83,7 +83,7 @@ class GroupImportForm extends Form {
 	
 		$this->sessionMessage($msg, 'good');
 		
-		Director::redirectBack();
+		$this->redirectBack();
 	}
 	
 }
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 025a4e2b..e2df7c12 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -113,7 +113,7 @@ class LeftAndMain extends Controller {
 		);
 		
 		// set reading lang
-		if(Object::has_extension('SiteTree', 'Translatable') && !Director::is_ajax()) {
+		if(Object::has_extension('SiteTree', 'Translatable') && !$this->isAjax()) {
 			Translatable::choose_site_locale(array_keys(Translatable::get_existing_content_languages('SiteTree')));
 		}
 
@@ -151,7 +151,7 @@ class LeftAndMain extends Controller {
 		if(Director::redirected_to()) return;
 
 		// Audit logging hook
-		if(empty($_REQUEST['executeForm']) && !Director::is_ajax()) $this->extend('accessedCMS');
+		if(empty($_REQUEST['executeForm']) && !$this->isAjax()) $this->extend('accessedCMS');
 
 		// Set the members html editor config
 		HtmlEditorConfig::set_active(Member::currentUser()->getHtmlEditorConfigForCMS());
@@ -352,10 +352,9 @@ class LeftAndMain extends Controller {
 			Session::set('currentMember', $params['OtherID']);
 		}
 
-		if(Director::is_ajax()) {
+		if($this->isAjax()) {
 			SSViewer::setOption('rewriteHashlinks', false);
 			return $this->EditForm()->formHtmlContent();
-
 		} else {
 			return array();
 		}
@@ -576,7 +575,7 @@ class LeftAndMain extends Controller {
 	 * and updates the tree via javascript.
 	 */
 	public function returnItemToUser($p) {
-		if(Director::is_ajax()) {
+		if($this->isAjax()) {
 			// Prepare the object for insertion.
 			$parentID = (int) $p->ParentID;
 			$id = $p->ID ? $p->ID : "new-$p->class-$p->ParentID";
@@ -670,7 +669,7 @@ JS;
 			$record->Status = ($record->Status == "New page" || $record->Status == "Saved (new)") ? "Saved (new)" : "Saved (update)";
 		}
 
-		if(Director::is_ajax()) {
+		if($this->isAjax()) {
 			if($SQL_id != $record->ID) {
 				FormResponse::add("$('sitetree').setNodeIdx(\"{$SQL_id}\", \"$record->ID\");");
 				FormResponse::add("$('Form_EditForm').elements.ID.value = \"$record->ID\";");
diff --git a/code/MemberImportForm.php b/code/MemberImportForm.php
index d3df83c5..d126693e 100644
--- a/code/MemberImportForm.php
+++ b/code/MemberImportForm.php
@@ -87,7 +87,7 @@ class MemberImportForm extends Form {
 	
 		$this->sessionMessage($msg, 'good');
 		
-		Director::redirectBack();
+		$this->controller->redirectBack();
 	}
 	
 	/**
diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index 32bc5cec..aca76634 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -347,7 +347,7 @@ class MemberTableField extends ComplexTableField {
 		);
 		$form->sessionMessage($message, 'good');
 
-		Director::redirectBack();		
+		$this->controller->redirectBack();
 	}	
 	
 	/**
diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index a451f42d..8382f1f6 100755
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -515,7 +515,7 @@ class ModelAdmin_CollectionController extends Controller {
 		// File wasn't properly uploaded, show a reminder to the user
 		if(empty($_FILES['_CsvFile']['tmp_name'])) {
 			$form->sessionMessage(_t('ModelAdmin.NOCSVFILE', 'Please browse for a CSV file to import'), 'good');
-			Director::redirectBack();
+			$this->redirectBack();
 			return false;
 		}
 		
@@ -542,7 +542,7 @@ class ModelAdmin_CollectionController extends Controller {
 		if(!$results->CreatedCount() && !$results->UpdatedCount()) $message .= _t('ModelAdmin.NOIMPORT', "Nothing to import");
 		
 		$form->sessionMessage($message, 'good');
-		Director::redirectBack();
+		$this->redirectBack();
 	}
 	
 	/**
@@ -837,7 +837,7 @@ class ModelAdmin_CollectionController extends Controller {
 		$form->saveInto($model);
 		$model->write();
 		
-		if(Director::is_ajax()) {
+		if($this->isAjax()) {
 			$class = $this->parentController->getRecordControllerClass($this->getModelClass());
 			$recordController = new $class($this, $request, $model->ID);
 			return new SS_HTTPResponse(
@@ -890,7 +890,7 @@ class ModelAdmin_RecordController extends Controller {
 	 */
 	function edit($request) {
 		if ($this->currentRecord) {
-			if(Director::is_ajax()) {
+			if($this->isAjax()) {
 				return new SS_HTTPResponse(
 					$this->EditForm()->forAjaxTemplate(), 
 					200, 
@@ -962,10 +962,10 @@ class ModelAdmin_RecordController extends Controller {
 		
 		
 		// Behaviour switched on ajax.
-		if(Director::is_ajax()) {
+		if($this->parentController->isAjax()) {
 			return $this->edit($request);
 		} else {
-			Director::redirectBack();
+			$this->parentController->redirectBack();
 		}
 	}	
 	
@@ -976,8 +976,9 @@ class ModelAdmin_RecordController extends Controller {
 		if($this->currentRecord->canDelete(Member::currentUser())) {
 			$this->currentRecord->delete();
 			Director::redirect($this->parentController->Link('SearchForm?action=search'));
+		} else {
+			$this->parentController->redirectBack();
 		}
-		else Director::redirectBack();
 		return;
 	}
 	
diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index dd3619f9..6507e36a 100755
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -95,7 +95,7 @@ class ReportAdmin extends LeftAndMain {
 		if(isset($params['ID'])) Session::set('currentReport', $params['ID']);
 		if(isset($params['OtherID'])) Session::set('currentOtherID', $params['OtherID']);
 		
-		if(Director::is_ajax()) {
+		if($this->isAjax()) {
 			SSViewer::setOption('rewriteHashlinks', false);
 			
 			$result = $this->customise(array(
diff --git a/code/sitefeatures/PageComment.php b/code/sitefeatures/PageComment.php
index 9067d0f7..4684cd2e 100755
--- a/code/sitefeatures/PageComment.php
+++ b/code/sitefeatures/PageComment.php
@@ -185,10 +185,10 @@ class PageComment_Controller extends Controller {
 			}
 		}
 		
-		if(Director::is_ajax()) {
+		if($this->isAjax()) {
 			echo "";
 		} else {
-			Director::redirectBack();
+			$this->redirectBack();
 		}
 	}
 	
@@ -200,10 +200,10 @@ class PageComment_Controller extends Controller {
 			}
 		}
 		
-		if(Director::is_ajax()) {
+		if($this->isAjax()) {
 			echo "";
 		} else {
-			Director::redirectBack();
+			$this->redirectBack();
 		}
 	}
 	
@@ -217,10 +217,10 @@ class PageComment_Controller extends Controller {
 			
 				// @todo Report to spamprotecter this is true
 			
-				if(Director::is_ajax()) {
+				if($this->isAjax()) {
 					echo $comment->renderWith('PageCommentInterface_singlecomment');
 				} else {
-					Director::redirectBack();
+					$this->redirectBack();
 				}
 			}
 		}
@@ -254,14 +254,14 @@ class PageComment_Controller extends Controller {
 				$comment->write();
 			}
 		}
-		if(Director::is_ajax()) {
+		if($this->isAjax()) {
 			if(SSAkismet::isEnabled() && SSAkismet::getSaveSpam()) {
 				echo $comment->renderWith('PageCommentInterface_singlecomment');
 			} else {
 				echo '';
 			}
 		} else {
-			Director::redirectBack();
+			$this->redirectBack();
 		}	
 	}
 	/**
@@ -291,10 +291,10 @@ class PageComment_Controller extends Controller {
 				$comment->write();
 			}
 		}
-		if(Director::is_ajax()) {
+		if($this->isAjax()) {
 			echo $comment->renderWith('PageCommentInterface_singlecomment');
 		} else {		
-			Director::redirectBack();
+			$this->redirectBack();
 		}
 	}
 	
diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index b3dae5e0..274da5db 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -301,8 +301,8 @@ class PageCommentInterface_Form extends Form {
 		//check if spam question was right.
 		if(MathSpamProtection::isEnabled()){
 			if(!MathSpamProtection::correctAnswer($data['Math'])){
-				if(!Director::is_ajax()) {				
-					Director::redirectBack();
+				if(!$this->controller->isAjax()) {
+					$this->controller->redirectBack();
 				}
 				return "spamprotectionfailed"; //used by javascript for checking if the spam question was wrong
 			}
@@ -330,7 +330,7 @@ class PageCommentInterface_Form extends Form {
 		$comment->write();
 		
 		Cookie::set("PageCommentInterface_Comment", '');
-		if(Director::is_ajax()) {
+		if($this->controller->isAjax()) {
 			if($comment->NeedsModeration){
 				echo _t('PageCommentInterface_Form.AWAITINGMODERATION', "Your comment has been submitted and is now awaiting moderation.");
 			} else{
@@ -347,7 +347,7 @@ class PageCommentInterface_Form extends Form {
 				}
 			}
 
-			return Director::redirectBack(); // worst case, just go back to the page
+			return $this->controller->redirectBack(); // worst case, just go back to the page
 		}
 	}
 }
@@ -362,7 +362,7 @@ class PageCommentInterface_Controller extends ContentController {
 	}
 	
 	function newspamquestion() {
-		if(Director::is_ajax()) {
+		if($this->isAjax()) {
 			echo Convert::raw2xml(sprintf(_t('PageCommentInterface_Controller.SPAMQUESTION', "Spam protection question: %s"),MathSpamProtection::getMathQuestion()));
 		}
 	}

From 56a32fe5c6c839810a43de03741c22b6616aebad Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Thu, 4 Mar 2010 04:09:18 +0000
Subject: [PATCH 289/483] MINOR Reverted r100484 as it was causing too many
 problems

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100485 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php                        |  4 ++--
 code/CMSBatchActionHandler.php             |  4 ++--
 code/CMSMain.php                           |  8 ++++----
 code/GroupImportForm.php                   |  2 +-
 code/LeftAndMain.php                       | 11 ++++++-----
 code/MemberImportForm.php                  |  2 +-
 code/MemberTableField.php                  |  2 +-
 code/ModelAdmin.php                        | 15 +++++++--------
 code/ReportAdmin.php                       |  2 +-
 code/sitefeatures/PageComment.php          | 20 ++++++++++----------
 code/sitefeatures/PageCommentInterface.php | 10 +++++-----
 11 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 42ba389f..6ccbef59 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -657,13 +657,13 @@ JS;
 			$file->delete();
 			$file->destroy();
 			
-			if($this->isAjax()) {
+			if(Director::is_ajax()) {
 				echo <<<JS
 				$('Form_EditForm_Files').removeFile($fileID);
 				statusMessage('removed file', 'good');
 JS;
 			} else {
-				$this->redirectBack();
+				Director::redirectBack();
 			}
 		} else {
 			user_error("AssetAdmin::removefile: Bad parameters: File=$fileID", E_USER_ERROR);
diff --git a/code/CMSBatchActionHandler.php b/code/CMSBatchActionHandler.php
index a5f4229b..ff53a0c5 100644
--- a/code/CMSBatchActionHandler.php
+++ b/code/CMSBatchActionHandler.php
@@ -49,8 +49,8 @@ class CMSBatchActionHandler extends RequestHandler {
 
 	function handleAction($request) {
 		// This method can't be called without ajax.
-		if(!$this->parentController->isAjax()) {
-			$this->parentController->redirectBack();
+		if(!Director::is_ajax()) {
+			Director::redirectBack();
 			return;
 		}
 
diff --git a/code/CMSMain.php b/code/CMSMain.php
index d52b1f0e..e459429f 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -668,7 +668,7 @@ JS;
 		$recordID = $record->ID;
 		$record->delete();
 		
-		if($this->isAjax()) {
+		if(Director::is_ajax()) {
 			// need a valid ID value even if the record doesn't have one in the database
 			// (its still present in the live tables)
 			$liveRecord = Versioned::get_one_by_stage('SiteTree', 'Live', "\"SiteTree_Live\".\"ID\" = $recordID");
@@ -683,7 +683,7 @@ JS;
 				return FormResponse::respond();
 			}			
 		} else {
-			$this->redirectBack();
+			Director::redirectBack();
 		}
 	}
 	
@@ -913,7 +913,7 @@ JS;
 
 			SSViewer::setOption('rewriteHashlinks', false);
 			
-			if($this->isAjax()) {
+			if(Director::is_ajax()) {
 				$result = $templateData->renderWith($this->class . '_right');
 				$parts = split('</?form[^>]*>', $result);
 				return $parts[sizeof($parts)-2];
@@ -997,7 +997,7 @@ JS;
 	}
 
 	function sendFormToBrowser($templateData) {
-		if($this->isAjax()) {
+		if(Director::is_ajax()) {
 			SSViewer::setOption('rewriteHashlinks', false);
 			$result = $this->customise($templateData)->renderWith($this->class . '_right');
 			$parts = split('</?form[^>]*>', $result);
diff --git a/code/GroupImportForm.php b/code/GroupImportForm.php
index 43233db9..a514247d 100644
--- a/code/GroupImportForm.php
+++ b/code/GroupImportForm.php
@@ -83,7 +83,7 @@ class GroupImportForm extends Form {
 	
 		$this->sessionMessage($msg, 'good');
 		
-		$this->redirectBack();
+		Director::redirectBack();
 	}
 	
 }
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index e2df7c12..025a4e2b 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -113,7 +113,7 @@ class LeftAndMain extends Controller {
 		);
 		
 		// set reading lang
-		if(Object::has_extension('SiteTree', 'Translatable') && !$this->isAjax()) {
+		if(Object::has_extension('SiteTree', 'Translatable') && !Director::is_ajax()) {
 			Translatable::choose_site_locale(array_keys(Translatable::get_existing_content_languages('SiteTree')));
 		}
 
@@ -151,7 +151,7 @@ class LeftAndMain extends Controller {
 		if(Director::redirected_to()) return;
 
 		// Audit logging hook
-		if(empty($_REQUEST['executeForm']) && !$this->isAjax()) $this->extend('accessedCMS');
+		if(empty($_REQUEST['executeForm']) && !Director::is_ajax()) $this->extend('accessedCMS');
 
 		// Set the members html editor config
 		HtmlEditorConfig::set_active(Member::currentUser()->getHtmlEditorConfigForCMS());
@@ -352,9 +352,10 @@ class LeftAndMain extends Controller {
 			Session::set('currentMember', $params['OtherID']);
 		}
 
-		if($this->isAjax()) {
+		if(Director::is_ajax()) {
 			SSViewer::setOption('rewriteHashlinks', false);
 			return $this->EditForm()->formHtmlContent();
+
 		} else {
 			return array();
 		}
@@ -575,7 +576,7 @@ class LeftAndMain extends Controller {
 	 * and updates the tree via javascript.
 	 */
 	public function returnItemToUser($p) {
-		if($this->isAjax()) {
+		if(Director::is_ajax()) {
 			// Prepare the object for insertion.
 			$parentID = (int) $p->ParentID;
 			$id = $p->ID ? $p->ID : "new-$p->class-$p->ParentID";
@@ -669,7 +670,7 @@ JS;
 			$record->Status = ($record->Status == "New page" || $record->Status == "Saved (new)") ? "Saved (new)" : "Saved (update)";
 		}
 
-		if($this->isAjax()) {
+		if(Director::is_ajax()) {
 			if($SQL_id != $record->ID) {
 				FormResponse::add("$('sitetree').setNodeIdx(\"{$SQL_id}\", \"$record->ID\");");
 				FormResponse::add("$('Form_EditForm').elements.ID.value = \"$record->ID\";");
diff --git a/code/MemberImportForm.php b/code/MemberImportForm.php
index d126693e..d3df83c5 100644
--- a/code/MemberImportForm.php
+++ b/code/MemberImportForm.php
@@ -87,7 +87,7 @@ class MemberImportForm extends Form {
 	
 		$this->sessionMessage($msg, 'good');
 		
-		$this->controller->redirectBack();
+		Director::redirectBack();
 	}
 	
 	/**
diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index aca76634..32bc5cec 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -347,7 +347,7 @@ class MemberTableField extends ComplexTableField {
 		);
 		$form->sessionMessage($message, 'good');
 
-		$this->controller->redirectBack();
+		Director::redirectBack();		
 	}	
 	
 	/**
diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index 8382f1f6..a451f42d 100755
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -515,7 +515,7 @@ class ModelAdmin_CollectionController extends Controller {
 		// File wasn't properly uploaded, show a reminder to the user
 		if(empty($_FILES['_CsvFile']['tmp_name'])) {
 			$form->sessionMessage(_t('ModelAdmin.NOCSVFILE', 'Please browse for a CSV file to import'), 'good');
-			$this->redirectBack();
+			Director::redirectBack();
 			return false;
 		}
 		
@@ -542,7 +542,7 @@ class ModelAdmin_CollectionController extends Controller {
 		if(!$results->CreatedCount() && !$results->UpdatedCount()) $message .= _t('ModelAdmin.NOIMPORT', "Nothing to import");
 		
 		$form->sessionMessage($message, 'good');
-		$this->redirectBack();
+		Director::redirectBack();
 	}
 	
 	/**
@@ -837,7 +837,7 @@ class ModelAdmin_CollectionController extends Controller {
 		$form->saveInto($model);
 		$model->write();
 		
-		if($this->isAjax()) {
+		if(Director::is_ajax()) {
 			$class = $this->parentController->getRecordControllerClass($this->getModelClass());
 			$recordController = new $class($this, $request, $model->ID);
 			return new SS_HTTPResponse(
@@ -890,7 +890,7 @@ class ModelAdmin_RecordController extends Controller {
 	 */
 	function edit($request) {
 		if ($this->currentRecord) {
-			if($this->isAjax()) {
+			if(Director::is_ajax()) {
 				return new SS_HTTPResponse(
 					$this->EditForm()->forAjaxTemplate(), 
 					200, 
@@ -962,10 +962,10 @@ class ModelAdmin_RecordController extends Controller {
 		
 		
 		// Behaviour switched on ajax.
-		if($this->parentController->isAjax()) {
+		if(Director::is_ajax()) {
 			return $this->edit($request);
 		} else {
-			$this->parentController->redirectBack();
+			Director::redirectBack();
 		}
 	}	
 	
@@ -976,9 +976,8 @@ class ModelAdmin_RecordController extends Controller {
 		if($this->currentRecord->canDelete(Member::currentUser())) {
 			$this->currentRecord->delete();
 			Director::redirect($this->parentController->Link('SearchForm?action=search'));
-		} else {
-			$this->parentController->redirectBack();
 		}
+		else Director::redirectBack();
 		return;
 	}
 	
diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index 6507e36a..dd3619f9 100755
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -95,7 +95,7 @@ class ReportAdmin extends LeftAndMain {
 		if(isset($params['ID'])) Session::set('currentReport', $params['ID']);
 		if(isset($params['OtherID'])) Session::set('currentOtherID', $params['OtherID']);
 		
-		if($this->isAjax()) {
+		if(Director::is_ajax()) {
 			SSViewer::setOption('rewriteHashlinks', false);
 			
 			$result = $this->customise(array(
diff --git a/code/sitefeatures/PageComment.php b/code/sitefeatures/PageComment.php
index 4684cd2e..9067d0f7 100755
--- a/code/sitefeatures/PageComment.php
+++ b/code/sitefeatures/PageComment.php
@@ -185,10 +185,10 @@ class PageComment_Controller extends Controller {
 			}
 		}
 		
-		if($this->isAjax()) {
+		if(Director::is_ajax()) {
 			echo "";
 		} else {
-			$this->redirectBack();
+			Director::redirectBack();
 		}
 	}
 	
@@ -200,10 +200,10 @@ class PageComment_Controller extends Controller {
 			}
 		}
 		
-		if($this->isAjax()) {
+		if(Director::is_ajax()) {
 			echo "";
 		} else {
-			$this->redirectBack();
+			Director::redirectBack();
 		}
 	}
 	
@@ -217,10 +217,10 @@ class PageComment_Controller extends Controller {
 			
 				// @todo Report to spamprotecter this is true
 			
-				if($this->isAjax()) {
+				if(Director::is_ajax()) {
 					echo $comment->renderWith('PageCommentInterface_singlecomment');
 				} else {
-					$this->redirectBack();
+					Director::redirectBack();
 				}
 			}
 		}
@@ -254,14 +254,14 @@ class PageComment_Controller extends Controller {
 				$comment->write();
 			}
 		}
-		if($this->isAjax()) {
+		if(Director::is_ajax()) {
 			if(SSAkismet::isEnabled() && SSAkismet::getSaveSpam()) {
 				echo $comment->renderWith('PageCommentInterface_singlecomment');
 			} else {
 				echo '';
 			}
 		} else {
-			$this->redirectBack();
+			Director::redirectBack();
 		}	
 	}
 	/**
@@ -291,10 +291,10 @@ class PageComment_Controller extends Controller {
 				$comment->write();
 			}
 		}
-		if($this->isAjax()) {
+		if(Director::is_ajax()) {
 			echo $comment->renderWith('PageCommentInterface_singlecomment');
 		} else {		
-			$this->redirectBack();
+			Director::redirectBack();
 		}
 	}
 	
diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index 274da5db..b3dae5e0 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -301,8 +301,8 @@ class PageCommentInterface_Form extends Form {
 		//check if spam question was right.
 		if(MathSpamProtection::isEnabled()){
 			if(!MathSpamProtection::correctAnswer($data['Math'])){
-				if(!$this->controller->isAjax()) {
-					$this->controller->redirectBack();
+				if(!Director::is_ajax()) {				
+					Director::redirectBack();
 				}
 				return "spamprotectionfailed"; //used by javascript for checking if the spam question was wrong
 			}
@@ -330,7 +330,7 @@ class PageCommentInterface_Form extends Form {
 		$comment->write();
 		
 		Cookie::set("PageCommentInterface_Comment", '');
-		if($this->controller->isAjax()) {
+		if(Director::is_ajax()) {
 			if($comment->NeedsModeration){
 				echo _t('PageCommentInterface_Form.AWAITINGMODERATION', "Your comment has been submitted and is now awaiting moderation.");
 			} else{
@@ -347,7 +347,7 @@ class PageCommentInterface_Form extends Form {
 				}
 			}
 
-			return $this->controller->redirectBack(); // worst case, just go back to the page
+			return Director::redirectBack(); // worst case, just go back to the page
 		}
 	}
 }
@@ -362,7 +362,7 @@ class PageCommentInterface_Controller extends ContentController {
 	}
 	
 	function newspamquestion() {
-		if($this->isAjax()) {
+		if(Director::is_ajax()) {
 			echo Convert::raw2xml(sprintf(_t('PageCommentInterface_Controller.SPAMQUESTION', "Spam protection question: %s"),MathSpamProtection::getMathQuestion()));
 		}
 	}

From 98cec468b23b497ec99d956f908569f1dda0f342 Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Thu, 4 Mar 2010 04:42:41 +0000
Subject: [PATCH 290/483] BUGFIX: replacing calls to deprecated Upload
 functions - using validator instead (related to r100057)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100496 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/GroupImportForm.php  | 2 +-
 code/MemberImportForm.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/GroupImportForm.php b/code/GroupImportForm.php
index a514247d..d139bc2c 100644
--- a/code/GroupImportForm.php
+++ b/code/GroupImportForm.php
@@ -45,7 +45,7 @@ class GroupImportForm extends Form {
 					)
 				)
 			);
-			$fileField->setAllowedExtensions(array('csv'));
+			$fileField->getValidator()->setAllowedExtensions(array('csv'));
 		}
 		
 		if(!$actions) $actions = new FieldSet(
diff --git a/code/MemberImportForm.php b/code/MemberImportForm.php
index d3df83c5..c1a30525 100644
--- a/code/MemberImportForm.php
+++ b/code/MemberImportForm.php
@@ -44,7 +44,7 @@ class MemberImportForm extends Form {
 					)
 				)
 			);
-			$fileField->setAllowedExtensions(array('csv'));
+			$fileField->getValidator()->setAllowedExtensions(array('csv'));
 		}
 		
 		if(!$actions) $actions = new FieldSet(

From 79ce73c75731af12d94e13e0f257fbbfb83da772 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Thu, 4 Mar 2010 23:10:38 +0000
Subject: [PATCH 291/483] MINOR LeftAndMain combined files don't need to be
 prefixed with "assets" because default combined folder is set in
 sapphire/_config.php

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100530 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 025a4e2b..41bdae91 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -241,7 +241,7 @@ class LeftAndMain extends Controller {
 
 		// Javascript combined files
 		Requirements::combine_files(
-			'assets/_base.js',
+			'_base.js',
 			array(
 				THIRDPARTY_DIR . '/prototype/prototype.js',
 				THIRDPARTY_DIR . '/behaviour/behaviour.js',
@@ -257,7 +257,7 @@ class LeftAndMain extends Controller {
 		);
 
 		Requirements::combine_files(
-			'assets/_leftandmain.js',
+			'_leftandmain.js',
 			array(
 				SAPPHIRE_DIR . '/javascript/loader.js',
 				CMS_DIR . '/javascript/hover.js',
@@ -278,7 +278,7 @@ class LeftAndMain extends Controller {
 		);
 
 		Requirements::combine_files(
-			'assets/_cmsmain.js',
+			'_cmsmain.js',
 			array(
 				CMS_DIR . '/javascript/CMSMain.js',
 				CMS_DIR . '/javascript/CMSMain_left.js',

From 2a9be51b9060859913d74b04e2c6098bffc1280d Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Fri, 5 Mar 2010 02:26:10 +0000
Subject: [PATCH 292/483] MINOR Removed underscores from combined files in
 LeftAndMain, made redundant by r100536

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100537 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 41bdae91..2a79fe61 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -241,7 +241,7 @@ class LeftAndMain extends Controller {
 
 		// Javascript combined files
 		Requirements::combine_files(
-			'_base.js',
+			'base.js',
 			array(
 				THIRDPARTY_DIR . '/prototype/prototype.js',
 				THIRDPARTY_DIR . '/behaviour/behaviour.js',
@@ -257,7 +257,7 @@ class LeftAndMain extends Controller {
 		);
 
 		Requirements::combine_files(
-			'_leftandmain.js',
+			'leftandmain.js',
 			array(
 				SAPPHIRE_DIR . '/javascript/loader.js',
 				CMS_DIR . '/javascript/hover.js',
@@ -278,7 +278,7 @@ class LeftAndMain extends Controller {
 		);
 
 		Requirements::combine_files(
-			'_cmsmain.js',
+			'cmsmain.js',
 			array(
 				CMS_DIR . '/javascript/CMSMain.js',
 				CMS_DIR . '/javascript/CMSMain_left.js',

From ff236fe98dec02dec81c4173e99f4fb5dfbdcf69 Mon Sep 17 00:00:00 2001
From: Geoff Munn <geoff@silverstripe.com>
Date: Tue, 9 Mar 2010 02:27:25 +0000
Subject: [PATCH 293/483] BUG FIX: column names quoted properly

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100688 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/PageComment.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/sitefeatures/PageComment.php b/code/sitefeatures/PageComment.php
index 9067d0f7..cc909a56 100755
--- a/code/sitefeatures/PageComment.php
+++ b/code/sitefeatures/PageComment.php
@@ -178,7 +178,7 @@ class PageComment_Controller extends Controller {
 		if(Permission::check('CMS_ACCESS_CMSMain')) {
 			$pageId = $_REQUEST['pageid'];
 			if(preg_match('/^\d+$/', $pageId)) {
-				$comments = DataObject::get("PageComment", "ParentID = $pageId");
+				$comments = DataObject::get("PageComment", "\"ParentID\" = $pageId");
 				if($comments) foreach($comments as $c) {
 					$c->delete();
 				}

From c3006cc448ed98949f0fda9dd589903fe2fb3023 Mon Sep 17 00:00:00 2001
From: Geoff Munn <geoff@silverstripe.com>
Date: Tue, 9 Mar 2010 02:27:54 +0000
Subject: [PATCH 294/483] BUG FIX: column name capitalised

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100689 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/CMSMainTest.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/CMSMainTest.yml b/tests/CMSMainTest.yml
index 0f09a7ff..c3b577aa 100644
--- a/tests/CMSMainTest.yml
+++ b/tests/CMSMainTest.yml
@@ -60,11 +60,10 @@ SiteConfig:
       CanCreateTopLevelType: 'OnlyTheseUsers'
 SiteConfig_CreateTopLevelGroups:
    createtoplevelgroups1:
-      siteconfigid:  1
+      SiteConfigID:  1
       GroupID: =>Group.rooteditusers
 PageComment:
     Comment1:
-        ID: 8
         Name: Person
         Comment: Very cool page
         NeedsModeration: 1

From 16f4e99af9fb0633fe5784cc58faf95b0d514d3f Mon Sep 17 00:00:00 2001
From: Geoff Munn <geoff@silverstripe.com>
Date: Tue, 9 Mar 2010 03:07:29 +0000
Subject: [PATCH 295/483] BUG FIX: column names quoted properly

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100699 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/PageCommentsTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/PageCommentsTest.php b/tests/PageCommentsTest.php
index fa57b991..7d2f6b81 100644
--- a/tests/PageCommentsTest.php
+++ b/tests/PageCommentsTest.php
@@ -16,15 +16,15 @@ class PageCommentsTest extends FunctionalTest {
 			null, $this->session());
 		Director::test('second-page', null, $this->session());
 		
-		$secondComments = DataObject::get('PageComment', 'ParentID = '.$second->ID);
+		$secondComments = DataObject::get('PageComment', '"ParentID" = '.$second->ID);
 		$this->assertNull($secondComments);
 		
 		$first = $this->objFromFixture('Page', 'first');
-		$firstComments = DataObject::get('PageComment', 'ParentID = '.$first->ID);
+		$firstComments = DataObject::get('PageComment', '"ParentID" = '.$first->ID);
 		$this->assertNotNull($firstComments);
 		
 		$third = $this->objFromFixture('Page', 'third');
-		$thirdComments = DataObject::get('PageComment', 'ParentID = '.$third->ID);
+		$thirdComments = DataObject::get('PageComment', '"ParentID" = '.$third->ID);
 		$this->assertEquals($thirdComments->Count(), 3);
 	}
 	

From 3f6a4dedfd552b83bd5cd58bed9c2e5a8523c510 Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Tue, 9 Mar 2010 03:24:37 +0000
Subject: [PATCH 296/483] BUGFIX: moving the ajaxupdatesort JS response code
 from php to js to get rid of eval. Also disable the "loading" on the moved
 element when we are done, in case we are repositioning other than the
 selected item - otherwise the progress indicator is displayed indefinitely.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100701 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php           |  9 ---------
 javascript/LeftAndMain_left.js | 13 +++++++++----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 2a79fe61..23f6762e 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -924,15 +924,6 @@ JS;
 					DB::query("UPDATE \"$className\" SET \"Sort\" = $counter WHERE \"ID\" = '$id'");
 				}
 			}
-			// Virtual pages require selected to be null if the page is the same.
-			FormResponse::add(
-				"if( $('sitetree').selected && $('sitetree').selected[0]){
-					var idx =  $('sitetree').selected[0].getIdx();
-					if(idx){
-						$('Form_EditForm').getPageFromServer(idx);
-					}
-				}\n" . $js
-			);
 			FormResponse::status_message(_t('LeftAndMain.SAVED'), 'good');
 		} else {
 			FormResponse::error(_t('LeftAndMain.REQUESTERROR',"Error in request"));
diff --git a/javascript/LeftAndMain_left.js b/javascript/LeftAndMain_left.js
index 8d07c056..c1eb7986 100755
--- a/javascript/LeftAndMain_left.js
+++ b/javascript/LeftAndMain_left.js
@@ -469,10 +469,15 @@ SiteTreeNode.prototype = {
 			new Ajax.Request(SiteTreeHandlers.orderChanged_url, {
 				method : 'post', 
 				postBody : parts.join('&') + '&CurrentlyOpenPageID=' + currentlyOpenPageID,
-				/*onSuccess : function(response) {
-					// statusMessage(response.responseText, 'good');
-				},*/
-				onSuccess: Ajax.Evaluator,
+				onSuccess : function(response) {
+					movedNode.removeNodeClass('loading');
+					if( $('sitetree').selected && $('sitetree').selected[0]){
+						var idx =  $('sitetree').selected[0].getIdx();
+						if(idx){
+							$('Form_EditForm').getPageFromServer(idx);
+						}
+					}
+				},
 				onFailure : function(response) {
 					errorMessage('error saving order', response);
 				}

From 9466e0733589a78c86d7e40dd3f9084b38bd6549 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 9 Mar 2010 20:27:42 +0000
Subject: [PATCH 297/483] BUGFIX Fixed MemberTableField->addtogroup() to fetch
 existing Member records by ID or $unique_identifier_field instead of relying
 on the (now removed) "auto-merging" in Member->onBeforeWrite() (see r100705)
 (from r100716)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100719 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberTableField.php | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index 32bc5cec..2e6cfe8e 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -159,23 +159,40 @@ class MemberTableField extends ComplexTableField {
 	 */
 	function addtogroup() {
 		$data = $_REQUEST;
-		unset($data['ID']);
-		$ctfID = isset($data['ctf']) ? $data['ctf']['ID'] : null;
+		$groupID = (isset($data['ctf']['ID'])) ? $data['ctf']['ID'] : null;
 
-		if(!is_numeric($ctfID)) {
+		if(!is_numeric($groupID)) {
 			FormResponse::status_messsage(_t('MemberTableField.ADDINGFIELD', 'Adding failed'), 'bad');
+			return;
 		}
 
+		// Get existing record either by ID or unique identifier.
+		$identifierField = Member::get_unique_identifier_field();
 		$className = self::$data_class;
-		$record = new $className();
-
+		$record = null;
+		if(isset($data['ID']) && $data['ID']) {
+			$record = DataObject::get_by_id($className, $data['ID']);
+		} elseif(isset($data[$identifierField])) {
+			$record = DataObject::get_one(
+				$className, 
+				sprintf('"%s" = \'%s\'', $identifierField, $data[$identifierField])
+			);
+		} 
+			
+		// Fall back to creating a new record
+		if(!$record) $record = new $className();
+		
+		// Update an existing record, or populate a new one.
+		// If values on an existing (autocompleted) record have been changed,
+		// they will overwrite current data.
 		$record->update($data);
 		
+		// Validate record, mainly password restrictions.
+		// Note: Doesn't use Member_Validator
 		$valid = $record->validate();
-
 		if($valid->valid()) {
 			$record->write();
-			$record->Groups()->add($ctfID);
+			$record->Groups()->add($groupID);
 
 			$this->sourceItems();
 

From abe4049c3d2c703864bb2abc98f59aed5d871fd7 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 9 Mar 2010 20:30:34 +0000
Subject: [PATCH 298/483] BUGFIX Unsetting 'ID' parameter in
 MemberTableField->addtogroup() to avoid confusion between Group and Member
 records (regression from r100716) (from r100720)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100721 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberTableField.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index 2e6cfe8e..0b6c6d17 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -170,9 +170,7 @@ class MemberTableField extends ComplexTableField {
 		$identifierField = Member::get_unique_identifier_field();
 		$className = self::$data_class;
 		$record = null;
-		if(isset($data['ID']) && $data['ID']) {
-			$record = DataObject::get_by_id($className, $data['ID']);
-		} elseif(isset($data[$identifierField])) {
+		if(isset($data[$identifierField])) {
 			$record = DataObject::get_one(
 				$className, 
 				sprintf('"%s" = \'%s\'', $identifierField, $data[$identifierField])
@@ -184,7 +182,10 @@ class MemberTableField extends ComplexTableField {
 		
 		// Update an existing record, or populate a new one.
 		// If values on an existing (autocompleted) record have been changed,
-		// they will overwrite current data.
+		// they will overwrite current data. We need to unset 'ID'
+		// record as it points to the group rather than the member record, and would
+		// cause the member to be written to a potentially existing record.
+		unset($data['ID']);
 		$record->update($data);
 		
 		// Validate record, mainly password restrictions.

From 2128b4cf1ebcd146b0da2096f90f8320e4bcfc98 Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Tue, 9 Mar 2010 20:30:48 +0000
Subject: [PATCH 299/483] BUGFIX reload page if broken link tracking values
 changed during a save. Ticket #1363

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100722 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 23f6762e..b06cd73e 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -656,6 +656,8 @@ JS;
 		$originalStatus = $record->Status;
 		$originalParentID = $record->ParentID;
 
+		$originalBrokenLinkValues = $record->HasBrokenLink.$record->HasBrokenFile;
+
 		$record->HasBrokenLink = 0;
 		$record->HasBrokenFile = 0;
 
@@ -727,6 +729,8 @@ JS;
 				FormResponse::add("if(\$('sitetree').setNodeParentID) \$('sitetree').setNodeParentID($record->ID, $record->ParentID);");
 			}
 
+			
+
 			$record->write();
 
 			if( ($record->class != 'VirtualPage') && $originalURLSegment != $record->URLSegment) {
@@ -743,6 +747,11 @@ JS;
 					}
 				}
 			}
+			
+			// If there has been a change in the broken link values, reload the page
+			if ($originalBrokenLinkValues != $record->HasBrokenLink.$record->HasBrokenFile) {
+				FormResponse::add("$('Form_EditForm').getPageFromServer($record->ID);");
+			}
 
 			// If the 'Save & Publish' button was clicked, also publish the page
 			if (isset($urlParams['publish']) && $urlParams['publish'] == 1) {

From 131c271f9ce650c8e4fa9f10abfdb1bd3e53d0aa Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Tue, 9 Mar 2010 21:16:20 +0000
Subject: [PATCH 300/483] BUGFIX: some sections dont have a tree at all, but
 they still use LeftAndMain as their base class (eg report admin). Added a
 guard.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100724 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/LeftAndMain_left.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/LeftAndMain_left.js b/javascript/LeftAndMain_left.js
index c1eb7986..fc660efd 100755
--- a/javascript/LeftAndMain_left.js
+++ b/javascript/LeftAndMain_left.js
@@ -23,7 +23,7 @@ var _HANDLER_FORMS = {
 			// make sure current ID of loaded form is actually selected in tree
 			var tree = $('#sitetree')[0], id = $('#Form_EditForm :input[name=ID]').val();
 			if(!id) id = 0;
-			tree.setCurrentByIdx(id);
+			if(tree) tree.setCurrentByIdx(id);
 		}, 200);
 	});
 }(jQuery));

From 13ee9391bfb8844b24fefae89b0ae9e58537c618 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 10 Mar 2010 02:59:24 +0000
Subject: [PATCH 301/483] ENHANCEMENT Better editing of roles through
 SecurityAdmin instead of a new "Roles" tab. Removed (previously unreleased)
 PermissionRoleAdmin. (see #4757)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100776 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/PermissionRoleAdmin.php   | 46 -----------------------------
 code/SecurityAdmin.php         | 36 +++++++++++++++++++++++
 javascript/MemberTableField.js | 53 ++++++++++++++++++----------------
 3 files changed, 64 insertions(+), 71 deletions(-)
 delete mode 100644 code/PermissionRoleAdmin.php

diff --git a/code/PermissionRoleAdmin.php b/code/PermissionRoleAdmin.php
deleted file mode 100644
index 1f4aed6c..00000000
--- a/code/PermissionRoleAdmin.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * Admin interface for Permission Roles.
- */
-class PermissionRoleAdmin extends ModelAdmin {
-	static $managed_models = array(
-		'PermissionRole'
-	);
-	
-	public static $collection_controller_class = "PermissionRoleAdmin_CollectionController";
-	public static $record_controller_class = "PermissionRoleAdmin_RecordController";
-	
-	static $url_segment = 'roles';
-	static $menu_title = 'Roles';
-}
-
-/**
- * Customized controller for hiding permissions on AddForm
- */
-class PermissionRoleAdmin_CollectionController extends ModelAdmin_CollectionController {
-	public function AddForm() {
-		$form = parent::AddForm();
-		if ( $this->modelClass=='PermissionRole' ) {
-			$permissionField = $form->Fields()->dataFieldByName('Codes');
-			if($permissionField) $permissionField->setHiddenPermissions(SecurityAdmin::$hidden_permissions);
-		}
-		return $form;
-	}
-}
-
-/**
- * Customized controller for hiding permissions on EditForm
- */
-class PermissionRoleAdmin_RecordController extends ModelAdmin_RecordController {
-	public function EditForm() {
-		$form = parent::EditForm();
-		if ( $this->parentController->modelClass=='PermissionRole' ) {
-			$permissionField = $form->Fields()->dataFieldByName('Codes');
-			if($permissionField) $permissionField->setHiddenPermissions(SecurityAdmin::$hidden_permissions);
-		}
-		return $form;
-	}	
-}
-
-?>
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 7d8797fd..ef86b03d 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -81,6 +81,20 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 						)
 					)
 				);
+				
+				$fields->addFieldToTab(
+					'Root.Roles',
+					new LiteralField(
+						'RolesAddEditLink', 
+						sprintf(
+							'<p class="add-role"><a href="%s">%s</a></p>',
+							$this->Link('show/root'),
+							// TODO This should include #Root_Roles to switch directly to the tab,
+							// but tabstrip.js doesn't display tabs when directly adressed through a URL pragma
+							_t('Group.RolesAddEditLink', 'Add/edit roles')
+						)
+					)
+				);
 			}
 		
 			$actions = new FieldSet(
@@ -147,6 +161,28 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 			// necessary for tree node selection in LeftAndMain.EditForm.js
 			new HiddenField('ID', false, 0)
 		);
+
+		// Add roles editing interface
+		if(Permission::check('APPLY_ROLES')) {
+			$rolesCTF = new ComplexTableField(
+				$this,
+				'Roles',
+				'PermissionRole'
+			);
+			// Necessary to make Permission code checkboxes behave consistently
+			$rolesCTF->requirementsForPopupCallback = create_function(
+				'$popup', 
+				'Requirements::javascript(CMS_DIR . "/javascript/MemberTableField.js");'
+			);
+			
+			$rolesTab = $fields->findOrMakeTab('Root.Roles', _t('SecurityAdmin.TABROLES', 'Roles'));
+			$rolesTab->push(new LiteralField(
+				'RolesDescription', 
+				''
+			));
+			$rolesTab->push($rolesCTF);
+		}
+
 		$actions = new FieldSet(
 			new FormAction('addmember',_t('SecurityAdmin.ADDMEMBER','Add Member'))
 		);
diff --git a/javascript/MemberTableField.js b/javascript/MemberTableField.js
index f9ca0b49..1663c2d4 100755
--- a/javascript/MemberTableField.js
+++ b/javascript/MemberTableField.js
@@ -281,36 +281,39 @@ Behaviour.register({
 });
 
 (function($) {
+	var checkboxBehaviour = {
+		initialize: function() {
+			this.toggleCheckboxes();
+		},
+		onclick: function(e) {
+			this.toggleCheckboxes();
+		},
+		toggleCheckboxes: function() {
+			var checkboxes = $(this).parents('.field:eq(0)').find('.checkbox').not(this);
+
+			if($(this).is(':checked')) {
+				checkboxes.each(function() {
+					$(this).data('SecurityAdmin.oldChecked', $(this).attr('checked'));
+					$(this).data('SecurityAdmin.oldDisabled', $(this).attr('disabled'));
+					$(this).attr('disabled', 'disabled');
+					$(this).attr('checked', 'checked');
+				});
+			} else {
+				checkboxes.each(function() {
+					$(this).attr('checked', $(this).data('SecurityAdmin.oldChecked'));
+					$(this).attr('disabled', $(this).data('SecurityAdmin.oldDisabled'));
+				});
+			}
+		}
+	};
+	
 	Behaviour.register({
 		/**
 		 * Automatically check and disable all checkboxes if ADMIN permissions are selected.
 		 * As they're disabled, any changes won't be submitted (which is intended behaviour),
 		 * checking all boxes is purely presentational.
 		 */
-		'#Permissions .valADMIN input': {
-			initialize: function() {
-				this.toggleCheckboxes();
-			},
-			onclick: function(e) {
-				this.toggleCheckboxes();
-			},
-			toggleCheckboxes: function() {
-				var checkboxes = $(this).parents('.field:eq(0)').find('.checkbox').not(this);
-
-				if($(this).is(':checked')) {
-					checkboxes.each(function() {
-						$(this).data('SecurityAdmin.oldChecked', $(this).attr('checked'));
-						$(this).data('SecurityAdmin.oldDisabled', $(this).attr('disabled'));
-						$(this).attr('disabled', 'disabled');
-						$(this).attr('checked', 'checked');
-					});
-				} else {
-					checkboxes.each(function() {
-						$(this).attr('checked', $(this).data('SecurityAdmin.oldChecked'));
-						$(this).attr('disabled', $(this).data('SecurityAdmin.oldDisabled'));
-					});
-				}
-			}
-		}
+		'#Permissions .valADMIN input': checkboxBehaviour,
+		'#Codes .valADMIN input': checkboxBehaviour
 	});
 }(jQuery));
\ No newline at end of file

From 5e42eee71acd6d93c8617ea4dde0735f571bd37c Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 10 Mar 2010 03:36:43 +0000
Subject: [PATCH 302/483] MINOR Improved help texts around permissions

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100783 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php       | 12 ++++++++++--
 code/SecurityAdmin.php |  4 ++--
 lang/en_US.php         | 15 +++++++--------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index e459429f..8a2a0fd2 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -1348,10 +1348,10 @@ JS;
 
 		foreach($classes as $i => $class) {
 			$title = _t("{$class}.MENUTITLE", LeftAndMain::menu_title_for_class($class));
-	        $perms["CMS_ACCESS_" . $class] = array(
+			$perms["CMS_ACCESS_" . $class] = array(
 				'name' => sprintf(_t(
 					'CMSMain.ACCESS', 
-					"Access to %s",
+					"Access to '%s' section",
 					PR_MEDIUM,
 					"Item in permission selection identifying the admin section. Example: Access to 'Files & Images'"
 				), $title, null),
@@ -1363,6 +1363,14 @@ JS;
 			'category' => _t('Permission.CMS_ACCESS_CATEGORY', 'CMS Access'),
 			'sort' => -100
 		);
+		$perms['CMS_ACCESS_CMSMain']['help'] = _t(
+			'CMSMain.ACCESS_HELP',
+			'Allow viewing of the section containing page tree and content. View and edit permissions can be handled through page specific dropdowns, as well as the separate "Content permissions".'
+		);
+		$perms['CMS_ACCESS_SecurityAdmin']['help'] = _t(
+			'SecurityAdmin.ACCESS_HELP',
+			'Allow viewing, adding and editing users, as well as assigning permissions and roles to them.'
+		);
 
 		if (isset($perms['CMS_ACCESS_ModelAdmin'])) unset($perms['CMS_ACCESS_ModelAdmin']);
 		
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index ef86b03d..0bfde258 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -450,13 +450,13 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 			'EDIT_PERMISSIONS' => array(
 				'name' => _t('SecurityAdmin.EDITPERMISSIONS', 'Manage permissions for groups'),
 				'category' => _t('Permissions.PERMISSIONS_CATEGORY', 'Roles and access permissions'),
-				'help' => _t('SecurityAdmin.EDITPERMISSIONS_HELP', 'Ability to edit Permissions and IP Addresses for a group. Requires "Access to Security".'),
+				'help' => _t('SecurityAdmin.EDITPERMISSIONS_HELP', 'Ability to edit Permissions and IP Addresses for a group. Requires the "Access to \'Security\' section" permission.'),
 				'sort' => 0
 			),
 			'APPLY_ROLES' => array(
 				'name' => _t('SecurityAdmin.APPLY_ROLES', 'Apply roles to groups'),
 				'category' => _t('Permissions.PERMISSIONS_CATEGORY', 'Roles and access permissions'),
-				'help' => _t('SecurityAdmin.APPLY_ROLES_HELP', 'Ability to edit the roles assigned to a group. Requires "Access to Security.".'),
+				'help' => _t('SecurityAdmin.APPLY_ROLES_HELP', 'Ability to edit the roles assigned to a group. Requires the "Access to \'Security\' section" permission.'),
 				'sort' => 0
 			)
 		);
diff --git a/lang/en_US.php b/lang/en_US.php
index eb03770f..967f4eca 100755
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -86,11 +86,12 @@ $lang['en_US']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Published %d pages, %d f
 $lang['en_US']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Publishing pages';
 $lang['en_US']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publish';
 $lang['en_US']['CMSMain']['ACCESS'] = array(
-	'Access to %s',
+	'Access to \'%s\' section',
 	PR_MEDIUM,
 	'Item in permission selection identifying the admin section. Example: Access to \'Files & Images\''
 );
 $lang['en_US']['CMSMain']['ACCESSALLINTERFACES'] = 'Access to all CMS sections';
+$lang['en_US']['CMSMain']['ACCESS_HELP'] = 'Allow viewing of the section containing page tree and content. View and edit permissions can be handled through page specific dropdowns, as well as the separate "Content permissions".';
 $lang['en_US']['CMSMain']['CANCEL'] = 'Cancel';
 $lang['en_US']['CMSMain']['CHOOSEREPORT'] = '(Choose a report)';
 $lang['en_US']['CMSMain']['COMPARINGV'] = 'Comparing versions %s and %s';
@@ -246,6 +247,7 @@ $lang['en_US']['CommentTableField.ss']['SPAM'] = 'spam';
 $lang['en_US']['ComplexTableField']['CLOSEPOPUP'] = 'Close Popup';
 $lang['en_US']['ComplexTableField']['SUCCESSADD'] = 'Added %s %s %s';
 $lang['en_US']['Group']['IMPORTTABTITLE'] = 'Import';
+$lang['en_US']['Group']['RolesAddEditLink'] = 'Add/edit roles';
 $lang['en_US']['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>';
 $lang['en_US']['GroupImportForm']['Help2'] = '<div class="advanced">
 	<h4>Advanced usage</h4>
@@ -474,11 +476,6 @@ $lang['en_US']['PageCommentInterface_singlecomment.ss']['ISSPAM'] = 'this commen
 $lang['en_US']['PageCommentInterface_singlecomment.ss']['PBY'] = 'Posted by';
 $lang['en_US']['PageCommentInterface_singlecomment.ss']['REMCOM'] = 'remove this comment';
 $lang['en_US']['Permission']['CMS_ACCESS_CATEGORY'] = 'CMS Access';
-$lang['en_US']['PermissionRoleAdmin']['MENUTITLE'] = array(
-	'Roles',
-	100,
-	'Menu title'
-);
 $lang['en_US']['Permissions']['PERMISSIONS_CATEGORY'] = 'Roles and access permissions';
 $lang['en_US']['ReportAdmin']['MENUTITLE'] = array(
 	'Reports',
@@ -496,11 +493,12 @@ $lang['en_US']['ReportAdmin_right.ss']['WELCOME2'] = array(
 	'reporting section.  Please choose a specific report from the left.',
 	50
 );
+$lang['en_US']['SecurityAdmin']['ACCESS_HELP'] = 'Allow viewing, adding and editing users, as well as assigning permissions and roles to them.';
 $lang['en_US']['SecurityAdmin']['ADDMEMBER'] = 'Add Member';
 $lang['en_US']['SecurityAdmin']['APPLY_ROLES'] = 'Apply roles to groups';
-$lang['en_US']['SecurityAdmin']['APPLY_ROLES_HELP'] = 'Ability to edit the roles assigned to a group. Requires "Access to Security.".';
+$lang['en_US']['SecurityAdmin']['APPLY_ROLES_HELP'] = 'Ability to edit the roles assigned to a group. Requires the "Access to \'Security\' section" permission.';
 $lang['en_US']['SecurityAdmin']['EDITPERMISSIONS'] = 'Manage permissions for groups';
-$lang['en_US']['SecurityAdmin']['EDITPERMISSIONS_HELP'] = 'Ability to edit Permissions and IP Addresses for a group. Requires "Access to Security".';
+$lang['en_US']['SecurityAdmin']['EDITPERMISSIONS_HELP'] = 'Ability to edit Permissions and IP Addresses for a group. Requires the "Access to \'Security\' section" permission.';
 $lang['en_US']['SecurityAdmin']['MENUTITLE'] = array(
 	'Security',
 	100,
@@ -511,6 +509,7 @@ $lang['en_US']['SecurityAdmin']['NEWGROUP'] = 'New Group';
 $lang['en_US']['SecurityAdmin']['SAVE'] = 'Save';
 $lang['en_US']['SecurityAdmin']['SGROUPS'] = 'Security Groups';
 $lang['en_US']['SecurityAdmin']['TABIMPORT'] = 'Import';
+$lang['en_US']['SecurityAdmin']['TABROLES'] = 'Roles';
 $lang['en_US']['SecurityAdmin_MemberImportForm']['BtnImport'] = 'Import';
 $lang['en_US']['SecurityAdmin_MemberImportForm']['FileFieldLabel'] = 'CSV File <small>(Allowed extensions: *.csv)</small>';
 $lang['en_US']['SecurityAdmin_left.ss']['CREATE'] = 'Create';

From 3cb46c28b540b8263f11388cf5d3e125e8f63233 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 10 Mar 2010 04:06:05 +0000
Subject: [PATCH 303/483] MINOR Improved help texts around permissions

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100789 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 8a2a0fd2..d288f7ef 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -1361,6 +1361,7 @@ JS;
 		$perms["CMS_ACCESS_LeftAndMain"] = array(
 			'name' => _t('CMSMain.ACCESSALLINTERFACES', 'Access to all CMS sections'),
 			'category' => _t('Permission.CMS_ACCESS_CATEGORY', 'CMS Access'),
+			'help' => _t('CMSMain.ACCESSALLINTERFACES', 'Overrules more specific access settings.'),
 			'sort' => -100
 		);
 		$perms['CMS_ACCESS_CMSMain']['help'] = _t(
@@ -1373,7 +1374,7 @@ JS;
 		);
 
 		if (isset($perms['CMS_ACCESS_ModelAdmin'])) unset($perms['CMS_ACCESS_ModelAdmin']);
-		
+
 		return $perms;
 	}
 	

From bc0934ae10bb1ce18e47fa10ee49abb95b7ccaff Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 10 Mar 2010 04:06:32 +0000
Subject: [PATCH 304/483] MINOR Moved PermissionCheckboxSetField specific
 javascript logic from MemberTableField.js to new
 sapphire/javascript/PermissionCheckboxSetField.js file

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100790 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SecurityAdmin.php         |  7 +-----
 javascript/MemberTableField.js | 40 +---------------------------------
 2 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 0bfde258..bdbfbe4b 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -169,12 +169,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 				'Roles',
 				'PermissionRole'
 			);
-			// Necessary to make Permission code checkboxes behave consistently
-			$rolesCTF->requirementsForPopupCallback = create_function(
-				'$popup', 
-				'Requirements::javascript(CMS_DIR . "/javascript/MemberTableField.js");'
-			);
-			
+
 			$rolesTab = $fields->findOrMakeTab('Root.Roles', _t('SecurityAdmin.TABROLES', 'Roles'));
 			$rolesTab->push(new LiteralField(
 				'RolesDescription', 
diff --git a/javascript/MemberTableField.js b/javascript/MemberTableField.js
index 1663c2d4..e1607782 100755
--- a/javascript/MemberTableField.js
+++ b/javascript/MemberTableField.js
@@ -278,42 +278,4 @@ MemberFilterButton.prototype = {
 // has to be external from initialize() because otherwise request will double on each reload - WTF
 Behaviour.register({
 	'#Form_EditForm div.MemberTableField table.data input.text' : AjaxMemberLookup
-});
-
-(function($) {
-	var checkboxBehaviour = {
-		initialize: function() {
-			this.toggleCheckboxes();
-		},
-		onclick: function(e) {
-			this.toggleCheckboxes();
-		},
-		toggleCheckboxes: function() {
-			var checkboxes = $(this).parents('.field:eq(0)').find('.checkbox').not(this);
-
-			if($(this).is(':checked')) {
-				checkboxes.each(function() {
-					$(this).data('SecurityAdmin.oldChecked', $(this).attr('checked'));
-					$(this).data('SecurityAdmin.oldDisabled', $(this).attr('disabled'));
-					$(this).attr('disabled', 'disabled');
-					$(this).attr('checked', 'checked');
-				});
-			} else {
-				checkboxes.each(function() {
-					$(this).attr('checked', $(this).data('SecurityAdmin.oldChecked'));
-					$(this).attr('disabled', $(this).data('SecurityAdmin.oldDisabled'));
-				});
-			}
-		}
-	};
-	
-	Behaviour.register({
-		/**
-		 * Automatically check and disable all checkboxes if ADMIN permissions are selected.
-		 * As they're disabled, any changes won't be submitted (which is intended behaviour),
-		 * checking all boxes is purely presentational.
-		 */
-		'#Permissions .valADMIN input': checkboxBehaviour,
-		'#Codes .valADMIN input': checkboxBehaviour
-	});
-}(jQuery));
\ No newline at end of file
+});
\ No newline at end of file

From b033c1839c992ce9c66294c77250ce8e1b03ac1d Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Thu, 11 Mar 2010 02:31:09 +0000
Subject: [PATCH 305/483] BUGFIX: fixed file uploading not uploading any files
 at all

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100854 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 6ccbef59..cebcd874 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -180,7 +180,6 @@ JS
 				$processedFiles[$key][$param] = $value;
 			}
 		}
-		array_shift($processedFiles);
 		
 		// Load POST data from arrays in to the correct dohickey.
 		$processedData = array();

From 2b99e456276a545812e0313e86a77e501cd32748 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Thu, 11 Mar 2010 02:43:47 +0000
Subject: [PATCH 306/483] BUGFIX: Fixed notice level error with folder ID

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100858 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index cebcd874..5228b36d 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -196,7 +196,7 @@ JS
 		}
 		$processedData = array_reverse($processedData);
 				
-		if($data['ID'] && $data['ID'] != 'root') $folder = DataObject::get_by_id("Folder", $data['ID']);
+		if($data['FolderID'] && $data['FolderID'] != '') $folder = DataObject::get_by_id("Folder", $data['FolderID']);
 		else $folder = singleton('Folder');
 
 		foreach($processedFiles as $filePostId => $tmpFile) {

From 6378a0fece7e7ecef7c007427f29530a4fd05171 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 11 Mar 2010 04:37:28 +0000
Subject: [PATCH 307/483] MINOR Using jquery.live and behaviour.js instead of
 livequery in ModelAdmin.js

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100887 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ModelAdmin.php      |  3 --
 javascript/ModelAdmin.js | 90 +++++++++++++++++++++-------------------
 2 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index a451f42d..58f8156f 100755
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -144,9 +144,6 @@ abstract class ModelAdmin extends LeftAndMain {
 		Requirements::css(CMS_DIR . '/css/silverstripe.tabs.css'); // follows the jQuery UI theme conventions
 		
 		Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js');
-		//Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.core.js');
-		//Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.tabs.js');
 		Requirements::javascript(THIRDPARTY_DIR . '/jquery-form/jquery.form.js');
 		Requirements::javascript(THIRDPARTY_DIR . '/jquery-effen/jquery.fn.js');
 		Requirements::javascript(SAPPHIRE_DIR . '/javascript/jquery_improvements.js');
diff --git a/javascript/ModelAdmin.js b/javascript/ModelAdmin.js
index a8adb673..ffcf7fbd 100644
--- a/javascript/ModelAdmin.js
+++ b/javascript/ModelAdmin.js
@@ -13,58 +13,62 @@ $(document).ready(function() {
 	/**
 	 * Generic ajax error handler
 	 */
-	$('form').livequery('ajaxError', function (XMLHttpRequest, textStatus, errorThrown) {
+	$('form').live('ajaxError', function (XMLHttpRequest, textStatus, errorThrown) {
 			$('input', this).removeClass('loading');
 			statusMessage(ss.i18n._t('ModelAdmin.ERROR', 'Error'), 'bad');
 	});
 	
-	/** 
-	 * Add class ajaxActions class to the parent of Add button of AddForm
-	 * so it float to the right
-	 */
-	$('#Form_AddForm_action_doCreate').livequery(function(){
-		if($(this)){
-			var parent = $(this).parent();
-			$("#right").append(parent);
-			
-			parent.addClass('ajaxActions');
-			parent.attr('id','form_actions_right');
+	// We're avoiding livequery initializers for now,
+	// to be replaced by jQuery.entwine.
+	Behaviour.register({
+		/** 
+		 * Add class ajaxActions class to the parent of Add button of AddForm
+		 * so it float to the right
+		 */
+		'#Form_AddForm_action_doCreate': {
+			initialize: function() {
+				var parent = $(this).parent();
+				$("#right").append(parent);
+
+				parent.addClass('ajaxActions');
+				parent.attr('id','form_actions_right');
+			}
+		},
+		/*
+		 * moves Forward button to the right and fixes it underneath result form.
+		*/
+		'#Form_ResultsForm_action_goForward': {
+			initialize: function() {
+				$("#form_actions_right").append($(this));
+			}
+		},
+		/*
+		 * we need an special case for results form since #ModelAdminPanel has overflow:hidden
+		 * it calculates the form height, gives it a padding and overflow auto, so we can scroll down.
+		*/
+		'#Form_ResultsForm': {
+			initialize: function(){
+				var newModelAdminPanelHeight = $("#right").height()-$(".ajaxActions").height();
+				$('#Form_ResultsForm').height(newModelAdminPanelHeight);
+				$('#Form_ResultsForm').css('overflow','auto');
+			}
 		}
-		
 	});
 	
-    /*
-     * Highlight buttons on click
-     */
-	$('input[type=submit]').livequery('click', function() {
+	/*
+	 * Highlight buttons on click
+	 */
+	$('input[type=submit]').live('click', function() {
 	    $(this).addClass('loading');
 	});
 	
-	$('input[name=action_search]').livequery('click', function() {
+	$('input[name=action_search]').live('click', function() {
 		$('#contentPanel').fn('closeRightPanel');
 		if($('#Form_AddForm_action_doCreate')){
 			$('div[class=ajaxActions]').remove();
 		}
 	});
 	
-	/*
-	 * moves Forward button to the right and fixes it underneath result form.
-	*/
-	$('#Form_ResultsForm_action_goForward').livequery(function() {
-		$("#form_actions_right").append($(this));
-	});
-	
-	/*
-	 * we need an special case for results form since #ModelAdminPanel has overflow:hidden
-	 * it calculates the form height, gives it a padding and overflow auto, so we can scroll down.
-	*/
-	$('#Form_ResultsForm').livequery( function(){
-		var newModelAdminPanelHeight = $("#right").height()-$(".ajaxActions").height();
-		$('#Form_ResultsForm').height(newModelAdminPanelHeight);
-		$('#Form_ResultsForm').css('overflow','auto');
-	});
-	
-	
 	$("#right").scroll( function () {
 		positionActionArea();
 	});
@@ -123,7 +127,7 @@ $(document).ready(function() {
 	 * 
 	 * Note: This is used for Form_CreateForm too
 	 * 
-	 * @todo use livequery to manage ResultTable click handlers
+	 * @todo use jQuery.live to manage ResultTable click handlers
 	 */
 	$('#SearchForm_holder .tab form:not(#Form_ImportForm)').submit(function () {
 	    var $form = $(this);
@@ -192,7 +196,7 @@ $(document).ready(function() {
 	 * @todo: Shouldn't this be part of TableListField?
 	 */
 	$('#right #Form_ResultsForm tbody td a:not(.deletelink,.downloadlink)')
-	    .livequery('click', function(){
+	    .live('click', function(){
 	        $(this).parent().parent().addClass('loading');
     		var el = $(this);
     		$('#ModelAdminPanel').fn('addHistory', el.attr('href'));
@@ -217,7 +221,7 @@ $(document).ready(function() {
     /**
      * RHS panel Back button
      */
-	$('#Form_EditForm_action_goBack, #Form_ResultsForm_action_goBack').livequery('click', function() {
+	$('#Form_EditForm_action_goBack, #Form_ResultsForm_action_goBack').live('click', function() {
 	    $('#ModelAdminPanel').fn('goBack');
 		return false;
 	});
@@ -225,7 +229,7 @@ $(document).ready(function() {
     /**
      * RHS panel Back button
      */
-	$('#Form_ResultsForm_action_goForward').livequery('click', function() {
+	$('#Form_ResultsForm_action_goForward').live('click', function() {
 	    $('#ModelAdminPanel').fn('goForward');
 		return false;
 	});
@@ -233,7 +237,7 @@ $(document).ready(function() {
 	/**
 	 * RHS panel Save button 
 	 */
-	$('#right input[name=action_doSave],#right input[name=action_doCreate]').livequery('click', function(){
+	$('#right input[name=action_doSave],#right input[name=action_doCreate]').live('click', function(){
 		var form = $('#right form');
 		var formAction = form.attr('action') + '?' + $(this).fieldSerialize();
 		
@@ -254,7 +258,7 @@ $(document).ready(function() {
 			}
 
 			// TODO/SAM: It seems a bit of a hack to have to list all the little updaters here. 
-			// Is livequery a solution?
+			// Is jQuery.live a solution?
 			Behaviour.apply(); // refreshes ComplexTableField
 			if(window.onresize) window.onresize();
 		}, 'html');
@@ -265,7 +269,7 @@ $(document).ready(function() {
 	/**
 	 * RHS panel Delete button
 	 */
-	$('#right input[name=action_doDelete]').livequery('click', function(){
+	$('#right input[name=action_doDelete]').live('click', function(){
 		var confirmed = confirm(ss.i18n._t('ModelAdmin.REALLYDELETE', 'Really delete?'));
 		if(!confirmed) {
 			$(this).removeClass('loading')

From d8736b938659d7d49af2a38b379718504ccd36bb Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 11 Mar 2010 04:37:29 +0000
Subject: [PATCH 308/483] MINOR Using jquery.live instead of livequery in
 MemberImportForm.js

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100888 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/MemberImportForm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/MemberImportForm.js b/javascript/MemberImportForm.js
index a8ff81a9..9cd16013 100644
--- a/javascript/MemberImportForm.js
+++ b/javascript/MemberImportForm.js
@@ -2,7 +2,7 @@
 $(document).ready(function() {
 	$('.import-form .advanced').hide();
 	
-	$('.import-form a.toggle-advanced').livequery(
+	$('.import-form a.toggle-advanced').live(
 		'click', 
 		function(e) {
 			$(this).parents('form:eq(0)').find('.advanced').toggle();

From 6306dfb6286f6ea19f16940b6ec62418d6aacf51 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 11 Mar 2010 04:48:16 +0000
Subject: [PATCH 309/483] MINOR Updated cms/ lang files

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100890 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 lang/en_US.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/en_US.php b/lang/en_US.php
index 967f4eca..0dc37c1f 100755
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -90,7 +90,7 @@ $lang['en_US']['CMSMain']['ACCESS'] = array(
 	PR_MEDIUM,
 	'Item in permission selection identifying the admin section. Example: Access to \'Files & Images\''
 );
-$lang['en_US']['CMSMain']['ACCESSALLINTERFACES'] = 'Access to all CMS sections';
+$lang['en_US']['CMSMain']['ACCESSALLINTERFACES'] = 'Overrules more specific access settings.';
 $lang['en_US']['CMSMain']['ACCESS_HELP'] = 'Allow viewing of the section containing page tree and content. View and edit permissions can be handled through page specific dropdowns, as well as the separate "Content permissions".';
 $lang['en_US']['CMSMain']['CANCEL'] = 'Cancel';
 $lang['en_US']['CMSMain']['CHOOSEREPORT'] = '(Choose a report)';

From 63ab9385dcaca092ea6c6622100e5a4c2b9dbcc2 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 11 Mar 2010 05:01:30 +0000
Subject: [PATCH 310/483] ENHANCEMENT Added Hebrew (he_IL) language to cms
 (thanks Oren, Yotam, tzvika, Amir, ohad) ENHANCEMENT Added Lithuanian (lt_LT)
 language to cms (thanks Irmantas, Mindaugas, Donatas, Andrius) MINOR Updated
 languages in cms from translate.silverstripe.org

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100892 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 lang/ar_SA.php |  53 +++---
 lang/bg_BG.php |  24 ---
 lang/ca_AD.php |  24 ---
 lang/cs_CZ.php |  53 +++---
 lang/da_DK.php |  87 +++++++---
 lang/de_DE.php |  73 ++++----
 lang/en_GB.php |  94 +++++++----
 lang/eo_XX.php |  73 ++++----
 lang/es_AR.php |  24 ---
 lang/es_ES.php |  49 ++----
 lang/es_MX.php |  24 ---
 lang/et_EE.php |  26 +--
 lang/fi_FI.php |  41 ++---
 lang/fr_FR.php |  24 ---
 lang/he_IL.php | 421 ++++++++++++++++++++++++++++++++++++++++++++++
 lang/hr_HR.php |  33 ++--
 lang/hu_HU.php | 253 ++++++++++++++++++++++------
 lang/id_ID.php |  25 +--
 lang/it_IT.php |  65 ++++---
 lang/ja_JP.php |  84 +++++-----
 lang/lc_XX.php |  19 ---
 lang/lt_LT.php | 446 +++++++++++++++++++++++++++++++++++++++++++++++++
 lang/ms_MY.php |  23 ---
 lang/nb_NO.php |  24 ---
 lang/ne_NP.php |  18 --
 lang/nl_NL.php |  77 +++++----
 lang/pl_PL.php |  31 +---
 lang/pt_BR.php |  30 +---
 lang/pt_PT.php |  23 ---
 lang/ru_RU.php |  24 ---
 lang/si_LK.php |  23 ---
 lang/sk_SK.php |  69 +++++---
 lang/sr_RS.php |  28 +---
 lang/sv_SE.php |  58 ++++---
 lang/tr_TR.php |  24 ---
 lang/zh_CN.php |  32 ++--
 lang/zh_TW.php |  18 --
 37 files changed, 1629 insertions(+), 888 deletions(-)
 create mode 100644 lang/he_IL.php
 create mode 100644 lang/lt_LT.php

diff --git a/lang/ar_SA.php b/lang/ar_SA.php
index 09757f9e..72a74f85 100644
--- a/lang/ar_SA.php
+++ b/lang/ar_SA.php
@@ -17,8 +17,6 @@ if(array_key_exists('ar_SA', $lang) && is_array($lang['ar_SA'])) {
 }
 
 $lang['ar_SA']['AssetAdmin']['CHOOSEFILE'] = 'اختر ملف';
-$lang['ar_SA']['AssetAdmin']['CONTENTMODBY'] = 'المحتوى قابل للتعديل بواسطة';
-$lang['ar_SA']['AssetAdmin']['CONTENTUSABLEBY'] = 'المحتوى قابل للستخدام بواسطة ';
 $lang['ar_SA']['AssetAdmin']['DELETEDX'] = 'ملفات محذوفة %s. %s';
 $lang['ar_SA']['AssetAdmin']['FILESREADY'] = 'ملفات جاهزة للرفع:';
 $lang['ar_SA']['AssetAdmin']['FOLDERDELETED'] = 'مجلد محذوف';
@@ -31,7 +29,6 @@ $lang['ar_SA']['AssetAdmin']['NOTEMP'] = 'لايوجد مجلد مؤقت للم
 $lang['ar_SA']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'لا يوجد ما يمكن رفعه';
 $lang['ar_SA']['AssetAdmin']['NOWBROKEN'] = 'الصفحات التالية تحتوي روابط معطوبة';
 $lang['ar_SA']['AssetAdmin']['NOWBROKEN2'] = 'تمت مراسلة الإدارة و سيتم تصليح الأخطاء في الصفحات';
-$lang['ar_SA']['AssetAdmin']['OWNER'] = 'المالك';
 $lang['ar_SA']['AssetAdmin']['SAVEDFILE'] = 'ملف محفوظ %s';
 $lang['ar_SA']['AssetAdmin']['SAVEFOLDERNAME'] = 'احفظ اسم المجلد';
 $lang['ar_SA']['AssetAdmin']['THUMBSDELETED'] = 'جميع المصغرات الغير مستخدمة تم حذفها';
@@ -41,6 +38,8 @@ $lang['ar_SA']['AssetAdmin_left.ss']['CREATE'] = 'إنشاء';
 $lang['ar_SA']['AssetAdmin_left.ss']['DELETE'] = 'حذف';
 $lang['ar_SA']['AssetAdmin_left.ss']['DELFOLDERS'] = 'احذف المجلدات المحددة';
 $lang['ar_SA']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'السماح بتغيير الترتيب عن طريق الإمساك و الإفلات';
+$lang['ar_SA']['AssetAdmin_left.ss']['FILESYSTEMSYNC'] = 'إضافة ملفات أخرى';
+$lang['ar_SA']['AssetAdmin_left.ss']['FILESYSTEMSYNC_DESC'] = 'SilverStripe maintains its own database of the files &amp; images stored in your assets/ folder. Click this button to update that database, if files are added to the assets/ folder from outside SilverStripe, for example, if you have uploaded files via FTP.';
 $lang['ar_SA']['AssetAdmin_left.ss']['FOLDERS'] = 'مجلدات';
 $lang['ar_SA']['AssetAdmin_left.ss']['GO'] = 'اذهب';
 $lang['ar_SA']['AssetAdmin_left.ss']['SELECTTODEL'] = 'اختر الملجدات التي تريد حذفها ثم اضغط على الزر بالأسفل';
@@ -48,6 +47,7 @@ $lang['ar_SA']['AssetAdmin_left.ss']['TOREORG'] = 'لإعادة ترتيب ال
 $lang['ar_SA']['AssetAdmin_right.ss']['CHOOSEPAGE'] = 'فضلاً اختر ضفحة من القائمة';
 $lang['ar_SA']['AssetAdmin_right.ss']['WELCOME'] = 'أهلاً بك في';
 $lang['ar_SA']['AssetAdmin_uploadiframe.ss']['PERMFAILED'] = 'لا تملك صلاحيات لرفع الملفات إلى هذا المجلد';
+$lang['ar_SA']['AssetAdmin_uploadiframe.ss']['TITLE'] = 'إطار رفع الصور';
 $lang['ar_SA']['AssetTableField']['CAPTION'] = 'العنوان';
 $lang['ar_SA']['AssetTableField']['CREATED'] = 'أول المرفوعات';
 $lang['ar_SA']['AssetTableField']['DIM'] = 'الأبعاد';
@@ -73,6 +73,15 @@ $lang['ar_SA']['AssetTableField']['SWFFILEOPTIONS'] = 'خيارات ملف ال
 $lang['ar_SA']['AssetTableField']['TITLE'] = 'العنوان';
 $lang['ar_SA']['AssetTableField']['TYPE'] = 'النوع';
 $lang['ar_SA']['AssetTableField']['URL'] = 'الرابط';
+$lang['ar_SA']['CMSBatchActions']['DELETED_PAGES'] = '%d من الصفحات المحذوفة من الموقع المنشور';
+$lang['ar_SA']['CMSBatchActions']['DELETE_PAGES'] = 'حذف من الصفحة المنشورة';
+$lang['ar_SA']['CMSBatchActions']['DELETING_PAGES'] = 'حذف الصفحات المحددة من قائمة الصفحات المنشورة';
+$lang['ar_SA']['CMSBatchActions']['PUBLISHED_PAGES'] = '%d من الصفحات المنشورة';
+$lang['ar_SA']['CMSBatchActions']['PUBLISHING_PAGES'] = 'الصفحات المنشورة';
+$lang['ar_SA']['CMSBatchActions']['PUBLISH_PAGES'] = 'النشر';
+$lang['ar_SA']['CMSBatchActions']['UNPUBLISHED_PAGES'] = '%d من الصفحات غير المنشورة';
+$lang['ar_SA']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'صفحات غير منشورة';
+$lang['ar_SA']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'غير منشور';
 $lang['ar_SA']['CMSLeft.ss']['DELPAGE'] = 'حذف صفحات ...';
 $lang['ar_SA']['CMSLeft.ss']['DELPAGES'] = 'احذف الصفحات المحددة';
 $lang['ar_SA']['CMSLeft.ss']['GO'] = 'اذهب';
@@ -86,12 +95,12 @@ $lang['ar_SA']['CMSMain']['CHOOSEREPORT'] = 'اختر تقرير';
 $lang['ar_SA']['CMSMain']['COMPARINGV'] = 'مقارنة الإصدارات %s و %s';
 $lang['ar_SA']['CMSMain']['COPYPUBTOSTAGE'] = 'هل ترغب فعلاً في نسخ المحتوى المنشور إلى الموقع ';
 $lang['ar_SA']['CMSMain']['DELETE'] = 'حذف من مسودة الموقع';
-$lang['ar_SA']['CMSMain']['DELETEFP'] = 'حذف من الموقع المنشور';
 $lang['ar_SA']['CMSMain']['DESCREMOVED'] = 'و %s أصول سابقة';
 $lang['ar_SA']['CMSMain']['EMAIL'] = 'البريد الإلكتروني';
 $lang['ar_SA']['CMSMain']['GO'] = 'اذهب';
 $lang['ar_SA']['CMSMain']['MENUTITLE'] = 'محتوى الموقع';
 $lang['ar_SA']['CMSMain']['MENUTITLE'] = 'محتوى الموقع';
+$lang['ar_SA']['CMSMain']['MENUTITLEOPT'] = 'Navigation Label';
 $lang['ar_SA']['CMSMain']['METADESCOPT'] = 'الوصف';
 $lang['ar_SA']['CMSMain']['METAKEYWORDSOPT'] = 'الكلمات المفتاحية';
 $lang['ar_SA']['CMSMain']['NEW'] = 'جديد';
@@ -119,7 +128,6 @@ $lang['ar_SA']['CMSMain']['REMOVEDFD'] = 'حذف من الموقع المسود
 $lang['ar_SA']['CMSMain']['REMOVEDPAGE'] = 'إلغاء \'%s\' من الموقع المنشور';
 $lang['ar_SA']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = '\'%s\' محذوف من مسودة الموقع';
 $lang['ar_SA']['CMSMain']['REPORT'] = 'التقرير';
-$lang['ar_SA']['CMSMain']['RESTORE'] = 'استعادة';
 $lang['ar_SA']['CMSMain']['RESTORED'] = 'تم تخزين \'%s\' بنجاح';
 $lang['ar_SA']['CMSMain']['ROLLBACK'] = 'عودة إلى هذا الإصدار';
 $lang['ar_SA']['CMSMain']['ROLLEDBACKPUB'] = 'عودة للإصدار المنشور . الإصدار الجديد يحمل الرقم #%d';
@@ -127,6 +135,7 @@ $lang['ar_SA']['CMSMain']['ROLLEDBACKVERSION'] = 'عودة للإصدار #%d. 
 $lang['ar_SA']['CMSMain']['SAVE'] = 'حفظ';
 $lang['ar_SA']['CMSMain']['SENTTO'] = 'تم الإرسال إلى %s %s للموافقة';
 $lang['ar_SA']['CMSMain']['STATUSOPT'] = 'الحالة';
+$lang['ar_SA']['CMSMain']['TITLEOPT'] = 'العنوان';
 $lang['ar_SA']['CMSMain']['TOTALPAGES'] = 'مجموع الصفحات';
 $lang['ar_SA']['CMSMain']['VERSIONSNOPAGE'] = 'لا يمكن إيجاد الصفحة رقم #%d';
 $lang['ar_SA']['CMSMain']['VIEWING'] = 'أنت الآن تشاهد الإصدار #%s. إنشاء  %s بواسطة %s';
@@ -139,8 +148,8 @@ $lang['ar_SA']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'تمت الإضافة إلى
 $lang['ar_SA']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'أضف معيار ...';
 $lang['ar_SA']['CMSMain_left.ss']['BATCHACTIONS'] = 'الإجراءات';
 $lang['ar_SA']['CMSMain_left.ss']['CHANGED'] = 'تم التغيير';
+$lang['ar_SA']['CMSMain_left.ss']['CLEARTITLE'] = 'مسح كلمات البحث وعرض جميع العناصر';
 $lang['ar_SA']['CMSMain_left.ss']['CLOSEBOX'] = 'اضغط لإغلاق الصفحة';
-$lang['ar_SA']['CMSMain_left.ss']['COMMENTS'] = 'تعليقات';
 $lang['ar_SA']['CMSMain_left.ss']['COMPAREMODE'] = 'وضع المقارنة ( اضغط 2 للأسفل )';
 $lang['ar_SA']['CMSMain_left.ss']['CREATE'] = 'إنشاء';
 $lang['ar_SA']['CMSMain_left.ss']['DEL'] = 'محذوف';
@@ -150,8 +159,10 @@ $lang['ar_SA']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'تم تعديلها في م
 $lang['ar_SA']['CMSMain_left.ss']['EDITEDSINCE'] = 'معدل منذ';
 $lang['ar_SA']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'السماح بتغيير الترتيب عن طريق الإمساك و الإفلات';
 $lang['ar_SA']['CMSMain_left.ss']['GO'] = 'اذهب';
+$lang['ar_SA']['CMSMain_left.ss']['HIDDEN'] = 'مخفي';
 $lang['ar_SA']['CMSMain_left.ss']['KEY'] = 'الكلمة المفتاحية :';
 $lang['ar_SA']['CMSMain_left.ss']['NEW'] = 'جديد';
+$lang['ar_SA']['CMSMain_left.ss']['NOTINMENU'] = 'مستبعد من القائمة';
 $lang['ar_SA']['CMSMain_left.ss']['OPENBOX'] = 'اضغط لفتح هذا الصندوق';
 $lang['ar_SA']['CMSMain_left.ss']['PAGEVERSIONH'] = 'تاريخ إصدارات الصفحة';
 $lang['ar_SA']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'انشر الصفحات المختارة';
@@ -163,8 +174,6 @@ $lang['ar_SA']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'اعرض الصفحات
 $lang['ar_SA']['CMSMain_left.ss']['SHOWUNPUB'] = 'إظهار الإصدارات الغير منشورة';
 $lang['ar_SA']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'محتوى و هيكلة الموقع';
 $lang['ar_SA']['CMSMain_left.ss']['SITEREPORTS'] = 'تقارير الموقع';
-$lang['ar_SA']['CMSMain_left.ss']['TASKLIST'] = 'قائمة المهام';
-$lang['ar_SA']['CMSMain_left.ss']['WAITINGON'] = 'انتظار';
 $lang['ar_SA']['CMSMain_right.ss']['ANYMESSAGE'] = 'هل لديك أي رسالة للكاتب';
 $lang['ar_SA']['CMSMain_right.ss']['CHOOSEPAGE'] = 'فضلاً اختر صفحة من القائمة';
 $lang['ar_SA']['CMSMain_right.ss']['LOADING'] = 'تحميل ...';
@@ -186,6 +195,7 @@ $lang['ar_SA']['CommentAdmin']['APPROVED'] = 'التعليقات الموافق
 $lang['ar_SA']['CommentAdmin']['APPROVEDCOMMENTS'] = 'تعليقات تمت الموافقة عليها';
 $lang['ar_SA']['CommentAdmin']['AUTHOR'] = 'الكاتب';
 $lang['ar_SA']['CommentAdmin']['COMMENT'] = 'التعليق';
+$lang['ar_SA']['CommentAdmin']['COMMENTERURL'] = 'الرابط';
 $lang['ar_SA']['CommentAdmin']['COMMENTS'] = 'التعليقات';
 $lang['ar_SA']['CommentAdmin']['COMMENTSAWAITINGMODERATION'] = 'تعليقات بانتظار موافقة الإدارة';
 $lang['ar_SA']['CommentAdmin']['DATEPOSTED'] = 'تدوين التاريخ';
@@ -247,6 +257,7 @@ $lang['ar_SA']['ImageEditor.ss']['SEPIA'] = 'Sepia';
 $lang['ar_SA']['ImageEditor.ss']['UNDO'] = 'تراجع';
 $lang['ar_SA']['ImageEditor.ss']['UNTITLED'] = 'مستند بدون عنوان';
 $lang['ar_SA']['ImageEditor.ss']['WIDTH'] = 'عرض';
+$lang['ar_SA']['LeftAndMain']['CANT_REORGANISE'] = 'لا تملك الصلاحية لتعديل شجرة الموقع. تعديلاتك لن يتم حفظها';
 $lang['ar_SA']['LeftAndMain']['CHANGEDURL'] = 'تم تغيير الرابط إلى \'%s\'';
 $lang['ar_SA']['LeftAndMain']['COMMENTS'] = 'التعليقات';
 $lang['ar_SA']['LeftAndMain']['FILESIMAGES'] = 'الملفات و الصور';
@@ -282,17 +293,6 @@ $lang['ar_SA']['LeftAndMain.ss']['VIEWPAGEIN'] = 'عرض الصفحة:';
 $lang['ar_SA']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = 'تم نشر \'%s\' بنجاح';
 $lang['ar_SA']['LeftAndMain']['STATUSTO'] = 'تم تغيير الحالة إلى \'%s\'';
 $lang['ar_SA']['LeftAndMain']['TREESITECONTENT'] = 'محتوى الموقع';
-$lang['ar_SA']['MemberList']['ADD'] = 'إضافة';
-$lang['ar_SA']['MemberList']['ANYGROUP'] = 'أي مجموعة';
-$lang['ar_SA']['MemberList']['ASC'] = 'تصاعدي';
-$lang['ar_SA']['MemberList']['DESC'] = 'تنازلي';
-$lang['ar_SA']['MemberList']['EMAIL'] = 'البريد الإلكتروني';
-$lang['ar_SA']['MemberList']['FILTERBYG'] = 'تصفية بالمجموعة';
-$lang['ar_SA']['MemberList']['FN'] = 'الاسم الأول';
-$lang['ar_SA']['MemberList']['ORDERBY'] = 'ترتيب بواسطة';
-$lang['ar_SA']['MemberList']['PASSWD'] = 'الرقم السري';
-$lang['ar_SA']['MemberList']['SEARCH'] = 'بحث';
-$lang['ar_SA']['MemberList']['SN'] = 'اسم العائلة';
 $lang['ar_SA']['MemberList.ss']['FILTER'] = 'رشح';
 $lang['ar_SA']['MemberList_PageControls.ss']['DISPLAYING'] = 'عرض';
 $lang['ar_SA']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'الأعضاء';
@@ -316,6 +316,7 @@ $lang['ar_SA']['MemberTableField']['ANYGROUP'] = 'أي مجموعة';
 $lang['ar_SA']['MemberTableField']['ASC'] = 'تصاعدي';
 $lang['ar_SA']['MemberTableField']['DESC'] = 'تنازلي';
 $lang['ar_SA']['MemberTableField']['EMAIL'] = 'البريد الإلكتروني';
+$lang['ar_SA']['MemberTableField']['ERRORADDINGUSER'] = 'هناك خطأ عند إضافة عضو جديد إلى المجموعة : %s';
 $lang['ar_SA']['MemberTableField']['FILTER'] = 'تصفية';
 $lang['ar_SA']['MemberTableField']['FILTERBYGROUP'] = 'تصفية بالمجموعة';
 $lang['ar_SA']['MemberTableField']['FIRSTNAME'] = 'الاسم الأول';
@@ -324,12 +325,12 @@ $lang['ar_SA']['MemberTableField']['SEARCH'] = 'بحث';
 $lang['ar_SA']['MemberTableField.ss']['ADDNEW'] = 'إضافة جديد';
 $lang['ar_SA']['MemberTableField.ss']['DELETEMEMBER'] = 'حذف هذا العضو';
 $lang['ar_SA']['MemberTableField.ss']['EDITMEMBER'] = 'تعديل هذا العضو';
+$lang['ar_SA']['MemberTableField.ss']['NOITEMSFOUND'] = 'لاتوجد نتائج';
 $lang['ar_SA']['MemberTableField.ss']['SHOWMEMBER'] = 'اعرض هذا العضو';
 $lang['ar_SA']['MemberTableField']['SURNAME'] = 'اسم العائلة';
 $lang['ar_SA']['ModelAdmin']['ADDBUTTON'] = 'إضافة';
 $lang['ar_SA']['ModelAdmin']['ADDFORM'] = 'أكمل هذا النموذج لإضافة  %s إلى قاعدة البيانات';
 $lang['ar_SA']['ModelAdmin']['CHOOSE_COLUMNS'] = 'اختر أعمدة النتائج';
-$lang['ar_SA']['ModelAdmin']['CLASSTYPE'] = 'النوع';
 $lang['ar_SA']['ModelAdmin']['CLEAR_SEARCH'] = 'تجديد البحث';
 $lang['ar_SA']['ModelAdmin']['CREATEBUTTON'] = 'إنشاء %s';
 $lang['ar_SA']['ModelAdmin']['DELETE'] = 'حذف';
@@ -345,6 +346,7 @@ $lang['ar_SA']['ModelAdmin']['NOCSVFILE'] = 'فضلاً استعرض ملف CSV
 $lang['ar_SA']['ModelAdmin']['NOIMPORT'] = 'لايوجد شيء للاستيراد';
 $lang['ar_SA']['ModelAdmin']['NORESULTS'] = 'لا نتائج';
 $lang['ar_SA']['ModelAdmin']['SAVE'] = 'حفظ';
+$lang['ar_SA']['ModelAdmin']['SEARCHFOR'] = 'البحث عن :';
 $lang['ar_SA']['ModelAdmin']['SEARCHRESULTS'] = 'بحث النتائج';
 $lang['ar_SA']['ModelAdmin']['SELECTALL'] = 'تحديد الكل';
 $lang['ar_SA']['ModelAdmin']['SELECTNONE'] = 'غير محدد';
@@ -354,10 +356,12 @@ $lang['ar_SA']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'عرض مواص
 $lang['ar_SA']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'العلاقات';
 $lang['ar_SA']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'مواصفات %s';
 $lang['ar_SA']['ModelAdmin_left.ss']['ADDLISTING'] = 'إضافة';
-$lang['ar_SA']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'إضافة';
 $lang['ar_SA']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'استيراد';
 $lang['ar_SA']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'بحث';
 $lang['ar_SA']['ModelAdmin_right.ss']['WELCOME1'] = 'مرحباً بك في %s. فضلاً اختر أحد المدخلات من القائمة اليسرى';
+$lang['ar_SA']['ModelSidebar.ss']['ADDLISTING'] = 'إضافة';
+$lang['ar_SA']['ModelSidebar.ss']['IMPORT_TAB_HEADER'] = 'استيراد';
+$lang['ar_SA']['ModelSidebar.ss']['SEARCHLISTINGS'] = 'البحث';
 $lang['ar_SA']['PageComment']['Comment'] = 'التعليقات';
 $lang['ar_SA']['PageComment']['COMMENTBY'] = 'تم التعليق بواسطة \'%s\' على %s';
 $lang['ar_SA']['PageComment']['IsSpam'] = 'رسالة مزعجة ؟';
@@ -368,7 +372,11 @@ $lang['ar_SA']['PageComment']['SINGULARNAME'] = 'تعليق الصفحة';
 $lang['ar_SA']['PageCommentInterface']['COMMENTERURL'] = 'رابط موقعك';
 $lang['ar_SA']['PageCommentInterface']['POST'] = 'التدوينة';
 $lang['ar_SA']['PageCommentInterface']['SPAMQUESTION'] = 'سؤال الحماية من الرسائل المصاحبة: %s';
+$lang['ar_SA']['PageCommentInterface.ss']['COMMENTLOGINERROR'] = 'لا تستطيع كتابة التعليقات حتى تقوم بعملية التسجيل';
+$lang['ar_SA']['PageCommentInterface.ss']['COMMENTPERMISSIONERROR'] = 'يجب أن تملك مستوى الصلاحيات المناسب للقيام بالتعديل';
+$lang['ar_SA']['PageCommentInterface.ss']['COMMENTPOSTLOGIN'] = 'الدخول ';
 $lang['ar_SA']['PageCommentInterface.ss']['COMMENTS'] = 'التعليقات';
+$lang['ar_SA']['PageCommentInterface.ss']['COMMENTSDISABLED'] = 'إضافة التعليقات معطلة';
 $lang['ar_SA']['PageCommentInterface.ss']['NEXT'] = 'التالي';
 $lang['ar_SA']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'لايوجد أحد علق على هذه التدوينة';
 $lang['ar_SA']['PageCommentInterface.ss']['POSTCOM'] = 'نشر تعليقك';
@@ -417,7 +425,6 @@ $lang['ar_SA']['StaticExporter']['BASEURL'] = 'الرابط الأساسي';
 $lang['ar_SA']['StaticExporter']['EXPORTTO'] = 'تصدير إلى مجلد';
 $lang['ar_SA']['StaticExporter']['FOLDEREXPORT'] = 'مجلدات لتصديرها إلى';
 $lang['ar_SA']['StaticExporter']['NAME'] = 'المصدر الثابت Exporter';
-$lang['ar_SA']['StaticExporter']['ONETHATEXISTS'] = 'فضلاً حدد مجلداً موجوداً';
 $lang['ar_SA']['TableListField_PageControls.ss']['DISPLAYING'] = 'عرض';
 $lang['ar_SA']['TableListField_PageControls.ss']['OF'] = 'من';
 $lang['ar_SA']['TableListField_PageControls.ss']['TO'] = 'إلى';
@@ -425,12 +432,10 @@ $lang['ar_SA']['TableListField_PageControls.ss']['VIEWFIRST'] = 'عرض الأو
 $lang['ar_SA']['TableListField_PageControls.ss']['VIEWLAST'] = 'عرض الأخير';
 $lang['ar_SA']['TableListField_PageControls.ss']['VIEWNEXT'] = 'عرض التالي';
 $lang['ar_SA']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'عرض السابق';
-$lang['ar_SA']['TaskList.ss']['BY'] = 'بواسطة';
 $lang['ar_SA']['ThumbnailStripField']['NOFLASHFOUND'] = 'لايوجد ملفات فلاش';
 $lang['ar_SA']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'لايوجد ملفات فلاش';
 $lang['ar_SA']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'لايوجد صور';
 $lang['ar_SA']['ThumbnailStripField']['NOIMAGESFOUND'] = 'لم يتم العثور على الصور';
-$lang['ar_SA']['ThumbnailStripField']['NOTAFOLDER'] = 'هذا ليس مجلداً';
 $lang['ar_SA']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = 'اختر مجلد أو ابحث بالأعلى';
 $lang['ar_SA']['ViewArchivedEmail.ss']['CANACCESS'] = 'يمكنك الدخول إلى أرشيف الموقع عن طريق الرابط التالي :';
 $lang['ar_SA']['ViewArchivedEmail.ss']['HAVEASKED'] = 'تم طلب مشاهدة محتوى الموقع في';
diff --git a/lang/bg_BG.php b/lang/bg_BG.php
index 2289152a..d53e9f58 100644
--- a/lang/bg_BG.php
+++ b/lang/bg_BG.php
@@ -17,8 +17,6 @@ if(array_key_exists('bg_BG', $lang) && is_array($lang['bg_BG'])) {
 }
 
 $lang['bg_BG']['AssetAdmin']['CHOOSEFILE'] = 'Избери файл';
-$lang['bg_BG']['AssetAdmin']['CONTENTMODBY'] = 'Съдържанието достъпно за промяна от';
-$lang['bg_BG']['AssetAdmin']['CONTENTUSABLEBY'] = 'Съдържанието достъпно за изполване от';
 $lang['bg_BG']['AssetAdmin']['DELETEDX'] = 'Изтрити %s файлове. %s';
 $lang['bg_BG']['AssetAdmin']['FILESREADY'] = 'Файлове готови за качване:';
 $lang['bg_BG']['AssetAdmin']['FOLDERDELETED'] = 'Изтрита папка.';
@@ -30,7 +28,6 @@ $lang['bg_BG']['AssetAdmin']['NOTEMP'] = 'Няма временна директ
 $lang['bg_BG']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Нямаше нищо за качване';
 $lang['bg_BG']['AssetAdmin']['NOWBROKEN'] = 'Показаните страници съдържат невалидни връзки:';
 $lang['bg_BG']['AssetAdmin']['NOWBROKEN2'] = 'Собствениците на страниците бяха информирани по мейл и скоро ще оправят проблемите.';
-$lang['bg_BG']['AssetAdmin']['OWNER'] = 'Собственик';
 $lang['bg_BG']['AssetAdmin']['SAVEDFILE'] = 'Съхранен файл %s';
 $lang['bg_BG']['AssetAdmin']['SAVEFOLDERNAME'] = 'Съхрани името на папката';
 $lang['bg_BG']['AssetAdmin']['THUMBSDELETED'] = 'Всички неизползвани миниатури бяха изтрити';
@@ -84,7 +81,6 @@ $lang['bg_BG']['CMSMain']['CHOOSEREPORT'] = '(Изберете доклад)';
 $lang['bg_BG']['CMSMain']['COMPARINGV'] = 'Вие сравнявате версии #%d и #%d';
 $lang['bg_BG']['CMSMain']['COPYPUBTOSTAGE'] = 'Наистина ли искате да копирате публикуваното съдържание на етапния сайт? ';
 $lang['bg_BG']['CMSMain']['DELETE'] = 'Изтрий от черновия сайт';
-$lang['bg_BG']['CMSMain']['DELETEFP'] = 'Изтрий от публикувания сайт';
 $lang['bg_BG']['CMSMain']['DESCREMOVED'] = 'и %s низходящи';
 $lang['bg_BG']['CMSMain']['EMAIL'] = 'e-mail';
 $lang['bg_BG']['CMSMain']['GO'] = 'Давай';
@@ -114,7 +110,6 @@ $lang['bg_BG']['CMSMain']['REMOVEDFD'] = 'Премахнато от чернов
 $lang['bg_BG']['CMSMain']['REMOVEDPAGE'] = 'Премахнато \'%s\' от публикувания сайт';
 $lang['bg_BG']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Премахното \'%s\' от черновият сайт';
 $lang['bg_BG']['CMSMain']['REPORT'] = 'Доклад';
-$lang['bg_BG']['CMSMain']['RESTORE'] = 'Възстанови';
 $lang['bg_BG']['CMSMain']['RESTORED'] = 'Възстановен \'%s\' успешно';
 $lang['bg_BG']['CMSMain']['ROLLBACK'] = 'Върни обратно към тази версия';
 $lang['bg_BG']['CMSMain']['ROLLEDBACKPUB'] = 'Върнато обратно на публикуваната версия. Новата версия е #%d';
@@ -135,7 +130,6 @@ $lang['bg_BG']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Добавете кр
 $lang['bg_BG']['CMSMain_left.ss']['BATCHACTIONS'] = 'Многобройни действия';
 $lang['bg_BG']['CMSMain_left.ss']['CHANGED'] = 'променено';
 $lang['bg_BG']['CMSMain_left.ss']['CLOSEBOX'] = 'Кликнете за да затворите кутията';
-$lang['bg_BG']['CMSMain_left.ss']['COMMENTS'] = 'Коментари';
 $lang['bg_BG']['CMSMain_left.ss']['COMPAREMODE'] = 'Функция за сравняване ( изберете 2)';
 $lang['bg_BG']['CMSMain_left.ss']['CREATE'] = 'Създай';
 $lang['bg_BG']['CMSMain_left.ss']['DEL'] = 'изтрит';
@@ -158,8 +152,6 @@ $lang['bg_BG']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Покажи само п
 $lang['bg_BG']['CMSMain_left.ss']['SHOWUNPUB'] = 'Покажи непубликуваните версии';
 $lang['bg_BG']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Съдържание и структура';
 $lang['bg_BG']['CMSMain_left.ss']['SITEREPORTS'] = 'Доклади на сайта';
-$lang['bg_BG']['CMSMain_left.ss']['TASKLIST'] = 'Списък задачи';
-$lang['bg_BG']['CMSMain_left.ss']['WAITINGON'] = 'Чакане на';
 $lang['bg_BG']['CMSMain_right.ss']['ANYMESSAGE'] = 'Имате ли някакво съобщение за вашия издател?';
 $lang['bg_BG']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Моля, изберете страница от ляво.';
 $lang['bg_BG']['CMSMain_right.ss']['LOADING'] = 'зареждане...';
@@ -261,17 +253,6 @@ $lang['bg_BG']['LeftAndMain.ss']['VIEWINPUBLISHED'] = 'Виж тази стра
 $lang['bg_BG']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Изглед на страница:';
 $lang['bg_BG']['LeftAndMain']['STATUSTO'] = 'Състояние променено на \' %s \'';
 $lang['bg_BG']['LeftAndMain']['TREESITECONTENT'] = 'Съдържание на сайта';
-$lang['bg_BG']['MemberList']['ADD'] = 'Добави';
-$lang['bg_BG']['MemberList']['ANYGROUP'] = 'Всякаква група';
-$lang['bg_BG']['MemberList']['ASC'] = 'Възходящ';
-$lang['bg_BG']['MemberList']['DESC'] = 'Низходящ';
-$lang['bg_BG']['MemberList']['EMAIL'] = 'e-mail';
-$lang['bg_BG']['MemberList']['FILTERBYG'] = 'Филтрирай по групи';
-$lang['bg_BG']['MemberList']['FN'] = 'Име';
-$lang['bg_BG']['MemberList']['ORDERBY'] = 'Подреди по';
-$lang['bg_BG']['MemberList']['PASSWD'] = 'Парола';
-$lang['bg_BG']['MemberList']['SEARCH'] = 'Търси';
-$lang['bg_BG']['MemberList']['SN'] = 'Фамилия';
 $lang['bg_BG']['MemberList.ss']['FILTER'] = 'Филтрирай';
 $lang['bg_BG']['MemberList_PageControls.ss']['DISPLAYING'] = 'Показани';
 $lang['bg_BG']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'потребители';
@@ -306,14 +287,12 @@ $lang['bg_BG']['MemberTableField.ss']['EDITMEMBER'] = 'Промени този 
 $lang['bg_BG']['MemberTableField.ss']['SHOWMEMBER'] = 'Покажи този потребител';
 $lang['bg_BG']['MemberTableField']['SURNAME'] = 'Фамилия';
 $lang['bg_BG']['ModelAdmin']['ADDBUTTON'] = 'Добави';
-$lang['bg_BG']['ModelAdmin']['CLASSTYPE'] = 'Вид';
 $lang['bg_BG']['ModelAdmin']['CLEAR_SEARCH'] = 'Изчисти търсенето';
 $lang['bg_BG']['ModelAdmin']['DELETE'] = 'Изтрий';
 $lang['bg_BG']['ModelAdmin']['GOBACK'] = 'Назад';
 $lang['bg_BG']['ModelAdmin']['IMPORT'] = 'Внеси от CSV';
 $lang['bg_BG']['ModelAdmin']['SAVE'] = 'Съхрани';
 $lang['bg_BG']['ModelAdmin']['SEARCHRESULTS'] = 'Резултати от търсенето';
-$lang['bg_BG']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Добави';
 $lang['bg_BG']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Внеси';
 $lang['bg_BG']['PageComment']['COMMENTBY'] = 'Коментар от \'%s\' относно %s';
 $lang['bg_BG']['PageCommentInterface']['POST'] = 'Публикувай';
@@ -363,10 +342,7 @@ $lang['bg_BG']['StaticExporter']['BASEURL'] = 'Основен URL';
 $lang['bg_BG']['StaticExporter']['EXPORTTO'] = 'Експортирай в тази папка';
 $lang['bg_BG']['StaticExporter']['FOLDEREXPORT'] = 'Папка към която да се експортира';
 $lang['bg_BG']['StaticExporter']['NAME'] = 'Статичен експортър';
-$lang['bg_BG']['StaticExporter']['ONETHATEXISTS'] = 'Моля укажете съществуваща папка';
-$lang['bg_BG']['TaskList.ss']['BY'] = 'от';
 $lang['bg_BG']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Не са намерени никакви изображения';
-$lang['bg_BG']['ThumbnailStripField']['NOTAFOLDER'] = 'Това не е папка';
 $lang['bg_BG']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Избери папка по-горе)';
 $lang['bg_BG']['ViewArchivedEmail.ss']['CANACCESS'] = 'Можете да влезнете в архивирания сайт чрез тази препратка:';
 $lang['bg_BG']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Вие поискахте да видите съдържанието на нашия сайт на';
diff --git a/lang/ca_AD.php b/lang/ca_AD.php
index 1bae8648..bba798f6 100644
--- a/lang/ca_AD.php
+++ b/lang/ca_AD.php
@@ -17,8 +17,6 @@ if(array_key_exists('ca_AD', $lang) && is_array($lang['ca_AD'])) {
 }
 
 $lang['ca_AD']['AssetAdmin']['CHOOSEFILE'] = 'Trieu un fitxer';
-$lang['ca_AD']['AssetAdmin']['CONTENTMODBY'] = 'Contingut modificable per';
-$lang['ca_AD']['AssetAdmin']['CONTENTUSABLEBY'] = 'Contingut usable per';
 $lang['ca_AD']['AssetAdmin']['DELETEDX'] = 'S\'han esborrat %s fitxers.%s';
 $lang['ca_AD']['AssetAdmin']['FILESREADY'] = 'Fitxers llestos per a carregar:';
 $lang['ca_AD']['AssetAdmin']['FOLDERDELETED'] = 'carpeta suprimida.';
@@ -31,7 +29,6 @@ $lang['ca_AD']['AssetAdmin']['NOTEMP'] = 'No hi ha cap carpeta temporal per a c
 $lang['ca_AD']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'No hi havia res a carregar';
 $lang['ca_AD']['AssetAdmin']['NOWBROKEN'] = 'Les pàgines següents ara tenen enllaços trencats:';
 $lang['ca_AD']['AssetAdmin']['NOWBROKEN2'] = 'Els seus propietaris han rebut un correu i arreglaran aquestes pàgines.';
-$lang['ca_AD']['AssetAdmin']['OWNER'] = 'Propietari';
 $lang['ca_AD']['AssetAdmin']['SAVEDFILE'] = 'S\'ha desat el fitxer %s';
 $lang['ca_AD']['AssetAdmin']['SAVEFOLDERNAME'] = 'Nom de la carpeta per desar';
 $lang['ca_AD']['AssetAdmin']['THUMBSDELETED'] = 'Totes les miniatures no usades s\'han suprimit';
@@ -85,7 +82,6 @@ $lang['ca_AD']['CMSMain']['CHOOSEREPORT'] = '(Trieu un informe)';
 $lang['ca_AD']['CMSMain']['COMPARINGV'] = 'Esteu comparant les versions #%d i #%d';
 $lang['ca_AD']['CMSMain']['COPYPUBTOSTAGE'] = 'Voleu realment copiar el contingut publicat al lloc esborrany?';
 $lang['ca_AD']['CMSMain']['DELETE'] = 'Suprimeix del lloc esborrany';
-$lang['ca_AD']['CMSMain']['DELETEFP'] = 'Eliminat del lloc publicat';
 $lang['ca_AD']['CMSMain']['DESCREMOVED'] = 'i %s descendents';
 $lang['ca_AD']['CMSMain']['EMAIL'] = 'Correu electrònic';
 $lang['ca_AD']['CMSMain']['GO'] = 'Vés';
@@ -116,7 +112,6 @@ $lang['ca_AD']['CMSMain']['REMOVEDFD'] = 'Eliminat del lloc esborrany';
 $lang['ca_AD']['CMSMain']['REMOVEDPAGE'] = 'S\'ha eliminat \'%s\' del lloc publicat';
 $lang['ca_AD']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'S\'ha suprimit  \'%s\' del lloc esborrany';
 $lang['ca_AD']['CMSMain']['REPORT'] = 'Informe';
-$lang['ca_AD']['CMSMain']['RESTORE'] = 'Restaura';
 $lang['ca_AD']['CMSMain']['RESTORED'] = 'S\'ha restaurat la pàgina \'%s\' amb èxit';
 $lang['ca_AD']['CMSMain']['ROLLBACK'] = 'Torna a aquesta versió';
 $lang['ca_AD']['CMSMain']['ROLLEDBACKPUB'] = 'S\'ha tornat a la versió publicada. El nou número de versió és #%d';
@@ -137,7 +132,6 @@ $lang['ca_AD']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Afegeix un criteri...'
 $lang['ca_AD']['CMSMain_left.ss']['BATCHACTIONS'] = 'Quantitat Accio';
 $lang['ca_AD']['CMSMain_left.ss']['CHANGED'] = 'canviat';
 $lang['ca_AD']['CMSMain_left.ss']['CLOSEBOX'] = 'premeu per tancar la caixa';
-$lang['ca_AD']['CMSMain_left.ss']['COMMENTS'] = 'Comentaris';
 $lang['ca_AD']['CMSMain_left.ss']['COMPAREMODE'] = 'Mode de comparació (trieu-ne 2 de sota)';
 $lang['ca_AD']['CMSMain_left.ss']['CREATE'] = 'Crea...';
 $lang['ca_AD']['CMSMain_left.ss']['DEL'] = 'eliminat';
@@ -160,8 +154,6 @@ $lang['ca_AD']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Mostra només pàgines c
 $lang['ca_AD']['CMSMain_left.ss']['SHOWUNPUB'] = 'Mostra versions no publicades';
 $lang['ca_AD']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Contingut del lloc i estructura';
 $lang['ca_AD']['CMSMain_left.ss']['SITEREPORTS'] = 'Informes del lloc';
-$lang['ca_AD']['CMSMain_left.ss']['TASKLIST'] = 'Llista de tasques';
-$lang['ca_AD']['CMSMain_left.ss']['WAITINGON'] = 'Esperant a';
 $lang['ca_AD']['CMSMain_right.ss']['ANYMESSAGE'] = 'Teniu algun missatge per al vostre editor?';
 $lang['ca_AD']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Si us plau, trieu una pàgina de l\'esquerra.';
 $lang['ca_AD']['CMSMain_right.ss']['LOADING'] = 's\'està carregant...';
@@ -272,17 +264,6 @@ $lang['ca_AD']['LeftAndMain.ss']['VIEWINPUBLISHED'] = 'Veure aquesta pàgina al
 $lang['ca_AD']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Vista de pàgina:';
 $lang['ca_AD']['LeftAndMain']['STATUSTO'] = 'S\'ha canviat l\'estat a \'%s\'';
 $lang['ca_AD']['LeftAndMain']['TREESITECONTENT'] = 'Contigut de Lloc';
-$lang['ca_AD']['MemberList']['ADD'] = 'Afegeix';
-$lang['ca_AD']['MemberList']['ANYGROUP'] = 'Qualsevol grup';
-$lang['ca_AD']['MemberList']['ASC'] = 'Ascendent';
-$lang['ca_AD']['MemberList']['DESC'] = 'Descendent';
-$lang['ca_AD']['MemberList']['EMAIL'] = 'Correu electrònic';
-$lang['ca_AD']['MemberList']['FILTERBYG'] = 'Filtra per grup';
-$lang['ca_AD']['MemberList']['FN'] = 'Nom';
-$lang['ca_AD']['MemberList']['ORDERBY'] = 'Ordena per';
-$lang['ca_AD']['MemberList']['PASSWD'] = 'Contrasenya';
-$lang['ca_AD']['MemberList']['SEARCH'] = 'Cerca';
-$lang['ca_AD']['MemberList']['SN'] = 'Cognom';
 $lang['ca_AD']['MemberList.ss']['FILTER'] = 'Filtrar';
 $lang['ca_AD']['MemberList_PageControls.ss']['DISPLAYING'] = 'S\'està mostrant';
 $lang['ca_AD']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'membres';
@@ -319,7 +300,6 @@ $lang['ca_AD']['MemberTableField']['SURNAME'] = 'Cognom';
 $lang['ca_AD']['ModelAdmin']['ADDBUTTON'] = 'Afegeix';
 $lang['ca_AD']['ModelAdmin']['ADDFORM'] = 'Ompliu aquest formulari per a afegir un %s a la base de dades.';
 $lang['ca_AD']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Selecciona les columnes de resultats..';
-$lang['ca_AD']['ModelAdmin']['CLASSTYPE'] = 'Tipus';
 $lang['ca_AD']['ModelAdmin']['CLEAR_SEARCH'] = 'Neteja la cerca';
 $lang['ca_AD']['ModelAdmin']['CREATEBUTTON'] = 'Crea un/a \'%s\'';
 $lang['ca_AD']['ModelAdmin']['DELETE'] = 'Suprimeix';
@@ -344,7 +324,6 @@ $lang['ca_AD']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Mostra l\'especi
 $lang['ca_AD']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Relacions';
 $lang['ca_AD']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Especificació per a %s';
 $lang['ca_AD']['ModelAdmin_left.ss']['ADDLISTING'] = 'Afegeix un llistat';
-$lang['ca_AD']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Afegeix';
 $lang['ca_AD']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Importa';
 $lang['ca_AD']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Llistats de cerca';
 $lang['ca_AD']['ModelAdmin_right.ss']['WELCOME1'] = 'Benvingut a %s. Si us plau, trieu una de les entrades del panell esquerra.';
@@ -404,7 +383,6 @@ $lang['ca_AD']['StaticExporter']['BASEURL'] = 'URL Base';
 $lang['ca_AD']['StaticExporter']['EXPORTTO'] = 'Exporta a aquella carpeta';
 $lang['ca_AD']['StaticExporter']['FOLDEREXPORT'] = 'Carpeta on exportar';
 $lang['ca_AD']['StaticExporter']['NAME'] = 'Exportador estàtic';
-$lang['ca_AD']['StaticExporter']['ONETHATEXISTS'] = 'Si us plau, especifiqueu una carpeta que existeixi';
 $lang['ca_AD']['TableListField_PageControls.ss']['DISPLAYING'] = 'S\'està mostrant';
 $lang['ca_AD']['TableListField_PageControls.ss']['OF'] = 'de';
 $lang['ca_AD']['TableListField_PageControls.ss']['TO'] = 'a';
@@ -412,12 +390,10 @@ $lang['ca_AD']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Veure el primer
 $lang['ca_AD']['TableListField_PageControls.ss']['VIEWLAST'] = 'Veure el darrer';
 $lang['ca_AD']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Veure el següent';
 $lang['ca_AD']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Veure l\'anterior';
-$lang['ca_AD']['TaskList.ss']['BY'] = 'per';
 $lang['ca_AD']['ThumbnailStripField']['NOFLASHFOUND'] = 'No s\'han trobat fitxers flash';
 $lang['ca_AD']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'No s\'han trobat fitxers flash a';
 $lang['ca_AD']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'No s\'han trobat imatges a';
 $lang['ca_AD']['ThumbnailStripField']['NOIMAGESFOUND'] = 'No s\'han trobat imatges a';
-$lang['ca_AD']['ThumbnailStripField']['NOTAFOLDER'] = 'Això no és una carpeta';
 $lang['ca_AD']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Trieu una carpeta a dalt)';
 $lang['ca_AD']['ViewArchivedEmail.ss']['CANACCESS'] = 'Podeu accedir al lloc arxivat en aquesta adreça:';
 $lang['ca_AD']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Heu demanat de veure el contingut del nostre lloc el';
diff --git a/lang/cs_CZ.php b/lang/cs_CZ.php
index d2cfa777..18a8253b 100644
--- a/lang/cs_CZ.php
+++ b/lang/cs_CZ.php
@@ -17,8 +17,6 @@ if(array_key_exists('cs_CZ', $lang) && is_array($lang['cs_CZ'])) {
 }
 
 $lang['cs_CZ']['AssetAdmin']['CHOOSEFILE'] = 'Vybrat soubor';
-$lang['cs_CZ']['AssetAdmin']['CONTENTMODBY'] = 'Obsah upravitelný';
-$lang['cs_CZ']['AssetAdmin']['CONTENTUSABLEBY'] = 'Obsah použitelný';
 $lang['cs_CZ']['AssetAdmin']['DELETEDX'] = 'Smazáno %s souborů.%s';
 $lang['cs_CZ']['AssetAdmin']['FILESREADY'] = 'Soubory připravené k nahrání:';
 $lang['cs_CZ']['AssetAdmin']['FOLDERDELETED'] = 'složka odstraněna.';
@@ -31,7 +29,6 @@ $lang['cs_CZ']['AssetAdmin']['NOTEMP'] = 'Nenalezen dočasný adresář pro uplo
 $lang['cs_CZ']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Nic k nahrání';
 $lang['cs_CZ']['AssetAdmin']['NOWBROKEN'] = 'Následující stránky mají nyní nefunkční odkazy:';
 $lang['cs_CZ']['AssetAdmin']['NOWBROKEN2'] = 'Jejich majitelé byly upozorněni e-mailem a měli by spravit tyto stránky.';
-$lang['cs_CZ']['AssetAdmin']['OWNER'] = 'Vlastník';
 $lang['cs_CZ']['AssetAdmin']['SAVEDFILE'] = 'Soubor %s uložen';
 $lang['cs_CZ']['AssetAdmin']['SAVEFOLDERNAME'] = 'Uložit název složky';
 $lang['cs_CZ']['AssetAdmin']['THUMBSDELETED'] = 'Všechny nepoužívané miniatury byly odstraněny.';
@@ -41,6 +38,8 @@ $lang['cs_CZ']['AssetAdmin_left.ss']['CREATE'] = 'Vytvořit';
 $lang['cs_CZ']['AssetAdmin_left.ss']['DELETE'] = 'Smazat';
 $lang['cs_CZ']['AssetAdmin_left.ss']['DELFOLDERS'] = 'Smazat vybrané složky';
 $lang['cs_CZ']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Povolit přeřazení &quot;táhni a pusť&quot;';
+$lang['cs_CZ']['AssetAdmin_left.ss']['FILESYSTEMSYNC'] = 'Hledat nové soubory';
+$lang['cs_CZ']['AssetAdmin_left.ss']['FILESYSTEMSYNC_DESC'] = 'SilverStripe udržuje svoji vlastní databázi souborů &amp; obrázků uložených ve vašem assets/ adresáři. Klikněte na tlačítko k obnovení této databáze, když jsou soubory přidány do assets/ adresáře mimo SilverStripe, například, když jste soubory nahráliif přes FTP.';
 $lang['cs_CZ']['AssetAdmin_left.ss']['FOLDERS'] = 'Složky';
 $lang['cs_CZ']['AssetAdmin_left.ss']['GO'] = 'Proveď';
 $lang['cs_CZ']['AssetAdmin_left.ss']['SELECTTODEL'] = 'Vyberte složky, které chcete smazat. Pak klikněte na tlačítko níže';
@@ -48,6 +47,7 @@ $lang['cs_CZ']['AssetAdmin_left.ss']['TOREORG'] = 'Pro organizaci Vašich slože
 $lang['cs_CZ']['AssetAdmin_right.ss']['CHOOSEPAGE'] = 'Prosím vyberte stránku vlevo.';
 $lang['cs_CZ']['AssetAdmin_right.ss']['WELCOME'] = 'Vítejte v';
 $lang['cs_CZ']['AssetAdmin_uploadiframe.ss']['PERMFAILED'] = 'Nemáte oprávnění pro nahrávání souborů do této složky.';
+$lang['cs_CZ']['AssetAdmin_uploadiframe.ss']['TITLE'] = 'Rámec nahrávání obrázku';
 $lang['cs_CZ']['AssetTableField']['CAPTION'] = 'Titulek';
 $lang['cs_CZ']['AssetTableField']['CREATED'] = 'Poprvé nahráno';
 $lang['cs_CZ']['AssetTableField']['DIM'] = 'Rozměry';
@@ -73,6 +73,15 @@ $lang['cs_CZ']['AssetTableField']['SWFFILEOPTIONS'] = 'Nastavení SWF souboru';
 $lang['cs_CZ']['AssetTableField']['TITLE'] = 'Titulek';
 $lang['cs_CZ']['AssetTableField']['TYPE'] = 'Typ';
 $lang['cs_CZ']['AssetTableField']['URL'] = 'URL';
+$lang['cs_CZ']['CMSBatchActions']['DELETED_PAGES'] = 'Smazáno %d stránek ze zveřejněného webu';
+$lang['cs_CZ']['CMSBatchActions']['DELETE_PAGES'] = 'Smazat ze zveřejněného webu';
+$lang['cs_CZ']['CMSBatchActions']['DELETING_PAGES'] = 'Mazání vybraných stránek ze zveřejněného webu';
+$lang['cs_CZ']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Zveřejněných %d stránek';
+$lang['cs_CZ']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Zveřejňování stránek';
+$lang['cs_CZ']['CMSBatchActions']['PUBLISH_PAGES'] = 'Zveřejnit';
+$lang['cs_CZ']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'Nezveřejněných %d stránek';
+$lang['cs_CZ']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'Nezveřejňování stránek';
+$lang['cs_CZ']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'Nezveřejnit';
 $lang['cs_CZ']['CMSLeft.ss']['DELPAGE'] = 'Smazat stránky...';
 $lang['cs_CZ']['CMSLeft.ss']['DELPAGES'] = 'Smazat vybrané stránky';
 $lang['cs_CZ']['CMSLeft.ss']['GO'] = 'Proveď';
@@ -86,12 +95,12 @@ $lang['cs_CZ']['CMSMain']['CHOOSEREPORT'] = '(Vyberte výkaz)';
 $lang['cs_CZ']['CMSMain']['COMPARINGV'] = 'Porovnáváte verze #%d a #%d';
 $lang['cs_CZ']['CMSMain']['COPYPUBTOSTAGE'] = 'Opravdu chcete zkopírovat zveřejněný obsah do úschovny?';
 $lang['cs_CZ']['CMSMain']['DELETE'] = 'Odstranit z návrhu';
-$lang['cs_CZ']['CMSMain']['DELETEFP'] = 'Smazat ze zveřejněných';
 $lang['cs_CZ']['CMSMain']['DESCREMOVED'] = 'a %s potomci';
 $lang['cs_CZ']['CMSMain']['EMAIL'] = 'Email';
 $lang['cs_CZ']['CMSMain']['GO'] = 'Proveď';
 $lang['cs_CZ']['CMSMain']['MENUTITLE'] = 'Obsah webu';
 $lang['cs_CZ']['CMSMain']['MENUTITLE'] = 'Obsah stránky';
+$lang['cs_CZ']['CMSMain']['MENUTITLEOPT'] = 'Navigační návěstí';
 $lang['cs_CZ']['CMSMain']['METADESCOPT'] = 'Popis';
 $lang['cs_CZ']['CMSMain']['METAKEYWORDSOPT'] = 'Klíčová slova';
 $lang['cs_CZ']['CMSMain']['NEW'] = 'Nový';
@@ -117,7 +126,6 @@ $lang['cs_CZ']['CMSMain']['REMOVEDFD'] = 'Smazáno z konceptů';
 $lang['cs_CZ']['CMSMain']['REMOVEDPAGE'] = '\'%s\' odstraněno ze zveřejněných';
 $lang['cs_CZ']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = '\'%s\' odebrano  z navrhu';
 $lang['cs_CZ']['CMSMain']['REPORT'] = 'Výpis';
-$lang['cs_CZ']['CMSMain']['RESTORE'] = 'Obnovit';
 $lang['cs_CZ']['CMSMain']['RESTORED'] = '\'%s\' úspěšně obnoven';
 $lang['cs_CZ']['CMSMain']['ROLLBACK'] = 'Vrátit se zpět na tuto verzi';
 $lang['cs_CZ']['CMSMain']['ROLLEDBACKPUB'] = 'Vracím se zpět na zveřejněnou verzi. Číslo nové verze je #%d';
@@ -125,6 +133,7 @@ $lang['cs_CZ']['CMSMain']['ROLLEDBACKVERSION'] = 'Vracím se zpět na verzi #%d.
 $lang['cs_CZ']['CMSMain']['SAVE'] = 'Uložit';
 $lang['cs_CZ']['CMSMain']['SENTTO'] = 'Posláno %s %s ke schválení.';
 $lang['cs_CZ']['CMSMain']['STATUSOPT'] = 'Stav';
+$lang['cs_CZ']['CMSMain']['TITLEOPT'] = 'Titul';
 $lang['cs_CZ']['CMSMain']['TOTALPAGES'] = 'Celkem stránek:';
 $lang['cs_CZ']['CMSMain']['VERSIONSNOPAGE'] = 'Nemohu najít stránku #%d';
 $lang['cs_CZ']['CMSMain']['VIEWING'] = 'Prohlížíte verzi #%s, vytvořenou %s - autor %s';
@@ -137,8 +146,8 @@ $lang['cs_CZ']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'Přidáno do konceptů, ale
 $lang['cs_CZ']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Přidat kritérium...';
 $lang['cs_CZ']['CMSMain_left.ss']['BATCHACTIONS'] = 'Skupinové akce';
 $lang['cs_CZ']['CMSMain_left.ss']['CHANGED'] = 'změněno';
+$lang['cs_CZ']['CMSMain_left.ss']['CLEARTITLE'] = 'Vyčistit hledání a zobrazit všechny položky';
 $lang['cs_CZ']['CMSMain_left.ss']['CLOSEBOX'] = 'klikněte pro zavření pole';
-$lang['cs_CZ']['CMSMain_left.ss']['COMMENTS'] = 'Komentáře';
 $lang['cs_CZ']['CMSMain_left.ss']['COMPAREMODE'] = 'Mód porovnávání (klikněte níže)';
 $lang['cs_CZ']['CMSMain_left.ss']['CREATE'] = 'Vytvořit';
 $lang['cs_CZ']['CMSMain_left.ss']['DEL'] = 'smazáno';
@@ -148,8 +157,10 @@ $lang['cs_CZ']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Upraveno v konceptech, ale
 $lang['cs_CZ']['CMSMain_left.ss']['EDITEDSINCE'] = 'Naposledy upraveno';
 $lang['cs_CZ']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Povolit přesuny drag &amp; drop';
 $lang['cs_CZ']['CMSMain_left.ss']['GO'] = 'Proveď';
+$lang['cs_CZ']['CMSMain_left.ss']['HIDDEN'] = 'skrytý';
 $lang['cs_CZ']['CMSMain_left.ss']['KEY'] = 'Klíč:';
 $lang['cs_CZ']['CMSMain_left.ss']['NEW'] = 'nový';
+$lang['cs_CZ']['CMSMain_left.ss']['NOTINMENU'] = 'Vynecháno z navigační nabídky';
 $lang['cs_CZ']['CMSMain_left.ss']['OPENBOX'] = 'klikněte pro otevření tohoto pole';
 $lang['cs_CZ']['CMSMain_left.ss']['PAGEVERSIONH'] = 'Historie verzí stránky';
 $lang['cs_CZ']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Zveřejnit vybrané stránky';
@@ -161,8 +172,6 @@ $lang['cs_CZ']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Zobrazovat jen změněn
 $lang['cs_CZ']['CMSMain_left.ss']['SHOWUNPUB'] = 'Ukázat nezveřejněné verze';
 $lang['cs_CZ']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Obsah a struktura webu';
 $lang['cs_CZ']['CMSMain_left.ss']['SITEREPORTS'] = 'Výkazy stránek';
-$lang['cs_CZ']['CMSMain_left.ss']['TASKLIST'] = 'Seznam úkolů';
-$lang['cs_CZ']['CMSMain_left.ss']['WAITINGON'] = 'Čeká se na';
 $lang['cs_CZ']['CMSMain_right.ss']['ANYMESSAGE'] = 'Máte nějakou zprávu pro Vašeho redaktora?';
 $lang['cs_CZ']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Prosím vyberte stránku vlevo.';
 $lang['cs_CZ']['CMSMain_right.ss']['LOADING'] = 'nahrávání...';
@@ -184,6 +193,7 @@ $lang['cs_CZ']['CommentAdmin']['APPROVED'] = 'Schváleno %s komentářů.';
 $lang['cs_CZ']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Schválené komentáře';
 $lang['cs_CZ']['CommentAdmin']['AUTHOR'] = 'Autor';
 $lang['cs_CZ']['CommentAdmin']['COMMENT'] = 'Komentář';
+$lang['cs_CZ']['CommentAdmin']['COMMENTERURL'] = 'URL';
 $lang['cs_CZ']['CommentAdmin']['COMMENTS'] = 'Komentáře';
 $lang['cs_CZ']['CommentAdmin']['COMMENTSAWAITINGMODERATION'] = 'Komentáře čekající na schválení';
 $lang['cs_CZ']['CommentAdmin']['DATEPOSTED'] = 'Datum vložení';
@@ -244,6 +254,7 @@ $lang['cs_CZ']['ImageEditor.ss']['SEPIA'] = 'sepia';
 $lang['cs_CZ']['ImageEditor.ss']['UNDO'] = 'zpět';
 $lang['cs_CZ']['ImageEditor.ss']['UNTITLED'] = 'Nepojmenovaný dokument';
 $lang['cs_CZ']['ImageEditor.ss']['WIDTH'] = 'šířka';
+$lang['cs_CZ']['LeftAndMain']['CANT_REORGANISE'] = 'Nemáte oprávnění rearanžovat strukturu webu. Vaše změny nebyly uloženy.';
 $lang['cs_CZ']['LeftAndMain']['CHANGEDURL'] = 'URL změněno na \'%s\'';
 $lang['cs_CZ']['LeftAndMain']['COMMENTS'] = 'Komentáře';
 $lang['cs_CZ']['LeftAndMain']['FILESIMAGES'] = 'Soubory & Obrázky';
@@ -279,17 +290,6 @@ $lang['cs_CZ']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Zobrazení stránky:';
 $lang['cs_CZ']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' publikováno úspěšně';
 $lang['cs_CZ']['LeftAndMain']['STATUSTO'] = 'Stav změněn na \'%s\'';
 $lang['cs_CZ']['LeftAndMain']['TREESITECONTENT'] = 'Obsah webu';
-$lang['cs_CZ']['MemberList']['ADD'] = 'Přidat';
-$lang['cs_CZ']['MemberList']['ANYGROUP'] = 'Každá skupina';
-$lang['cs_CZ']['MemberList']['ASC'] = 'Vzestupně';
-$lang['cs_CZ']['MemberList']['DESC'] = 'Sestupně';
-$lang['cs_CZ']['MemberList']['EMAIL'] = 'Email';
-$lang['cs_CZ']['MemberList']['FILTERBYG'] = 'Filtrovat podle skupin';
-$lang['cs_CZ']['MemberList']['FN'] = 'Křestní jméno';
-$lang['cs_CZ']['MemberList']['ORDERBY'] = 'Seřadit podle';
-$lang['cs_CZ']['MemberList']['PASSWD'] = 'Heslo';
-$lang['cs_CZ']['MemberList']['SEARCH'] = 'Hledat';
-$lang['cs_CZ']['MemberList']['SN'] = 'Příjmení';
 $lang['cs_CZ']['MemberList.ss']['FILTER'] = 'Filtr';
 $lang['cs_CZ']['MemberList_PageControls.ss']['DISPLAYING'] = 'Zobrazuji';
 $lang['cs_CZ']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'členové';
@@ -313,6 +313,7 @@ $lang['cs_CZ']['MemberTableField']['ANYGROUP'] = 'Každá skupina';
 $lang['cs_CZ']['MemberTableField']['ASC'] = 'Vzestupně';
 $lang['cs_CZ']['MemberTableField']['DESC'] = 'Sestupně';
 $lang['cs_CZ']['MemberTableField']['EMAIL'] = 'Email';
+$lang['cs_CZ']['MemberTableField']['ERRORADDINGUSER'] = 'Nastala chyba pri přidání uživatele do skupiny: %s';
 $lang['cs_CZ']['MemberTableField']['FILTER'] = 'Filtr';
 $lang['cs_CZ']['MemberTableField']['FILTERBYGROUP'] = 'Filtrovat podle skupiny';
 $lang['cs_CZ']['MemberTableField']['FIRSTNAME'] = 'KrestniJmeno';
@@ -321,12 +322,12 @@ $lang['cs_CZ']['MemberTableField']['SEARCH'] = 'Hledani';
 $lang['cs_CZ']['MemberTableField.ss']['ADDNEW'] = 'Přidat nový';
 $lang['cs_CZ']['MemberTableField.ss']['DELETEMEMBER'] = 'Smazat tohoto člena';
 $lang['cs_CZ']['MemberTableField.ss']['EDITMEMBER'] = 'Upravit tohoto člena';
+$lang['cs_CZ']['MemberTableField.ss']['NOITEMSFOUND'] = 'Žádné položky nalezeny';
 $lang['cs_CZ']['MemberTableField.ss']['SHOWMEMBER'] = 'Zobrazit tohoto člena';
 $lang['cs_CZ']['MemberTableField']['SURNAME'] = 'Prijmeni';
 $lang['cs_CZ']['ModelAdmin']['ADDBUTTON'] = 'Přidat';
 $lang['cs_CZ']['ModelAdmin']['ADDFORM'] = 'Vyplňte tento formulář pro přidání  %s do databáze';
 $lang['cs_CZ']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Vybrat sloupec výsledků...';
-$lang['cs_CZ']['ModelAdmin']['CLASSTYPE'] = 'Typ';
 $lang['cs_CZ']['ModelAdmin']['CLEAR_SEARCH'] = 'Čisté hledání';
 $lang['cs_CZ']['ModelAdmin']['CREATEBUTTON'] = 'Vytvořit \'%s\'';
 $lang['cs_CZ']['ModelAdmin']['DELETE'] = 'Smazat';
@@ -342,6 +343,7 @@ $lang['cs_CZ']['ModelAdmin']['NOCSVFILE'] = 'Prosím, vyhledejte soubor CSV pro
 $lang['cs_CZ']['ModelAdmin']['NOIMPORT'] = 'Nic k importu';
 $lang['cs_CZ']['ModelAdmin']['NORESULTS'] = 'Bez výsledků';
 $lang['cs_CZ']['ModelAdmin']['SAVE'] = 'Uložit';
+$lang['cs_CZ']['ModelAdmin']['SEARCHFOR'] = 'Hledat';
 $lang['cs_CZ']['ModelAdmin']['SEARCHRESULTS'] = 'Výsledky hledání';
 $lang['cs_CZ']['ModelAdmin']['SELECTALL'] = 'označit vše';
 $lang['cs_CZ']['ModelAdmin']['SELECTNONE'] = 'Vybrat žádné';
@@ -351,10 +353,12 @@ $lang['cs_CZ']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Zobrazit specifi
 $lang['cs_CZ']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Vztahy';
 $lang['cs_CZ']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Specifikace pro %s';
 $lang['cs_CZ']['ModelAdmin_left.ss']['ADDLISTING'] = 'Přidat';
-$lang['cs_CZ']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Přidat';
 $lang['cs_CZ']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Importovat';
 $lang['cs_CZ']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Hledat';
 $lang['cs_CZ']['ModelAdmin_right.ss']['WELCOME1'] = 'Vítejte v %s. Vyberte si prosím jednu z položek v levém panelu.';
+$lang['cs_CZ']['ModelSidebar.ss']['ADDLISTING'] = 'Přidat';
+$lang['cs_CZ']['ModelSidebar.ss']['IMPORT_TAB_HEADER'] = 'Importovat';
+$lang['cs_CZ']['ModelSidebar.ss']['SEARCHLISTINGS'] = 'Hledat';
 $lang['cs_CZ']['PageComment']['Comment'] = 'Komentář';
 $lang['cs_CZ']['PageComment']['COMMENTBY'] = 'Komentář od \'%s\' na %s';
 $lang['cs_CZ']['PageComment']['IsSpam'] = 'Spam?';
@@ -365,7 +369,11 @@ $lang['cs_CZ']['PageComment']['SINGULARNAME'] = 'Komentáře';
 $lang['cs_CZ']['PageCommentInterface']['COMMENTERURL'] = 'URL vaší webové stránky';
 $lang['cs_CZ']['PageCommentInterface']['POST'] = 'Příspěvek';
 $lang['cs_CZ']['PageCommentInterface']['SPAMQUESTION'] = 'Antispamová otázka: %s';
+$lang['cs_CZ']['PageCommentInterface.ss']['COMMENTLOGINERROR'] = 'Nemůžete přidat komentáře pokud nejste přihlášen/a';
+$lang['cs_CZ']['PageCommentInterface.ss']['COMMENTPERMISSIONERROR'] = 'a nemáte příslušnou úroveň oprávnění';
+$lang['cs_CZ']['PageCommentInterface.ss']['COMMENTPOSTLOGIN'] = 'Přihlášení zde';
 $lang['cs_CZ']['PageCommentInterface.ss']['COMMENTS'] = 'Komentáře';
+$lang['cs_CZ']['PageCommentInterface.ss']['COMMENTSDISABLED'] = 'Odesílání kometářů bylo znemožněno';
 $lang['cs_CZ']['PageCommentInterface.ss']['NEXT'] = 'další';
 $lang['cs_CZ']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'Nikdo na této stránce ještě nepřidal komentář.';
 $lang['cs_CZ']['PageCommentInterface.ss']['POSTCOM'] = 'Zaslat komentář';
@@ -414,7 +422,6 @@ $lang['cs_CZ']['StaticExporter']['BASEURL'] = 'Základní URL';
 $lang['cs_CZ']['StaticExporter']['EXPORTTO'] = 'Exportovat do této složky';
 $lang['cs_CZ']['StaticExporter']['FOLDEREXPORT'] = 'Složka, kam se má exportovat';
 $lang['cs_CZ']['StaticExporter']['NAME'] = 'Statický exportér';
-$lang['cs_CZ']['StaticExporter']['ONETHATEXISTS'] = 'Prosím určete existující složku';
 $lang['cs_CZ']['TableListField_PageControls.ss']['DISPLAYING'] = 'Zobrazuji';
 $lang['cs_CZ']['TableListField_PageControls.ss']['OF'] = 'z';
 $lang['cs_CZ']['TableListField_PageControls.ss']['TO'] = 'do';
@@ -422,12 +429,10 @@ $lang['cs_CZ']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Zobraz první';
 $lang['cs_CZ']['TableListField_PageControls.ss']['VIEWLAST'] = 'Zobraz poslední';
 $lang['cs_CZ']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Zobrazit další';
 $lang['cs_CZ']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Zobrazit předchozí';
-$lang['cs_CZ']['TaskList.ss']['BY'] = '-';
 $lang['cs_CZ']['ThumbnailStripField']['NOFLASHFOUND'] = 'Flash soubory nenalezeny';
 $lang['cs_CZ']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'Flash soubory nenalezeny v';
 $lang['cs_CZ']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'Obrázky nenalezeny v';
 $lang['cs_CZ']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Žádný obrázky nenalezeny.';
-$lang['cs_CZ']['ThumbnailStripField']['NOTAFOLDER'] = 'Toto není složka';
 $lang['cs_CZ']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Vyberte složku nebo použijte vyhledávání)';
 $lang['cs_CZ']['ViewArchivedEmail.ss']['CANACCESS'] = 'Můžete přistupovat k archivu pomocí tohoto odkazu:';
 $lang['cs_CZ']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Požadovali jste prohlížet obsah našich stránek během';
diff --git a/lang/da_DK.php b/lang/da_DK.php
index 7f4c0ca7..609951d5 100644
--- a/lang/da_DK.php
+++ b/lang/da_DK.php
@@ -17,8 +17,6 @@ if(array_key_exists('da_DK', $lang) && is_array($lang['da_DK'])) {
 }
 
 $lang['da_DK']['AssetAdmin']['CHOOSEFILE'] = 'Vælg fil';
-$lang['da_DK']['AssetAdmin']['CONTENTMODBY'] = 'Indhold kan ændres af';
-$lang['da_DK']['AssetAdmin']['CONTENTUSABLEBY'] = 'Indhold anvendeligt af';
 $lang['da_DK']['AssetAdmin']['DELETEDX'] = 'Slettede %s filer.%s';
 $lang['da_DK']['AssetAdmin']['FILESREADY'] = 'Filer klar til at blive uploadet:';
 $lang['da_DK']['AssetAdmin']['FOLDERDELETED'] = 'mappe slettet.';
@@ -31,7 +29,6 @@ $lang['da_DK']['AssetAdmin']['NOTEMP'] = 'Der er ikke defineret et midlertidigt
 $lang['da_DK']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Der var ikke noget at uploade';
 $lang['da_DK']['AssetAdmin']['NOWBROKEN'] = 'Følgende sider har nu ødelagte links:';
 $lang['da_DK']['AssetAdmin']['NOWBROKEN2'] = 'De retmæssige ejere har fået besked og vil rette op på siderne.';
-$lang['da_DK']['AssetAdmin']['OWNER'] = 'Ejer';
 $lang['da_DK']['AssetAdmin']['SAVEDFILE'] = 'Gemt fil %s';
 $lang['da_DK']['AssetAdmin']['SAVEFOLDERNAME'] = 'Gem mappenavn';
 $lang['da_DK']['AssetAdmin']['THUMBSDELETED'] = 'Alle ubrugte thumbnails er slettet';
@@ -41,6 +38,8 @@ $lang['da_DK']['AssetAdmin_left.ss']['CREATE'] = 'Opret';
 $lang['da_DK']['AssetAdmin_left.ss']['DELETE'] = 'Slet';
 $lang['da_DK']['AssetAdmin_left.ss']['DELFOLDERS'] = 'Slet de valgte mapper';
 $lang['da_DK']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Tillad træk & slip reorganisering';
+$lang['da_DK']['AssetAdmin_left.ss']['FILESYSTEMSYNC'] = 'Led efter nye filer';
+$lang['da_DK']['AssetAdmin_left.ss']['FILESYSTEMSYNC_DESC'] = 'SilverStripe vedligeholder selv sin database over de filer og billeder der er gemt i din assets/ mappe. Klik på denne knap for at opdatere databasen, hvis filerne er tilf&oslash;jet til assets/ mappen udenfor SilverStripe. For eksempel, hvis du har uploadet filer via FTP.';
 $lang['da_DK']['AssetAdmin_left.ss']['FOLDERS'] = 'Mapper';
 $lang['da_DK']['AssetAdmin_left.ss']['GO'] = 'Go';
 $lang['da_DK']['AssetAdmin_left.ss']['SELECTTODEL'] = 'Vælg de mapper du ønsker at slette og klik på knappen nedenunder';
@@ -48,6 +47,7 @@ $lang['da_DK']['AssetAdmin_left.ss']['TOREORG'] = 'For at omorganisere dine mapp
 $lang['da_DK']['AssetAdmin_right.ss']['CHOOSEPAGE'] = 'Vælg en side i venstreside';
 $lang['da_DK']['AssetAdmin_right.ss']['WELCOME'] = 'Velkommen til';
 $lang['da_DK']['AssetAdmin_uploadiframe.ss']['PERMFAILED'] = 'Du har ikke rettigheder til at uploade filer til denne mappe.';
+$lang['da_DK']['AssetAdmin_uploadiframe.ss']['TITLE'] = 'Billedeupload Iframe';
 $lang['da_DK']['AssetTableField']['CAPTION'] = 'Billedetekst';
 $lang['da_DK']['AssetTableField']['CREATED'] = 'Først uploadet';
 $lang['da_DK']['AssetTableField']['DIM'] = 'Dimensioner';
@@ -67,10 +67,21 @@ $lang['da_DK']['AssetTableField']['POPUPWIDTH'] = 'Popop-bredde';
 $lang['da_DK']['AssetTableField']['SIZE'] = 'Størrelse';
 $lang['da_DK']['AssetTableField.ss']['DELFILE'] = 'Slet denne fil';
 $lang['da_DK']['AssetTableField.ss']['DRAGTOFOLDER'] = 'Træk til en mappe i venstre side for at flytte filen';
+$lang['da_DK']['AssetTableField.ss']['EDIT'] = 'Redigér aktiv';
+$lang['da_DK']['AssetTableField.ss']['SHOW'] = 'Vis aktiv';
 $lang['da_DK']['AssetTableField']['SWFFILEOPTIONS'] = 'SWF Fil Indstillinger';
 $lang['da_DK']['AssetTableField']['TITLE'] = 'Titel';
 $lang['da_DK']['AssetTableField']['TYPE'] = 'Type';
 $lang['da_DK']['AssetTableField']['URL'] = 'URL Adresse';
+$lang['da_DK']['CMSBatchActions']['DELETED_PAGES'] = 'Slettede %d sider fra den publiserede side';
+$lang['da_DK']['CMSBatchActions']['DELETE_PAGES'] = 'Slet fra publiseret side';
+$lang['da_DK']['CMSBatchActions']['DELETING_PAGES'] = 'Slet valgte sider fra den publiserede side';
+$lang['da_DK']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Publiserede %d sider';
+$lang['da_DK']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Publiserer sider';
+$lang['da_DK']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publisér';
+$lang['da_DK']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'U-publiserede %d sider';
+$lang['da_DK']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'U-publiserede %d sider';
+$lang['da_DK']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'U-publisér';
 $lang['da_DK']['CMSLeft.ss']['DELPAGE'] = 'Sletter sider...';
 $lang['da_DK']['CMSLeft.ss']['DELPAGES'] = 'Slet de valgte sider';
 $lang['da_DK']['CMSLeft.ss']['GO'] = 'Go';
@@ -78,16 +89,18 @@ $lang['da_DK']['CMSLeft.ss']['NEWPAGE'] = 'Ny side...';
 $lang['da_DK']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Vælg de sider, som du ønsker at slette og tryk på knappen nedenfor';
 $lang['da_DK']['CMSLeft.ss']['SITECONT'] = 'Sideindhold';
 $lang['da_DK']['CMSMain']['ACCESS'] = 'Adgang til %S i CMS';
+$lang['da_DK']['CMSMain']['ACCESSALLINTERFACES'] = 'Adgang til alle CMS grænseflader';
 $lang['da_DK']['CMSMain']['CANCEL'] = 'Annuller';
 $lang['da_DK']['CMSMain']['CHOOSEREPORT'] = 'Vælg en rapport';
 $lang['da_DK']['CMSMain']['COMPARINGV'] = 'Du sammenligner version #%d og #%d';
 $lang['da_DK']['CMSMain']['COPYPUBTOSTAGE'] = 'Er du sikker på du vil kopiere det udgivne indhold til kladde?';
 $lang['da_DK']['CMSMain']['DELETE'] = 'Slet fra fra udkast-sitet';
-$lang['da_DK']['CMSMain']['DELETEFP'] = 'Slet fra den udgivne side';
+$lang['da_DK']['CMSMain']['DESCREMOVED'] = 'og %s efterkommere';
 $lang['da_DK']['CMSMain']['EMAIL'] = 'Email';
 $lang['da_DK']['CMSMain']['GO'] = 'Go';
 $lang['da_DK']['CMSMain']['MENUTITLE'] = 'Sideindhold';
 $lang['da_DK']['CMSMain']['MENUTITLE'] = 'Indhold site';
+$lang['da_DK']['CMSMain']['MENUTITLEOPT'] = 'Navigationsetiket';
 $lang['da_DK']['CMSMain']['METADESCOPT'] = 'Beskrivelse';
 $lang['da_DK']['CMSMain']['METAKEYWORDSOPT'] = 'Nøgleord';
 $lang['da_DK']['CMSMain']['NEW'] = 'Ny';
@@ -113,7 +126,6 @@ $lang['da_DK']['CMSMain']['REMOVEDFD'] = 'Fjernet fra kladde';
 $lang['da_DK']['CMSMain']['REMOVEDPAGE'] = 'Fjernede \'%s\' fra den udgivne side';
 $lang['da_DK']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = '\'%s\'  fjernet fra udkast-sitet';
 $lang['da_DK']['CMSMain']['REPORT'] = 'Report';
-$lang['da_DK']['CMSMain']['RESTORE'] = 'Genskab';
 $lang['da_DK']['CMSMain']['RESTORED'] = 'Succesfuld gendannelse \'%s\'';
 $lang['da_DK']['CMSMain']['ROLLBACK'] = 'Rul tilbage til denne version';
 $lang['da_DK']['CMSMain']['ROLLEDBACKPUB'] = 'Rullet tilbage til udgivet version. Nyt versionnummer er #%d';
@@ -121,6 +133,7 @@ $lang['da_DK']['CMSMain']['ROLLEDBACKVERSION'] = 'Tilbagerullet til version #%d.
 $lang['da_DK']['CMSMain']['SAVE'] = 'Gem';
 $lang['da_DK']['CMSMain']['SENTTO'] = 'Sendt til %s %s for godkendelse.';
 $lang['da_DK']['CMSMain']['STATUSOPT'] = 'Status';
+$lang['da_DK']['CMSMain']['TITLEOPT'] = 'Titel';
 $lang['da_DK']['CMSMain']['TOTALPAGES'] = 'Total antal sider:';
 $lang['da_DK']['CMSMain']['VERSIONSNOPAGE'] = 'Kan ikke finde side #%d';
 $lang['da_DK']['CMSMain']['VIEWING'] = 'Du kigger på version #%d, oprettet %s';
@@ -128,12 +141,13 @@ $lang['da_DK']['CMSMain']['VISITRESTORE'] = 'Besøg restorepage/(ID)';
 $lang['da_DK']['CMSMain']['WAITINGON'] = 'Du venter på andre folks arbejde på disse  <b>%d</b> sider.';
 $lang['da_DK']['CMSMain']['WORKTODO'] = 'Du er blevet tildelt opgaver på disse <b>%d</b> sider.';
 $lang['da_DK']['CMSMain_dialog.ss']['BUTTONNOTFOUND'] = 'Navnet på knappen kunne ikke findes';
+$lang['da_DK']['CMSMain_dialog.ss']['NOLINKED'] = 'Kan ikke finde windows.linkedObject for at sende knapklik tilbage til hovedvinduet';
 $lang['da_DK']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'Tilføjet kladden, men endnu ikke udgivet';
 $lang['da_DK']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Tilføj kriterie...';
 $lang['da_DK']['CMSMain_left.ss']['BATCHACTIONS'] = 'Masse-funktioner';
 $lang['da_DK']['CMSMain_left.ss']['CHANGED'] = 'ændret';
+$lang['da_DK']['CMSMain_left.ss']['CLEARTITLE'] = 'Ryd S&oslash;gningen og vis alt';
 $lang['da_DK']['CMSMain_left.ss']['CLOSEBOX'] = 'klik for at lukke boksen';
-$lang['da_DK']['CMSMain_left.ss']['COMMENTS'] = 'Kommentarer';
 $lang['da_DK']['CMSMain_left.ss']['COMPAREMODE'] = 'Sammenlign (klik 2 nedenunder)';
 $lang['da_DK']['CMSMain_left.ss']['CREATE'] = 'Opret';
 $lang['da_DK']['CMSMain_left.ss']['DEL'] = 'slettet';
@@ -143,6 +157,7 @@ $lang['da_DK']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Redigeret på kladden, men
 $lang['da_DK']['CMSMain_left.ss']['EDITEDSINCE'] = 'Ændret siden';
 $lang['da_DK']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Tillad træk & slip';
 $lang['da_DK']['CMSMain_left.ss']['GO'] = 'Go';
+$lang['da_DK']['CMSMain_left.ss']['HIDDEN'] = 'skjult';
 $lang['da_DK']['CMSMain_left.ss']['KEY'] = 'Nøgle:';
 $lang['da_DK']['CMSMain_left.ss']['NEW'] = 'ny';
 $lang['da_DK']['CMSMain_left.ss']['OPENBOX'] = 'klik for at åbne denne boks';
@@ -156,8 +171,6 @@ $lang['da_DK']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Vis kun ændrede sider';
 $lang['da_DK']['CMSMain_left.ss']['SHOWUNPUB'] = 'Vis ikke udgivne versioner';
 $lang['da_DK']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Sideindhold og Struktur';
 $lang['da_DK']['CMSMain_left.ss']['SITEREPORTS'] = 'Siderapporter';
-$lang['da_DK']['CMSMain_left.ss']['TASKLIST'] = 'Opgaveliste';
-$lang['da_DK']['CMSMain_left.ss']['WAITINGON'] = 'Venter på';
 $lang['da_DK']['CMSMain_right.ss']['ANYMESSAGE'] = 'Har du nogen besked til din redaktør?';
 $lang['da_DK']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Vælg en side fra venstresiden.';
 $lang['da_DK']['CMSMain_right.ss']['LOADING'] = 'indlæser...';
@@ -218,16 +231,24 @@ $lang['da_DK']['CommentTableField.ss']['SPAM'] = 'spam';
 $lang['da_DK']['ComplexTableField']['CLOSEPOPUP'] = 'Luk popup';
 $lang['da_DK']['ComplexTableField']['SUCCESSADD'] = 'Tilføjede %s %s %s';
 $lang['da_DK']['ImageEditor.ss']['ACTIONS'] = 'handlinger';
+$lang['da_DK']['ImageEditor.ss']['ADJUST'] = 'tilpas';
 $lang['da_DK']['ImageEditor.ss']['APPLY'] = 'anvend';
+$lang['da_DK']['ImageEditor.ss']['BLUR'] = 'Sl&oslash;r';
+$lang['da_DK']['ImageEditor.ss']['BRIGHTNESS'] = 'lysstyrke';
 $lang['da_DK']['ImageEditor.ss']['CANCEL'] = 'annuller';
+$lang['da_DK']['ImageEditor.ss']['CONTRAST'] = 'kontrast';
 $lang['da_DK']['ImageEditor.ss']['CROP'] = 'beskær';
 $lang['da_DK']['ImageEditor.ss']['CURRENTACTION'] = 'Nuværende&nbsp;handling';
 $lang['da_DK']['ImageEditor.ss']['EDITFUNCTIONS'] = 'rediger&nbsp;funktioner';
+$lang['da_DK']['ImageEditor.ss']['EFFECTS'] = 'effekter';
 $lang['da_DK']['ImageEditor.ss']['EXIT'] = 'Afslut';
+$lang['da_DK']['ImageEditor.ss']['GAMMA'] = 'gamma';
+$lang['da_DK']['ImageEditor.ss']['GREYSCALE'] = 'gr&aring;skala';
 $lang['da_DK']['ImageEditor.ss']['HEIGHT'] = 'højde';
 $lang['da_DK']['ImageEditor.ss']['REDO'] = 'gentag';
 $lang['da_DK']['ImageEditor.ss']['ROT'] = 'roter';
 $lang['da_DK']['ImageEditor.ss']['SAVE'] = 'gem billede';
+$lang['da_DK']['ImageEditor.ss']['SEPIA'] = 'Sepia';
 $lang['da_DK']['ImageEditor.ss']['UNDO'] = 'fortryd';
 $lang['da_DK']['ImageEditor.ss']['UNTITLED'] = '"Ingen titel" dokument';
 $lang['da_DK']['ImageEditor.ss']['WIDTH'] = 'bredde';
@@ -263,19 +284,9 @@ $lang['da_DK']['LeftAndMain.ss']['SSWEB'] = 'Silverstripe hjemmeside';
 $lang['da_DK']['LeftAndMain.ss']['VIEWINDRAFT'] = 'Vis denne side i udkast-sitet';
 $lang['da_DK']['LeftAndMain.ss']['VIEWINPUBLISHED'] = 'Vis denne side i Live-sitet';
 $lang['da_DK']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Sidevisning:';
+$lang['da_DK']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = 'Publicerede \'%s\'';
 $lang['da_DK']['LeftAndMain']['STATUSTO'] = 'Status er ændret til \'%s\'';
 $lang['da_DK']['LeftAndMain']['TREESITECONTENT'] = 'Sideindhold';
-$lang['da_DK']['MemberList']['ADD'] = 'Tilføj';
-$lang['da_DK']['MemberList']['ANYGROUP'] = 'Alle grupper';
-$lang['da_DK']['MemberList']['ASC'] = 'Stigende';
-$lang['da_DK']['MemberList']['DESC'] = 'Faldende';
-$lang['da_DK']['MemberList']['EMAIL'] = 'Email';
-$lang['da_DK']['MemberList']['FILTERBYG'] = 'Filtrer på gruppe';
-$lang['da_DK']['MemberList']['FN'] = 'Fornavn';
-$lang['da_DK']['MemberList']['ORDERBY'] = 'Sorter efter';
-$lang['da_DK']['MemberList']['PASSWD'] = 'Kodeord';
-$lang['da_DK']['MemberList']['SEARCH'] = 'Søg';
-$lang['da_DK']['MemberList']['SN'] = 'Efternavn';
 $lang['da_DK']['MemberList.ss']['FILTER'] = 'FIltrer';
 $lang['da_DK']['MemberList_PageControls.ss']['DISPLAYING'] = 'Viser';
 $lang['da_DK']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'medlemmer';
@@ -310,24 +321,43 @@ $lang['da_DK']['MemberTableField.ss']['EDITMEMBER'] = 'Rediger dette medlem';
 $lang['da_DK']['MemberTableField.ss']['SHOWMEMBER'] = 'Vis dette medlem';
 $lang['da_DK']['MemberTableField']['SURNAME'] = 'Efternavn';
 $lang['da_DK']['ModelAdmin']['ADDBUTTON'] = 'Tilføj';
-$lang['da_DK']['ModelAdmin']['CLASSTYPE'] = 'Type';
+$lang['da_DK']['ModelAdmin']['ADDFORM'] = 'Udfyld denne formular for at tilf&oslash;je en %s til databasen.';
+$lang['da_DK']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Vælg resultat kolonner';
+$lang['da_DK']['ModelAdmin']['CLEAR_SEARCH'] = 'Ryd S&oslash;gning';
 $lang['da_DK']['ModelAdmin']['CREATEBUTTON'] = 'Opret \'%s\'';
 $lang['da_DK']['ModelAdmin']['DELETE'] = 'Slet';
+$lang['da_DK']['ModelAdmin']['DELETEDRECORDS'] = '%S poster er slettet.';
+$lang['da_DK']['ModelAdmin']['FOUNDRESULTS'] = 'Din s&oslash;gning gav %s resultater';
 $lang['da_DK']['ModelAdmin']['GOBACK'] = 'Tilbage';
+$lang['da_DK']['ModelAdmin']['GOFORWARD'] = 'Fremad';
 $lang['da_DK']['ModelAdmin']['IMPORT'] = 'Importer fra CSV';
+$lang['da_DK']['ModelAdmin']['IMPORTEDRECORDS'] = 'Importerede %s poster.';
+$lang['da_DK']['ModelAdmin']['ITEMNOTFOUND'] = 'Jeg kan ikke finde enheden';
+$lang['da_DK']['ModelAdmin']['LOADEDFOREDITING'] = 'ind&aelig;ste \'%s\' til redigering';
+$lang['da_DK']['ModelAdmin']['NOCSVFILE'] = 'Tryk p&aring; Gennemse for at v&aelig;lge en CSVfil til importering';
 $lang['da_DK']['ModelAdmin']['NOIMPORT'] = 'Intet at importere';
+$lang['da_DK']['ModelAdmin']['NORESULTS'] = 'Ingen resultater';
 $lang['da_DK']['ModelAdmin']['SAVE'] = 'Gem';
 $lang['da_DK']['ModelAdmin']['SEARCHRESULTS'] = 'Søgeresultater';
 $lang['da_DK']['ModelAdmin']['SELECTALL'] = 'Vælg alle';
 $lang['da_DK']['ModelAdmin']['SELECTNONE'] = 'Vælg ingen';
+$lang['da_DK']['ModelAdmin']['UPDATEDRECORDS'] = 'Opdaterede %s poster.';
+$lang['da_DK']['ModelAdmin_ImportSpec.ss']['IMPORTSPECFIELDS'] = 'Database kolonner';
 $lang['da_DK']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Vis specifikationer for %s';
 $lang['da_DK']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Relationer';
 $lang['da_DK']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Specifikationer for %s';
-$lang['da_DK']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Tilføj';
+$lang['da_DK']['ModelAdmin_left.ss']['ADDLISTING'] = 'Tilf&oslash;j';
 $lang['da_DK']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Importer';
+$lang['da_DK']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'S&oslash;g';
+$lang['da_DK']['ModelAdmin_right.ss']['WELCOME1'] = 'Velkommen til %s. V&aelig;lg venligst en af indgangene i venstre rude.';
+$lang['da_DK']['PageComment']['Comment'] = 'Kommentér';
 $lang['da_DK']['PageComment']['COMMENTBY'] = 'Kommentar af \'%s\' den %s';
+$lang['da_DK']['PageComment']['IsSpam'] = 'Spam?';
+$lang['da_DK']['PageComment']['Name'] = 'Forfatternavn';
+$lang['da_DK']['PageComment']['NeedsModeration'] = 'Skal ordstyres ?';
 $lang['da_DK']['PageComment']['PLURALNAME'] = 'Side kommentarer';
 $lang['da_DK']['PageComment']['SINGULARNAME'] = 'Side kommentarer';
+$lang['da_DK']['PageCommentInterface']['COMMENTERURL'] = 'Din hjemmesides adresse (URL)';
 $lang['da_DK']['PageCommentInterface']['POST'] = 'Post';
 $lang['da_DK']['PageCommentInterface']['SPAMQUESTION'] = 'Spørgsmål for Spam-beskyttelse: %s';
 $lang['da_DK']['PageCommentInterface.ss']['COMMENTS'] = 'Kommentarer';
@@ -335,7 +365,9 @@ $lang['da_DK']['PageCommentInterface.ss']['NEXT'] = 'næste';
 $lang['da_DK']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'Ingen har kommenteret siden endnu';
 $lang['da_DK']['PageCommentInterface.ss']['POSTCOM'] = 'Indsend din kommentar';
 $lang['da_DK']['PageCommentInterface.ss']['PREV'] = 'forrige';
+$lang['da_DK']['PageCommentInterface.ss']['RSSFEEDALLCOMMENTS'] = 'RSS feed for alle kommentarer';
 $lang['da_DK']['PageCommentInterface.ss']['RSSFEEDCOMMENTS'] = 'RSS Feed med kommentarer fra denne side';
+$lang['da_DK']['PageCommentInterface.ss']['RSSVIEWALLCOMMENTS'] = 'Vis alle kommentarer';
 $lang['da_DK']['PageCommentInterface']['YOURCOMMENT'] = 'Kommentarer';
 $lang['da_DK']['PageCommentInterface']['YOURNAME'] = 'Dit navn';
 $lang['da_DK']['PageCommentInterface_Controller']['SPAMQUESTION'] = 'Spørgsmål for Spam-beskyttelse: %s';
@@ -377,10 +409,17 @@ $lang['da_DK']['StaticExporter']['BASEURL'] = 'Base URL';
 $lang['da_DK']['StaticExporter']['EXPORTTO'] = 'Eksporter til mappen';
 $lang['da_DK']['StaticExporter']['FOLDEREXPORT'] = 'Mappe der skal eksporteres til';
 $lang['da_DK']['StaticExporter']['NAME'] = 'Statisk eksporter';
-$lang['da_DK']['StaticExporter']['ONETHATEXISTS'] = 'Specificer en mappe der findes';
-$lang['da_DK']['TaskList.ss']['BY'] = 'af';
+$lang['da_DK']['TableListField_PageControls.ss']['DISPLAYING'] = 'Viser';
+$lang['da_DK']['TableListField_PageControls.ss']['OF'] = 'af';
+$lang['da_DK']['TableListField_PageControls.ss']['TO'] = 'til';
+$lang['da_DK']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Vis f&oslash;rste';
+$lang['da_DK']['TableListField_PageControls.ss']['VIEWLAST'] = 'Vis Sidste';
+$lang['da_DK']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Vis n&aelig;ste';
+$lang['da_DK']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Vis forrige';
+$lang['da_DK']['ThumbnailStripField']['NOFLASHFOUND'] = 'Der blev ikke fundet flashfiler';
+$lang['da_DK']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'Der blev ikke fundet flashfiler i ';
+$lang['da_DK']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'Der blev ikke fundet billeder i ';
 $lang['da_DK']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Ingen billeder fundet i';
-$lang['da_DK']['ThumbnailStripField']['NOTAFOLDER'] = 'Dette  er ikke en mappe';
 $lang['da_DK']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = 'Vælg en mappe ovenover';
 $lang['da_DK']['ViewArchivedEmail.ss']['CANACCESS'] = 'Du kan tilgå¨den arkiverede side på dette link:';
 $lang['da_DK']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Du har spurgt om at se indholdet af vores side på';
diff --git a/lang/de_DE.php b/lang/de_DE.php
index 1188c598..b120ef59 100644
--- a/lang/de_DE.php
+++ b/lang/de_DE.php
@@ -16,9 +16,7 @@ if(array_key_exists('de_DE', $lang) && is_array($lang['de_DE'])) {
 	$lang['de_DE'] = $lang['en_US'];
 }
 
-$lang['de_DE']['AssetAdmin']['CHOOSEFILE'] = 'Datei auswählen';
-$lang['de_DE']['AssetAdmin']['CONTENTMODBY'] = 'Inhalt veränderbar durch';
-$lang['de_DE']['AssetAdmin']['CONTENTUSABLEBY'] = 'Inhalt einsetzbar von';
+$lang['de_DE']['AssetAdmin']['CHOOSEFILE'] = 'Datei auswählen:';
 $lang['de_DE']['AssetAdmin']['DELETEDX'] = '%s Dateien gelöscht';
 $lang['de_DE']['AssetAdmin']['FILESREADY'] = 'Dateien bereit zum hochladen:';
 $lang['de_DE']['AssetAdmin']['FOLDERDELETED'] = 'Ordner entfernt.';
@@ -31,16 +29,17 @@ $lang['de_DE']['AssetAdmin']['NOTEMP'] = 'Es existiert kein temporäres Verzeich
 $lang['de_DE']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Keine Dateien zum hochladen vorhanden';
 $lang['de_DE']['AssetAdmin']['NOWBROKEN'] = 'Folgende Seiten besitzen fehlerhafte Verweise';
 $lang['de_DE']['AssetAdmin']['NOWBROKEN2'] = 'Die Eigentümer wurden per E-Mail benachrichtig und werden die Seite aktualisieren.';
-$lang['de_DE']['AssetAdmin']['OWNER'] = 'Eigentümer';
 $lang['de_DE']['AssetAdmin']['SAVEDFILE'] = 'Datei %s gespeichert';
 $lang['de_DE']['AssetAdmin']['SAVEFOLDERNAME'] = 'Ordner speichern';
-$lang['de_DE']['AssetAdmin']['THUMBSDELETED'] = 'Alle ungenutzten Vorschaubilder wurden gelöscht';
+$lang['de_DE']['AssetAdmin']['THUMBSDELETED'] = '%s ungenutzte Vorschaubilder wurden gelöscht';
 $lang['de_DE']['AssetAdmin']['UPLOAD'] = 'Ausgewählte Dateien hochladen';
 $lang['de_DE']['AssetAdmin']['UPLOADEDX'] = '%s Dateien hochgeladen';
 $lang['de_DE']['AssetAdmin_left.ss']['CREATE'] = 'Erstellen';
 $lang['de_DE']['AssetAdmin_left.ss']['DELETE'] = 'Löschen...';
 $lang['de_DE']['AssetAdmin_left.ss']['DELFOLDERS'] = 'Lösche die markierten Ordner';
 $lang['de_DE']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Erlaube Neuordnen per Drag &amp; Drop';
+$lang['de_DE']['AssetAdmin_left.ss']['FILESYSTEMSYNC'] = 'Nach neuen Dateien suchen';
+$lang['de_DE']['AssetAdmin_left.ss']['FILESYSTEMSYNC_DESC'] = 'SilverStripe verwaltet seine eigene Datenbank für die Dateien und Bilder, die Sie in Ihrem assets/ Verzeichnis speichern. Drücken Sie diesen Knopf, um die Datenbank zu aktualieren, wenn Dateien zum assets/ Verzeichnis außerhalb von SilverStripehinzugefügt wurden; z.B. falls Sie Dateien via FTP hochgeladen haben.';
 $lang['de_DE']['AssetAdmin_left.ss']['FOLDERS'] = 'Ordner';
 $lang['de_DE']['AssetAdmin_left.ss']['GO'] = 'Los';
 $lang['de_DE']['AssetAdmin_left.ss']['SELECTTODEL'] = 'Markieren Sie die Ordner aus die Sie löschen möchten und drücken dann die nachstehende Schaltfläche ';
@@ -48,6 +47,7 @@ $lang['de_DE']['AssetAdmin_left.ss']['TOREORG'] = 'Um Ihre Ordner neu zu ordnen,
 $lang['de_DE']['AssetAdmin_right.ss']['CHOOSEPAGE'] = 'Bitte wählen Sie eine der Seiten links aus.';
 $lang['de_DE']['AssetAdmin_right.ss']['WELCOME'] = 'Willkommen zu';
 $lang['de_DE']['AssetAdmin_uploadiframe.ss']['PERMFAILED'] = 'Sie haben nicht die Berechtigung Dateien in diesen Ordner hochzuladen.';
+$lang['de_DE']['AssetAdmin_uploadiframe.ss']['TITLE'] = 'Iframe für den Bilderupload';
 $lang['de_DE']['AssetTableField']['CAPTION'] = 'Titel';
 $lang['de_DE']['AssetTableField']['CREATED'] = 'Erstmalig hochgeladen';
 $lang['de_DE']['AssetTableField']['DIM'] = 'Dimensionen';
@@ -73,6 +73,15 @@ $lang['de_DE']['AssetTableField']['SWFFILEOPTIONS'] = 'SWF Datei Optionen';
 $lang['de_DE']['AssetTableField']['TITLE'] = 'Titel';
 $lang['de_DE']['AssetTableField']['TYPE'] = 'Typ';
 $lang['de_DE']['AssetTableField']['URL'] = 'URL';
+$lang['de_DE']['CMSBatchActions']['DELETED_PAGES'] = '%d Seiten von der veröffentlichten Site gelöscht.';
+$lang['de_DE']['CMSBatchActions']['DELETE_PAGES'] = 'Von veröffentlichter Site löschen';
+$lang['de_DE']['CMSBatchActions']['DELETING_PAGES'] = 'Ausgewählte Seiten werden von der veröffentlichten Site gelöscht.';
+$lang['de_DE']['CMSBatchActions']['PUBLISHED_PAGES'] = '%d Seiten veröffentlicht';
+$lang['de_DE']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Veröffentliche Seiten';
+$lang['de_DE']['CMSBatchActions']['PUBLISH_PAGES'] = 'Veröffentlichen';
+$lang['de_DE']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'Veröffentlichung von %d Seiten zurückgenommen';
+$lang['de_DE']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'Veröffentlichung wird zurückgenommen';
+$lang['de_DE']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'Veröffentlichung zurücknehmen';
 $lang['de_DE']['CMSLeft.ss']['DELPAGE'] = 'Lösche Seiten...';
 $lang['de_DE']['CMSLeft.ss']['DELPAGES'] = 'Lösche die markierten Ordner';
 $lang['de_DE']['CMSLeft.ss']['GO'] = 'Los';
@@ -86,12 +95,12 @@ $lang['de_DE']['CMSMain']['CHOOSEREPORT'] = '(Report wählen)';
 $lang['de_DE']['CMSMain']['COMPARINGV'] = 'Sie vergleichen Versionen #%d und #%d';
 $lang['de_DE']['CMSMain']['COPYPUBTOSTAGE'] = 'Wollen Sie den Inhalt wirklich von Live nach Entwurf kopieren?';
 $lang['de_DE']['CMSMain']['DELETE'] = 'Von Entwurf-Seite löschen';
-$lang['de_DE']['CMSMain']['DELETEFP'] = 'Von Live-Seite löschen';
 $lang['de_DE']['CMSMain']['DESCREMOVED'] = 'und %s Unterseiten';
 $lang['de_DE']['CMSMain']['EMAIL'] = 'E-Mail';
 $lang['de_DE']['CMSMain']['GO'] = 'Los';
 $lang['de_DE']['LeftAndMain']['SITECONTENT'] = 'Seitenbaum';
 $lang['de_DE']['CMSMain']['MENUTITLE'] = 'Seiteninhalt';
+$lang['de_DE']['CMSMain']['MENUTITLEOPT'] = 'Menütitel';
 $lang['de_DE']['CMSMain']['METADESCOPT'] = 'Beschreibung';
 $lang['de_DE']['CMSMain']['METAKEYWORDSOPT'] = 'Schlüsselwörter';
 $lang['de_DE']['CMSMain']['NEW'] = 'Neu';
@@ -117,7 +126,6 @@ $lang['de_DE']['CMSMain']['REMOVEDFD'] = 'Von Entwurf-Seite gelöscht';
 $lang['de_DE']['CMSMain']['REMOVEDPAGE'] = '\'%s\' von veröffentlichter Webseite gelöscht';
 $lang['de_DE']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Lösche \'%s\' von der Entwurfs-Seite';
 $lang['de_DE']['CMSMain']['REPORT'] = 'Bericht';
-$lang['de_DE']['CMSMain']['RESTORE'] = 'Wiederherstellen';
 $lang['de_DE']['CMSMain']['RESTORED'] = '\'%s\' erfolgreich wiederhergestellt';
 $lang['de_DE']['CMSMain']['ROLLBACK'] = 'Diese Version wiederherstellen';
 $lang['de_DE']['CMSMain']['ROLLEDBACKPUB'] = 'Zur veröffentlichten Version wiederhergestellt. Neue Versionsnummer ist #%d';
@@ -125,6 +133,7 @@ $lang['de_DE']['CMSMain']['ROLLEDBACKVERSION'] = 'Version #%d wiederhergestellt.
 $lang['de_DE']['CMSMain']['SAVE'] = 'Speichern';
 $lang['de_DE']['CMSMain']['SENTTO'] = 'Zur Freigabe an %s %s gesendet.';
 $lang['de_DE']['CMSMain']['STATUSOPT'] = 'Status';
+$lang['de_DE']['CMSMain']['TITLEOPT'] = 'Titel';
 $lang['de_DE']['CMSMain']['TOTALPAGES'] = 'Seiten gesamt:';
 $lang['de_DE']['CMSMain']['VERSIONSNOPAGE'] = 'Seite #%d nicht gefunden.';
 $lang['de_DE']['CMSMain']['VIEWING'] = 'Sie sehen Version #%d, erstellt von %s';
@@ -134,11 +143,11 @@ $lang['de_DE']['CMSMain']['WORKTODO'] = 'Sie müssen an diesen <b>%d</b> Seiten
 $lang['de_DE']['CMSMain_dialog.ss']['BUTTONNOTFOUND'] = 'Konnte den Schaltflächennamen nicht finden';
 $lang['de_DE']['CMSMain_dialog.ss']['NOLINKED'] = 'Finde  window.linkedObject nicht, klicken Sie auf die Schaltfläche um Zurück zum Hauptfenster zu kommen';
 $lang['de_DE']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'Als Entwurf gespeichert, noch nicht veröffentlicht.';
-$lang['de_DE']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Kriterien hinzufügen...';
+$lang['de_DE']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Kriterien hinzufügen';
 $lang['de_DE']['CMSMain_left.ss']['BATCHACTIONS'] = 'Batch-Aktionen';
 $lang['de_DE']['CMSMain_left.ss']['CHANGED'] = 'geändert';
+$lang['de_DE']['CMSMain_left.ss']['CLEARTITLE'] = 'Suche löschen und alle Inhalte anzeigen';
 $lang['de_DE']['CMSMain_left.ss']['CLOSEBOX'] = 'Hier klicken, um Box zu schließen';
-$lang['de_DE']['CMSMain_left.ss']['COMMENTS'] = 'Kommentare';
 $lang['de_DE']['CMSMain_left.ss']['COMPAREMODE'] = 'Vergleichsmodus (paarweise auswählen)';
 $lang['de_DE']['CMSMain_left.ss']['CREATE'] = 'Seite erstellen';
 $lang['de_DE']['CMSMain_left.ss']['DEL'] = 'gelöscht';
@@ -148,8 +157,10 @@ $lang['de_DE']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Im Entwurf geändert und no
 $lang['de_DE']['CMSMain_left.ss']['EDITEDSINCE'] = 'In der Zwischenzeit bearbeitet';
 $lang['de_DE']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Erlaube Neuordnen per Drag &amp; Drop';
 $lang['de_DE']['CMSMain_left.ss']['GO'] = 'Los';
+$lang['de_DE']['CMSMain_left.ss']['HIDDEN'] = 'versteckt';
 $lang['de_DE']['CMSMain_left.ss']['KEY'] = 'Schlüssel:';
 $lang['de_DE']['CMSMain_left.ss']['NEW'] = 'neu';
+$lang['de_DE']['CMSMain_left.ss']['NOTINMENU'] = 'Aus Navigationsmenüs ausgeschlossen';
 $lang['de_DE']['CMSMain_left.ss']['OPENBOX'] = 'Hier klicken, um diese Box zu öffnen';
 $lang['de_DE']['CMSMain_left.ss']['PAGEVERSIONH'] = 'Versionsverlauf';
 $lang['de_DE']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Veröffentliche die markierten Seiten';
@@ -161,8 +172,6 @@ $lang['de_DE']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Zeige nur veränderte Se
 $lang['de_DE']['CMSMain_left.ss']['SHOWUNPUB'] = 'Zeige unveröffentlichte Versionen';
 $lang['de_DE']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Seitenbaum';
 $lang['de_DE']['CMSMain_left.ss']['SITEREPORTS'] = 'Berichte';
-$lang['de_DE']['CMSMain_left.ss']['TASKLIST'] = 'Aufgabenliste';
-$lang['de_DE']['CMSMain_left.ss']['WAITINGON'] = 'Warte auf';
 $lang['de_DE']['CMSMain_right.ss']['ANYMESSAGE'] = 'Haben Sie eine Nachricht an Ihren Redakteur?';
 $lang['de_DE']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Bitte eine Seite links auswählen.';
 $lang['de_DE']['CMSMain_right.ss']['LOADING'] = 'lade...';
@@ -184,6 +193,7 @@ $lang['de_DE']['CommentAdmin']['APPROVED'] = '%s Kommentare akzeptiert.';
 $lang['de_DE']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Überprüfte Kommentare';
 $lang['de_DE']['CommentAdmin']['AUTHOR'] = 'Autor';
 $lang['de_DE']['CommentAdmin']['COMMENT'] = 'Kommentar';
+$lang['de_DE']['CommentAdmin']['COMMENTERURL'] = 'URL';
 $lang['de_DE']['CommentAdmin']['COMMENTS'] = 'Kommentare';
 $lang['de_DE']['CommentAdmin']['COMMENTSAWAITINGMODERATION'] = 'Auf Moderation wartende Kommentare';
 $lang['de_DE']['CommentAdmin']['DATEPOSTED'] = 'Verfasst am';
@@ -244,6 +254,7 @@ $lang['de_DE']['ImageEditor.ss']['SEPIA'] = 'Sepia';
 $lang['de_DE']['ImageEditor.ss']['UNDO'] = 'rückgängig machen';
 $lang['de_DE']['ImageEditor.ss']['UNTITLED'] = 'Unbetiteltes Dokument';
 $lang['de_DE']['ImageEditor.ss']['WIDTH'] = 'Breite';
+$lang['de_DE']['LeftAndMain']['CANT_REORGANISE'] = 'Sie haben keine Berechtigung, die Struktur der Site umzustellen. Ihre Änderung wurde nicht gespeichert.';
 $lang['de_DE']['LeftAndMain']['CHANGEDURL'] = 'URL geändert: \'%s\'';
 $lang['de_DE']['LeftAndMain']['COMMENTS'] = 'Kommentare';
 $lang['de_DE']['LeftAndMain']['FILESIMAGES'] = 'Dateien & Bilder';
@@ -251,7 +262,7 @@ $lang['de_DE']['LeftAndMain']['HELP'] = 'Hilfe';
 $lang['de_DE']['LeftAndMain']['PAGETYPE'] = 'Seitentyp:';
 $lang['de_DE']['LeftAndMain']['PERMAGAIN'] = 'Sie wurden aus dem System ausgeloggt. Falls Sie sich wieder einloggen möchten, geben Sie bitte Benutzernamen und Passwort im untenstehenden Formular an.';
 $lang['de_DE']['LeftAndMain']['PERMALREADY'] = 'Leider dürfen Sie diesen Teil des CMS nicht aufrufen. Wenn Sie sich als jemand anderes einloggen wollen, benutzen Sie bitte das nachstehende Formular.';
-$lang['de_DE']['LeftAndMain']['PERMDEFAULT'] = 'Geben Sie Ihre E-Mail-Adresse und das Passwort für den Zugang zum CMS ein.';
+$lang['de_DE']['LeftAndMain']['PERMDEFAULT'] = 'Bitte wählen Sie eine Authentifizierungsmethode und geben Sie Ihre Benutzerdaten für den Zugang zum CMS ein.';
 $lang['de_DE']['LeftAndMain']['PLEASESAVE'] = 'Diese Seite konnte nicht aktualisiert werden weil sie noch nicht gespeichert wurde - bitte speichern.';
 $lang['de_DE']['LeftAndMain']['REPORTS'] = 'Berichte';
 $lang['de_DE']['LeftAndMain']['REQUESTERROR'] = 'Systemfehler';
@@ -269,7 +280,7 @@ $lang['de_DE']['LeftAndMain.ss']['EDITINCMS'] = 'Diese Seite im CMS bearbeiten';
 $lang['de_DE']['LeftAndMain.ss']['EDITPROFILE'] = 'Profil';
 $lang['de_DE']['LeftAndMain.ss']['LOADING'] = 'Lade...';
 $lang['de_DE']['LeftAndMain.ss']['LOGGEDINAS'] = 'Eingeloggt als';
-$lang['de_DE']['LeftAndMain.ss']['LOGOUT'] = 'ausloggen';
+$lang['de_DE']['LeftAndMain.ss']['LOGOUT'] = 'Abmelden';
 $lang['de_DE']['LeftAndMain.ss']['PUBLIS'] = 'Veröffentlichte Seite';
 $lang['de_DE']['LeftAndMain.ss']['REQUIREJS'] = 'Das CMS benötigt aktiviertes JavaScript.';
 $lang['de_DE']['LeftAndMain.ss']['SSWEB'] = 'Silverstripe Website';
@@ -279,17 +290,6 @@ $lang['de_DE']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Seitenansicht:';
 $lang['de_DE']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' erfolgreich veröffentlicht';
 $lang['de_DE']['LeftAndMain']['STATUSTO'] = 'Status geändert: \'%s\'';
 $lang['de_DE']['LeftAndMain']['TREESITECONTENT'] = 'Seiteninhalt';
-$lang['de_DE']['MemberList']['ADD'] = 'hinzufügen';
-$lang['de_DE']['MemberList']['ANYGROUP'] = 'Jede Gruppe';
-$lang['de_DE']['MemberList']['ASC'] = 'Aufsteigend';
-$lang['de_DE']['MemberList']['DESC'] = 'Absteigend';
-$lang['de_DE']['MemberList']['EMAIL'] = 'Email';
-$lang['de_DE']['MemberList']['FILTERBYG'] = 'Nach Gruppen sortieren';
-$lang['de_DE']['MemberList']['FN'] = 'Vorname';
-$lang['de_DE']['MemberList']['ORDERBY'] = 'Sortieren nach';
-$lang['de_DE']['MemberList']['PASSWD'] = 'Passwort';
-$lang['de_DE']['MemberList']['SEARCH'] = 'Suche';
-$lang['de_DE']['MemberList']['SN'] = 'Nachname';
 $lang['de_DE']['MemberList.ss']['FILTER'] = 'filtern';
 $lang['de_DE']['MemberList_PageControls.ss']['DISPLAYING'] = 'Anzeigen';
 $lang['de_DE']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'Mitglieder';
@@ -302,7 +302,7 @@ $lang['de_DE']['MemberList_PageControls.ss']['VIEWFIRST'] = 'Erstes ansehen';
 $lang['de_DE']['MemberList_PageControls.ss']['VIEWLAST'] = 'Letztes ansehen';
 $lang['de_DE']['MemberList_PageControls.ss']['VIEWNEXT'] = 'Nächstes ansehen';
 $lang['de_DE']['MemberList_PageControls.ss']['VIEWPREVIOUS'] = 'Vorheriges ansehen';
-$lang['de_DE']['MemberList_Table.ss']['EMAIL'] = 'Email Adresse';
+$lang['de_DE']['MemberList_Table.ss']['EMAIL'] = 'E-Mail-Adresse';
 $lang['de_DE']['MemberList_Table.ss']['FN'] = 'Vorname';
 $lang['de_DE']['MemberList_Table.ss']['PASSWD'] = 'Passwort';
 $lang['de_DE']['MemberList_Table.ss']['SN'] = 'Nachname';
@@ -313,6 +313,7 @@ $lang['de_DE']['MemberTableField']['ANYGROUP'] = 'Jede Gruppe';
 $lang['de_DE']['MemberTableField']['ASC'] = 'Aufsteigend';
 $lang['de_DE']['MemberTableField']['DESC'] = 'Absteigend';
 $lang['de_DE']['MemberTableField']['EMAIL'] = 'E-Mail';
+$lang['de_DE']['MemberTableField']['ERRORADDINGUSER'] = 'Ein Fehler ist aufgetreten beim Versuch, den Benutzer zur Gruppe %s hinzuzufügen.';
 $lang['de_DE']['MemberTableField']['FILTER'] = 'Filter';
 $lang['de_DE']['MemberTableField']['FILTERBYGROUP'] = 'Nach Gruppen filtern';
 $lang['de_DE']['MemberTableField']['FIRSTNAME'] = 'Vorname';
@@ -321,12 +322,12 @@ $lang['de_DE']['MemberTableField']['SEARCH'] = 'Suche';
 $lang['de_DE']['MemberTableField.ss']['ADDNEW'] = 'Hinzufügen von';
 $lang['de_DE']['MemberTableField.ss']['DELETEMEMBER'] = 'Lösche dieses Mitglied';
 $lang['de_DE']['MemberTableField.ss']['EDITMEMBER'] = 'Bearbeite dieses Mitglied';
+$lang['de_DE']['MemberTableField.ss']['NOITEMSFOUND'] = 'Keine Inhalte gefunden';
 $lang['de_DE']['MemberTableField.ss']['SHOWMEMBER'] = 'Zeige dieses Mitglied an';
 $lang['de_DE']['MemberTableField']['SURNAME'] = 'Nachname';
 $lang['de_DE']['ModelAdmin']['ADDBUTTON'] = 'Hinzufügen';
 $lang['de_DE']['ModelAdmin']['ADDFORM'] = 'Fügen Sie einen Datensatz vom Typ "%s" hinzu.';
 $lang['de_DE']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Spalten in Suchergebnissen';
-$lang['de_DE']['ModelAdmin']['CLASSTYPE'] = 'Typ';
 $lang['de_DE']['ModelAdmin']['CLEAR_SEARCH'] = 'Zurücksetzen';
 $lang['de_DE']['ModelAdmin']['CREATEBUTTON'] = 'Erstelle \'%s\'';
 $lang['de_DE']['ModelAdmin']['DELETE'] = 'Löschen';
@@ -342,6 +343,7 @@ $lang['de_DE']['ModelAdmin']['NOCSVFILE'] = 'Wählen sie eine CSV-Datei zum Impo
 $lang['de_DE']['ModelAdmin']['NOIMPORT'] = 'Kein Import notwendig.';
 $lang['de_DE']['ModelAdmin']['NORESULTS'] = 'Keine Ergebnisse';
 $lang['de_DE']['ModelAdmin']['SAVE'] = 'Speichern';
+$lang['de_DE']['ModelAdmin']['SEARCHFOR'] = 'Suche nach:';
 $lang['de_DE']['ModelAdmin']['SEARCHRESULTS'] = 'Suchergebnisse';
 $lang['de_DE']['ModelAdmin']['SELECTALL'] = 'Alle Spalten';
 $lang['de_DE']['ModelAdmin']['SELECTNONE'] = 'Keine Spalten';
@@ -351,10 +353,12 @@ $lang['de_DE']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Spezifikation f
 $lang['de_DE']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Verknüpfungen';
 $lang['de_DE']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Spezifikation für %s';
 $lang['de_DE']['ModelAdmin_left.ss']['ADDLISTING'] = 'Datensatz hinzufügen';
-$lang['de_DE']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Hinzufügen';
 $lang['de_DE']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Importieren';
 $lang['de_DE']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Suche';
 $lang['de_DE']['ModelAdmin_right.ss']['WELCOME1'] = 'Willkommen zu %s. Bitte wählen Sie einen Eintrag von der linken Seite.';
+$lang['de_DE']['ModelSidebar.ss']['ADDLISTING'] = 'Hinzufügen';
+$lang['de_DE']['ModelSidebar.ss']['IMPORT_TAB_HEADER'] = 'Importieren';
+$lang['de_DE']['ModelSidebar.ss']['SEARCHLISTINGS'] = 'Suchen';
 $lang['de_DE']['PageComment']['Comment'] = 'Kommentar';
 $lang['de_DE']['PageComment']['COMMENTBY'] = 'Kommentar von \'%s\' am %s';
 $lang['de_DE']['PageComment']['IsSpam'] = 'Spam?';
@@ -365,7 +369,11 @@ $lang['de_DE']['PageComment']['SINGULARNAME'] = 'Kommentar';
 $lang['de_DE']['PageCommentInterface']['COMMENTERURL'] = 'Die URL Deiner Website';
 $lang['de_DE']['PageCommentInterface']['POST'] = 'Abschicken';
 $lang['de_DE']['PageCommentInterface']['SPAMQUESTION'] = 'Spamschutz Frage: %s';
+$lang['de_DE']['PageCommentInterface.ss']['COMMENTLOGINERROR'] = 'Sie können keine Kommentare schreiben, bevor Sie angemeldet sind.';
+$lang['de_DE']['PageCommentInterface.ss']['COMMENTPERMISSIONERROR'] = 'und daß Sie über passende Zugriffsberechtigungen verfügen';
+$lang['de_DE']['PageCommentInterface.ss']['COMMENTPOSTLOGIN'] = 'Hier anmelden';
 $lang['de_DE']['PageCommentInterface.ss']['COMMENTS'] = 'Kommentare';
+$lang['de_DE']['PageCommentInterface.ss']['COMMENTSDISABLED'] = 'Schreiben von Kommentaren ist deaktiviert';
 $lang['de_DE']['PageCommentInterface.ss']['NEXT'] = 'nächste';
 $lang['de_DE']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'Bisher hat niemand diese Seite kommentiert.';
 $lang['de_DE']['PageCommentInterface.ss']['POSTCOM'] = 'Geben Sie einen Kommentar ab';
@@ -390,20 +398,20 @@ $lang['de_DE']['ReportAdmin_right.ss']['WELCOME1'] = 'Willkommen bei der';
 $lang['de_DE']['ReportAdmin_right.ss']['WELCOME2'] = 'Berichtebereich. Bitte wählen Sie einen Bericht auf der linken Seite.';
 $lang['de_DE']['ReportAdmin_SiteTree.ss']['REPORTS'] = 'Berichte';
 $lang['de_DE']['SecurityAdmin']['ADDMEMBER'] = 'Mitglied hinzufügen';
-$lang['de_DE']['SecurityAdmin']['EDITPERMISSIONS'] = 'Bearbeiten der Rechte und IP Adressen für jede Gruppe';
+$lang['de_DE']['SecurityAdmin']['EDITPERMISSIONS'] = 'Bearbeiten der Rechte und IP-Adressen für jede Gruppe';
 $lang['de_DE']['SecurityAdmin']['MENUTITLE'] = 'Sicherheit';
 $lang['de_DE']['SecurityAdmin']['MENUTITLE'] = 'Sicherheit';
 $lang['de_DE']['SecurityAdmin']['NEWGROUP'] = 'Neue Gruppe';
 $lang['de_DE']['SecurityAdmin']['SAVE'] = 'Speichern';
 $lang['de_DE']['SecurityAdmin']['SGROUPS'] = 'Sicherheitsgruppen';
 $lang['de_DE']['SecurityAdmin_left.ss']['CREATE'] = 'Erstellen';
-$lang['de_DE']['SecurityAdmin_left.ss']['DEL'] = 'Löschen...';
+$lang['de_DE']['SecurityAdmin_left.ss']['DEL'] = 'Löschen';
 $lang['de_DE']['SecurityAdmin_left.ss']['DELGROUPS'] = 'Lösche die markierten Gruppen';
 $lang['de_DE']['SecurityAdmin_left.ss']['ENABLEDRAGGING'] = 'Erlaube Neuordnen per Drag &amp; Drop';
 $lang['de_DE']['SecurityAdmin_left.ss']['GO'] = 'Los';
 $lang['de_DE']['SecurityAdmin_left.ss']['SECGROUPS'] = 'Sicherheitsgruppen';
-$lang['de_DE']['SecurityAdmin_left.ss']['SELECT'] = 'Markieren Sie die Seiten die Sie löschen wollen und drücken dann die nachfolgende Schaltfläche';
-$lang['de_DE']['SecurityAdmin_left.ss']['TOREORG'] = 'Um Ihre Seiten neu zu ordnen, ziehen sie die Seiten an die gewünschte Stelle.';
+$lang['de_DE']['SecurityAdmin_left.ss']['SELECT'] = 'Markieren Sie die Seiten, die Sie löschen wollen und klicken Sie danach auf die Schaltfläche';
+$lang['de_DE']['SecurityAdmin_left.ss']['TOREORG'] = 'Um Ihre Seiten neu zu ordnen, ziehen Sie die Seiten an die gewünschte Stelle.';
 $lang['de_DE']['SecurityAdmin_right.ss']['WELCOME1'] = 'Willkommen bei dem';
 $lang['de_DE']['SecurityAdmin_right.ss']['WELCOME2'] = 'Sicherheitsadministrationsbereich. Bitte wählen Sie eine Gruppe auf der linken Seite.';
 $lang['de_DE']['SideReport']['EMPTYPAGES'] = 'Leere Seiten';
@@ -414,7 +422,6 @@ $lang['de_DE']['StaticExporter']['BASEURL'] = 'Ausgangs URL';
 $lang['de_DE']['StaticExporter']['EXPORTTO'] = 'Exportieren in diesen Ordner';
 $lang['de_DE']['StaticExporter']['FOLDEREXPORT'] = 'Ordner zum exportieren';
 $lang['de_DE']['StaticExporter']['NAME'] = 'statischer Exporter';
-$lang['de_DE']['StaticExporter']['ONETHATEXISTS'] = 'Bitte geben Sie einen vorhandenen Ordner an';
 $lang['de_DE']['TableListField_PageControls.ss']['DISPLAYING'] = 'Zeige';
 $lang['de_DE']['TableListField_PageControls.ss']['OF'] = 'von';
 $lang['de_DE']['TableListField_PageControls.ss']['TO'] = 'bis';
@@ -422,12 +429,10 @@ $lang['de_DE']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Ersten anzeigen
 $lang['de_DE']['TableListField_PageControls.ss']['VIEWLAST'] = 'Letzten anzeigen';
 $lang['de_DE']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Nächsten anzeigen';
 $lang['de_DE']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Vorigen anzeigen';
-$lang['de_DE']['TaskList.ss']['BY'] = 'von';
 $lang['de_DE']['ThumbnailStripField']['NOFLASHFOUND'] = 'Keine Flashdateien gefunden';
 $lang['de_DE']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'Keine Flashdateien gefunden in';
 $lang['de_DE']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'Keine Bilder gefunden in';
 $lang['de_DE']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Keine Bilder gefunden';
-$lang['de_DE']['ThumbnailStripField']['NOTAFOLDER'] = 'Dies ist  kein Ordner';
 $lang['de_DE']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(wählen Sie eine der obigen Ordner)';
 $lang['de_DE']['ViewArchivedEmail.ss']['CANACCESS'] = 'Sie können unter folgendem Verweis auf die archivierte Seite zugreifen:';
 $lang['de_DE']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Sie haben darum gebeten, den Inhalt unserer Seite zu sehen, am';
diff --git a/lang/en_GB.php b/lang/en_GB.php
index 98b52b70..1d174144 100644
--- a/lang/en_GB.php
+++ b/lang/en_GB.php
@@ -17,8 +17,6 @@ if(array_key_exists('en_GB', $lang) && is_array($lang['en_GB'])) {
 }
 
 $lang['en_GB']['AssetAdmin']['CHOOSEFILE'] = 'Choose file ';
-$lang['en_GB']['AssetAdmin']['CONTENTMODBY'] = 'Content modifiable by';
-$lang['en_GB']['AssetAdmin']['CONTENTUSABLEBY'] = 'Content usable by';
 $lang['en_GB']['AssetAdmin']['DELETEDX'] = 'Deleted %s files.%s';
 $lang['en_GB']['AssetAdmin']['FILESREADY'] = 'Files ready to upload:';
 $lang['en_GB']['AssetAdmin']['FOLDERDELETED'] = 'folder deleted.';
@@ -31,7 +29,6 @@ $lang['en_GB']['AssetAdmin']['NOTEMP'] = 'There is no temporary folder for uploa
 $lang['en_GB']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'There was nothing to upload';
 $lang['en_GB']['AssetAdmin']['NOWBROKEN'] = 'The following pages now have broken links:';
 $lang['en_GB']['AssetAdmin']['NOWBROKEN2'] = 'Their owners have been emailed and they will fix up those pages.';
-$lang['en_GB']['AssetAdmin']['OWNER'] = 'Owner';
 $lang['en_GB']['AssetAdmin']['SAVEDFILE'] = 'Saved file %s';
 $lang['en_GB']['AssetAdmin']['SAVEFOLDERNAME'] = 'Save folder name';
 $lang['en_GB']['AssetAdmin']['THUMBSDELETED'] = 'All unused thumbnails have been deleted';
@@ -79,13 +76,13 @@ $lang['en_GB']['CMSLeft.ss']['GO'] = 'Go';
 $lang['en_GB']['CMSLeft.ss']['NEWPAGE'] = 'New Page...';
 $lang['en_GB']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Select the pages that you want to delete and then click the button below';
 $lang['en_GB']['CMSLeft.ss']['SITECONT'] = 'Site Content';
-$lang['en_GB']['CMSMain']['ACCESS'] = 'Access to %s in CMS';
+$lang['en_GB']['CMSMain']['ACCESS'] = 'Access to \'%s\' (%s)';
+$lang['en_GB']['CMSMain']['ACCESSALLINTERFACES'] = 'Access to all CMS interfaces';
 $lang['en_GB']['CMSMain']['CANCEL'] = 'Cancel';
 $lang['en_GB']['CMSMain']['CHOOSEREPORT'] = '(Choose a report)';
-$lang['en_GB']['CMSMain']['COMPARINGV'] = 'You are comparing versions #%d and #%d';
+$lang['en_GB']['CMSMain']['COMPARINGV'] = 'Comparing versions %s and %s';
 $lang['en_GB']['CMSMain']['COPYPUBTOSTAGE'] = 'Do you really want to copy the published content to the stage site?';
 $lang['en_GB']['CMSMain']['DELETE'] = 'Delete from the draft site';
-$lang['en_GB']['CMSMain']['DELETEFP'] = 'Delete from the published site';
 $lang['en_GB']['CMSMain']['DESCREMOVED'] = 'and %s descendants';
 $lang['en_GB']['CMSMain']['EMAIL'] = 'Email';
 $lang['en_GB']['CMSMain']['GO'] = 'Go';
@@ -117,7 +114,6 @@ $lang['en_GB']['CMSMain']['REMOVEDFD'] = 'Removed from the draft site';
 $lang['en_GB']['CMSMain']['REMOVEDPAGE'] = 'Removed \'%s\' from the published site';
 $lang['en_GB']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Removed \'%s\' from the draft site';
 $lang['en_GB']['CMSMain']['REPORT'] = 'Report';
-$lang['en_GB']['CMSMain']['RESTORE'] = 'Restore';
 $lang['en_GB']['CMSMain']['RESTORED'] = 'Restored \'%s\' successfully';
 $lang['en_GB']['CMSMain']['ROLLBACK'] = 'Roll back to this version';
 $lang['en_GB']['CMSMain']['ROLLEDBACKPUB'] = 'Rolled back to published version. New version number is #%d';
@@ -127,7 +123,7 @@ $lang['en_GB']['CMSMain']['SENTTO'] = 'Sent to %s %s for approval.';
 $lang['en_GB']['CMSMain']['STATUSOPT'] = 'Status';
 $lang['en_GB']['CMSMain']['TOTALPAGES'] = 'Total pages:';
 $lang['en_GB']['CMSMain']['VERSIONSNOPAGE'] = 'Can\'t find page #%d';
-$lang['en_GB']['CMSMain']['VIEWING'] = 'You are viewing version #%d, created %s';
+$lang['en_GB']['CMSMain']['VIEWING'] = 'You are viewing version #%s, created %s by %s';
 $lang['en_GB']['CMSMain']['VISITRESTORE'] = 'visit restorepage/(ID)';
 $lang['en_GB']['CMSMain']['WAITINGON'] = 'You are waiting on other people to work on these <b>%d</b> pages.';
 $lang['en_GB']['CMSMain']['WORKTODO'] = 'You have work to do on these <b>%d</b> pages.';
@@ -138,7 +134,6 @@ $lang['en_GB']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Add Criteria...';
 $lang['en_GB']['CMSMain_left.ss']['BATCHACTIONS'] = 'Batch Actions';
 $lang['en_GB']['CMSMain_left.ss']['CHANGED'] = 'changed';
 $lang['en_GB']['CMSMain_left.ss']['CLOSEBOX'] = 'click to close box';
-$lang['en_GB']['CMSMain_left.ss']['COMMENTS'] = 'Comments';
 $lang['en_GB']['CMSMain_left.ss']['COMPAREMODE'] = 'Compare mode (click 2 below)';
 $lang['en_GB']['CMSMain_left.ss']['CREATE'] = 'Create';
 $lang['en_GB']['CMSMain_left.ss']['DEL'] = 'deleted';
@@ -161,8 +156,6 @@ $lang['en_GB']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Show only changed pages'
 $lang['en_GB']['CMSMain_left.ss']['SHOWUNPUB'] = 'Show unpublished versions';
 $lang['en_GB']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Site Content and Structure';
 $lang['en_GB']['CMSMain_left.ss']['SITEREPORTS'] = 'Site Reports';
-$lang['en_GB']['CMSMain_left.ss']['TASKLIST'] = 'Tasklist';
-$lang['en_GB']['CMSMain_left.ss']['WAITINGON'] = 'Waiting on';
 $lang['en_GB']['CMSMain_right.ss']['ANYMESSAGE'] = 'Do you have any message for your editor?';
 $lang['en_GB']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Please choose a page from the left.';
 $lang['en_GB']['CMSMain_right.ss']['LOADING'] = 'loading...';
@@ -221,17 +214,27 @@ $lang['en_GB']['CommentTableField.ss']['MARKASSPAM'] = 'Mark this comment as SPA
 $lang['en_GB']['CommentTableField.ss']['MARKNOSPAM'] = 'Mark this comment as not SPAM';
 $lang['en_GB']['CommentTableField.ss']['NOITEMSFOUND'] = 'No items found';
 $lang['en_GB']['CommentTableField.ss']['SPAM'] = 'SPAM';
+$lang['en_GB']['ComplexTableField']['CLOSEPOPUP'] = 'Close Popup';
+$lang['en_GB']['ComplexTableField']['SUCCESSADD'] = 'Added %s %s %s';
 $lang['en_GB']['ImageEditor.ss']['ACTIONS'] = 'actions';
+$lang['en_GB']['ImageEditor.ss']['ADJUST'] = 'adjust';
 $lang['en_GB']['ImageEditor.ss']['APPLY'] = 'apply';
+$lang['en_GB']['ImageEditor.ss']['BLUR'] = 'blur';
+$lang['en_GB']['ImageEditor.ss']['BRIGHTNESS'] = 'brightness';
 $lang['en_GB']['ImageEditor.ss']['CANCEL'] = 'cancel';
+$lang['en_GB']['ImageEditor.ss']['CONTRAST'] = 'contrast';
 $lang['en_GB']['ImageEditor.ss']['CROP'] = 'crop';
 $lang['en_GB']['ImageEditor.ss']['CURRENTACTION'] = 'current&nbsp;action';
 $lang['en_GB']['ImageEditor.ss']['EDITFUNCTIONS'] = 'edit&nbsp;functions';
+$lang['en_GB']['ImageEditor.ss']['EFFECTS'] = 'effects';
 $lang['en_GB']['ImageEditor.ss']['EXIT'] = 'exit';
+$lang['en_GB']['ImageEditor.ss']['GAMMA'] = 'gamma';
+$lang['en_GB']['ImageEditor.ss']['GREYSCALE'] = 'greyscale';
 $lang['en_GB']['ImageEditor.ss']['HEIGHT'] = 'height';
 $lang['en_GB']['ImageEditor.ss']['REDO'] = 'redo';
 $lang['en_GB']['ImageEditor.ss']['ROT'] = 'rotate';
 $lang['en_GB']['ImageEditor.ss']['SAVE'] = 'save&nbsp;image';
+$lang['en_GB']['ImageEditor.ss']['SEPIA'] = 'sepia';
 $lang['en_GB']['ImageEditor.ss']['UNDO'] = 'undo';
 $lang['en_GB']['ImageEditor.ss']['UNTITLED'] = 'Untitled Document';
 $lang['en_GB']['ImageEditor.ss']['WIDTH'] = 'width';
@@ -270,17 +273,6 @@ $lang['en_GB']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Page view:';
 $lang['en_GB']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = 'Published \'%s\' successfully';
 $lang['en_GB']['LeftAndMain']['STATUSTO'] = ' Status changed to \'%s\'';
 $lang['en_GB']['LeftAndMain']['TREESITECONTENT'] = 'Site Content';
-$lang['en_GB']['MemberList']['ADD'] = 'Add';
-$lang['en_GB']['MemberList']['ANYGROUP'] = 'Any group';
-$lang['en_GB']['MemberList']['ASC'] = 'Ascending';
-$lang['en_GB']['MemberList']['DESC'] = 'Descending';
-$lang['en_GB']['MemberList']['EMAIL'] = 'Email';
-$lang['en_GB']['MemberList']['FILTERBYG'] = 'Filter by group';
-$lang['en_GB']['MemberList']['FN'] = 'FirstName';
-$lang['en_GB']['MemberList']['ORDERBY'] = 'Order by';
-$lang['en_GB']['MemberList']['PASSWD'] = 'Password';
-$lang['en_GB']['MemberList']['SEARCH'] = 'Search';
-$lang['en_GB']['MemberList']['SN'] = 'Surname';
 $lang['en_GB']['MemberList.ss']['FILTER'] = 'Filter';
 $lang['en_GB']['MemberList_PageControls.ss']['DISPLAYING'] = 'Displaying';
 $lang['en_GB']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'members';
@@ -314,11 +306,44 @@ $lang['en_GB']['MemberTableField.ss']['DELETEMEMBER'] = 'Delete this member';
 $lang['en_GB']['MemberTableField.ss']['EDITMEMBER'] = 'Edit this member';
 $lang['en_GB']['MemberTableField.ss']['SHOWMEMBER'] = 'Show this member';
 $lang['en_GB']['MemberTableField']['SURNAME'] = 'Surname';
-$lang['en_GB']['ModelAdmin']['CLASSTYPE'] = 'Type';
-$lang['en_GB']['ModelAdmin']['CREATEBUTTON'] = 'Create \'%s\'';
+$lang['en_GB']['ModelAdmin']['ADDBUTTON'] = 'Add';
+$lang['en_GB']['ModelAdmin']['ADDFORM'] = 'Fill out this form to add a %s to the database.';
+$lang['en_GB']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Select result columns...';
+$lang['en_GB']['ModelAdmin']['CLEAR_SEARCH'] = 'Clear Search';
+$lang['en_GB']['ModelAdmin']['CREATEBUTTON'] = 'Creat \'%s\'';
+$lang['en_GB']['ModelAdmin']['DELETE'] = 'Delete';
+$lang['en_GB']['ModelAdmin']['DELETEDRECORDS'] = 'Deleted %s records.';
+$lang['en_GB']['ModelAdmin']['FOUNDRESULTS'] = 'Your search found %s matching items';
+$lang['en_GB']['ModelAdmin']['GOBACK'] = 'Back';
+$lang['en_GB']['ModelAdmin']['GOFORWARD'] = 'Forward';
+$lang['en_GB']['ModelAdmin']['IMPORT'] = 'Import from CSV';
+$lang['en_GB']['ModelAdmin']['IMPORTEDRECORDS'] = 'Imported %s records.';
+$lang['en_GB']['ModelAdmin']['ITEMNOTFOUND'] = 'That item was not found.';
+$lang['en_GB']['ModelAdmin']['LOADEDFOREDITING'] = 'Loaded \'%s\' for editing.';
+$lang['en_GB']['ModelAdmin']['NOCSVFILE'] = 'Please browse for a CSV file to import';
+$lang['en_GB']['ModelAdmin']['NOIMPORT'] = 'Nothing to import';
+$lang['en_GB']['ModelAdmin']['NORESULTS'] = 'No results';
+$lang['en_GB']['ModelAdmin']['SAVE'] = 'Save';
+$lang['en_GB']['ModelAdmin']['SEARCHRESULTS'] = 'Search Results';
+$lang['en_GB']['ModelAdmin']['SELECTALL'] = 'select all';
+$lang['en_GB']['ModelAdmin']['SELECTNONE'] = 'select none';
+$lang['en_GB']['ModelAdmin']['UPDATEDRECORDS'] = 'Updated %s records.';
+$lang['en_GB']['ModelAdmin_ImportSpec.ss']['IMPORTSPECFIELDS'] = 'Database columns';
+$lang['en_GB']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Show Specification for %s';
+$lang['en_GB']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Relations';
+$lang['en_GB']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Specification for %s';
+$lang['en_GB']['ModelAdmin_left.ss']['ADDLISTING'] = 'Add';
+$lang['en_GB']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Import';
+$lang['en_GB']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Search';
+$lang['en_GB']['ModelAdmin_right.ss']['WELCOME1'] = 'Welcome to %s. Please choose on one of the entries in the left pane.';
+$lang['en_GB']['PageComment']['Comment'] = 'Comment';
 $lang['en_GB']['PageComment']['COMMENTBY'] = 'Comment by \'%s\' on %s';
+$lang['en_GB']['PageComment']['IsSpam'] = 'Spam?';
+$lang['en_GB']['PageComment']['Name'] = 'Author Name';
+$lang['en_GB']['PageComment']['NeedsModeration'] = 'Needs Moderation?';
 $lang['en_GB']['PageComment']['PLURALNAME'] = 'Page Comments';
 $lang['en_GB']['PageComment']['SINGULARNAME'] = 'Page Comment';
+$lang['en_GB']['PageCommentInterface']['COMMENTERURL'] = 'Your website URL';
 $lang['en_GB']['PageCommentInterface']['POST'] = 'Post';
 $lang['en_GB']['PageCommentInterface']['SPAMQUESTION'] = 'SPAM protection question: %s';
 $lang['en_GB']['PageCommentInterface.ss']['COMMENTS'] = 'Comments';
@@ -326,11 +351,13 @@ $lang['en_GB']['PageCommentInterface.ss']['NEXT'] = 'next';
 $lang['en_GB']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'No one has commented on this page yet.';
 $lang['en_GB']['PageCommentInterface.ss']['POSTCOM'] = 'Post your comment';
 $lang['en_GB']['PageCommentInterface.ss']['PREV'] = 'previous';
+$lang['en_GB']['PageCommentInterface.ss']['RSSFEEDALLCOMMENTS'] = 'RSS feed for all comments';
 $lang['en_GB']['PageCommentInterface.ss']['RSSFEEDCOMMENTS'] = 'RSS feed for comments on this page';
+$lang['en_GB']['PageCommentInterface.ss']['RSSVIEWALLCOMMENTS'] = 'View all Comments';
 $lang['en_GB']['PageCommentInterface']['YOURCOMMENT'] = 'Comments';
 $lang['en_GB']['PageCommentInterface']['YOURNAME'] = 'Your name';
 $lang['en_GB']['PageCommentInterface_Controller']['SPAMQUESTION'] = 'SPAM protection question: %s';
-$lang['en_GB']['PageCommentInterface_Form']['AWAITINGMODERATION'] = 'Your comment has been submitted and is now awating moderation.';
+$lang['en_GB']['PageCommentInterface_Form']['AWAITINGMODERATION'] = 'Your comment has been submitted and is now awaiting moderation.';
 $lang['en_GB']['PageCommentInterface_Form']['MSGYOUPOSTED'] = 'The message you posted was:';
 $lang['en_GB']['PageCommentInterface_Form']['SPAMDETECTED'] = 'SPAM detected!!';
 $lang['en_GB']['PageCommentInterface_singlecomment.ss']['APPROVE'] = 'approve this comment';
@@ -368,11 +395,18 @@ $lang['en_GB']['StaticExporter']['BASEURL'] = 'Base URL';
 $lang['en_GB']['StaticExporter']['EXPORTTO'] = 'Export to that folder';
 $lang['en_GB']['StaticExporter']['FOLDEREXPORT'] = 'Folder to export to';
 $lang['en_GB']['StaticExporter']['NAME'] = 'Static exporter';
-$lang['en_GB']['StaticExporter']['ONETHATEXISTS'] = 'Please specify a folder that exists';
-$lang['en_GB']['TaskList.ss']['BY'] = 'by';
-$lang['en_GB']['ThumbnailStripField']['NOIMAGESFOUND'] = 'No images found in';
-$lang['en_GB']['ThumbnailStripField']['NOTAFOLDER'] = 'This is not a folder';
-$lang['en_GB']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Choose a folder above)';
+$lang['en_GB']['TableListField_PageControls.ss']['DISPLAYING'] = 'Displaying';
+$lang['en_GB']['TableListField_PageControls.ss']['OF'] = 'of';
+$lang['en_GB']['TableListField_PageControls.ss']['TO'] = 'to';
+$lang['en_GB']['TableListField_PageControls.ss']['VIEWFIRST'] = 'View first';
+$lang['en_GB']['TableListField_PageControls.ss']['VIEWLAST'] = 'View last';
+$lang['en_GB']['TableListField_PageControls.ss']['VIEWNEXT'] = 'View next';
+$lang['en_GB']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'View previous';
+$lang['en_GB']['ThumbnailStripField']['NOFLASHFOUND'] = 'No flash files found';
+$lang['en_GB']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'No flash files found in';
+$lang['en_GB']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'No images found in';
+$lang['en_GB']['ThumbnailStripField']['NOIMAGESFOUND'] = 'No images found';
+$lang['en_GB']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Choose a folder or search above)';
 $lang['en_GB']['ViewArchivedEmail.ss']['CANACCESS'] = 'You can access the archived site at this link:';
 $lang['en_GB']['ViewArchivedEmail.ss']['HAVEASKED'] = 'You have asked to view the content of our site on';
 $lang['en_GB']['WaitingOn.ss']['ATO'] = 'assigned to';
diff --git a/lang/eo_XX.php b/lang/eo_XX.php
index 7228bf81..7d7ec747 100644
--- a/lang/eo_XX.php
+++ b/lang/eo_XX.php
@@ -16,9 +16,7 @@ if(array_key_exists('eo_XX', $lang) && is_array($lang['eo_XX'])) {
 	$lang['eo_XX'] = $lang['en_US'];
 }
 
-$lang['eo_XX']['AssetAdmin']['CHOOSEFILE'] = 'Elekti dosieron';
-$lang['eo_XX']['AssetAdmin']['CONTENTMODBY'] = 'Enhavo modifebla de';
-$lang['eo_XX']['AssetAdmin']['CONTENTUSABLEBY'] = 'Enhavo uzebla de';
+$lang['eo_XX']['AssetAdmin']['CHOOSEFILE'] = 'Elekti dosieron:';
 $lang['eo_XX']['AssetAdmin']['DELETEDX'] = 'Forigis %s dosierojn.%s';
 $lang['eo_XX']['AssetAdmin']['FILESREADY'] = 'Dosieroj pretaj por alŝutiĝi:';
 $lang['eo_XX']['AssetAdmin']['FOLDERDELETED'] = 'dosierujo forigita.';
@@ -31,16 +29,17 @@ $lang['eo_XX']['AssetAdmin']['NOTEMP'] = 'Mankas provizora dosierujo por alŝuto
 $lang['eo_XX']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Estis nenio alŝutebla';
 $lang['eo_XX']['AssetAdmin']['NOWBROKEN'] = 'La jenaj paĝoj aktuale havas rompitajn ligilojn:';
 $lang['eo_XX']['AssetAdmin']['NOWBROKEN2'] = 'Retmesaĝis al iliaj posedantoj, kiuj riparos tiujn paĝojn.';
-$lang['eo_XX']['AssetAdmin']['OWNER'] = 'Posedanto';
 $lang['eo_XX']['AssetAdmin']['SAVEDFILE'] = 'Konservis dosieron %s';
 $lang['eo_XX']['AssetAdmin']['SAVEFOLDERNAME'] = 'Konservi nomon de dosierujo';
-$lang['eo_XX']['AssetAdmin']['THUMBSDELETED'] = 'Forigis ĉiujn neuzitajn minaturojn';
+$lang['eo_XX']['AssetAdmin']['THUMBSDELETED'] = 'Forigis %s neuzitajn minaturojn';
 $lang['eo_XX']['AssetAdmin']['UPLOAD'] = 'Alŝutu dosierojn listigitajn sube';
 $lang['eo_XX']['AssetAdmin']['UPLOADEDX'] = 'Alŝutis %s dosierojn';
 $lang['eo_XX']['AssetAdmin_left.ss']['CREATE'] = 'Krei';
 $lang['eo_XX']['AssetAdmin_left.ss']['DELETE'] = 'Forigi';
 $lang['eo_XX']['AssetAdmin_left.ss']['DELFOLDERS'] = 'Forigu la elektitajn tekojn';
 $lang['eo_XX']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Permesi ŝove kaj demete reordigi';
+$lang['eo_XX']['AssetAdmin_left.ss']['FILESYSTEMSYNC'] = 'Serĉi novajn dosierojn';
+$lang['eo_XX']['AssetAdmin_left.ss']['FILESYSTEMSYNC_DESC'] = 'SilverStripe prizorgas sian propran datumbazon de dosieroj kaj bildoj en via dosierujo assets/. Alklaku ĉi tiun butonon por aktualigi tiun datumbazon, se dosieroj estas aldonitaj al la dosiero assets/, ekzemple, se vi alŝutis dosierojn per FTP.';
 $lang['eo_XX']['AssetAdmin_left.ss']['FOLDERS'] = 'Dosierujoj';
 $lang['eo_XX']['AssetAdmin_left.ss']['GO'] = 'Ek';
 $lang['eo_XX']['AssetAdmin_left.ss']['SELECTTODEL'] = 'Elektu la dosierujojn forigotajn kaj poste alklaku la suban butonon';
@@ -48,6 +47,7 @@ $lang['eo_XX']['AssetAdmin_left.ss']['TOREORG'] = 'Por reorganizi viajn dosieruj
 $lang['eo_XX']['AssetAdmin_right.ss']['CHOOSEPAGE'] = 'Bonvolu elekti paĝon maldekstre.';
 $lang['eo_XX']['AssetAdmin_right.ss']['WELCOME'] = 'Bonvenon al';
 $lang['eo_XX']['AssetAdmin_uploadiframe.ss']['PERMFAILED'] = 'Vi ne rajtas alŝuti dosierojn en ĉi tiun dosierujon.';
+$lang['eo_XX']['AssetAdmin_uploadiframe.ss']['TITLE'] = 'Bildalŝuta Iframe';
 $lang['eo_XX']['AssetTableField']['CAPTION'] = 'Apudskribo';
 $lang['eo_XX']['AssetTableField']['CREATED'] = 'Unue alŝutita';
 $lang['eo_XX']['AssetTableField']['DIM'] = 'Dimensioj';
@@ -73,24 +73,34 @@ $lang['eo_XX']['AssetTableField']['SWFFILEOPTIONS'] = 'Agordoj de SWF-dosieroj';
 $lang['eo_XX']['AssetTableField']['TITLE'] = 'Titolo';
 $lang['eo_XX']['AssetTableField']['TYPE'] = 'Tipo';
 $lang['eo_XX']['AssetTableField']['URL'] = 'URL';
+$lang['eo_XX']['CMSBatchActions']['DELETED_PAGES'] = 'Forigis %d paĝojn el la publikigita retejo';
+$lang['eo_XX']['CMSBatchActions']['DELETE_PAGES'] = 'Forigi el publikigita retejo.';
+$lang['eo_XX']['CMSBatchActions']['DELETING_PAGES'] = 'Forigas elektitajn paĝojn el la publikigita retejo.';
+$lang['eo_XX']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Publikigis %d paĝojn';
+$lang['eo_XX']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Publikigas paĝojn';
+$lang['eo_XX']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publikigi';
+$lang['eo_XX']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'Malpublikigis %d paĝojn';
+$lang['eo_XX']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'Malpublikigas paĝojn';
+$lang['eo_XX']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'Malpublikigi';
 $lang['eo_XX']['CMSLeft.ss']['DELPAGE'] = 'Forigi Paĝojn...';
 $lang['eo_XX']['CMSLeft.ss']['DELPAGES'] = 'Forigu la elektitajn paĝojn';
 $lang['eo_XX']['CMSLeft.ss']['GO'] = 'Ek';
 $lang['eo_XX']['CMSLeft.ss']['NEWPAGE'] = 'Nova Paĝo...';
 $lang['eo_XX']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Elektu la paĝojn forigotajn kaj poste alklaku la suban butonon';
 $lang['eo_XX']['CMSLeft.ss']['SITECONT'] = 'Enhavo de Retejo ';
-$lang['eo_XX']['CMSMain']['ACCESS'] = 'Aliro al %s en CMS';
+$lang['eo_XX']['CMSMain']['ACCESS'] = 'Aliro al \'%s\' (%s)';
+$lang['eo_XX']['CMSMain']['ACCESSALLINTERFACES'] = 'Aliro al ĉiuj interfacoj de CMS';
 $lang['eo_XX']['CMSMain']['CANCEL'] = 'Rezigni';
 $lang['eo_XX']['CMSMain']['CHOOSEREPORT'] = '(Elektu raporton)';
 $lang['eo_XX']['CMSMain']['COMPARINGV'] = 'Vi komparas versiojn #%d kaj #%d';
 $lang['eo_XX']['CMSMain']['COPYPUBTOSTAGE'] = 'Ĉu vi vere volas kopii la eldonitan enhavon al la stapla retejo?';
 $lang['eo_XX']['CMSMain']['DELETE'] = 'Forigi el la malneta retejo';
-$lang['eo_XX']['CMSMain']['DELETEFP'] = 'Forigi de la publikigita retejo';
 $lang['eo_XX']['CMSMain']['DESCREMOVED'] = 'kaj %s posteuloj';
 $lang['eo_XX']['CMSMain']['EMAIL'] = 'Retpoŝto';
 $lang['eo_XX']['CMSMain']['GO'] = 'Ek';
 $lang['eo_XX']['CMSMain']['MENUTITLE'] = 'Enhavo de Retejo';
 $lang['eo_XX']['CMSMain']['MENUTITLE'] = 'Enhavo de Retejo';
+$lang['eo_XX']['CMSMain']['MENUTITLEOPT'] = 'Naviga Etikedo';
 $lang['eo_XX']['CMSMain']['METADESCOPT'] = 'Priskribo';
 $lang['eo_XX']['CMSMain']['METAKEYWORDSOPT'] = 'Ŝlosilvortoj';
 $lang['eo_XX']['CMSMain']['NEW'] = 'Nova';
@@ -116,7 +126,6 @@ $lang['eo_XX']['CMSMain']['REMOVEDFD'] = 'Forigita de la projekta retejo';
 $lang['eo_XX']['CMSMain']['REMOVEDPAGE'] = '\'%s\' forigita de la eldonita retejo';
 $lang['eo_XX']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Forigis je \'%s\' el la malneta retejo';
 $lang['eo_XX']['CMSMain']['REPORT'] = 'Raporto';
-$lang['eo_XX']['CMSMain']['RESTORE'] = 'Ripari';
 $lang['eo_XX']['CMSMain']['RESTORED'] = '\'%s\' sukcese riparita';
 $lang['eo_XX']['CMSMain']['ROLLBACK'] = 'Malfari al ĉi tiu versio';
 $lang['eo_XX']['CMSMain']['ROLLEDBACKPUB'] = 'Malfaris al eldonita versio. Nova versia nombro estas #%d';
@@ -124,9 +133,10 @@ $lang['eo_XX']['CMSMain']['ROLLEDBACKVERSION'] = 'Malfaris al versio #%d. Nova v
 $lang['eo_XX']['CMSMain']['SAVE'] = 'Konservi';
 $lang['eo_XX']['CMSMain']['SENTTO'] = 'Sendita al %s %s por aprobo';
 $lang['eo_XX']['CMSMain']['STATUSOPT'] = 'Stato';
+$lang['eo_XX']['CMSMain']['TITLEOPT'] = 'Titolo';
 $lang['eo_XX']['CMSMain']['TOTALPAGES'] = 'Nombro da paĝoj:';
 $lang['eo_XX']['CMSMain']['VERSIONSNOPAGE'] = 'Ne povas trovi paĝon #%d';
-$lang['eo_XX']['CMSMain']['VIEWING'] = 'Vi vidas version #%d, kreita je %s';
+$lang['eo_XX']['CMSMain']['VIEWING'] = 'Vi vidas version #%s, kreita je %s de %s';
 $lang['eo_XX']['CMSMain']['VISITRESTORE'] = 'vizitu riparan paĝon/(ID)';
 $lang['eo_XX']['CMSMain']['WAITINGON'] = 'Vi atendas aliajn personojn prilabori ĉi tiujn <b>%d</b> paĝojn.';
 $lang['eo_XX']['CMSMain']['WORKTODO'] = 'Vi havas laboron farotan ĉe ĉi tiuj <b>%d</b> paĝoj.';
@@ -136,8 +146,8 @@ $lang['eo_XX']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'Enmetita en la projektan ret
 $lang['eo_XX']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Enmetu Kriteriojn...';
 $lang['eo_XX']['CMSMain_left.ss']['BATCHACTIONS'] = 'Staplaj Agoj';
 $lang['eo_XX']['CMSMain_left.ss']['CHANGED'] = 'ŝanĝita';
+$lang['eo_XX']['CMSMain_left.ss']['CLEARTITLE'] = 'Vakigi la serĉon kaj vidigi ĉiujn erojn';
 $lang['eo_XX']['CMSMain_left.ss']['CLOSEBOX'] = 'alklaku por fermi kadron';
-$lang['eo_XX']['CMSMain_left.ss']['COMMENTS'] = 'Rimarkoj';
 $lang['eo_XX']['CMSMain_left.ss']['COMPAREMODE'] = 'Kompara reĝimo (alklaku je 2 malsupre)';
 $lang['eo_XX']['CMSMain_left.ss']['CREATE'] = 'Krei';
 $lang['eo_XX']['CMSMain_left.ss']['DEL'] = 'forigita';
@@ -147,8 +157,10 @@ $lang['eo_XX']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Redaktita en la projekta re
 $lang['eo_XX']['CMSMain_left.ss']['EDITEDSINCE'] = 'Redaktita ekde';
 $lang['eo_XX']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Permesi ŝove kaj demete reordigi';
 $lang['eo_XX']['CMSMain_left.ss']['GO'] = 'Ek';
+$lang['eo_XX']['CMSMain_left.ss']['HIDDEN'] = 'kaŝita';
 $lang['eo_XX']['CMSMain_left.ss']['KEY'] = 'Ŝlosilo:';
 $lang['eo_XX']['CMSMain_left.ss']['NEW'] = 'nova';
+$lang['eo_XX']['CMSMain_left.ss']['NOTINMENU'] = 'Ekskluzivitaj de navigaj menuoj';
 $lang['eo_XX']['CMSMain_left.ss']['OPENBOX'] = 'alklaku por malfermi ĉi tiun kadron';
 $lang['eo_XX']['CMSMain_left.ss']['PAGEVERSIONH'] = 'Historio de paĝa versio';
 $lang['eo_XX']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Eldoni la elektitajn paĝojn ';
@@ -160,8 +172,6 @@ $lang['eo_XX']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Montru nur ŝanĝitajn p
 $lang['eo_XX']['CMSMain_left.ss']['SHOWUNPUB'] = 'Montri nepublikigitajn versiojn';
 $lang['eo_XX']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Enhavo kaj Strukturo de Retejo ';
 $lang['eo_XX']['CMSMain_left.ss']['SITEREPORTS'] = 'Raportoj de Retejo';
-$lang['eo_XX']['CMSMain_left.ss']['TASKLIST'] = 'Listo de taskoj';
-$lang['eo_XX']['CMSMain_left.ss']['WAITINGON'] = 'Atendanta por';
 $lang['eo_XX']['CMSMain_right.ss']['ANYMESSAGE'] = 'Ĉu vi havas mesaĝon por via redaktoro?';
 $lang['eo_XX']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Bonvolu elekti paĝon maldekstre.';
 $lang['eo_XX']['CMSMain_right.ss']['LOADING'] = 'ŝargas...';
@@ -183,6 +193,7 @@ $lang['eo_XX']['CommentAdmin']['APPROVED'] = 'Akceptis %s komentojn.';
 $lang['eo_XX']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Aprobitaj Komentoj';
 $lang['eo_XX']['CommentAdmin']['AUTHOR'] = 'Aŭtoro';
 $lang['eo_XX']['CommentAdmin']['COMMENT'] = 'Komento';
+$lang['eo_XX']['CommentAdmin']['COMMENTERURL'] = 'URL';
 $lang['eo_XX']['CommentAdmin']['COMMENTS'] = 'Komentoj';
 $lang['eo_XX']['CommentAdmin']['COMMENTSAWAITINGMODERATION'] = 'Komentoj Kontrolotaj';
 $lang['eo_XX']['CommentAdmin']['DATEPOSTED'] = 'Afiŝodato';
@@ -243,16 +254,22 @@ $lang['eo_XX']['ImageEditor.ss']['SEPIA'] = 'sepia';
 $lang['eo_XX']['ImageEditor.ss']['UNDO'] = 'malfari';
 $lang['eo_XX']['ImageEditor.ss']['UNTITLED'] = 'Sentitola Dokumento';
 $lang['eo_XX']['ImageEditor.ss']['WIDTH'] = 'larĝo';
+$lang['eo_XX']['LeftAndMain']['CANT_REORGANISE'] = 'Vi ne havas permeson rearanĝi la retejan arbon. Ne konservis vian ŝanĝon.';
 $lang['eo_XX']['LeftAndMain']['CHANGEDURL'] = 'URL ŝanĝita al \'%s\'';
+$lang['eo_XX']['LeftAndMain']['COMMENTS'] = 'Komentoj';
+$lang['eo_XX']['LeftAndMain']['FILESIMAGES'] = 'Dosieroj kaj Bildoj';
 $lang['eo_XX']['LeftAndMain']['HELP'] = 'Helpo';
 $lang['eo_XX']['LeftAndMain']['PAGETYPE'] = 'Tipo de paĝo:';
 $lang['eo_XX']['LeftAndMain']['PERMAGAIN'] = 'Vin adiaŭis la CMS. Se vi volas denove saluti, enigu salutnomon kaj pasvorton malsupre.';
 $lang['eo_XX']['LeftAndMain']['PERMALREADY'] = 'Bedaŭrinde vi ne povas aliri tiun parton de la CMS. Se vi volas saluti kiel iu alia, tiel faru sube';
 $lang['eo_XX']['LeftAndMain']['PERMDEFAULT'] = 'Enigi vian retadreson kaj pasvorton por aliri al la CMS.';
 $lang['eo_XX']['LeftAndMain']['PLEASESAVE'] = 'Bonvolu konservi paĝon: Ne eblis ĝisdatigi ĉi tiun paĝon ĉar ĝi ankoraŭ ne estas konservita.';
+$lang['eo_XX']['LeftAndMain']['REPORTS'] = 'Raportoj';
 $lang['eo_XX']['LeftAndMain']['REQUESTERROR'] = 'Eraro en peto';
 $lang['eo_XX']['LeftAndMain']['SAVED'] = 'konservis';
 $lang['eo_XX']['LeftAndMain']['SAVEDUP'] = 'Konservis';
+$lang['eo_XX']['LeftAndMain']['SECURITY'] = 'Sekureco';
+$lang['eo_XX']['LeftAndMain']['SITECONTENT'] = 'Enhavo de retejo';
 $lang['eo_XX']['LeftAndMain']['SITECONTENTLEFT'] = 'Enhavo de Retejo';
 $lang['eo_XX']['LeftAndMain.ss']['APPVERSIONTEXT1'] = 'Ĉi tiu estas la';
 $lang['eo_XX']['LeftAndMain.ss']['APPVERSIONTEXT2'] = 'versio kiun vi aktuale rulas, teknike ĝi estas la CVS-branĉo';
@@ -263,26 +280,16 @@ $lang['eo_XX']['LeftAndMain.ss']['EDITINCMS'] = 'Redakti ĉi tiun paĝon en la C
 $lang['eo_XX']['LeftAndMain.ss']['EDITPROFILE'] = 'Profilo';
 $lang['eo_XX']['LeftAndMain.ss']['LOADING'] = 'Ŝargas...';
 $lang['eo_XX']['LeftAndMain.ss']['LOGGEDINAS'] = 'Salutis kiel';
-$lang['eo_XX']['LeftAndMain.ss']['LOGOUT'] = 'adiaŭii';
+$lang['eo_XX']['LeftAndMain.ss']['LOGOUT'] = 'Elsaluti';
 $lang['eo_XX']['LeftAndMain.ss']['PUBLIS'] = 'Publikigita Retejo';
 $lang['eo_XX']['LeftAndMain.ss']['REQUIREJS'] = 'La CMS postulas ke vi estu enŝaltinta Javaskripton';
 $lang['eo_XX']['LeftAndMain.ss']['SSWEB'] = 'Silverstripe-Retejo';
 $lang['eo_XX']['LeftAndMain.ss']['VIEWINDRAFT'] = 'Vidigi la Paĝon en la Malneta Retejo';
 $lang['eo_XX']['LeftAndMain.ss']['VIEWINPUBLISHED'] = 'Vidigi la Paĝon en la Publika Retejo';
 $lang['eo_XX']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Paĝa vido:';
+$lang['eo_XX']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' sukcese publikigita';
 $lang['eo_XX']['LeftAndMain']['STATUSTO'] = 'Stato ŝanĝiĝis al \'%s\'';
 $lang['eo_XX']['LeftAndMain']['TREESITECONTENT'] = 'Enhavo de Retejo';
-$lang['eo_XX']['MemberList']['ADD'] = 'Enmeti';
-$lang['eo_XX']['MemberList']['ANYGROUP'] = 'Ajna grupo';
-$lang['eo_XX']['MemberList']['ASC'] = 'Kreske';
-$lang['eo_XX']['MemberList']['DESC'] = 'Malkreske';
-$lang['eo_XX']['MemberList']['EMAIL'] = 'Retpoŝto';
-$lang['eo_XX']['MemberList']['FILTERBYG'] = 'Filtri laŭ grupo';
-$lang['eo_XX']['MemberList']['FN'] = 'Persona Nomo';
-$lang['eo_XX']['MemberList']['ORDERBY'] = 'Ordigi laŭ';
-$lang['eo_XX']['MemberList']['PASSWD'] = 'Pasvorto';
-$lang['eo_XX']['MemberList']['SEARCH'] = 'Serĉi';
-$lang['eo_XX']['MemberList']['SN'] = 'Familia Nomo';
 $lang['eo_XX']['MemberList.ss']['FILTER'] = 'Filtrilo';
 $lang['eo_XX']['MemberList_PageControls.ss']['DISPLAYING'] = 'Vidigi';
 $lang['eo_XX']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'membroj';
@@ -306,6 +313,7 @@ $lang['eo_XX']['MemberTableField']['ANYGROUP'] = 'Ajna grupo';
 $lang['eo_XX']['MemberTableField']['ASC'] = 'Kreske';
 $lang['eo_XX']['MemberTableField']['DESC'] = 'Malkreske';
 $lang['eo_XX']['MemberTableField']['EMAIL'] = 'Retpoŝto';
+$lang['eo_XX']['MemberTableField']['ERRORADDINGUSER'] = 'Eraro okazis aldonante la uzanton al la grupo: %s';
 $lang['eo_XX']['MemberTableField']['FILTER'] = 'Filtri';
 $lang['eo_XX']['MemberTableField']['FILTERBYGROUP'] = 'Filtri laŭ grupo';
 $lang['eo_XX']['MemberTableField']['FIRSTNAME'] = 'Antaŭnomo';
@@ -314,12 +322,12 @@ $lang['eo_XX']['MemberTableField']['SEARCH'] = 'Serĉi';
 $lang['eo_XX']['MemberTableField.ss']['ADDNEW'] = 'Almetu novan';
 $lang['eo_XX']['MemberTableField.ss']['DELETEMEMBER'] = 'Forigu ĉi tiun membron';
 $lang['eo_XX']['MemberTableField.ss']['EDITMEMBER'] = 'Redaktu ĉi tiun membron';
+$lang['eo_XX']['MemberTableField.ss']['NOITEMSFOUND'] = 'Ne trovis eron';
 $lang['eo_XX']['MemberTableField.ss']['SHOWMEMBER'] = 'Montru ĉi tiun membron';
 $lang['eo_XX']['MemberTableField']['SURNAME'] = 'Familia nomo';
 $lang['eo_XX']['ModelAdmin']['ADDBUTTON'] = 'Aldoni';
 $lang['eo_XX']['ModelAdmin']['ADDFORM'] = 'Plenigu ĉi tiun formularon por aldoni je %s al la datumbazo.';
 $lang['eo_XX']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Elekti rezultajn kolumnojn...';
-$lang['eo_XX']['ModelAdmin']['CLASSTYPE'] = 'Tipo';
 $lang['eo_XX']['ModelAdmin']['CLEAR_SEARCH'] = 'Vakigi Serĉon';
 $lang['eo_XX']['ModelAdmin']['CREATEBUTTON'] = 'Krei je \'%s\'';
 $lang['eo_XX']['ModelAdmin']['DELETE'] = 'Forigi';
@@ -335,6 +343,7 @@ $lang['eo_XX']['ModelAdmin']['NOCSVFILE'] = 'Bonvolu foliumi por CSV-dosiero imp
 $lang['eo_XX']['ModelAdmin']['NOIMPORT'] = 'Nenio importota';
 $lang['eo_XX']['ModelAdmin']['NORESULTS'] = 'Neniu rezulto';
 $lang['eo_XX']['ModelAdmin']['SAVE'] = 'Konservi';
+$lang['eo_XX']['ModelAdmin']['SEARCHFOR'] = 'Serĉi por: ';
 $lang['eo_XX']['ModelAdmin']['SEARCHRESULTS'] = 'Serĉi Rezultojn';
 $lang['eo_XX']['ModelAdmin']['SELECTALL'] = 'elekti ĉiujn';
 $lang['eo_XX']['ModelAdmin']['SELECTNONE'] = 'elekti neniun';
@@ -344,10 +353,12 @@ $lang['eo_XX']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Vidigi Specifon
 $lang['eo_XX']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Rilatoj';
 $lang['eo_XX']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Specifo por %s';
 $lang['eo_XX']['ModelAdmin_left.ss']['ADDLISTING'] = 'Enmeti';
-$lang['eo_XX']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Enmeti';
 $lang['eo_XX']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Importi';
 $lang['eo_XX']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Serĉi';
 $lang['eo_XX']['ModelAdmin_right.ss']['WELCOME1'] = 'Bonvenon al %s. Bonvole elektu iun el la eroj en la maldekstra fenestro.';
+$lang['eo_XX']['ModelSidebar.ss']['ADDLISTING'] = 'Aldoni';
+$lang['eo_XX']['ModelSidebar.ss']['IMPORT_TAB_HEADER'] = 'Importi';
+$lang['eo_XX']['ModelSidebar.ss']['SEARCHLISTINGS'] = 'Serĉi';
 $lang['eo_XX']['PageComment']['Comment'] = 'Komento';
 $lang['eo_XX']['PageComment']['COMMENTBY'] = 'Rimarko de \'%s\' pri %s';
 $lang['eo_XX']['PageComment']['IsSpam'] = 'Ĉu Spamo?';
@@ -355,14 +366,21 @@ $lang['eo_XX']['PageComment']['Name'] = 'Nomo de Aŭtoro';
 $lang['eo_XX']['PageComment']['NeedsModeration'] = 'Ĉu Kontrolota?';
 $lang['eo_XX']['PageComment']['PLURALNAME'] = 'Paĝaj Komentoj';
 $lang['eo_XX']['PageComment']['SINGULARNAME'] = 'Paĝa Komento';
+$lang['eo_XX']['PageCommentInterface']['COMMENTERURL'] = 'URL de via retejo';
 $lang['eo_XX']['PageCommentInterface']['POST'] = 'Afiŝi';
 $lang['eo_XX']['PageCommentInterface']['SPAMQUESTION'] = 'Spamprotekta demando: %s';
+$lang['eo_XX']['PageCommentInterface.ss']['COMMENTLOGINERROR'] = 'Vi ne povas afiŝi komentojn ĝis vi ensalutis';
+$lang['eo_XX']['PageCommentInterface.ss']['COMMENTPERMISSIONERROR'] = 'kaj vi havas taŭgan permesnivelon';
+$lang['eo_XX']['PageCommentInterface.ss']['COMMENTPOSTLOGIN'] = 'Ensaluti ĉi tie';
 $lang['eo_XX']['PageCommentInterface.ss']['COMMENTS'] = 'Rimarkoj';
+$lang['eo_XX']['PageCommentInterface.ss']['COMMENTSDISABLED'] = 'Afiŝi komentojn estas malŝaltita';
 $lang['eo_XX']['PageCommentInterface.ss']['NEXT'] = 'sekva';
 $lang['eo_XX']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'Neniu jam komentis pri ĉi tiu paĝo.';
 $lang['eo_XX']['PageCommentInterface.ss']['POSTCOM'] = 'Sendu vian rimarkon';
 $lang['eo_XX']['PageCommentInterface.ss']['PREV'] = 'antaŭa';
+$lang['eo_XX']['PageCommentInterface.ss']['RSSFEEDALLCOMMENTS'] = 'RSS-fluo por ĉiuj komentoj';
 $lang['eo_XX']['PageCommentInterface.ss']['RSSFEEDCOMMENTS'] = 'RSS-fluo por komentoj en ĉi tiu paĝo';
+$lang['eo_XX']['PageCommentInterface.ss']['RSSVIEWALLCOMMENTS'] = 'Vidigi ĉiujn komentojn';
 $lang['eo_XX']['PageCommentInterface']['YOURCOMMENT'] = 'Komentoj';
 $lang['eo_XX']['PageCommentInterface']['YOURNAME'] = 'Via nomo';
 $lang['eo_XX']['PageCommentInterface_Controller']['SPAMQUESTION'] = 'Spamprotekta demando: %s';
@@ -404,7 +422,6 @@ $lang['eo_XX']['StaticExporter']['BASEURL'] = 'Baza URL';
 $lang['eo_XX']['StaticExporter']['EXPORTTO'] = 'Eksporti al tiu dosierujo';
 $lang['eo_XX']['StaticExporter']['FOLDEREXPORT'] = 'Dosierujo al kiu eksporti';
 $lang['eo_XX']['StaticExporter']['NAME'] = 'Statika eksportilo';
-$lang['eo_XX']['StaticExporter']['ONETHATEXISTS'] = 'Bonvolu specifi dosierujon ekzistantan';
 $lang['eo_XX']['TableListField_PageControls.ss']['DISPLAYING'] = 'Vidigas';
 $lang['eo_XX']['TableListField_PageControls.ss']['OF'] = 'de';
 $lang['eo_XX']['TableListField_PageControls.ss']['TO'] = 'al';
@@ -412,12 +429,10 @@ $lang['eo_XX']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Vidigi unuan';
 $lang['eo_XX']['TableListField_PageControls.ss']['VIEWLAST'] = 'Vidigi lastan';
 $lang['eo_XX']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Vidigi sekvan';
 $lang['eo_XX']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Vidigi antaŭan';
-$lang['eo_XX']['TaskList.ss']['BY'] = 'de';
 $lang['eo_XX']['ThumbnailStripField']['NOFLASHFOUND'] = 'Ne trovis flash-dosierojn';
 $lang['eo_XX']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'Ne trovis flash-dosierojn en';
 $lang['eo_XX']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'Ne trovis bildojn en';
 $lang['eo_XX']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Ne trovis bildojn';
-$lang['eo_XX']['ThumbnailStripField']['NOTAFOLDER'] = 'Ĉi tiu ne estas dosierujo';
 $lang['eo_XX']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Elektu dosierujon aŭ serĉi supre)';
 $lang['eo_XX']['ViewArchivedEmail.ss']['CANACCESS'] = 'Vi povas aliri la enarkivigitan retejon je ĉi tiu ligilo:';
 $lang['eo_XX']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Vi petis vidi la enhavon de nia retejo je';
diff --git a/lang/es_AR.php b/lang/es_AR.php
index 868649b0..7567b8b1 100644
--- a/lang/es_AR.php
+++ b/lang/es_AR.php
@@ -17,8 +17,6 @@ if(array_key_exists('es_AR', $lang) && is_array($lang['es_AR'])) {
 }
 
 $lang['es_AR']['AssetAdmin']['CHOOSEFILE'] = 'Selecciona un archivo';
-$lang['es_AR']['AssetAdmin']['CONTENTMODBY'] = 'Contenido modificable por';
-$lang['es_AR']['AssetAdmin']['CONTENTUSABLEBY'] = 'Contenido utilizable por';
 $lang['es_AR']['AssetAdmin']['DELETEDX'] = '%s archivos eliminados.%s';
 $lang['es_AR']['AssetAdmin']['FILESREADY'] = 'Archivos listos para cargar:';
 $lang['es_AR']['AssetAdmin']['FOLDERDELETED'] = 'carpeta eliminada.';
@@ -31,7 +29,6 @@ $lang['es_AR']['AssetAdmin']['NOTEMP'] = 'No existe una carpeta temporal para fi
 $lang['es_AR']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'No había nada que cargar';
 $lang['es_AR']['AssetAdmin']['NOWBROKEN'] = 'Las siguientes páginas ahora tienen enlaces rotos:';
 $lang['es_AR']['AssetAdmin']['NOWBROKEN2'] = 'Se ha enviado un correo a los propietarios y ellos deben corregir estas páginas.';
-$lang['es_AR']['AssetAdmin']['OWNER'] = 'Propietario';
 $lang['es_AR']['AssetAdmin']['SAVEDFILE'] = 'Archivo %s guardado';
 $lang['es_AR']['AssetAdmin']['SAVEFOLDERNAME'] = 'Guardar nombre de carpeta';
 $lang['es_AR']['AssetAdmin']['THUMBSDELETED'] = 'Se han eliminado las miniaturas de imágenes que no se utilizan.';
@@ -86,7 +83,6 @@ $lang['es_AR']['CMSMain']['CHOOSEREPORT'] = '(Elije un informe)';
 $lang['es_AR']['CMSMain']['COMPARINGV'] = 'Estás comparando las versiones %s y %s';
 $lang['es_AR']['CMSMain']['COPYPUBTOSTAGE'] = '¿Realmente deseas copiar el contenido publicado al boceto?';
 $lang['es_AR']['CMSMain']['DELETE'] = 'Eliminar del sitio borrador';
-$lang['es_AR']['CMSMain']['DELETEFP'] = 'Eliminar del sitio públicado';
 $lang['es_AR']['CMSMain']['DESCREMOVED'] = 'y %s descendientes';
 $lang['es_AR']['CMSMain']['EMAIL'] = 'Email';
 $lang['es_AR']['CMSMain']['GO'] = 'Ir';
@@ -117,7 +113,6 @@ $lang['es_AR']['CMSMain']['REMOVEDFD'] = 'Quitado del sitio borrador';
 $lang['es_AR']['CMSMain']['REMOVEDPAGE'] = 'Se ha eliminado \'%s\' del sitio público';
 $lang['es_AR']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Quitados \'%s\' del borrador del sitio';
 $lang['es_AR']['CMSMain']['REPORT'] = 'Informe';
-$lang['es_AR']['CMSMain']['RESTORE'] = 'Restaurar';
 $lang['es_AR']['CMSMain']['RESTORED'] = 'Se ha restaurado \'%s\' con éxito';
 $lang['es_AR']['CMSMain']['ROLLBACK'] = 'Restaurar a ésta versión';
 $lang['es_AR']['CMSMain']['ROLLEDBACKPUB'] = 'Se ha restaurado a la versión publicada. La nueva versión es #%d';
@@ -138,7 +133,6 @@ $lang['es_AR']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Agregar criterio...';
 $lang['es_AR']['CMSMain_left.ss']['BATCHACTIONS'] = 'Acciones Múltiples';
 $lang['es_AR']['CMSMain_left.ss']['CHANGED'] = 'cambiado';
 $lang['es_AR']['CMSMain_left.ss']['CLOSEBOX'] = 'pulsa para cerrar la caja';
-$lang['es_AR']['CMSMain_left.ss']['COMMENTS'] = 'Comentarios';
 $lang['es_AR']['CMSMain_left.ss']['COMPAREMODE'] = 'Modo de comparación (haz click en 2 abajo)';
 $lang['es_AR']['CMSMain_left.ss']['CREATE'] = 'Crear';
 $lang['es_AR']['CMSMain_left.ss']['DEL'] = 'eliminado';
@@ -161,8 +155,6 @@ $lang['es_AR']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Muestra sólo páginas m
 $lang['es_AR']['CMSMain_left.ss']['SHOWUNPUB'] = 'Mostrar versiones no publicadas';
 $lang['es_AR']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Contenido y Estructura del Sitio';
 $lang['es_AR']['CMSMain_left.ss']['SITEREPORTS'] = 'Informes del sitio';
-$lang['es_AR']['CMSMain_left.ss']['TASKLIST'] = 'Lista de tareas';
-$lang['es_AR']['CMSMain_left.ss']['WAITINGON'] = 'Esperando por';
 $lang['es_AR']['CMSMain_right.ss']['ANYMESSAGE'] = '¿Tienes algún mensaje para tu editor?';
 $lang['es_AR']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Por favor selecciona una página de la izquierda.';
 $lang['es_AR']['CMSMain_right.ss']['LOADING'] = 'cargando...';
@@ -279,17 +271,6 @@ $lang['es_AR']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Ver página:';
 $lang['es_AR']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' se publicó con éxito';
 $lang['es_AR']['LeftAndMain']['STATUSTO'] = 'Estado cambiado a \'%s\'';
 $lang['es_AR']['LeftAndMain']['TREESITECONTENT'] = 'Contenido del Sitio';
-$lang['es_AR']['MemberList']['ADD'] = 'Agregar';
-$lang['es_AR']['MemberList']['ANYGROUP'] = 'Cualquier grupo';
-$lang['es_AR']['MemberList']['ASC'] = 'Ascendente';
-$lang['es_AR']['MemberList']['DESC'] = 'Descendente';
-$lang['es_AR']['MemberList']['EMAIL'] = 'Dirección Email';
-$lang['es_AR']['MemberList']['FILTERBYG'] = 'Filtrar por grupo';
-$lang['es_AR']['MemberList']['FN'] = 'Nombre(s)';
-$lang['es_AR']['MemberList']['ORDERBY'] = 'Ordenar por';
-$lang['es_AR']['MemberList']['PASSWD'] = 'Contraseña';
-$lang['es_AR']['MemberList']['SEARCH'] = 'Buscar';
-$lang['es_AR']['MemberList']['SN'] = 'Apellidos';
 $lang['es_AR']['MemberList.ss']['FILTER'] = 'Filtro';
 $lang['es_AR']['MemberList_PageControls.ss']['DISPLAYING'] = 'Mostrando';
 $lang['es_AR']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'miembros';
@@ -326,7 +307,6 @@ $lang['es_AR']['MemberTableField']['SURNAME'] = 'Apellido';
 $lang['es_AR']['ModelAdmin']['ADDBUTTON'] = 'Agregar';
 $lang['es_AR']['ModelAdmin']['ADDFORM'] = 'Llena este formulario para agregar un %s a la base de datos.';
 $lang['es_AR']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Seleccionar columnas de resultados...';
-$lang['es_AR']['ModelAdmin']['CLASSTYPE'] = 'Tipo';
 $lang['es_AR']['ModelAdmin']['CLEAR_SEARCH'] = 'Borrar la Búsqueda';
 $lang['es_AR']['ModelAdmin']['CREATEBUTTON'] = 'Crear \'%s\'';
 $lang['es_AR']['ModelAdmin']['DELETE'] = 'Eliminar';
@@ -351,7 +331,6 @@ $lang['es_AR']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Mostrar Especifi
 $lang['es_AR']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Relaciones';
 $lang['es_AR']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Especificaciones para %s';
 $lang['es_AR']['ModelAdmin_left.ss']['ADDLISTING'] = 'Agregar';
-$lang['es_AR']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Agregar';
 $lang['es_AR']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Importar';
 $lang['es_AR']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Buscar';
 $lang['es_AR']['ModelAdmin_right.ss']['WELCOME1'] = 'Bienvenido a %s. Por favor elije en alguna de las entidades ubicadas en el panel de la izquierda.';
@@ -414,7 +393,6 @@ $lang['es_AR']['StaticExporter']['BASEURL'] = 'URL base';
 $lang['es_AR']['StaticExporter']['EXPORTTO'] = 'Exportar a esa carpeta';
 $lang['es_AR']['StaticExporter']['FOLDEREXPORT'] = 'Carpeta a exportar a';
 $lang['es_AR']['StaticExporter']['NAME'] = 'Exportador estático';
-$lang['es_AR']['StaticExporter']['ONETHATEXISTS'] = 'Por favor especifica una carpeta que exista';
 $lang['es_AR']['TableListField_PageControls.ss']['DISPLAYING'] = 'Mostrando';
 $lang['es_AR']['TableListField_PageControls.ss']['OF'] = 'de';
 $lang['es_AR']['TableListField_PageControls.ss']['TO'] = 'a';
@@ -422,12 +400,10 @@ $lang['es_AR']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Ver primero';
 $lang['es_AR']['TableListField_PageControls.ss']['VIEWLAST'] = 'Ver último';
 $lang['es_AR']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Ver siguiente';
 $lang['es_AR']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Ver previo';
-$lang['es_AR']['TaskList.ss']['BY'] = 'por';
 $lang['es_AR']['ThumbnailStripField']['NOFLASHFOUND'] = 'No hay archivos flash';
 $lang['es_AR']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'No hay archivos flash en';
 $lang['es_AR']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'No hay imágenes en';
 $lang['es_AR']['ThumbnailStripField']['NOIMAGESFOUND'] = 'No encuentro imágenes';
-$lang['es_AR']['ThumbnailStripField']['NOTAFOLDER'] = 'Esto no es una carpeta';
 $lang['es_AR']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Elije una carpeta o busca arriba)';
 $lang['es_AR']['ViewArchivedEmail.ss']['CANACCESS'] = 'Puedes acceder al sitio archivado con este enlace:';
 $lang['es_AR']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Has solicitado ver el contenido de nuestro sitio en';
diff --git a/lang/es_ES.php b/lang/es_ES.php
index 8bbb6a99..d6a2f621 100644
--- a/lang/es_ES.php
+++ b/lang/es_ES.php
@@ -17,8 +17,6 @@ if(array_key_exists('es_ES', $lang) && is_array($lang['es_ES'])) {
 }
 
 $lang['es_ES']['AssetAdmin']['CHOOSEFILE'] = 'Seleccione archivo';
-$lang['es_ES']['AssetAdmin']['CONTENTMODBY'] = 'Contenido modificable por';
-$lang['es_ES']['AssetAdmin']['CONTENTUSABLEBY'] = 'Contenido utilizable por';
 $lang['es_ES']['AssetAdmin']['DELETEDX'] = 'Eliminados %s archivos.%s';
 $lang['es_ES']['AssetAdmin']['FILESREADY'] = 'Ficheros listos para agregar:';
 $lang['es_ES']['AssetAdmin']['FOLDERDELETED'] = 'carpeta borrada.';
@@ -31,7 +29,6 @@ $lang['es_ES']['AssetAdmin']['NOTEMP'] = 'No hay un directorio temporal para la
 $lang['es_ES']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'No había nada que agregar';
 $lang['es_ES']['AssetAdmin']['NOWBROKEN'] = 'Las siguientes páginas tienen ahora enlaces rotos:';
 $lang['es_ES']['AssetAdmin']['NOWBROKEN2'] = 'Sus propietarios han sido avisados por email y arreglarán esas páginas.';
-$lang['es_ES']['AssetAdmin']['OWNER'] = 'Propietario';
 $lang['es_ES']['AssetAdmin']['SAVEDFILE'] = 'Guardado archivo %s';
 $lang['es_ES']['AssetAdmin']['SAVEFOLDERNAME'] = 'Guardar nombre de carpeta';
 $lang['es_ES']['AssetAdmin']['THUMBSDELETED'] = 'Todas la miniaturas sin usar serán borradas';
@@ -84,9 +81,8 @@ $lang['es_ES']['CMSMain']['ACCESSALLINTERFACES'] = 'Acceder a todas las interfac
 $lang['es_ES']['CMSMain']['CANCEL'] = 'Cancelar';
 $lang['es_ES']['CMSMain']['CHOOSEREPORT'] = '(Elija un reporte)';
 $lang['es_ES']['CMSMain']['COMPARINGV'] = 'Está comparando las versiones %s y %s';
-$lang['es_ES']['CMSMain']['COPYPUBTOSTAGE'] = 'Desea realmente copiar el contenido publicado al borrador?';
+$lang['es_ES']['CMSMain']['COPYPUBTOSTAGE'] = '¿Desea realmente copiar el contenido publicado al borrador?';
 $lang['es_ES']['CMSMain']['DELETE'] = 'borrar del sitio no publicado';
-$lang['es_ES']['CMSMain']['DELETEFP'] = 'Eliminar del sitio publicado';
 $lang['es_ES']['CMSMain']['DESCREMOVED'] = 'y %s decendientes';
 $lang['es_ES']['CMSMain']['EMAIL'] = 'E-mail';
 $lang['es_ES']['CMSMain']['GO'] = 'Ir';
@@ -117,13 +113,12 @@ $lang['es_ES']['CMSMain']['REMOVEDFD'] = 'Eliminado del borrador';
 $lang['es_ES']['CMSMain']['REMOVEDPAGE'] = 'Se ha eliminado \'%s\' del sitio publicado';
 $lang['es_ES']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Borrado \'%s\'%s desde el sitio no publicado';
 $lang['es_ES']['CMSMain']['REPORT'] = 'Reporte';
-$lang['es_ES']['CMSMain']['RESTORE'] = 'Restaurar';
 $lang['es_ES']['CMSMain']['RESTORED'] = '\'%s\'  Se ha restaurado con éxito';
 $lang['es_ES']['CMSMain']['ROLLBACK'] = 'Restaurar esta versión';
 $lang['es_ES']['CMSMain']['ROLLEDBACKPUB'] = 'Se ha restaurado a la versión publicada. La nueva versión es #%d';
 $lang['es_ES']['CMSMain']['ROLLEDBACKVERSION'] = 'Se ha restaurdo a la versión #%d. La nueva  versión es #%d';
 $lang['es_ES']['CMSMain']['SAVE'] = 'Guardar';
-$lang['es_ES']['CMSMain']['SENTTO'] = 'Se ha enviado a %s %s para su aprovación';
+$lang['es_ES']['CMSMain']['SENTTO'] = 'Se ha enviado a %s %s para su aprobación';
 $lang['es_ES']['CMSMain']['STATUSOPT'] = 'Estatus';
 $lang['es_ES']['CMSMain']['TOTALPAGES'] = 'Páginas totales:';
 $lang['es_ES']['CMSMain']['VERSIONSNOPAGE'] = 'No se puede encontrar la página #%d';
@@ -138,7 +133,6 @@ $lang['es_ES']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Añadir criterio de b
 $lang['es_ES']['CMSMain_left.ss']['BATCHACTIONS'] = 'Acción Múltiple';
 $lang['es_ES']['CMSMain_left.ss']['CHANGED'] = 'cambiado';
 $lang['es_ES']['CMSMain_left.ss']['CLOSEBOX'] = 'pulse para cerrar la caja';
-$lang['es_ES']['CMSMain_left.ss']['COMMENTS'] = 'Comentarios';
 $lang['es_ES']['CMSMain_left.ss']['COMPAREMODE'] = 'Modo de comparación (seleccione 2 versiones)';
 $lang['es_ES']['CMSMain_left.ss']['CREATE'] = 'Crear';
 $lang['es_ES']['CMSMain_left.ss']['DEL'] = 'eliminado';
@@ -147,23 +141,21 @@ $lang['es_ES']['CMSMain_left.ss']['DELETEDSTILLLIVE'] = 'Eliminado del borrador
 $lang['es_ES']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Editado en el borrador pero aún sin publicar';
 $lang['es_ES']['CMSMain_left.ss']['EDITEDSINCE'] = 'Editado Desde';
 $lang['es_ES']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Permite reordenar arrastrando';
-$lang['es_ES']['CMSMain_left.ss']['GO'] = 'Ir';
+$lang['es_ES']['CMSMain_left.ss']['GO'] = 'Crear';
 $lang['es_ES']['CMSMain_left.ss']['KEY'] = 'Clave:';
 $lang['es_ES']['CMSMain_left.ss']['NEW'] = 'nuevo';
 $lang['es_ES']['CMSMain_left.ss']['OPENBOX'] = 'pulse para abrir la caja';
 $lang['es_ES']['CMSMain_left.ss']['PAGEVERSIONH'] = 'Historial de versiones de la página';
 $lang['es_ES']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publica las páginas seleccionadas';
 $lang['es_ES']['CMSMain_left.ss']['SEARCH'] = 'Buscar';
-$lang['es_ES']['CMSMain_left.ss']['SEARCHTITLE'] = 'Busca a travpes de la URL, Título, Título de Menú &amp; Contenido';
+$lang['es_ES']['CMSMain_left.ss']['SEARCHTITLE'] = 'Busca a través de la URL, Título, Título de Menú &amp; Contenido';
 $lang['es_ES']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Seleccione las páginas que quiere cambiar y luego haga pulse sobre una acción:';
 $lang['es_ES']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Seleccione las páginas que quiera duplicar, también si desea incluir las "páginas hija", y la ubicación de los duplicados';
 $lang['es_ES']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Muestra sólo páginas modificadas';
 $lang['es_ES']['CMSMain_left.ss']['SHOWUNPUB'] = 'Mostrar versiones no publicadas';
 $lang['es_ES']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Contenido del Sitio y Estructura';
 $lang['es_ES']['CMSMain_left.ss']['SITEREPORTS'] = 'Reportes del sitio';
-$lang['es_ES']['CMSMain_left.ss']['TASKLIST'] = 'Lista de tareas';
-$lang['es_ES']['CMSMain_left.ss']['WAITINGON'] = 'Esperando';
-$lang['es_ES']['CMSMain_right.ss']['ANYMESSAGE'] = 'Tiene algún mensaje para su editor?';
+$lang['es_ES']['CMSMain_right.ss']['ANYMESSAGE'] = '¿Tiene algún mensaje para su editor?';
 $lang['es_ES']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Por favor seleccione una página de la izquierda.';
 $lang['es_ES']['CMSMain_right.ss']['LOADING'] = 'cargando...';
 $lang['es_ES']['CMSMain_right.ss']['MESSAGE'] = 'Mensaje';
@@ -202,7 +194,7 @@ $lang['es_ES']['CommentAdmin']['SPAMMARKED'] = 'Marcar como spam';
 $lang['es_ES']['CommentAdmin_left.ss']['COMMENTS'] = 'Comentarios';
 $lang['es_ES']['CommentAdmin_right.ss']['WELCOME1'] = 'Bienvenido a ';
 $lang['es_ES']['CommentAdmin_right.ss']['WELCOME2'] = 'gestión de comentarios. Por favor seleccione una carpeta en el árbol de la izquierda.';
-$lang['es_ES']['CommentAdmin_SiteTree.ss']['APPROVED'] = 'Aprovado';
+$lang['es_ES']['CommentAdmin_SiteTree.ss']['APPROVED'] = 'Aprobado';
 $lang['es_ES']['CommentAdmin_SiteTree.ss']['AWAITMODERATION'] = 'Esperando ser moderado';
 $lang['es_ES']['CommentAdmin_SiteTree.ss']['COMMENTS'] = 'Comentarios';
 $lang['es_ES']['CommentAdmin_SiteTree.ss']['SPAM'] = 'Spam';
@@ -220,6 +212,8 @@ $lang['es_ES']['CommentTableField.ss']['MARKASSPAM'] = 'Marcar este comentario c
 $lang['es_ES']['CommentTableField.ss']['MARKNOSPAM'] = 'Marcar este comentario como no spam';
 $lang['es_ES']['CommentTableField.ss']['NOITEMSFOUND'] = 'No ha sido encontrado ninguno';
 $lang['es_ES']['CommentTableField.ss']['SPAM'] = 'spam';
+$lang['es_ES']['ComplexTableField']['CLOSEPOPUP'] = 'Cerrar Popup';
+$lang['es_ES']['ComplexTableField']['SUCCESSADD'] = 'Añadido %s %s %s';
 $lang['es_ES']['ImageEditor.ss']['ACTIONS'] = 'acciones';
 $lang['es_ES']['ImageEditor.ss']['ADJUST'] = 'ajustar';
 $lang['es_ES']['ImageEditor.ss']['APPLY'] = 'aplicar';
@@ -277,17 +271,6 @@ $lang['es_ES']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Ver página:';
 $lang['es_ES']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' publicado correctamente.';
 $lang['es_ES']['LeftAndMain']['STATUSTO'] = 'Estado cambiado a \'%s\'';
 $lang['es_ES']['LeftAndMain']['TREESITECONTENT'] = 'Contenido del Sitio';
-$lang['es_ES']['MemberList']['ADD'] = 'Añadir';
-$lang['es_ES']['MemberList']['ANYGROUP'] = 'Cualquier grupo';
-$lang['es_ES']['MemberList']['ASC'] = 'Ascendente';
-$lang['es_ES']['MemberList']['DESC'] = 'Descendente';
-$lang['es_ES']['MemberList']['EMAIL'] = 'E-mail';
-$lang['es_ES']['MemberList']['FILTERBYG'] = 'Filtrar por grupo';
-$lang['es_ES']['MemberList']['FN'] = 'Nombre(s)';
-$lang['es_ES']['MemberList']['ORDERBY'] = 'Ordenar por';
-$lang['es_ES']['MemberList']['PASSWD'] = 'Contraseña';
-$lang['es_ES']['MemberList']['SEARCH'] = 'Buscar';
-$lang['es_ES']['MemberList']['SN'] = 'Apellidos';
 $lang['es_ES']['MemberList.ss']['FILTER'] = 'Filtrar';
 $lang['es_ES']['MemberList_PageControls.ss']['DISPLAYING'] = 'Mostrando';
 $lang['es_ES']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'miembros';
@@ -323,13 +306,15 @@ $lang['es_ES']['MemberTableField.ss']['SHOWMEMBER'] = 'Mostrar este miembro';
 $lang['es_ES']['MemberTableField']['SURNAME'] = 'Apellido/s';
 $lang['es_ES']['ModelAdmin']['ADDBUTTON'] = 'Añadir';
 $lang['es_ES']['ModelAdmin']['ADDFORM'] = 'Rellena este formulario para añadir un %s a la base de datos.';
-$lang['es_ES']['ModelAdmin']['CLASSTYPE'] = 'Tipo';
+$lang['es_ES']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Seleccionar columnas resultantes...';
+$lang['es_ES']['ModelAdmin']['CLEAR_SEARCH'] = 'Borrar Búsqueda';
 $lang['es_ES']['ModelAdmin']['CREATEBUTTON'] = 'Crear \'%s\'';
 $lang['es_ES']['ModelAdmin']['DELETE'] = 'Eliminar';
 $lang['es_ES']['ModelAdmin']['DELETEDRECORDS'] = 'Eleminatos %s registros.';
 $lang['es_ES']['ModelAdmin']['FOUNDRESULTS'] = 'Tu búsqueda ha encontrado %s artículos relacionados';
 $lang['es_ES']['ModelAdmin']['GOBACK'] = 'Volver';
 $lang['es_ES']['ModelAdmin']['GOFORWARD'] = 'Adelante';
+$lang['es_ES']['ModelAdmin']['IMPORT'] = 'Importar desde CSV';
 $lang['es_ES']['ModelAdmin']['IMPORTEDRECORDS'] = 'Importados %s registros.';
 $lang['es_ES']['ModelAdmin']['ITEMNOTFOUND'] = 'No puedo encontrar ese artículo';
 $lang['es_ES']['ModelAdmin']['LOADEDFOREDITING'] = 'Se ha cargado \'%s\' para su edición';
@@ -337,13 +322,15 @@ $lang['es_ES']['ModelAdmin']['NOCSVFILE'] = 'Por favor, selecciona un archivo CS
 $lang['es_ES']['ModelAdmin']['NOIMPORT'] = 'Nada para importar';
 $lang['es_ES']['ModelAdmin']['NORESULTS'] = 'No hay resultados';
 $lang['es_ES']['ModelAdmin']['SAVE'] = 'Guardar';
+$lang['es_ES']['ModelAdmin']['SEARCHRESULTS'] = 'Buscar Resultados';
 $lang['es_ES']['ModelAdmin']['SELECTALL'] = 'seleccionar todos';
 $lang['es_ES']['ModelAdmin']['SELECTNONE'] = 'no seleccionar ninguno';
 $lang['es_ES']['ModelAdmin']['UPDATEDRECORDS'] = 'Actualizados %s registros';
 $lang['es_ES']['ModelAdmin_ImportSpec.ss']['IMPORTSPECFIELDS'] = 'Columnas de la Base de Datos';
+$lang['es_ES']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Mostrar Especificaciones para %s';
 $lang['es_ES']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Relaciones';
+$lang['es_ES']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Especificación para %s';
 $lang['es_ES']['ModelAdmin_left.ss']['ADDLISTING'] = 'Añadir';
-$lang['es_ES']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Añadir';
 $lang['es_ES']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Importar';
 $lang['es_ES']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Buscar';
 $lang['es_ES']['ModelAdmin_right.ss']['WELCOME1'] = 'Bienvenido a %s. Por favor, elije una de las entradas en el menú de la izquierda.';
@@ -355,13 +342,14 @@ $lang['es_ES']['PageComment']['NeedsModeration'] = '¿Necesita moderación?';
 $lang['es_ES']['PageComment']['PLURALNAME'] = 'Comentarios de la página';
 $lang['es_ES']['PageComment']['SINGULARNAME'] = 'Comentario de la página';
 $lang['es_ES']['PageCommentInterface']['COMMENTERURL'] = 'La URL de tu web';
-$lang['es_ES']['PageCommentInterface']['POST'] = 'Publica';
+$lang['es_ES']['PageCommentInterface']['POST'] = 'Publicar';
 $lang['es_ES']['PageCommentInterface']['SPAMQUESTION'] = 'Pregunta de protección contra el spam: %s';
 $lang['es_ES']['PageCommentInterface.ss']['COMMENTS'] = 'Comentarios';
 $lang['es_ES']['PageCommentInterface.ss']['NEXT'] = 'siguiente';
 $lang['es_ES']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'Nadie ha comentado en esta página aún.';
 $lang['es_ES']['PageCommentInterface.ss']['POSTCOM'] = 'Introduzca su comentario';
 $lang['es_ES']['PageCommentInterface.ss']['PREV'] = 'anterior';
+$lang['es_ES']['PageCommentInterface.ss']['RSSFEEDALLCOMMENTS'] = 'RSS feed para todos los comentarios';
 $lang['es_ES']['PageCommentInterface.ss']['RSSFEEDCOMMENTS'] = 'Emisión RSS para los comentarios de esta página';
 $lang['es_ES']['PageCommentInterface.ss']['RSSVIEWALLCOMMENTS'] = 'Ver todos los Comentarios';
 $lang['es_ES']['PageCommentInterface']['YOURCOMMENT'] = 'Comentarios';
@@ -405,7 +393,6 @@ $lang['es_ES']['StaticExporter']['BASEURL'] = 'URL base';
 $lang['es_ES']['StaticExporter']['EXPORTTO'] = 'Exportar a esa carpeta';
 $lang['es_ES']['StaticExporter']['FOLDEREXPORT'] = 'Carpeta a exportar';
 $lang['es_ES']['StaticExporter']['NAME'] = 'Exportador estático';
-$lang['es_ES']['StaticExporter']['ONETHATEXISTS'] = 'Por favor especifique una carpeta que exista';
 $lang['es_ES']['TableListField_PageControls.ss']['DISPLAYING'] = 'Mostrando';
 $lang['es_ES']['TableListField_PageControls.ss']['OF'] = 'de';
 $lang['es_ES']['TableListField_PageControls.ss']['TO'] = 'a';
@@ -413,13 +400,11 @@ $lang['es_ES']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Ver primero';
 $lang['es_ES']['TableListField_PageControls.ss']['VIEWLAST'] = 'Ver último';
 $lang['es_ES']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Ver siguiente';
 $lang['es_ES']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Ver anterior';
-$lang['es_ES']['TaskList.ss']['BY'] = 'por';
 $lang['es_ES']['ThumbnailStripField']['NOFLASHFOUND'] = 'No se han encontrado archivos flash';
 $lang['es_ES']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'No hay archivos flash en';
 $lang['es_ES']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'No hay imágenes en';
 $lang['es_ES']['ThumbnailStripField']['NOIMAGESFOUND'] = 'No se han encontrado imágenes';
-$lang['es_ES']['ThumbnailStripField']['NOTAFOLDER'] = 'Esto no es una carpeta';
-$lang['es_ES']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Elija una carpeta a continuación)';
+$lang['es_ES']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Elija una carpeta o haga una búsqueda a continuación)';
 $lang['es_ES']['ViewArchivedEmail.ss']['CANACCESS'] = 'Puede acceder al sitio archivado con este enlace:';
 $lang['es_ES']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Ha pedido ver el contenido de nuestro sitio el';
 $lang['es_ES']['WaitingOn.ss']['ATO'] = 'asignado a';
diff --git a/lang/es_MX.php b/lang/es_MX.php
index 8a1a121a..5051e3d0 100644
--- a/lang/es_MX.php
+++ b/lang/es_MX.php
@@ -17,8 +17,6 @@ if(array_key_exists('es_MX', $lang) && is_array($lang['es_MX'])) {
 }
 
 $lang['es_MX']['AssetAdmin']['CHOOSEFILE'] = 'Selecciona un fichero';
-$lang['es_MX']['AssetAdmin']['CONTENTMODBY'] = 'Contenido modificable por';
-$lang['es_MX']['AssetAdmin']['CONTENTUSABLEBY'] = 'Contenido utilizable por';
 $lang['es_MX']['AssetAdmin']['DELETEDX'] = '%s ficheros eliminados.%s';
 $lang['es_MX']['AssetAdmin']['FILESREADY'] = 'Ficheros listos para subir:';
 $lang['es_MX']['AssetAdmin']['FOLDERDELETED'] = 'carpeta eliminada.';
@@ -31,7 +29,6 @@ $lang['es_MX']['AssetAdmin']['NOTEMP'] = 'No existe una carpeta temporal para fi
 $lang['es_MX']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'No había nada que subr';
 $lang['es_MX']['AssetAdmin']['NOWBROKEN'] = 'Las siguientes páginas ahora tienen enlaces rotos:';
 $lang['es_MX']['AssetAdmin']['NOWBROKEN2'] = 'Se ha enviado un correo a los propietarios y ellos deben corregir estas páginas.';
-$lang['es_MX']['AssetAdmin']['OWNER'] = 'Propietario';
 $lang['es_MX']['AssetAdmin']['SAVEDFILE'] = 'Se guardó el fichero %s';
 $lang['es_MX']['AssetAdmin']['SAVEFOLDERNAME'] = 'Guardar nombre de carpeta';
 $lang['es_MX']['AssetAdmin']['THUMBSDELETED'] = 'Se han eliminado las miniaturas de imágenes que no se utilizan.';
@@ -86,7 +83,6 @@ $lang['es_MX']['CMSMain']['CHOOSEREPORT'] = '(Elije un reporte)';
 $lang['es_MX']['CMSMain']['COMPARINGV'] = 'Estás comparando las versiones %s y %s';
 $lang['es_MX']['CMSMain']['COPYPUBTOSTAGE'] = '¿Realmente deseas copiar el contenido publicado al boceto?';
 $lang['es_MX']['CMSMain']['DELETE'] = 'Eliminar del boceto del sitio';
-$lang['es_MX']['CMSMain']['DELETEFP'] = 'Eliminar del sitio público';
 $lang['es_MX']['CMSMain']['DESCREMOVED'] = 'y %s descendientes';
 $lang['es_MX']['CMSMain']['EMAIL'] = 'Correo Electrónico';
 $lang['es_MX']['CMSMain']['GO'] = 'Ir';
@@ -117,7 +113,6 @@ $lang['es_MX']['CMSMain']['REMOVEDFD'] = 'Eliminado desde el boceto del sitio';
 $lang['es_MX']['CMSMain']['REMOVEDPAGE'] = 'Se ha eliminado \'%s\' del sitio público';
 $lang['es_MX']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Removidos \'%s\' del borrador del sitio';
 $lang['es_MX']['CMSMain']['REPORT'] = 'Reporte';
-$lang['es_MX']['CMSMain']['RESTORE'] = 'Restaurar';
 $lang['es_MX']['CMSMain']['RESTORED'] = '\'%s\'  Se ha restaurado con éxito';
 $lang['es_MX']['CMSMain']['ROLLBACK'] = 'Restaurar a ésta versión';
 $lang['es_MX']['CMSMain']['ROLLEDBACKPUB'] = 'Se ha restaurado a la versión publicada. La nueva versión es #%d';
@@ -138,7 +133,6 @@ $lang['es_MX']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Agregar Criterio...';
 $lang['es_MX']['CMSMain_left.ss']['BATCHACTIONS'] = 'Acción Múltiple';
 $lang['es_MX']['CMSMain_left.ss']['CHANGED'] = 'cambiado';
 $lang['es_MX']['CMSMain_left.ss']['CLOSEBOX'] = 'pulsa para cerrar el cuadro';
-$lang['es_MX']['CMSMain_left.ss']['COMMENTS'] = 'Comentarios';
 $lang['es_MX']['CMSMain_left.ss']['COMPAREMODE'] = 'Modo de comparación (selecciona 2 versiones)';
 $lang['es_MX']['CMSMain_left.ss']['CREATE'] = 'Crear';
 $lang['es_MX']['CMSMain_left.ss']['DEL'] = 'eliminado';
@@ -161,8 +155,6 @@ $lang['es_MX']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Muestra sólo páginas m
 $lang['es_MX']['CMSMain_left.ss']['SHOWUNPUB'] = 'Mostrar versiones no publicadas';
 $lang['es_MX']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Contenido y Estructura del Sitio';
 $lang['es_MX']['CMSMain_left.ss']['SITEREPORTS'] = 'Reportes del sitio';
-$lang['es_MX']['CMSMain_left.ss']['TASKLIST'] = 'Lista de tareas';
-$lang['es_MX']['CMSMain_left.ss']['WAITINGON'] = 'Esperando';
 $lang['es_MX']['CMSMain_right.ss']['ANYMESSAGE'] = '¿Tienes algún mensaje para tu editor?';
 $lang['es_MX']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Por favor selecciona una página de la izquierda.';
 $lang['es_MX']['CMSMain_right.ss']['LOADING'] = 'cargando...';
@@ -279,17 +271,6 @@ $lang['es_MX']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Ver página:';
 $lang['es_MX']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = 'Se publicó \'%s\' satisfactoriamente';
 $lang['es_MX']['LeftAndMain']['STATUSTO'] = 'Estado cambiado a \'%s\'';
 $lang['es_MX']['LeftAndMain']['TREESITECONTENT'] = 'Contenido del Sitio';
-$lang['es_MX']['MemberList']['ADD'] = 'Agregar';
-$lang['es_MX']['MemberList']['ANYGROUP'] = 'Cualquier grupo';
-$lang['es_MX']['MemberList']['ASC'] = 'Ascendente';
-$lang['es_MX']['MemberList']['DESC'] = 'Descendente';
-$lang['es_MX']['MemberList']['EMAIL'] = 'Correo-e';
-$lang['es_MX']['MemberList']['FILTERBYG'] = 'Filtrar por grupo';
-$lang['es_MX']['MemberList']['FN'] = 'Nombre(s)';
-$lang['es_MX']['MemberList']['ORDERBY'] = 'Ordenar por';
-$lang['es_MX']['MemberList']['PASSWD'] = 'Contraseña';
-$lang['es_MX']['MemberList']['SEARCH'] = 'Buscar';
-$lang['es_MX']['MemberList']['SN'] = 'Apellidos';
 $lang['es_MX']['MemberList.ss']['FILTER'] = 'Filtro';
 $lang['es_MX']['MemberList_PageControls.ss']['DISPLAYING'] = 'Mostrando';
 $lang['es_MX']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'miembros';
@@ -326,7 +307,6 @@ $lang['es_MX']['MemberTableField']['SURNAME'] = 'Apellido Materno';
 $lang['es_MX']['ModelAdmin']['ADDBUTTON'] = 'Añadir';
 $lang['es_MX']['ModelAdmin']['ADDFORM'] = 'Llena este formulario para agregarlo a la base de datos %s.';
 $lang['es_MX']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Seleccionar columnas de resultados...';
-$lang['es_MX']['ModelAdmin']['CLASSTYPE'] = 'Tipo';
 $lang['es_MX']['ModelAdmin']['CLEAR_SEARCH'] = 'Limpiar Búsqueda';
 $lang['es_MX']['ModelAdmin']['CREATEBUTTON'] = 'Crear \'%s\'';
 $lang['es_MX']['ModelAdmin']['DELETE'] = 'Eliminar';
@@ -351,7 +331,6 @@ $lang['es_MX']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Muestra Especifi
 $lang['es_MX']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Relaciones';
 $lang['es_MX']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Especificaciones para %s';
 $lang['es_MX']['ModelAdmin_left.ss']['ADDLISTING'] = 'Agregar';
-$lang['es_MX']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Agregar';
 $lang['es_MX']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Importar';
 $lang['es_MX']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Buscar';
 $lang['es_MX']['ModelAdmin_right.ss']['WELCOME1'] = 'Bienvenido a %s. Por favor selecciona un elemento del panel derecho';
@@ -414,7 +393,6 @@ $lang['es_MX']['StaticExporter']['BASEURL'] = 'URL base';
 $lang['es_MX']['StaticExporter']['EXPORTTO'] = 'Exportar a esa carpeta';
 $lang['es_MX']['StaticExporter']['FOLDEREXPORT'] = 'Carpeta a exportar';
 $lang['es_MX']['StaticExporter']['NAME'] = 'Exportador estático';
-$lang['es_MX']['StaticExporter']['ONETHATEXISTS'] = 'Por favor especifica una carpeta que exista';
 $lang['es_MX']['TableListField_PageControls.ss']['DISPLAYING'] = 'Mostrado';
 $lang['es_MX']['TableListField_PageControls.ss']['OF'] = 'de';
 $lang['es_MX']['TableListField_PageControls.ss']['TO'] = 'a';
@@ -422,12 +400,10 @@ $lang['es_MX']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Ver primero';
 $lang['es_MX']['TableListField_PageControls.ss']['VIEWLAST'] = 'Ver último';
 $lang['es_MX']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Ver siguiente';
 $lang['es_MX']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Ver anterior';
-$lang['es_MX']['TaskList.ss']['BY'] = 'por';
 $lang['es_MX']['ThumbnailStripField']['NOFLASHFOUND'] = 'No encuentro archivos flash';
 $lang['es_MX']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'No encuentro archivos flash en';
 $lang['es_MX']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'No encuentro imágenes en';
 $lang['es_MX']['ThumbnailStripField']['NOIMAGESFOUND'] = 'No encuentro imágenes';
-$lang['es_MX']['ThumbnailStripField']['NOTAFOLDER'] = 'Esto no es una carpeta';
 $lang['es_MX']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(A continuación elije una carpeta)';
 $lang['es_MX']['ViewArchivedEmail.ss']['CANACCESS'] = 'Puedes acceder al sitio archivado con este enlace:';
 $lang['es_MX']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Has solicitado ver el contenido de nuestro sitio en';
diff --git a/lang/et_EE.php b/lang/et_EE.php
index 314991de..fedd56b6 100644
--- a/lang/et_EE.php
+++ b/lang/et_EE.php
@@ -17,8 +17,6 @@ if(array_key_exists('et_EE', $lang) && is_array($lang['et_EE'])) {
 }
 
 $lang['et_EE']['AssetAdmin']['CHOOSEFILE'] = 'Vali fail';
-$lang['et_EE']['AssetAdmin']['CONTENTMODBY'] = 'Sisu muudetav';
-$lang['et_EE']['AssetAdmin']['CONTENTUSABLEBY'] = 'Sisu kasutatav';
 $lang['et_EE']['AssetAdmin']['DELETEDX'] = 'Kustutati %s faili. %s';
 $lang['et_EE']['AssetAdmin']['FILESREADY'] = 'Üleslaadimiseks valmis failid:';
 $lang['et_EE']['AssetAdmin']['FOLDERDELETED'] = 'Kaust kustutatud.';
@@ -31,7 +29,6 @@ $lang['et_EE']['AssetAdmin']['NOTEMP'] = 'Üleslaadimiste jaoks puudub ajutine k
 $lang['et_EE']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Polnud midagi üles laadida';
 $lang['et_EE']['AssetAdmin']['NOWBROKEN'] = 'Järgnevatel lehekülgedel on nüüd katkiseid linke:';
 $lang['et_EE']['AssetAdmin']['NOWBROKEN2'] = 'Nende omanikele saadeti e-mail ja nad parandavad need lehed.';
-$lang['et_EE']['AssetAdmin']['OWNER'] = 'Omanik';
 $lang['et_EE']['AssetAdmin']['SAVEDFILE'] = 'Salvestati fail %';
 $lang['et_EE']['AssetAdmin']['SAVEFOLDERNAME'] = 'Salvesta kausta nimi';
 $lang['et_EE']['AssetAdmin']['THUMBSDELETED'] = 'Kõik kasutamata pisipildid on kustutatud.';
@@ -86,7 +83,6 @@ $lang['et_EE']['CMSMain']['CHOOSEREPORT'] = '(Vali aruanne)';
 $lang['et_EE']['CMSMain']['COMPARINGV'] = 'Võrdled versioone #%d ja #%d';
 $lang['et_EE']['CMSMain']['COPYPUBTOSTAGE'] = 'Kas soovid kindlasti kopeerida avaldatud sisu proovilehele?';
 $lang['et_EE']['CMSMain']['DELETE'] = 'Kustuta visandi lehelt';
-$lang['et_EE']['CMSMain']['DELETEFP'] = 'Kustuta avalikult lehelt';
 $lang['et_EE']['CMSMain']['DESCREMOVED'] = 'ja %s järeltulijat';
 $lang['et_EE']['CMSMain']['EMAIL'] = 'E-post';
 $lang['et_EE']['CMSMain']['GO'] = 'Mine';
@@ -117,7 +113,6 @@ $lang['et_EE']['CMSMain']['REMOVEDFD'] = 'Eemaldatud visandilehelt';
 $lang['et_EE']['CMSMain']['REMOVEDPAGE'] = '\'%s\' eemaldati avalikult lehelt';
 $lang['et_EE']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = '\'%s\' eemaldatud visandi lehelt';
 $lang['et_EE']['CMSMain']['REPORT'] = 'Aruanne';
-$lang['et_EE']['CMSMain']['RESTORE'] = 'Taasta';
 $lang['et_EE']['CMSMain']['RESTORED'] = '\'%s\' taastati edukalt';
 $lang['et_EE']['CMSMain']['ROLLBACK'] = 'Pööra tagasi sellesse versiooni';
 $lang['et_EE']['CMSMain']['ROLLEDBACKPUB'] = 'Taastatud avaldatud versioon. Uue versiooni number on #%d';
@@ -138,7 +133,6 @@ $lang['et_EE']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Lisa Kriteeriume...';
 $lang['et_EE']['CMSMain_left.ss']['BATCHACTIONS'] = 'Pakktegevused';
 $lang['et_EE']['CMSMain_left.ss']['CHANGED'] = 'muudetud';
 $lang['et_EE']['CMSMain_left.ss']['CLOSEBOX'] = 'klõpsa kasti sulgemiseks';
-$lang['et_EE']['CMSMain_left.ss']['COMMENTS'] = 'Kommentaarid';
 $lang['et_EE']['CMSMain_left.ss']['COMPAREMODE'] = 'Võrdlemise režiim (klõpsa kahte allolevat)';
 $lang['et_EE']['CMSMain_left.ss']['CREATE'] = 'Loo';
 $lang['et_EE']['CMSMain_left.ss']['DEL'] = 'kustutatud';
@@ -154,15 +148,13 @@ $lang['et_EE']['CMSMain_left.ss']['OPENBOX'] = 'klõpsa selle kasti avamiseks';
 $lang['et_EE']['CMSMain_left.ss']['PAGEVERSIONH'] = 'Lehe Versiooni Ajalugu';
 $lang['et_EE']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Avalda valitud lehed';
 $lang['et_EE']['CMSMain_left.ss']['SEARCH'] = 'Otsing';
-$lang['et_EE']['CMSMain_left.ss']['SEARCHTITLE'] = 'Otsing läbi aadressi, pealkirja, menüü pealkirja, &amp; sisu';
+$lang['et_EE']['CMSMain_left.ss']['SEARCHTITLE'] = 'Otsing läbi aadressi, pealkirja, menüü pealkirja ning sisu';
 $lang['et_EE']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Vali lehed mida soovid muuta &amp; ja vajuta tegevusele:';
 $lang['et_EE']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Vali lehed, mida soovid paljundada, määratle, kas kaasata ka nende alamlehed ning kuhu paljundused lisada';
 $lang['et_EE']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Näita ainult muudetud lehti';
 $lang['et_EE']['CMSMain_left.ss']['SHOWUNPUB'] = 'Näita avaldamata versioone';
 $lang['et_EE']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Lehe Sisu ja Struktuur';
 $lang['et_EE']['CMSMain_left.ss']['SITEREPORTS'] = 'Lehe Aruanded';
-$lang['et_EE']['CMSMain_left.ss']['TASKLIST'] = 'Ülesannete nimekiri';
-$lang['et_EE']['CMSMain_left.ss']['WAITINGON'] = 'Ootab';
 $lang['et_EE']['CMSMain_right.ss']['ANYMESSAGE'] = 'Soovid sa oma toimetajale midagi teada anda?';
 $lang['et_EE']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Palun vali lehekülg vasakult.';
 $lang['et_EE']['CMSMain_right.ss']['LOADING'] = 'laadin...';
@@ -279,17 +271,6 @@ $lang['et_EE']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Lehekülje vaade:';
 $lang['et_EE']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' edukalt avaldatud';
 $lang['et_EE']['LeftAndMain']['STATUSTO'] = 'Olekuks muudeti \'%s\'';
 $lang['et_EE']['LeftAndMain']['TREESITECONTENT'] = 'Lehe Sisu';
-$lang['et_EE']['MemberList']['ADD'] = 'Lisa';
-$lang['et_EE']['MemberList']['ANYGROUP'] = 'Iga rühm';
-$lang['et_EE']['MemberList']['ASC'] = 'Kasvav';
-$lang['et_EE']['MemberList']['DESC'] = 'Kahanev';
-$lang['et_EE']['MemberList']['EMAIL'] = 'E-post';
-$lang['et_EE']['MemberList']['FILTERBYG'] = 'Filtreeri rühma järgi';
-$lang['et_EE']['MemberList']['FN'] = 'Eesnimi';
-$lang['et_EE']['MemberList']['ORDERBY'] = 'Järjesta';
-$lang['et_EE']['MemberList']['PASSWD'] = 'Parool';
-$lang['et_EE']['MemberList']['SEARCH'] = 'Otsing';
-$lang['et_EE']['MemberList']['SN'] = 'Perekonnanimi';
 $lang['et_EE']['MemberList.ss']['FILTER'] = 'Filter';
 $lang['et_EE']['MemberList_PageControls.ss']['DISPLAYING'] = 'Kuvatakse';
 $lang['et_EE']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'Liikmed';
@@ -326,7 +307,6 @@ $lang['et_EE']['MemberTableField']['SURNAME'] = 'Perekonnanimi';
 $lang['et_EE']['ModelAdmin']['ADDBUTTON'] = 'Lisa';
 $lang['et_EE']['ModelAdmin']['ADDFORM'] = 'Täida see vorm, et lisada %s andmebaasi.';
 $lang['et_EE']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Valige tulemuste veerud';
-$lang['et_EE']['ModelAdmin']['CLASSTYPE'] = 'Tüüp';
 $lang['et_EE']['ModelAdmin']['CLEAR_SEARCH'] = 'Puhasta otsing';
 $lang['et_EE']['ModelAdmin']['CREATEBUTTON'] = 'Loo \'%s\'';
 $lang['et_EE']['ModelAdmin']['DELETE'] = 'Kustuta';
@@ -351,7 +331,6 @@ $lang['et_EE']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Näita %s täpsu
 $lang['et_EE']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Sidemed';
 $lang['et_EE']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = '%s täpsustus';
 $lang['et_EE']['ModelAdmin_left.ss']['ADDLISTING'] = 'Lisa';
-$lang['et_EE']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Lisa';
 $lang['et_EE']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Import';
 $lang['et_EE']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Otsi';
 $lang['et_EE']['ModelAdmin_right.ss']['WELCOME1'] = 'Teretulemast %s. Palun valuge üks sisestustest vasakust paanist.';
@@ -414,7 +393,6 @@ $lang['et_EE']['StaticExporter']['BASEURL'] = 'Baas-URL';
 $lang['et_EE']['StaticExporter']['EXPORTTO'] = 'Ekspordi sellesse kausta';
 $lang['et_EE']['StaticExporter']['FOLDEREXPORT'] = 'Kaust eksportimiseks';
 $lang['et_EE']['StaticExporter']['NAME'] = 'Staatiline eksportija';
-$lang['et_EE']['StaticExporter']['ONETHATEXISTS'] = 'Palun täpsusta olemasolev kaust';
 $lang['et_EE']['TableListField_PageControls.ss']['DISPLAYING'] = 'Kuvamine';
 $lang['et_EE']['TableListField_PageControls.ss']['OF'] = '-';
 $lang['et_EE']['TableListField_PageControls.ss']['TO'] = '-';
@@ -422,12 +400,10 @@ $lang['et_EE']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Vaata esimest';
 $lang['et_EE']['TableListField_PageControls.ss']['VIEWLAST'] = 'Vaata viimast';
 $lang['et_EE']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Vaata järgmist';
 $lang['et_EE']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Vaata eelmist';
-$lang['et_EE']['TaskList.ss']['BY'] = '-';
 $lang['et_EE']['ThumbnailStripField']['NOFLASHFOUND'] = 'Flash faile ei leitud';
 $lang['et_EE']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'Flash faile ei leitud';
 $lang['et_EE']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'Pilte ei leitud';
 $lang['et_EE']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Pilte ei leitud';
-$lang['et_EE']['ThumbnailStripField']['NOTAFOLDER'] = 'See ei ole kaust';
 $lang['et_EE']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Vali ülalt kaust)';
 $lang['et_EE']['ViewArchivedEmail.ss']['CANACCESS'] = 'Arhiveeritud lehele pääsed ligi selle lingi kaudu:';
 $lang['et_EE']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Soovid vaadata meie lehe sisu kuupäeval';
diff --git a/lang/fi_FI.php b/lang/fi_FI.php
index 41aaba0c..68b3b296 100644
--- a/lang/fi_FI.php
+++ b/lang/fi_FI.php
@@ -17,19 +17,17 @@ if(array_key_exists('fi_FI', $lang) && is_array($lang['fi_FI'])) {
 }
 
 $lang['fi_FI']['AssetAdmin']['CHOOSEFILE'] = 'Valitse tiedosto';
-$lang['fi_FI']['AssetAdmin']['CONTENTMODBY'] = 'Sisältö on muokattavissa henkilöillä';
-$lang['fi_FI']['AssetAdmin']['CONTENTUSABLEBY'] = 'Sisältö on käytettävissä henkilöillä';
 $lang['fi_FI']['AssetAdmin']['DELETEDX'] = 'Poistettu %s tiedostoa.%s';
 $lang['fi_FI']['AssetAdmin']['FILESREADY'] = 'Tiedostot, jotka ovat valmiita kopiointiin:';
 $lang['fi_FI']['AssetAdmin']['FOLDERDELETED'] = 'hakemisto poistettu.';
 $lang['fi_FI']['AssetAdmin']['FOLDERSDELETED'] = 'hakemistot poistettu.';
 $lang['fi_FI']['AssetAdmin']['MENUTITLE'] = 'Tiedostot ja kuvat';
+$lang['fi_FI']['AssetAdmin']['MENUTITLE'] = 'Tiedostot ja kuvat';
 $lang['fi_FI']['AssetAdmin']['MOVEDX'] = 'Siirrettiin %s tiedostoa';
 $lang['fi_FI']['AssetAdmin']['NEWFOLDER'] = 'Uusi kansio';
 $lang['fi_FI']['AssetAdmin']['NOTEMP'] = 'Väliaikaiskansiota palvelimelle kopiointeja varten ei ole asetettu. Ole hyvä ja määrittele upload_tmp_dir tiedostossa php.ini';
 $lang['fi_FI']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Palvelimelle ei ollut mitään kopioitavaa';
 $lang['fi_FI']['AssetAdmin']['NOWBROKEN'] = 'Seuraavilla sivuilla on rikkinäisiä linkkejä:';
-$lang['fi_FI']['AssetAdmin']['OWNER'] = 'Omistaja';
 $lang['fi_FI']['AssetAdmin']['SAVEDFILE'] = 'Tallennettu tiedosto %s';
 $lang['fi_FI']['AssetAdmin']['SAVEFOLDERNAME'] = 'Tallenna kansion nimi';
 $lang['fi_FI']['AssetAdmin']['THUMBSDELETED'] = 'Kaikki käyttämättömät pikkukuvat on poistettu';
@@ -80,7 +78,6 @@ $lang['fi_FI']['CMSMain']['CHOOSEREPORT'] = '(Valitse raportti)';
 $lang['fi_FI']['CMSMain']['COMPARINGV'] = 'Olet vertaamassa versioita #%d ja #%d';
 $lang['fi_FI']['CMSMain']['COPYPUBTOSTAGE'] = 'Haluatko varmasti kopioida julkaistun sisällön luonnossivustolle?';
 $lang['fi_FI']['CMSMain']['DELETE'] = 'Poista luonnossivustolta';
-$lang['fi_FI']['CMSMain']['DELETEFP'] = 'Poista julkaistulta sivustolta';
 $lang['fi_FI']['CMSMain']['DESCREMOVED'] = 'ja %s jälkeläistä';
 $lang['fi_FI']['CMSMain']['EMAIL'] = 'Sähköposti';
 $lang['fi_FI']['CMSMain']['GO'] = 'Siirry';
@@ -110,7 +107,6 @@ $lang['fi_FI']['CMSMain']['REMOVEDFD'] = 'Poistettu luonnossivustolta';
 $lang['fi_FI']['CMSMain']['REMOVEDPAGE'] = '%s poistettiin julkaistulta sivulta';
 $lang['fi_FI']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Poistettu \'%s\' luonnossivustolta';
 $lang['fi_FI']['CMSMain']['REPORT'] = 'Raportti';
-$lang['fi_FI']['CMSMain']['RESTORE'] = 'Palauta';
 $lang['fi_FI']['CMSMain']['RESTORED'] = '%s palautettiin';
 $lang['fi_FI']['CMSMain']['ROLLBACK'] = 'Siirry takaisin tähän versioon.';
 $lang['fi_FI']['CMSMain']['ROLLEDBACKPUB'] = 'Siirrytty takaisin julkaistuun versioon. Uusi versionumero on #%d';
@@ -130,7 +126,6 @@ $lang['fi_FI']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Lisää suodatin...';
 $lang['fi_FI']['CMSMain_left.ss']['BATCHACTIONS'] = 'Toiminnot';
 $lang['fi_FI']['CMSMain_left.ss']['CHANGED'] = 'vaihdettu';
 $lang['fi_FI']['CMSMain_left.ss']['CLOSEBOX'] = 'sulkeaksesi laatikon napsauta tästä';
-$lang['fi_FI']['CMSMain_left.ss']['COMMENTS'] = 'Kommentit';
 $lang['fi_FI']['CMSMain_left.ss']['COMPAREMODE'] = 'Vertailutila (valitse kaksi alta)';
 $lang['fi_FI']['CMSMain_left.ss']['CREATE'] = 'Luo';
 $lang['fi_FI']['CMSMain_left.ss']['DEL'] = 'poistettu';
@@ -153,8 +148,6 @@ $lang['fi_FI']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Näytä ainoastaan muute
 $lang['fi_FI']['CMSMain_left.ss']['SHOWUNPUB'] = 'Näytä julkaisemattomat versiot';
 $lang['fi_FI']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Sivuston sisältö ja rakenne';
 $lang['fi_FI']['CMSMain_left.ss']['SITEREPORTS'] = 'Sivuston raportit';
-$lang['fi_FI']['CMSMain_left.ss']['TASKLIST'] = 'Tehtävälista';
-$lang['fi_FI']['CMSMain_left.ss']['WAITINGON'] = 'Odotetaan';
 $lang['fi_FI']['CMSMain_right.ss']['ANYMESSAGE'] = 'Onko sinulla viestejä muokkaajallesi?';
 $lang['fi_FI']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Valitse sivu vasemmalta.';
 $lang['fi_FI']['CMSMain_right.ss']['LOADING'] = 'ladataan...';
@@ -209,6 +202,7 @@ $lang['fi_FI']['CommentTableField.ss']['EDIT'] = 'muokkaa';
 $lang['fi_FI']['CommentTableField.ss']['MARKASSPAM'] = 'Merkitse tämä kommentti roskapostiksi';
 $lang['fi_FI']['CommentTableField.ss']['MARKNOSPAM'] = 'Merkkaa tämä kommentti ei-roskapostiksi';
 $lang['fi_FI']['CommentTableField.ss']['SPAM'] = 'roskaposti';
+$lang['fi_FI']['ComplexTableField']['CLOSEPOPUP'] = 'Sulje ponnahdusikkuna';
 $lang['fi_FI']['ImageEditor.ss']['ACTIONS'] = 'toiminnot';
 $lang['fi_FI']['ImageEditor.ss']['APPLY'] = 'käytä';
 $lang['fi_FI']['ImageEditor.ss']['CANCEL'] = 'peruuta';
@@ -224,15 +218,20 @@ $lang['fi_FI']['ImageEditor.ss']['UNDO'] = 'kumoa';
 $lang['fi_FI']['ImageEditor.ss']['UNTITLED'] = 'Nimeämätön asiakirja';
 $lang['fi_FI']['ImageEditor.ss']['WIDTH'] = 'leveys';
 $lang['fi_FI']['LeftAndMain']['CHANGEDURL'] = 'URL-osoite vaihdettiin osoitteeksi %s';
+$lang['fi_FI']['LeftAndMain']['COMMENTS'] = 'Kommentit';
+$lang['fi_FI']['LeftAndMain']['FILESIMAGES'] = 'Tiedostot ja kuvat';
 $lang['fi_FI']['LeftAndMain']['HELP'] = 'Ohje';
 $lang['fi_FI']['LeftAndMain']['PAGETYPE'] = 'Sivun tyyppi:';
 $lang['fi_FI']['LeftAndMain']['PERMAGAIN'] = 'Olet kirjautunut ulos CMS:stä. Jos haluat kirjautua uudelleen sisään, syötä käyttäjätunnuksesi ja salasanasi alla.';
 $lang['fi_FI']['LeftAndMain']['PERMALREADY'] = 'Paihoittelut, mutta et pääse tähän osaan CMS:ää. Jos haluat kirjautua jonain muuna, voit tehdä sen alla.';
 $lang['fi_FI']['LeftAndMain']['PERMDEFAULT'] = 'Valitse tunnistustapa ja syötä tunnistetietosi CMS:ään.';
 $lang['fi_FI']['LeftAndMain']['PLEASESAVE'] = 'Tätä sivua ei voitu päivittää, koska sitä ei ole vielä tallennettu. Tallenna sivu.';
+$lang['fi_FI']['LeftAndMain']['REPORTS'] = 'Raportit';
 $lang['fi_FI']['LeftAndMain']['REQUESTERROR'] = 'Virhe pyynnössä';
 $lang['fi_FI']['LeftAndMain']['SAVED'] = 'tallennettu';
 $lang['fi_FI']['LeftAndMain']['SAVEDUP'] = 'Tallennettu';
+$lang['fi_FI']['LeftAndMain']['SECURITY'] = 'Turvallisuus';
+$lang['fi_FI']['LeftAndMain']['SITECONTENT'] = 'Sivuston sisältö';
 $lang['fi_FI']['LeftAndMain']['SITECONTENTLEFT'] = 'Sivuston sisältö';
 $lang['fi_FI']['LeftAndMain.ss']['APPVERSIONTEXT1'] = 'Tämä on';
 $lang['fi_FI']['LeftAndMain.ss']['APPVERSIONTEXT2'] = 'versio, jota sinä käytät, on CVS-versio';
@@ -245,23 +244,13 @@ $lang['fi_FI']['LeftAndMain.ss']['LOADING'] = 'Ladataan...';
 $lang['fi_FI']['LeftAndMain.ss']['LOGGEDINAS'] = 'Kirjautuneena käyttäjänä';
 $lang['fi_FI']['LeftAndMain.ss']['LOGOUT'] = 'Kirjaudu ulos';
 $lang['fi_FI']['LeftAndMain.ss']['PUBLIS'] = 'Julkaistu sivusto';
+$lang['fi_FI']['LeftAndMain.ss']['REQUIREJS'] = 'Sisällönhallintajärjestelmä tarvitsee selaimessa Javascript tuen päälle.';
 $lang['fi_FI']['LeftAndMain.ss']['SSWEB'] = 'Silverstripe-verkkosivusto';
 $lang['fi_FI']['LeftAndMain.ss']['VIEWINDRAFT'] = 'Näytä tämä sivu luonnossivustolla';
 $lang['fi_FI']['LeftAndMain.ss']['VIEWINPUBLISHED'] = 'Näytä tämä sivu julkaistulla sivustolla';
 $lang['fi_FI']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Sivun katselu:';
 $lang['fi_FI']['LeftAndMain']['STATUSTO'] = 'Tila vaihdettiin tilaksi %s';
 $lang['fi_FI']['LeftAndMain']['TREESITECONTENT'] = 'Sivuston sisältö';
-$lang['fi_FI']['MemberList']['ADD'] = 'Lisää';
-$lang['fi_FI']['MemberList']['ANYGROUP'] = 'Mikä tahansa ryhmä';
-$lang['fi_FI']['MemberList']['ASC'] = 'Nousevasti';
-$lang['fi_FI']['MemberList']['DESC'] = 'Laskevasti';
-$lang['fi_FI']['MemberList']['EMAIL'] = 'Sähköposti';
-$lang['fi_FI']['MemberList']['FILTERBYG'] = 'Suodata ryhmän mukaan';
-$lang['fi_FI']['MemberList']['FN'] = 'Etunimi';
-$lang['fi_FI']['MemberList']['ORDERBY'] = 'Lajittele';
-$lang['fi_FI']['MemberList']['PASSWD'] = 'Salasana';
-$lang['fi_FI']['MemberList']['SEARCH'] = 'Etsi';
-$lang['fi_FI']['MemberList']['SN'] = 'Sukunimi';
 $lang['fi_FI']['MemberList.ss']['FILTER'] = 'Suodata';
 $lang['fi_FI']['MemberList_PageControls.ss']['DISPLAYING'] = 'Näytetään';
 $lang['fi_FI']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'jäsenet';
@@ -294,8 +283,8 @@ $lang['fi_FI']['MemberTableField.ss']['EDITMEMBER'] = 'Muokkaa tätä käyttäj
 $lang['fi_FI']['MemberTableField.ss']['SHOWMEMBER'] = 'Näytä tämä käyttäjä';
 $lang['fi_FI']['MemberTableField']['SURNAME'] = 'Sukunimi';
 $lang['fi_FI']['ModelAdmin']['ADDBUTTON'] = 'Lisää';
-$lang['fi_FI']['ModelAdmin']['CLASSTYPE'] = 'Tyyppi';
 $lang['fi_FI']['ModelAdmin']['CLEAR_SEARCH'] = 'Tyhjennä haku';
+$lang['fi_FI']['ModelAdmin']['CREATEBUTTON'] = 'Create \'%s\'';
 $lang['fi_FI']['ModelAdmin']['DELETE'] = 'Poista';
 $lang['fi_FI']['ModelAdmin']['DELETEDRECORDS'] = 'Poistettu %s tietuetta.';
 $lang['fi_FI']['ModelAdmin']['GOBACK'] = 'Palaa';
@@ -305,9 +294,12 @@ $lang['fi_FI']['ModelAdmin']['SEARCHRESULTS'] = 'Haun tulokset';
 $lang['fi_FI']['ModelAdmin']['SELECTALL'] = 'valitse kaikki';
 $lang['fi_FI']['ModelAdmin']['SELECTNONE'] = 'poista valinta';
 $lang['fi_FI']['ModelAdmin']['UPDATEDRECORDS'] = 'Päivitetty %s tietuetta.';
-$lang['fi_FI']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Lisää';
+$lang['fi_FI']['ModelAdmin_left.ss']['ADDLISTING'] = 'Lisää';
 $lang['fi_FI']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Tuo';
 $lang['fi_FI']['PageComment']['COMMENTBY'] = 'Henkilön %s kommentti sivulla %s';
+$lang['fi_FI']['PageComment']['PLURALNAME'] = 'Sivun kommentit';
+$lang['fi_FI']['PageComment']['SINGULARNAME'] = 'Sivukommentti';
+$lang['fi_FI']['PageCommentInterface']['COMMENTERURL'] = 'Sivustosi URL';
 $lang['fi_FI']['PageCommentInterface']['POST'] = 'Lähetä';
 $lang['fi_FI']['PageCommentInterface']['SPAMQUESTION'] = 'Roskapostin estokysymys: %s';
 $lang['fi_FI']['PageCommentInterface.ss']['COMMENTS'] = 'Kommentit';
@@ -315,7 +307,9 @@ $lang['fi_FI']['PageCommentInterface.ss']['NEXT'] = 'seuraava';
 $lang['fi_FI']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'Kukaan ei ole kommentoinut tätä sivua.';
 $lang['fi_FI']['PageCommentInterface.ss']['POSTCOM'] = 'Lähetä kommenttisi';
 $lang['fi_FI']['PageCommentInterface.ss']['PREV'] = 'edellinen';
+$lang['fi_FI']['PageCommentInterface.ss']['RSSFEEDALLCOMMENTS'] = 'Kaikkien kommenttien RSS-syöte';
 $lang['fi_FI']['PageCommentInterface.ss']['RSSFEEDCOMMENTS'] = 'Tämän sivun kommenttejen RSS-lähde';
+$lang['fi_FI']['PageCommentInterface.ss']['RSSVIEWALLCOMMENTS'] = 'Näytä kaikki kommentit';
 $lang['fi_FI']['PageCommentInterface']['YOURCOMMENT'] = 'Kommentit';
 $lang['fi_FI']['PageCommentInterface']['YOURNAME'] = 'Sinun nimesi';
 $lang['fi_FI']['PageCommentInterface_Controller']['SPAMQUESTION'] = 'Roskapostin estokysymys: %s';
@@ -327,6 +321,7 @@ $lang['fi_FI']['PageCommentInterface_singlecomment.ss']['ISNTSPAM'] = 'tämä ko
 $lang['fi_FI']['PageCommentInterface_singlecomment.ss']['ISSPAM'] = 'tämä kommentti on roskapostia';
 $lang['fi_FI']['PageCommentInterface_singlecomment.ss']['PBY'] = 'Lähettäjä:';
 $lang['fi_FI']['PageCommentInterface_singlecomment.ss']['REMCOM'] = 'poista tämä kommentti';
+$lang['fi_FI']['ReportAdmin']['MENUTITLE'] = 'Raportit';
 $lang['fi_FI']['ReportAdmin_left.ss']['REPORTS'] = 'Raportit';
 $lang['fi_FI']['ReportAdmin_right.ss']['WELCOME1'] = 'Tervetuloa ohjelman';
 $lang['fi_FI']['ReportAdmin_right.ss']['WELCOME2'] = 'raportoinnin hallintaosioon. Valitse raportti vasemmalta.';
@@ -334,6 +329,7 @@ $lang['fi_FI']['ReportAdmin_SiteTree.ss']['REPORTS'] = 'Raportit';
 $lang['fi_FI']['SecurityAdmin']['ADDMEMBER'] = 'Lisää jäsen';
 $lang['fi_FI']['SecurityAdmin']['EDITPERMISSIONS'] = 'Muokkaa jokaisen ryhmän oikeuksia ja IP-osotteita.';
 $lang['fi_FI']['SecurityAdmin']['MENUTITLE'] = 'Suojaus';
+$lang['fi_FI']['SecurityAdmin']['MENUTITLE'] = 'Turvallisuus';
 $lang['fi_FI']['SecurityAdmin']['NEWGROUP'] = 'Uusi ryhmä';
 $lang['fi_FI']['SecurityAdmin']['SAVE'] = 'Tallenna';
 $lang['fi_FI']['SecurityAdmin']['SGROUPS'] = 'Tietoturvaryhmät';
@@ -354,10 +350,7 @@ $lang['fi_FI']['StaticExporter']['BASEURL'] = 'Kannan URL-osoite';
 $lang['fi_FI']['StaticExporter']['EXPORTTO'] = 'Vie tähän kansioon';
 $lang['fi_FI']['StaticExporter']['FOLDEREXPORT'] = 'Kansio, jonne viedään:';
 $lang['fi_FI']['StaticExporter']['NAME'] = 'Staattinen viejä';
-$lang['fi_FI']['StaticExporter']['ONETHATEXISTS'] = 'Anna olemassaoleva kansio';
-$lang['fi_FI']['TaskList.ss']['BY'] = 'henkilöltä';
 $lang['fi_FI']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Kuvia ei löytynyt kohteesta ';
-$lang['fi_FI']['ThumbnailStripField']['NOTAFOLDER'] = 'Tämä ei ole kansio';
 $lang['fi_FI']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Valitse yllä kansio)';
 $lang['fi_FI']['ViewArchivedEmail.ss']['CANACCESS'] = 'Pääset arkistoidulle sivulle tällä linkillä:';
 $lang['fi_FI']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Sinua on pyydetty katsomaan sivun sisältöä ';
diff --git a/lang/fr_FR.php b/lang/fr_FR.php
index c28249f4..54f65170 100644
--- a/lang/fr_FR.php
+++ b/lang/fr_FR.php
@@ -17,8 +17,6 @@ if(array_key_exists('fr_FR', $lang) && is_array($lang['fr_FR'])) {
 }
 
 $lang['fr_FR']['AssetAdmin']['CHOOSEFILE'] = 'Choisir un fichier';
-$lang['fr_FR']['AssetAdmin']['CONTENTMODBY'] = 'Contenu modifiable par';
-$lang['fr_FR']['AssetAdmin']['CONTENTUSABLEBY'] = 'Contenu utilisable par';
 $lang['fr_FR']['AssetAdmin']['DELETEDX'] = '%s fichiers supprimés.%s';
 $lang['fr_FR']['AssetAdmin']['FILESREADY'] = 'Fichiers prêts à être chargé';
 $lang['fr_FR']['AssetAdmin']['FOLDERDELETED'] = 'Dossier supprimé';
@@ -31,7 +29,6 @@ $lang['fr_FR']['AssetAdmin']['NOTEMP'] = 'Il n\'existe pas de dossier temporaire
 $lang['fr_FR']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Il n\'y avait rien à charger';
 $lang['fr_FR']['AssetAdmin']['NOWBROKEN'] = 'Ces pages ont maintenant des liens cassés:';
 $lang['fr_FR']['AssetAdmin']['NOWBROKEN2'] = 'Leurs propriétaires ont été avertis par e-mail et vont corriger ces pages.';
-$lang['fr_FR']['AssetAdmin']['OWNER'] = 'Propriétaire';
 $lang['fr_FR']['AssetAdmin']['SAVEDFILE'] = 'Fichier %s enregistré';
 $lang['fr_FR']['AssetAdmin']['SAVEFOLDERNAME'] = 'Enregistrer le nom du dossier';
 $lang['fr_FR']['AssetAdmin']['THUMBSDELETED'] = 'Toutes les vignettes inutilisées ont été supprimées';
@@ -86,7 +83,6 @@ $lang['fr_FR']['CMSMain']['CHOOSEREPORT'] = 'Choisir un rapport...';
 $lang['fr_FR']['CMSMain']['COMPARINGV'] = 'Vous comparez actuellement les versions %s et %s';
 $lang['fr_FR']['CMSMain']['COPYPUBTOSTAGE'] = 'Voulez-vous vraiment copier le contenu public vers le site brouillon ?';
 $lang['fr_FR']['CMSMain']['DELETE'] = 'Supprimer du site brouillon';
-$lang['fr_FR']['CMSMain']['DELETEFP'] = 'Supprimer du site public';
 $lang['fr_FR']['CMSMain']['DESCREMOVED'] = 'et %s suivants';
 $lang['fr_FR']['CMSMain']['EMAIL'] = 'Email';
 $lang['fr_FR']['CMSMain']['GO'] = 'Go';
@@ -117,7 +113,6 @@ $lang['fr_FR']['CMSMain']['REMOVEDFD'] = 'Supprimé du site brouillon';
 $lang['fr_FR']['CMSMain']['REMOVEDPAGE'] = '\'%s\' supprimé du site public';
 $lang['fr_FR']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Supprimé \'%s\' du site de test';
 $lang['fr_FR']['CMSMain']['REPORT'] = 'Rapport';
-$lang['fr_FR']['CMSMain']['RESTORE'] = 'Restaurer';
 $lang['fr_FR']['CMSMain']['RESTORED'] = '\'%s\' correctement restauré';
 $lang['fr_FR']['CMSMain']['ROLLBACK'] = 'Retourner à cette version';
 $lang['fr_FR']['CMSMain']['ROLLEDBACKPUB'] = 'Retour à la version publique. La nouvelle version est #%d';
@@ -138,7 +133,6 @@ $lang['fr_FR']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Ajouter un critère...
 $lang['fr_FR']['CMSMain_left.ss']['BATCHACTIONS'] = 'Groupe d\'Actions';
 $lang['fr_FR']['CMSMain_left.ss']['CHANGED'] = 'modifié';
 $lang['fr_FR']['CMSMain_left.ss']['CLOSEBOX'] = 'cliquer pour fermer la fenêtre';
-$lang['fr_FR']['CMSMain_left.ss']['COMMENTS'] = 'Commentaires';
 $lang['fr_FR']['CMSMain_left.ss']['COMPAREMODE'] = 'Comparer ( sélectionner 2 versions ci-dessous )';
 $lang['fr_FR']['CMSMain_left.ss']['CREATE'] = 'Créer';
 $lang['fr_FR']['CMSMain_left.ss']['DEL'] = 'supprimé';
@@ -161,8 +155,6 @@ $lang['fr_FR']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Afficher seulement les p
 $lang['fr_FR']['CMSMain_left.ss']['SHOWUNPUB'] = 'Afficher les versions non publiées';
 $lang['fr_FR']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Contenu du Site et Structure';
 $lang['fr_FR']['CMSMain_left.ss']['SITEREPORTS'] = 'Rapports du Site';
-$lang['fr_FR']['CMSMain_left.ss']['TASKLIST'] = 'Liste de requêtes';
-$lang['fr_FR']['CMSMain_left.ss']['WAITINGON'] = 'En attente de';
 $lang['fr_FR']['CMSMain_right.ss']['ANYMESSAGE'] = 'Avez-vous un message pour votre editeur ?';
 $lang['fr_FR']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Choisissez une page sur la gauche s\'il vous plaît.';
 $lang['fr_FR']['CMSMain_right.ss']['LOADING'] = 'chargement en cours...';
@@ -279,17 +271,6 @@ $lang['fr_FR']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Vue de la page :';
 $lang['fr_FR']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '%s publié avec succès';
 $lang['fr_FR']['LeftAndMain']['STATUSTO'] = 'Statut changé en \'%s\'';
 $lang['fr_FR']['LeftAndMain']['TREESITECONTENT'] = 'Contenu du site';
-$lang['fr_FR']['MemberList']['ADD'] = 'Ajouter';
-$lang['fr_FR']['MemberList']['ANYGROUP'] = 'Tous les groupes';
-$lang['fr_FR']['MemberList']['ASC'] = 'Ordre croissant';
-$lang['fr_FR']['MemberList']['DESC'] = 'Ordre décroissant';
-$lang['fr_FR']['MemberList']['EMAIL'] = 'Email';
-$lang['fr_FR']['MemberList']['FILTERBYG'] = 'Filtrer par groupe';
-$lang['fr_FR']['MemberList']['FN'] = 'Prénom';
-$lang['fr_FR']['MemberList']['ORDERBY'] = 'Trié par';
-$lang['fr_FR']['MemberList']['PASSWD'] = 'Mot de passe';
-$lang['fr_FR']['MemberList']['SEARCH'] = 'Chercher';
-$lang['fr_FR']['MemberList']['SN'] = 'Nom de famille';
 $lang['fr_FR']['MemberList.ss']['FILTER'] = 'Filtrer';
 $lang['fr_FR']['MemberList_PageControls.ss']['DISPLAYING'] = 'Afficher';
 $lang['fr_FR']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'membre(s)';
@@ -326,7 +307,6 @@ $lang['fr_FR']['MemberTableField']['SURNAME'] = 'Nom';
 $lang['fr_FR']['ModelAdmin']['ADDBUTTON'] = 'Ajout';
 $lang['fr_FR']['ModelAdmin']['ADDFORM'] = 'Complétez cette forme pour ajouter un %s à la base de données.';
 $lang['fr_FR']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Sélectionne les colonnes du résultat ';
-$lang['fr_FR']['ModelAdmin']['CLASSTYPE'] = 'Type';
 $lang['fr_FR']['ModelAdmin']['CLEAR_SEARCH'] = 'Efface la recherche';
 $lang['fr_FR']['ModelAdmin']['CREATEBUTTON'] = 'Crée  \'%s\'';
 $lang['fr_FR']['ModelAdmin']['DELETE'] = 'Supprime';
@@ -351,7 +331,6 @@ $lang['fr_FR']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Montre spécific
 $lang['fr_FR']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Relations';
 $lang['fr_FR']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Spécification pour %s';
 $lang['fr_FR']['ModelAdmin_left.ss']['ADDLISTING'] = 'Ajoute la liste';
-$lang['fr_FR']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Ajoute';
 $lang['fr_FR']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'importe';
 $lang['fr_FR']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Listes de recherche';
 $lang['fr_FR']['ModelAdmin_right.ss']['WELCOME1'] = 'Bienvenue à %s. Veuillez choisir une des entrées dans le panneau de gauche.';
@@ -414,7 +393,6 @@ $lang['fr_FR']['StaticExporter']['BASEURL'] = 'Domaine';
 $lang['fr_FR']['StaticExporter']['EXPORTTO'] = 'Exporter vers ce dossier';
 $lang['fr_FR']['StaticExporter']['FOLDEREXPORT'] = 'Dossier à exporter vers';
 $lang['fr_FR']['StaticExporter']['NAME'] = 'Exportation Statique';
-$lang['fr_FR']['StaticExporter']['ONETHATEXISTS'] = 'Spécifier un dossier qui existe s\'il vous plaît';
 $lang['fr_FR']['TableListField_PageControls.ss']['DISPLAYING'] = 'Affichage';
 $lang['fr_FR']['TableListField_PageControls.ss']['OF'] = 'de';
 $lang['fr_FR']['TableListField_PageControls.ss']['TO'] = 'à';
@@ -422,12 +400,10 @@ $lang['fr_FR']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Voir premier';
 $lang['fr_FR']['TableListField_PageControls.ss']['VIEWLAST'] = 'Voir dernier';
 $lang['fr_FR']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Voir suivant';
 $lang['fr_FR']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Voir précédent';
-$lang['fr_FR']['TaskList.ss']['BY'] = 'par';
 $lang['fr_FR']['ThumbnailStripField']['NOFLASHFOUND'] = 'pas de fichier Flash trouvé';
 $lang['fr_FR']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'pas de fichiers Flash trouvé dans';
 $lang['fr_FR']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'pas d\'images trouvées';
 $lang['fr_FR']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Aucune image trouvée';
-$lang['fr_FR']['ThumbnailStripField']['NOTAFOLDER'] = 'Ce n\'est pas un dossier';
 $lang['fr_FR']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Choisissez un dossier ou cherchez ci-dessus)';
 $lang['fr_FR']['ViewArchivedEmail.ss']['CANACCESS'] = 'Vous pouvez accéder le site archivé par ce lien :';
 $lang['fr_FR']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Vous avez demandé à voir le contenu de notre site le';
diff --git a/lang/he_IL.php b/lang/he_IL.php
new file mode 100644
index 00000000..e9589dc2
--- /dev/null
+++ b/lang/he_IL.php
@@ -0,0 +1,421 @@
+<?php
+
+/**
+ * Hebrew (Israel) language pack
+ * @package cms
+ * @subpackage i18n
+ */
+
+i18n::include_locale_file('cms', 'en_US');
+
+global $lang;
+
+if(array_key_exists('he_IL', $lang) && is_array($lang['he_IL'])) {
+	$lang['he_IL'] = array_merge($lang['en_US'], $lang['he_IL']);
+} else {
+	$lang['he_IL'] = $lang['en_US'];
+}
+
+$lang['he_IL']['AssetAdmin']['CHOOSEFILE'] = 'בחר קובץ';
+$lang['he_IL']['AssetAdmin']['DELETEDX'] = ' %s קבצים נמחקו.%s
+';
+$lang['he_IL']['AssetAdmin']['FILESREADY'] = 'קבצים המוכנים להעלאה';
+$lang['he_IL']['AssetAdmin']['FOLDERDELETED'] = 'תיקיה נמחקה.';
+$lang['he_IL']['AssetAdmin']['FOLDERSDELETED'] = 'תיקיות נמחקו.';
+$lang['he_IL']['AssetAdmin']['MENUTITLE'] = 'קבצים ותמונות';
+$lang['he_IL']['AssetAdmin']['MENUTITLE'] = 'קבצים ותמונות';
+$lang['he_IL']['AssetAdmin']['MOVEDX'] = '%s קבצים הועברו';
+$lang['he_IL']['AssetAdmin']['NEWFOLDER'] = 'תיקיהחדשה';
+$lang['he_IL']['AssetAdmin']['NOTEMP'] = 'לא קיימת תיקיה זמנית עבור העלאת קבצים. יש להגדיר את המשתנה upload_tmp_dir בקובץ php.ini.';
+$lang['he_IL']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'לא היה מה להעלות';
+$lang['he_IL']['AssetAdmin']['NOWBROKEN'] = 'בעמודים אלה קיימים כעת קישורים מתים:';
+$lang['he_IL']['AssetAdmin']['NOWBROKEN2'] = 'נשלח אימייל לאחראים והם יתקנו דפים אלה.';
+$lang['he_IL']['AssetAdmin']['SAVEDFILE'] = 'הקובץ %s נשמר';
+$lang['he_IL']['AssetAdmin']['SAVEFOLDERNAME'] = 'שמור שם תיקיה';
+$lang['he_IL']['AssetAdmin']['THUMBSDELETED'] = 'כל התמונות המוקטנות שאינן בשימוש נמחקו';
+$lang['he_IL']['AssetAdmin']['UPLOAD'] = 'קבצים להעלאה מצוינים מתחת';
+$lang['he_IL']['AssetAdmin']['UPLOADEDX'] = '%s קבצים הועלו';
+$lang['he_IL']['AssetAdmin_left.ss']['CREATE'] = 'צור';
+$lang['he_IL']['AssetAdmin_left.ss']['DELETE'] = 'מחק';
+$lang['he_IL']['AssetAdmin_left.ss']['DELFOLDERS'] = 'מחק תיקיות מסומנות';
+$lang['he_IL']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'אפשר סידור ע"י גרור והשלך';
+$lang['he_IL']['AssetAdmin_left.ss']['FOLDERS'] = 'תיקיות';
+$lang['he_IL']['AssetAdmin_left.ss']['GO'] = 'סע';
+$lang['he_IL']['AssetAdmin_left.ss']['SELECTTODEL'] = 'סמן את התיקיות שברצונך למחוק ולאחר מכן לחץ על הכפתור המסומן';
+$lang['he_IL']['AssetAdmin_left.ss']['TOREORG'] = 'בכדי לארגן מחדש את תיקיות המידע שלכם גררו אותן על פי רצונכם';
+$lang['he_IL']['AssetAdmin_right.ss']['CHOOSEPAGE'] = 'נא לבחור עמוד מהעמודה בצד שמאל';
+$lang['he_IL']['AssetAdmin_right.ss']['WELCOME'] = 'ברוכים הבאים אל';
+$lang['he_IL']['AssetAdmin_uploadiframe.ss']['PERMFAILED'] = 'אין לך אישור להעלות לתיקייה זו';
+$lang['he_IL']['AssetTableField']['CAPTION'] = 'כותרת';
+$lang['he_IL']['AssetTableField']['CREATED'] = 'הועלה לראשונה';
+$lang['he_IL']['AssetTableField']['DIM'] = 'מידות';
+$lang['he_IL']['AssetTableField']['DIMLIMT'] = 'הגבל ממדי חלון קופץ';
+$lang['he_IL']['AssetTableField']['EDITIMAGE'] = 'עריכת תמונה';
+$lang['he_IL']['AssetTableField']['FILENAME'] = 'שם הקובץ';
+$lang['he_IL']['AssetTableField']['GALLERYOPTIONS'] = 'אפשרויות גלריה';
+$lang['he_IL']['AssetTableField']['IMAGE'] = 'תמונה';
+$lang['he_IL']['AssetTableField']['ISFLASH'] = 'הינו קובץ פלאש';
+$lang['he_IL']['AssetTableField']['LASTEDIT'] = 'שונה לאחרונה';
+$lang['he_IL']['AssetTableField']['MAIN'] = 'ראשי';
+$lang['he_IL']['AssetTableField']['NOLINKS'] = 'קובץ זה לא קשור מאף עמוד';
+$lang['he_IL']['AssetTableField']['OWNER'] = 'בעל הקובץ';
+$lang['he_IL']['AssetTableField']['PAGESLINKING'] = 'העמודים הבאים מתקשרים לקובץ זה';
+$lang['he_IL']['AssetTableField']['POPUPHEIGHT'] = 'גובה חלון קופץ';
+$lang['he_IL']['AssetTableField']['POPUPWIDTH'] = 'רוחב חלון קופץ';
+$lang['he_IL']['AssetTableField']['SIZE'] = 'גודל';
+$lang['he_IL']['AssetTableField.ss']['DELFILE'] = 'מחק את הקובץ';
+$lang['he_IL']['AssetTableField.ss']['DRAGTOFOLDER'] = 'גרור לתיקיה משמאל כדי להעביר את הקובץ';
+$lang['he_IL']['AssetTableField.ss']['EDIT'] = 'ערוך פריט';
+$lang['he_IL']['AssetTableField.ss']['SHOW'] = 'הצג פריט';
+$lang['he_IL']['AssetTableField']['SWFFILEOPTIONS'] = 'אפשרויות קובץ SWF';
+$lang['he_IL']['AssetTableField']['TITLE'] = 'כותרת';
+$lang['he_IL']['AssetTableField']['TYPE'] = 'סוג';
+$lang['he_IL']['AssetTableField']['URL'] = 'כתובת הדף';
+$lang['he_IL']['CMSLeft.ss']['DELPAGE'] = 'מחיקת דפים...';
+$lang['he_IL']['CMSLeft.ss']['DELPAGES'] = 'מחק את הדפים הנבחרים';
+$lang['he_IL']['CMSLeft.ss']['GO'] = 'סע';
+$lang['he_IL']['CMSLeft.ss']['NEWPAGE'] = 'דף חדש...';
+$lang['he_IL']['CMSLeft.ss']['SELECTPAGESDEL'] = 'בחר את הדפים שברצונך למחוק ולחץ על הכפתור שמתחת';
+$lang['he_IL']['CMSLeft.ss']['SITECONT'] = 'תוכן האתר';
+$lang['he_IL']['CMSMain']['ACCESS'] = 'גישה ל \'%s\' (%s)';
+$lang['he_IL']['CMSMain']['ACCESSALLINTERFACES'] = 'גישה לכל ממשקי המערכת';
+$lang['he_IL']['CMSMain']['CANCEL'] = 'בטל';
+$lang['he_IL']['CMSMain']['CHOOSEREPORT'] = 'תבחר דו"ח';
+$lang['he_IL']['CMSMain']['COMPARINGV'] = 'אתה משווה בין גרסה #%d ל  #%d
+';
+$lang['he_IL']['CMSMain']['COPYPUBTOSTAGE'] = 'האם אתה בטוח שברצונך להעתיק את התוכן המפורסם לאתר שבעריכה?';
+$lang['he_IL']['CMSMain']['DELETE'] = 'מחיקה מאתר הטיוטה';
+$lang['he_IL']['CMSMain']['DESCREMOVED'] = 'והבנים של %s';
+$lang['he_IL']['CMSMain']['EMAIL'] = 'דוא"ל';
+$lang['he_IL']['CMSMain']['GO'] = 'התקדם';
+$lang['he_IL']['CMSMain']['MENUTITLE'] = 'תוכן האתר';
+$lang['he_IL']['CMSMain']['MENUTITLE'] = 'תכני האתר';
+$lang['he_IL']['CMSMain']['METADESCOPT'] = 'תאור';
+$lang['he_IL']['CMSMain']['METAKEYWORDSOPT'] = 'מילות מפתח';
+$lang['he_IL']['CMSMain']['NEW'] = 'חדש';
+$lang['he_IL']['CMSMain']['NOCONTENT'] = 'אין תוכן';
+$lang['he_IL']['CMSMain']['NOTHINGASSIGNED'] = 'אין לך מטלות פתוחות';
+$lang['he_IL']['CMSMain']['NOWAITINGON'] = 'אינך מחכה למשתמשים אחרים';
+$lang['he_IL']['CMSMain']['NOWBROKEN'] = 'לעמודים הבאים יש קישורים שבורים';
+$lang['he_IL']['CMSMain']['NOWBROKEN2'] = 'בעלי עמודים אלו קיבלו הודעה והעמודים יתוקנו';
+$lang['he_IL']['CMSMain']['OK'] = 'אשר';
+$lang['he_IL']['CMSMain']['PAGEDEL'] = 'עמוד %d נמחק';
+$lang['he_IL']['CMSMain']['PAGENOTEXISTS'] = 'עמוד זה אינו קיים במערכת';
+$lang['he_IL']['CMSMain']['PAGEPUB'] = 'עמוד d% פורסם';
+$lang['he_IL']['CMSMain']['PAGESDEL'] = '%d עמודים נמחקו';
+$lang['he_IL']['CMSMain']['PAGESPUB'] = 'd% דפים פורסמו';
+$lang['he_IL']['CMSMain']['PAGETYPEOPT'] = 'סוג דף';
+$lang['he_IL']['CMSMain']['PRINT'] = 'הדפס';
+$lang['he_IL']['CMSMain']['PUBALLCONFIRM'] = 'נא לפרסם את כל העמודים באתר, תוך העתקת כל הטיוטות לגרסה הסופית';
+$lang['he_IL']['CMSMain']['PUBALLFUN'] = 'פרסם הכל';
+$lang['he_IL']['CMSMain']['PUBALLFUN2'] = 'לחיצת כפתור זה מקבילה לאישור פרסום על כל העמודים באתר. הכפתור נועד לאישורים גורפים שבאו בעקבות עריכה נרחבת באתר דוגמת ההגדרות הראשוניות כאשר נוצר אתר זה';
+$lang['he_IL']['CMSMain']['PUBPAGES'] = 'בוצע: d% דפים פורסמו.';
+$lang['he_IL']['CMSMain']['REMOVED'] = '\'%s\'%s נמחק מהאתר';
+$lang['he_IL']['CMSMain']['REMOVEDFD'] = 'הוסר מגרסת הטיוטה לאתר זה';
+$lang['he_IL']['CMSMain']['REMOVEDPAGE'] = '\'s%\' הוסר מהאתר המפורסם';
+$lang['he_IL']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = '\'$s\' הוסר מאתר הטיוטה';
+$lang['he_IL']['CMSMain']['REPORT'] = 'דו"ח';
+$lang['he_IL']['CMSMain']['RESTORED'] = 'שוחזר בהצלחה';
+$lang['he_IL']['CMSMain']['ROLLBACK'] = 'שחזר לגרסה זו';
+$lang['he_IL']['CMSMain']['ROLLEDBACKPUB'] = 'שוחזר לגירסא המפורסמת. מספר הגרסא החדשה הוא #%d';
+$lang['he_IL']['CMSMain']['ROLLEDBACKVERSION'] = 'שוחזר לגירסה  #%d. הגירסה הנוכחית היא  #%d';
+$lang['he_IL']['CMSMain']['SAVE'] = 'שמור';
+$lang['he_IL']['CMSMain']['SENTTO'] = 'נשלח לאישור';
+$lang['he_IL']['CMSMain']['STATUSOPT'] = 'סטטוס';
+$lang['he_IL']['CMSMain']['TOTALPAGES'] = 'עמודים';
+$lang['he_IL']['CMSMain']['VERSIONSNOPAGE'] = 'עמוד זה לא נמצא';
+$lang['he_IL']['CMSMain']['VIEWING'] = 'אתה צופה בגרסה  #%d, נוצר ב%s';
+$lang['he_IL']['CMSMain']['VISITRESTORE'] = 'כניסה restorepage/(ID)';
+$lang['he_IL']['CMSMain']['WAITINGON'] = 'אתה ממתין לאנשים אחרים לעבוד על האתרים <b>%d</b> האלה';
+$lang['he_IL']['CMSMain']['WORKTODO'] = 'עמודים אלה דורשים עריכה';
+$lang['he_IL']['CMSMain_dialog.ss']['BUTTONNOTFOUND'] = 'שם הכפתור לא נמצא';
+$lang['he_IL']['CMSMain_dialog.ss']['NOLINKED'] = 'לא נמצא window.linkedObject בכדי להפנות את לחיצת הכפתור בחזרה לחלון הראשי';
+$lang['he_IL']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'התווסף לטיוטה ולא פורסם';
+$lang['he_IL']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'הוסף קריטריון..';
+$lang['he_IL']['CMSMain_left.ss']['BATCHACTIONS'] = 'פעולות אצווה';
+$lang['he_IL']['CMSMain_left.ss']['CHANGED'] = 'שונה';
+$lang['he_IL']['CMSMain_left.ss']['CLOSEBOX'] = 'לחץ לסגירה';
+$lang['he_IL']['CMSMain_left.ss']['COMPAREMODE'] = 'מצב השוואה (לחץ 2 מתחת)';
+$lang['he_IL']['CMSMain_left.ss']['CREATE'] = 'צור';
+$lang['he_IL']['CMSMain_left.ss']['DEL'] = 'נמחק';
+$lang['he_IL']['CMSMain_left.ss']['DELETECONFIRM'] = 'מחק עמודים מסומנים';
+$lang['he_IL']['CMSMain_left.ss']['DELETEDSTILLLIVE'] = 'נמחק מהטיוטה אך נותר באתר המפורסם';
+$lang['he_IL']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'נערך באתר הטיוטה אך לא פורסם';
+$lang['he_IL']['CMSMain_left.ss']['EDITEDSINCE'] = 'נערך מאז';
+$lang['he_IL']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'אפשר סידור מחדש על ידי גרור והשלך';
+$lang['he_IL']['CMSMain_left.ss']['GO'] = 'התקדם';
+$lang['he_IL']['CMSMain_left.ss']['KEY'] = 'מפתח:';
+$lang['he_IL']['CMSMain_left.ss']['NEW'] = 'חדש';
+$lang['he_IL']['CMSMain_left.ss']['OPENBOX'] = 'נא ללחוץ';
+$lang['he_IL']['CMSMain_left.ss']['PAGEVERSIONH'] = 'גרסאות קודמות';
+$lang['he_IL']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'פרסם את הדפים הנבחרים';
+$lang['he_IL']['CMSMain_left.ss']['SEARCH'] = 'חיפוש';
+$lang['he_IL']['CMSMain_left.ss']['SEARCHTITLE'] = 'חפש ב כתובת, כותרת, כותרת תפריט, &amp; תוכן';
+$lang['he_IL']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'בחר את הדפים שברצונך לשנות  &amp; ואז לחץ על פעולה:';
+$lang['he_IL']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'בחר את העמודים שברצונך לשכפל, את כללי הגישה אליהם ואת מיקום ההעתקים';
+$lang['he_IL']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'הצג רק דפים ששונו';
+$lang['he_IL']['CMSMain_left.ss']['SHOWUNPUB'] = 'הצג טיוטות';
+$lang['he_IL']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'תוכן ומבנה האתר';
+$lang['he_IL']['CMSMain_left.ss']['SITEREPORTS'] = 'דו"חות אתר';
+$lang['he_IL']['CMSMain_right.ss']['ANYMESSAGE'] = 'הערות לעורך';
+$lang['he_IL']['CMSMain_right.ss']['CHOOSEPAGE'] = 'בחר מהתפריט משמאל';
+$lang['he_IL']['CMSMain_right.ss']['LOADING'] = 'טוען';
+$lang['he_IL']['CMSMain_right.ss']['MESSAGE'] = 'הודאה';
+$lang['he_IL']['CMSMain_right.ss']['SENDTO'] = 'שלח אל';
+$lang['he_IL']['CMSMain_right.ss']['STATUS'] = 'מצב';
+$lang['he_IL']['CMSMain_right.ss']['SUBMIT'] = 'הגש לאישור';
+$lang['he_IL']['CMSMain_right.ss']['WELCOMETO'] = 'ברוכים הבאים ל';
+$lang['he_IL']['CMSMain_versions.ss']['AUTHOR'] = 'יוצר';
+$lang['he_IL']['CMSMain_versions.ss']['NOTPUB'] = 'לא מפורסם';
+$lang['he_IL']['CMSMain_versions.ss']['PUBR'] = 'מפרסם';
+$lang['he_IL']['CMSMain_versions.ss']['UNKNOWN'] = 'לא ידוע';
+$lang['he_IL']['CMSMain_versions.ss']['WHEN'] = 'כאשר';
+$lang['he_IL']['CMSRight.ss']['CHOOSEPAGE'] = 'בחר עמוד מהעמודה לשמאל
+';
+$lang['he_IL']['CMSRight.ss']['ECONTENT'] = 'ערוך תוכן';
+$lang['he_IL']['CMSRight.ss']['WELCOMETO'] = 'ברוכים הבאים ל';
+$lang['he_IL']['CommentAdmin']['ACCEPT'] = 'אשר';
+$lang['he_IL']['CommentAdmin']['APPROVED'] = 'אושרו %s תגובות';
+$lang['he_IL']['CommentAdmin']['APPROVEDCOMMENTS'] = 'תגובות מאושרות';
+$lang['he_IL']['CommentAdmin']['AUTHOR'] = 'מחבר';
+$lang['he_IL']['CommentAdmin']['COMMENT'] = 'תגובה';
+$lang['he_IL']['CommentAdmin']['COMMENTS'] = 'תגובות';
+$lang['he_IL']['CommentAdmin']['COMMENTSAWAITINGMODERATION'] = 'תגובות הממתינות לאישור';
+$lang['he_IL']['CommentAdmin']['DATEPOSTED'] = 'תאריך פרסום';
+$lang['he_IL']['CommentAdmin']['DELETE'] = 'מחק';
+$lang['he_IL']['CommentAdmin']['DELETEALL'] = 'מחק הכל';
+$lang['he_IL']['CommentAdmin']['DELETED'] = 'נמחקו %s תגובות';
+$lang['he_IL']['CommentAdmin']['MARKASNOTSPAM'] = 'סמן כ"לא ספאם"';
+$lang['he_IL']['CommentAdmin']['MARKEDNOTSPAM'] = '%s תגובות סומנו כ-"לא ספאם"';
+$lang['he_IL']['CommentAdmin']['MARKEDSPAM'] = '%s תגובות סומנו כספאם';
+$lang['he_IL']['CommentAdmin']['MENUTITLE'] = 'הערות';
+$lang['he_IL']['CommentAdmin']['MENUTITLE'] = 'תגובות';
+$lang['he_IL']['CommentAdmin']['NAME'] = 'שם';
+$lang['he_IL']['CommentAdmin']['PAGE'] = 'דף';
+$lang['he_IL']['CommentAdmin']['SPAM'] = 'ספאם';
+$lang['he_IL']['CommentAdmin']['SPAMMARKED'] = 'סמן כספאם';
+$lang['he_IL']['CommentAdmin_left.ss']['COMMENTS'] = 'תגובות';
+$lang['he_IL']['CommentAdmin_right.ss']['WELCOME1'] = 'ברוכ/ה הבא/ה ל';
+$lang['he_IL']['CommentAdmin_right.ss']['WELCOME2'] = 'ניהול תגובות. בחר תיקיה מהעץ מימין.';
+$lang['he_IL']['CommentAdmin_SiteTree.ss']['APPROVED'] = 'מאושר';
+$lang['he_IL']['CommentAdmin_SiteTree.ss']['AWAITMODERATION'] = 'ממתין לאישור';
+$lang['he_IL']['CommentAdmin_SiteTree.ss']['COMMENTS'] = 'תגובות';
+$lang['he_IL']['CommentAdmin_SiteTree.ss']['SPAM'] = 'ספאם';
+$lang['he_IL']['CommentList.ss']['CREATEDW'] = 'הערות נוצרות  בכל פעם שהפעולות - פרסם , דחה או אשר  מבוצעות.';
+$lang['he_IL']['CommentList.ss']['NOCOM'] = 'אין תגובות בעמוד זה';
+$lang['he_IL']['CommentTableField']['FILTER'] = 'סנן';
+$lang['he_IL']['CommentTableField']['SEARCH'] = 'חיפוש';
+$lang['he_IL']['CommentTableField.ss']['APPROVE'] = 'אשר';
+$lang['he_IL']['CommentTableField.ss']['APPROVECOMMENT'] = 'אשר תגובה זו';
+$lang['he_IL']['CommentTableField.ss']['DELETE'] = 'מחק';
+$lang['he_IL']['CommentTableField.ss']['DELETEROW'] = 'מחק שורה זו';
+$lang['he_IL']['CommentTableField.ss']['EDIT'] = 'ערוך';
+$lang['he_IL']['CommentTableField.ss']['MARKASSPAM'] = 'סמן תגובה זו כספאם';
+$lang['he_IL']['CommentTableField.ss']['MARKNOSPAM'] = 'סמן תגובה זו כ "לא ספאם"';
+$lang['he_IL']['CommentTableField.ss']['NOITEMSFOUND'] = 'לא נמצאו רשומות';
+$lang['he_IL']['CommentTableField.ss']['SPAM'] = 'ספאם';
+$lang['he_IL']['ComplexTableField']['CLOSEPOPUP'] = 'סגור חלון';
+$lang['he_IL']['ComplexTableField']['SUCCESSADD'] = '%s %s %s הוסף';
+$lang['he_IL']['ImageEditor.ss']['ACTIONS'] = 'פעולות';
+$lang['he_IL']['ImageEditor.ss']['ADJUST'] = 'התאם';
+$lang['he_IL']['ImageEditor.ss']['APPLY'] = 'החל';
+$lang['he_IL']['ImageEditor.ss']['BLUR'] = 'טשטש';
+$lang['he_IL']['ImageEditor.ss']['BRIGHTNESS'] = 'בהירות';
+$lang['he_IL']['ImageEditor.ss']['CANCEL'] = 'בטל';
+$lang['he_IL']['ImageEditor.ss']['CONTRAST'] = 'ניגודיות';
+$lang['he_IL']['ImageEditor.ss']['CROP'] = 'גזור';
+$lang['he_IL']['ImageEditor.ss']['CURRENTACTION'] = 'פעולה@nbsp;נוכחית';
+$lang['he_IL']['ImageEditor.ss']['EDITFUNCTIONS'] = 'ערוך&nbsp;פונקציות';
+$lang['he_IL']['ImageEditor.ss']['EFFECTS'] = 'אפקטים';
+$lang['he_IL']['ImageEditor.ss']['EXIT'] = 'יציאה';
+$lang['he_IL']['ImageEditor.ss']['GAMMA'] = 'גאמא';
+$lang['he_IL']['ImageEditor.ss']['GREYSCALE'] = 'גווני אפור';
+$lang['he_IL']['ImageEditor.ss']['HEIGHT'] = 'גובה';
+$lang['he_IL']['ImageEditor.ss']['REDO'] = 'בצע מחדש';
+$lang['he_IL']['ImageEditor.ss']['ROT'] = 'סובב';
+$lang['he_IL']['ImageEditor.ss']['SAVE'] = 'שמור תמונה';
+$lang['he_IL']['ImageEditor.ss']['SEPIA'] = 'חום כהה';
+$lang['he_IL']['ImageEditor.ss']['UNDO'] = 'בטל';
+$lang['he_IL']['ImageEditor.ss']['UNTITLED'] = 'מסמך ללא שם';
+$lang['he_IL']['ImageEditor.ss']['WIDTH'] = 'רוחב';
+$lang['he_IL']['LeftAndMain']['CHANGEDURL'] = 'הכתובת שונתה ל  \'%s\'
+';
+$lang['he_IL']['LeftAndMain']['COMMENTS'] = 'תגובות';
+$lang['he_IL']['LeftAndMain']['FILESIMAGES'] = 'קבצים ותמונות';
+$lang['he_IL']['LeftAndMain']['HELP'] = 'עזרה';
+$lang['he_IL']['LeftAndMain']['PAGETYPE'] = 'סוג העמוד';
+$lang['he_IL']['LeftAndMain']['PERMAGAIN'] = 'התנתקת מהמערכת. לחיבור מחדש נא להזין שם וסיסמה';
+$lang['he_IL']['LeftAndMain']['PERMALREADY'] = 'צר לנו, אך לא תוכל לגשת לחלק זה של מערכת ניהול התוכן. אם ברצונך להתחבר למערכת בתור משתמש אחר נא להשתמש בתיבה בעמוד זה';
+$lang['he_IL']['LeftAndMain']['PERMDEFAULT'] = 'נא לבחור בשיטת וידוא והזן פרטיך למערכת';
+$lang['he_IL']['LeftAndMain']['PLEASESAVE'] = 'נא לשמור עמוד זה. העמוד לא עודכן מכיוון ולא עודכן.';
+$lang['he_IL']['LeftAndMain']['REPORTS'] = 'דוחות';
+$lang['he_IL']['LeftAndMain']['REQUESTERROR'] = 'שגיאה בבקשה';
+$lang['he_IL']['LeftAndMain']['SAVED'] = 'נשמר';
+$lang['he_IL']['LeftAndMain']['SAVEDUP'] = 'שמור';
+$lang['he_IL']['LeftAndMain']['SECURITY'] = 'אבטחה';
+$lang['he_IL']['LeftAndMain']['SITECONTENT'] = 'תכני האתר';
+$lang['he_IL']['LeftAndMain']['SITECONTENTLEFT'] = 'תוכן האתר';
+$lang['he_IL']['LeftAndMain.ss']['APPVERSIONTEXT1'] = 'זה ה';
+$lang['he_IL']['LeftAndMain.ss']['APPVERSIONTEXT2'] = 'גירסת המערכת הנוכחית';
+$lang['he_IL']['LeftAndMain.ss']['ARCHS'] = 'אתר מאופסן';
+$lang['he_IL']['LeftAndMain.ss']['DRAFTS'] = 'גרסת טיוטה';
+$lang['he_IL']['LeftAndMain.ss']['EDIT'] = 'ערוך';
+$lang['he_IL']['LeftAndMain.ss']['EDITINCMS'] = 'ערוך דף זה ';
+$lang['he_IL']['LeftAndMain.ss']['EDITPROFILE'] = 'פרופיל';
+$lang['he_IL']['LeftAndMain.ss']['LOADING'] = 'טוען...';
+$lang['he_IL']['LeftAndMain.ss']['LOGGEDINAS'] = 'מחובר כ';
+$lang['he_IL']['LeftAndMain.ss']['LOGOUT'] = 'התנתק';
+$lang['he_IL']['LeftAndMain.ss']['PUBLIS'] = 'אתר מפורסם/סופי';
+$lang['he_IL']['LeftAndMain.ss']['REQUIREJS'] = 'בכדי להשתמש במערכת ניהול התוכן javascript צריך להיות מופעל';
+$lang['he_IL']['LeftAndMain.ss']['SSWEB'] = 'אתר סילברסטרייב';
+$lang['he_IL']['LeftAndMain.ss']['VIEWINDRAFT'] = 'צפה בדף זה באתר הטיוטה';
+$lang['he_IL']['LeftAndMain.ss']['VIEWINPUBLISHED'] = 'צפה בדף זה באתר החי';
+$lang['he_IL']['LeftAndMain.ss']['VIEWPAGEIN'] = 'תצוגת עמוד:';
+$lang['he_IL']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' פורסם בהצלחה';
+$lang['he_IL']['LeftAndMain']['STATUSTO'] = 'המצב שונה ל \'%s\'
+';
+$lang['he_IL']['LeftAndMain']['TREESITECONTENT'] = 'תוכן האתר';
+$lang['he_IL']['MemberList.ss']['FILTER'] = 'מיין';
+$lang['he_IL']['MemberList_PageControls.ss']['DISPLAYING'] = 'מציג';
+$lang['he_IL']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'חברים רשומים';
+$lang['he_IL']['MemberList_PageControls.ss']['LASTMEMBERS'] = 'חברים רשומים';
+$lang['he_IL']['MemberList_PageControls.ss']['NEXTMEMBERS'] = 'חברים רשומים';
+$lang['he_IL']['MemberList_PageControls.ss']['OF'] = 'מ - ';
+$lang['he_IL']['MemberList_PageControls.ss']['PREVIOUSMEMBERS'] = 'חברים רשומים';
+$lang['he_IL']['MemberList_PageControls.ss']['TO'] = 'אל';
+$lang['he_IL']['MemberList_PageControls.ss']['VIEWFIRST'] = 'צפה בראשון';
+$lang['he_IL']['MemberList_PageControls.ss']['VIEWLAST'] = 'צפה באחרון';
+$lang['he_IL']['MemberList_PageControls.ss']['VIEWNEXT'] = 'צפה בבא';
+$lang['he_IL']['MemberList_PageControls.ss']['VIEWPREVIOUS'] = 'צפה בקודמים';
+$lang['he_IL']['MemberList_Table.ss']['EMAIL'] = 'כתובת דואר אלקטרוני';
+$lang['he_IL']['MemberList_Table.ss']['FN'] = 'שם פרטי';
+$lang['he_IL']['MemberList_Table.ss']['PASSWD'] = 'סיסמא';
+$lang['he_IL']['MemberList_Table.ss']['SN'] = 'שם משפחה';
+$lang['he_IL']['MemberTableField']['ADD'] = 'הוסף';
+$lang['he_IL']['MemberTableField']['ADDEDTOGROUP'] = 'חבר הוסף לקבוצה';
+$lang['he_IL']['MemberTableField']['ADDINGFIELD'] = 'הוספה נכשלה';
+$lang['he_IL']['MemberTableField']['ANYGROUP'] = 'קבוצה כלשהי';
+$lang['he_IL']['MemberTableField']['ASC'] = 'סדר עולה';
+$lang['he_IL']['MemberTableField']['DESC'] = 'סדר יורד';
+$lang['he_IL']['MemberTableField']['EMAIL'] = 'אימייל';
+$lang['he_IL']['MemberTableField']['FILTER'] = 'סנן';
+$lang['he_IL']['MemberTableField']['FILTERBYGROUP'] = 'סנן ע"פ קבוצה';
+$lang['he_IL']['MemberTableField']['FIRSTNAME'] = 'שם פרטי';
+$lang['he_IL']['MemberTableField']['ORDERBY'] = 'סדר לפי';
+$lang['he_IL']['MemberTableField']['SEARCH'] = 'חיפוש';
+$lang['he_IL']['MemberTableField.ss']['ADDNEW'] = 'הוסף';
+$lang['he_IL']['MemberTableField.ss']['DELETEMEMBER'] = 'מחק את המספר הזה';
+$lang['he_IL']['MemberTableField.ss']['EDITMEMBER'] = 'ערוך את המספר הזה';
+$lang['he_IL']['MemberTableField.ss']['SHOWMEMBER'] = 'הצג את המספר הזה';
+$lang['he_IL']['MemberTableField']['SURNAME'] = 'שם משפחה';
+$lang['he_IL']['ModelAdmin']['ADDBUTTON'] = 'הוסף';
+$lang['he_IL']['ModelAdmin']['ADDFORM'] = 'מלא טופס זה והוסף %s לבסיס הנתונים.';
+$lang['he_IL']['ModelAdmin']['CHOOSE_COLUMNS'] = 'בחירת עמודות לתוצאה';
+$lang['he_IL']['ModelAdmin']['CLEAR_SEARCH'] = 'נקוי חיפוש';
+$lang['he_IL']['ModelAdmin']['CREATEBUTTON'] = 'צור \'%s\'';
+$lang['he_IL']['ModelAdmin']['DELETE'] = 'מחק';
+$lang['he_IL']['ModelAdmin']['DELETEDRECORDS'] = '%s פריטים נמחקו';
+$lang['he_IL']['ModelAdmin']['FOUNDRESULTS'] = 'נמצאו %s רשומות מתאימות';
+$lang['he_IL']['ModelAdmin']['GOBACK'] = 'אחורה';
+$lang['he_IL']['ModelAdmin']['GOFORWARD'] = 'קדימה';
+$lang['he_IL']['ModelAdmin']['IMPORT'] = 'ייבא מקובץ CSV';
+$lang['he_IL']['ModelAdmin']['IMPORTEDRECORDS'] = '%s פריטים יובאו בהצלחה.';
+$lang['he_IL']['ModelAdmin']['ITEMNOTFOUND'] = 'הפריט המבוקש לא נמצא';
+$lang['he_IL']['ModelAdmin']['LOADEDFOREDITING'] = '\'%s\'  נטען עבור עריכה.';
+$lang['he_IL']['ModelAdmin']['NOCSVFILE'] = 'בחר קובץ CSV לייבוא';
+$lang['he_IL']['ModelAdmin']['NOIMPORT'] = 'לא נמצאו פריטים לייבוא';
+$lang['he_IL']['ModelAdmin']['NORESULTS'] = 'לא נמצאו רשומות';
+$lang['he_IL']['ModelAdmin']['SAVE'] = 'שמור';
+$lang['he_IL']['ModelAdmin']['SEARCHRESULTS'] = 'תוצאות חיפוש';
+$lang['he_IL']['ModelAdmin']['SELECTALL'] = 'בחר הכל';
+$lang['he_IL']['ModelAdmin']['SELECTNONE'] = 'נקה בחירה';
+$lang['he_IL']['ModelAdmin']['UPDATEDRECORDS'] = '%s פריטים עודכנו.';
+$lang['he_IL']['ModelAdmin_ImportSpec.ss']['IMPORTSPECFIELDS'] = 'עמודות בבסיס הנתונים';
+$lang['he_IL']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'הצג מפרט עבור %s';
+$lang['he_IL']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'קשרים';
+$lang['he_IL']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'מפרט עבור %s';
+$lang['he_IL']['ModelAdmin_left.ss']['ADDLISTING'] = 'הוספה';
+$lang['he_IL']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'ייבוא';
+$lang['he_IL']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'חיפוש';
+$lang['he_IL']['ModelAdmin_right.ss']['WELCOME1'] = 'ברוך/ה הבא/ה ל %s. אנא בחר/י דף מהעמודה הימנית.';
+$lang['he_IL']['PageComment']['Comment'] = 'תגובה';
+$lang['he_IL']['PageComment']['COMMENTBY'] = 'הערה של \'s%\' על s%';
+$lang['he_IL']['PageComment']['IsSpam'] = 'ספאם?';
+$lang['he_IL']['PageComment']['Name'] = 'שם נוסף';
+$lang['he_IL']['PageComment']['NeedsModeration'] = 'האם דרוש סינון?';
+$lang['he_IL']['PageComment']['PLURALNAME'] = 'תגובות לדף';
+$lang['he_IL']['PageComment']['SINGULARNAME'] = 'תגובה לדף';
+$lang['he_IL']['PageCommentInterface']['COMMENTERURL'] = 'כתובת האתר שלך';
+$lang['he_IL']['PageCommentInterface']['POST'] = 'רשומה';
+$lang['he_IL']['PageCommentInterface']['SPAMQUESTION'] = 'שאלת אבטחה: %s';
+$lang['he_IL']['PageCommentInterface.ss']['COMMENTS'] = 'הערות';
+$lang['he_IL']['PageCommentInterface.ss']['NEXT'] = 'הבא';
+$lang['he_IL']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'אין עדיין הערות לעמוד זה ';
+$lang['he_IL']['PageCommentInterface.ss']['POSTCOM'] = 'הוסף את ההערה שלך';
+$lang['he_IL']['PageCommentInterface.ss']['PREV'] = 'הקודם';
+$lang['he_IL']['PageCommentInterface.ss']['RSSFEEDALLCOMMENTS'] = 'ערוץ RSS עבור כל התגובות';
+$lang['he_IL']['PageCommentInterface.ss']['RSSFEEDCOMMENTS'] = 'ערוץ RSS עבור תגובות בדף זה';
+$lang['he_IL']['PageCommentInterface.ss']['RSSVIEWALLCOMMENTS'] = 'צפה בכל התגובות';
+$lang['he_IL']['PageCommentInterface']['YOURCOMMENT'] = 'תגובות';
+$lang['he_IL']['PageCommentInterface']['YOURNAME'] = 'שמך';
+$lang['he_IL']['PageCommentInterface_Controller']['SPAMQUESTION'] = 'שאלת אבטחה: %s';
+$lang['he_IL']['PageCommentInterface_Form']['AWAITINGMODERATION'] = 'תגובתך נשלחה והיא מחכה לאישור';
+$lang['he_IL']['PageCommentInterface_Form']['MSGYOUPOSTED'] = 'ההודעה שפרסמת היא:';
+$lang['he_IL']['PageCommentInterface_Form']['SPAMDETECTED'] = 'התגלה ספאם!';
+$lang['he_IL']['PageCommentInterface_singlecomment.ss']['APPROVE'] = 'אשר הערה זו';
+$lang['he_IL']['PageCommentInterface_singlecomment.ss']['ISNTSPAM'] = 'הערה זו אינה ספאם';
+$lang['he_IL']['PageCommentInterface_singlecomment.ss']['ISSPAM'] = 'הערה זו היא ספאם';
+$lang['he_IL']['PageCommentInterface_singlecomment.ss']['PBY'] = 'נשלח על ידי';
+$lang['he_IL']['PageCommentInterface_singlecomment.ss']['REMCOM'] = 'הסר הערה זו';
+$lang['he_IL']['ReportAdmin']['MENUTITLE'] = 'דוחות';
+$lang['he_IL']['ReportAdmin_left.ss']['REPORTS'] = 'דו"חות';
+$lang['he_IL']['ReportAdmin_right.ss']['WELCOME1'] = 'ברוך הבא ל';
+$lang['he_IL']['ReportAdmin_right.ss']['WELCOME2'] = 'איזור דיווח. אנא בחר דוח משמאל';
+$lang['he_IL']['ReportAdmin_SiteTree.ss']['REPORTS'] = 'דוחות';
+$lang['he_IL']['SecurityAdmin']['ADDMEMBER'] = 'הוסף חבר';
+$lang['he_IL']['SecurityAdmin']['EDITPERMISSIONS'] = 'ערוך הרשאות וכתובות IP לכל קבוצה';
+$lang['he_IL']['SecurityAdmin']['MENUTITLE'] = 'אבטחה';
+$lang['he_IL']['SecurityAdmin']['MENUTITLE'] = 'אבטחה';
+$lang['he_IL']['SecurityAdmin']['NEWGROUP'] = 'קבוצה חדשה';
+$lang['he_IL']['SecurityAdmin']['SAVE'] = 'שמור';
+$lang['he_IL']['SecurityAdmin']['SGROUPS'] = 'קבוצות אבטחה';
+$lang['he_IL']['SecurityAdmin_left.ss']['CREATE'] = 'צור';
+$lang['he_IL']['SecurityAdmin_left.ss']['DEL'] = 'מחק';
+$lang['he_IL']['SecurityAdmin_left.ss']['DELGROUPS'] = 'מחק את הקבוצות שנבחרו';
+$lang['he_IL']['SecurityAdmin_left.ss']['ENABLEDRAGGING'] = 'אפשר סידור ע"י גרור והשלך';
+$lang['he_IL']['SecurityAdmin_left.ss']['GO'] = 'סע';
+$lang['he_IL']['SecurityAdmin_left.ss']['SECGROUPS'] = 'קבוצות אבטחה';
+$lang['he_IL']['SecurityAdmin_left.ss']['SELECT'] = 'בחר בעמודים שברצונך למחוק ולאחר לחץ על הכפתור למטה';
+$lang['he_IL']['SecurityAdmin_left.ss']['TOREORG'] = 'בכדי לארגן את האתר שלך , גרור את העמודים לפי הצורך';
+$lang['he_IL']['SecurityAdmin_right.ss']['WELCOME1'] = 'ברוך הבא ל';
+$lang['he_IL']['SecurityAdmin_right.ss']['WELCOME2'] = 'איזור אבטחה. אנא בחר קבוצה משמאל';
+$lang['he_IL']['SideReport']['EMPTYPAGES'] = 'עמודים ריקים';
+$lang['he_IL']['SideReport']['LAST2WEEKS'] = 'עמודים שנערכו בשבועיים האחרונים';
+$lang['he_IL']['SideReport']['REPEMPTY'] = 'הדוח %s ריק';
+$lang['he_IL']['SideReport']['TODO'] = 'מטלות';
+$lang['he_IL']['StaticExporter']['BASEURL'] = 'כתובת בסיס';
+$lang['he_IL']['StaticExporter']['EXPORTTO'] = 'ייצא לתיקיה זו';
+$lang['he_IL']['StaticExporter']['FOLDEREXPORT'] = 'תיקייה ליצוא';
+$lang['he_IL']['StaticExporter']['NAME'] = 'מייצא ';
+$lang['he_IL']['TableListField_PageControls.ss']['DISPLAYING'] = 'מציג';
+$lang['he_IL']['TableListField_PageControls.ss']['OF'] = 'מתוך';
+$lang['he_IL']['TableListField_PageControls.ss']['TO'] = 'עד';
+$lang['he_IL']['TableListField_PageControls.ss']['VIEWFIRST'] = 'הצג ראשון';
+$lang['he_IL']['TableListField_PageControls.ss']['VIEWLAST'] = 'הצג אחרון';
+$lang['he_IL']['TableListField_PageControls.ss']['VIEWNEXT'] = 'הצג את הבא';
+$lang['he_IL']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'הצג את הקודם';
+$lang['he_IL']['ThumbnailStripField']['NOFLASHFOUND'] = 'לא נמצאו קבצי פלאש';
+$lang['he_IL']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'לא נמצאו קבצי פלאש ב ';
+$lang['he_IL']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'לא נמצאו תמונות ב ';
+$lang['he_IL']['ThumbnailStripField']['NOIMAGESFOUND'] = 'לא נמצאו תמונות';
+$lang['he_IL']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(בחר תיקייה מלמעלה)';
+$lang['he_IL']['ViewArchivedEmail.ss']['CANACCESS'] = 'אתה יכול להכנס לארכיון האתר בקישור הזה:';
+$lang['he_IL']['ViewArchivedEmail.ss']['HAVEASKED'] = 'ביקשת לצפות בתוכן האתר שלנו ב';
+$lang['he_IL']['WaitingOn.ss']['ATO'] = 'משויך ל';
+$lang['he_IL']['WidgetAreaEditor.ss']['AVAILABLE'] = 'וויג\'טים קיימים';
+$lang['he_IL']['WidgetAreaEditor.ss']['INUSE'] = 'וויג\'טים בשימוש';
+$lang['he_IL']['WidgetAreaEditor.ss']['NOAVAIL'] = 'לא קיימים וויג\'טים';
+$lang['he_IL']['WidgetAreaEditor.ss']['TOADD'] = 'על מנת להוסיף וויג\'טים, יש לגרור אותם מהעמודה מימין לכאן';
+$lang['he_IL']['WidgetEditor.ss']['DELETE'] = 'מחק';
+
+?>
\ No newline at end of file
diff --git a/lang/hr_HR.php b/lang/hr_HR.php
index fb8096c1..32cbd9b9 100644
--- a/lang/hr_HR.php
+++ b/lang/hr_HR.php
@@ -17,16 +17,14 @@ if(array_key_exists('hr_HR', $lang) && is_array($lang['hr_HR'])) {
 }
 
 $lang['hr_HR']['AssetAdmin']['CHOOSEFILE'] = 'Odaberite datoteku';
-$lang['hr_HR']['AssetAdmin']['CONTENTMODBY'] = 'Sadržaj može mijenjati';
-$lang['hr_HR']['AssetAdmin']['CONTENTUSABLEBY'] = 'Sadržaj može korisiti';
 $lang['hr_HR']['AssetAdmin']['DELETEDX'] = 'Obrisano %s datoteka. %s';
 $lang['hr_HR']['AssetAdmin']['FILESREADY'] = 'Datoteke spremne za upload:';
 $lang['hr_HR']['AssetAdmin']['MENUTITLE'] = 'Datoteke & Slike';
+$lang['hr_HR']['AssetAdmin']['MENUTITLE'] = 'Datoteke i Slike';
 $lang['hr_HR']['AssetAdmin']['MOVEDX'] = 'Premješteno %s datoteka';
 $lang['hr_HR']['AssetAdmin']['NEWFOLDER'] = 'Novi direktorij';
 $lang['hr_HR']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Nema ništa za upload';
 $lang['hr_HR']['AssetAdmin']['NOWBROKEN'] = 'Stranica ima pogrešne linkove:';
-$lang['hr_HR']['AssetAdmin']['OWNER'] = 'Vlasnik';
 $lang['hr_HR']['AssetAdmin']['SAVEDFILE'] = 'Spremljena datoteka %s';
 $lang['hr_HR']['AssetAdmin']['SAVEFOLDERNAME'] = 'Spremi ime direktorija';
 $lang['hr_HR']['AssetAdmin']['UPLOAD'] = 'Uploadaj izlistane datoteke ';
@@ -60,14 +58,15 @@ $lang['hr_HR']['CMSLeft.ss']['GO'] = 'Idi';
 $lang['hr_HR']['CMSLeft.ss']['NEWPAGE'] = 'Nova stranica...';
 $lang['hr_HR']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Označite stranice koje želite obrisati i kliknite gumb ispod';
 $lang['hr_HR']['CMSLeft.ss']['SITECONT'] = 'Sadržaj stranice';
+$lang['hr_HR']['CMSMain']['ACCESS'] = 'Pristup u \'%s\' (%s)';
 $lang['hr_HR']['CMSMain']['CANCEL'] = 'Odustani';
 $lang['hr_HR']['CMSMain']['CHOOSEREPORT'] = '(Odaberite izvještaj)';
 $lang['hr_HR']['CMSMain']['COMPARINGV'] = 'Uspoređujete verzije #%d i #%d';
 $lang['hr_HR']['CMSMain']['COPYPUBTOSTAGE'] = 'Želite li stvarno kopirati objavljeni sadržaj?';
-$lang['hr_HR']['CMSMain']['DELETEFP'] = 'Obriši sa objavljene stranice';
 $lang['hr_HR']['CMSMain']['EMAIL'] = 'Email';
 $lang['hr_HR']['CMSMain']['GO'] = 'Idi';
 $lang['hr_HR']['CMSMain']['MENUTITLE'] = 'Sadržaj stranice';
+$lang['hr_HR']['CMSMain']['MENUTITLE'] = 'Sadržaj stranice';
 $lang['hr_HR']['CMSMain']['METADESCOPT'] = 'Opis';
 $lang['hr_HR']['CMSMain']['METAKEYWORDSOPT'] = 'Ključne riječi';
 $lang['hr_HR']['CMSMain']['NEW'] = 'Nova';
@@ -90,7 +89,6 @@ $lang['hr_HR']['CMSMain']['PUBALLFUN2'] = 'Ovaj gumb radi isto što i klikanje n
 $lang['hr_HR']['CMSMain']['PUBPAGES'] = 'Obavljeno: Objavljeno %d stranica';
 $lang['hr_HR']['CMSMain']['REMOVEDFD'] = 'Obrisano sa privremene stranice';
 $lang['hr_HR']['CMSMain']['REMOVEDPAGE'] = '\'%s\' obrisano sa objavljene stranice';
-$lang['hr_HR']['CMSMain']['RESTORE'] = 'Vrati u početno stanje';
 $lang['hr_HR']['CMSMain']['RESTORED'] = '\'%s\' uspješno vraćen u početno stanje';
 $lang['hr_HR']['CMSMain']['ROLLBACK'] = 'Vrati na ovu verziju';
 $lang['hr_HR']['CMSMain']['ROLLEDBACKPUB'] = 'Vraćen na objavljenu verziju. Novi broj verzije je #%d';
@@ -109,7 +107,6 @@ $lang['hr_HR']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Dodaj kriterij...';
 $lang['hr_HR']['CMSMain_left.ss']['BATCHACTIONS'] = 'Masovne akcije';
 $lang['hr_HR']['CMSMain_left.ss']['CHANGED'] = 'promjenjeno';
 $lang['hr_HR']['CMSMain_left.ss']['CLOSEBOX'] = 'kliknite za zatvaranje prozora';
-$lang['hr_HR']['CMSMain_left.ss']['COMMENTS'] = 'Komentari';
 $lang['hr_HR']['CMSMain_left.ss']['COMPAREMODE'] = 'Metoda usporedbe (klikni na dva ispod)';
 $lang['hr_HR']['CMSMain_left.ss']['CREATE'] = 'Kreiraj';
 $lang['hr_HR']['CMSMain_left.ss']['DEL'] = 'obrisano';
@@ -133,8 +130,6 @@ $lang['hr_HR']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Pokaži samo izmjenjene
 $lang['hr_HR']['CMSMain_left.ss']['SHOWUNPUB'] = 'Pokaži neobjavljene verzije';
 $lang['hr_HR']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Sadržaj i Struktura Site-a';
 $lang['hr_HR']['CMSMain_left.ss']['SITEREPORTS'] = 'Izvještaji';
-$lang['hr_HR']['CMSMain_left.ss']['TASKLIST'] = 'Lista zadataka';
-$lang['hr_HR']['CMSMain_left.ss']['WAITINGON'] = 'Čekam na';
 $lang['hr_HR']['CMSMain_right.ss']['ANYMESSAGE'] = 'Imate li kakvu poruku za vašeg urednika? ';
 $lang['hr_HR']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Molim odaberite stranicu s lijeve strane';
 $lang['hr_HR']['CMSMain_right.ss']['LOADING'] = 'učitavam...';
@@ -152,6 +147,7 @@ $lang['hr_HR']['CMSRight.ss']['CHOOSEPAGE'] = 'Odaberite stranicu s lijeve stran
 $lang['hr_HR']['CMSRight.ss']['ECONTENT'] = 'Uredi sadržaj';
 $lang['hr_HR']['CMSRight.ss']['WELCOMETO'] = 'Dobrodošli na';
 $lang['hr_HR']['CommentAdmin']['MENUTITLE'] = 'Komentari';
+$lang['hr_HR']['CommentAdmin']['MENUTITLE'] = 'Komentari';
 $lang['hr_HR']['CommentList.ss']['CREATEDW'] = 'Komentari se kreiraju za bilo koju od ovih akcija - Objavi, Otkaži, Podnesi';
 $lang['hr_HR']['CommentList.ss']['NOCOM'] = 'Na ovoj stranici nema komentara';
 $lang['hr_HR']['ImageEditor.ss']['CANCEL'] = 'odustani';
@@ -164,15 +160,20 @@ $lang['hr_HR']['ImageEditor.ss']['UNDO'] = 'undo';
 $lang['hr_HR']['ImageEditor.ss']['UNTITLED'] = 'Neimenovani dokument';
 $lang['hr_HR']['ImageEditor.ss']['WIDTH'] = 'širina';
 $lang['hr_HR']['LeftAndMain']['CHANGEDURL'] = 'URL promjenjen na \'%s\'';
+$lang['hr_HR']['LeftAndMain']['COMMENTS'] = 'Komentari';
+$lang['hr_HR']['LeftAndMain']['FILESIMAGES'] = 'Datoteke i Slike';
 $lang['hr_HR']['LeftAndMain']['HELP'] = 'Pomoć';
 $lang['hr_HR']['LeftAndMain']['PAGETYPE'] = 'Tip Stranice:';
 $lang['hr_HR']['LeftAndMain']['PERMAGAIN'] = 'Odjavili ste se sa CMS-a. Želite li se ponovno prijaviti, upišite korisničko ime i lozinku';
 $lang['hr_HR']['LeftAndMain']['PERMALREADY'] = 'Nažalost, ne možete pristupiti tom dijelu CMS-a. Želite li se prijaviti kao netko drugi, učinite to ispod';
 $lang['hr_HR']['LeftAndMain']['PERMDEFAULT'] = 'Odaberite metodu autorizacije te upišite svoje podatke za pristup CMS-u.';
 $lang['hr_HR']['LeftAndMain']['PLEASESAVE'] = 'Molim spremite stranicu: Nemože biti ažurirano dok nije spremljeno.';
+$lang['hr_HR']['LeftAndMain']['REPORTS'] = 'Izvještaji';
 $lang['hr_HR']['LeftAndMain']['REQUESTERROR'] = 'Greška u zahtjevu';
 $lang['hr_HR']['LeftAndMain']['SAVED'] = 'spremljeno';
 $lang['hr_HR']['LeftAndMain']['SAVEDUP'] = 'Spremljeno';
+$lang['hr_HR']['LeftAndMain']['SECURITY'] = 'Sigurnost';
+$lang['hr_HR']['LeftAndMain']['SITECONTENT'] = 'Sadržaj stranice';
 $lang['hr_HR']['LeftAndMain']['SITECONTENTLEFT'] = 'Sadržaj stranice';
 $lang['hr_HR']['LeftAndMain.ss']['APPVERSIONTEXT1'] = 'Ovo je ';
 $lang['hr_HR']['LeftAndMain.ss']['APPVERSIONTEXT2'] = 'verzija koju trenutno koristite, zapravo to je CVS faza';
@@ -184,17 +185,11 @@ $lang['hr_HR']['LeftAndMain.ss']['LOADING'] = 'Učitavam...';
 $lang['hr_HR']['LeftAndMain.ss']['LOGGEDINAS'] = 'Prijavljen kao ';
 $lang['hr_HR']['LeftAndMain.ss']['LOGOUT'] = 'Odjavi se';
 $lang['hr_HR']['LeftAndMain.ss']['PUBLIS'] = 'Objavljena stranica';
+$lang['hr_HR']['LeftAndMain.ss']['REQUIREJS'] = 'Sustav zahtjeva omogućeni JavaScript';
 $lang['hr_HR']['LeftAndMain.ss']['SSWEB'] = 'Silverstripe Web stranica';
 $lang['hr_HR']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Pregleda stranice:';
 $lang['hr_HR']['LeftAndMain']['STATUSTO'] = 'Status promjenjen na \'%s\'';
 $lang['hr_HR']['LeftAndMain']['TREESITECONTENT'] = 'Sadržaj stranice';
-$lang['hr_HR']['MemberList']['ADD'] = 'Dodaj';
-$lang['hr_HR']['MemberList']['EMAIL'] = 'Email';
-$lang['hr_HR']['MemberList']['FILTERBYG'] = 'Filtriraj po grupi';
-$lang['hr_HR']['MemberList']['FN'] = 'Ime';
-$lang['hr_HR']['MemberList']['PASSWD'] = 'Lozinka';
-$lang['hr_HR']['MemberList']['SEARCH'] = 'Traži';
-$lang['hr_HR']['MemberList']['SN'] = 'Prezime';
 $lang['hr_HR']['MemberList.ss']['FILTER'] = 'Filter';
 $lang['hr_HR']['MemberList_Table.ss']['EMAIL'] = 'Email Adresa';
 $lang['hr_HR']['MemberList_Table.ss']['FN'] = 'Ime';
@@ -206,7 +201,10 @@ $lang['hr_HR']['MemberTableField.ss']['ADDNEW'] = 'Dodaj ';
 $lang['hr_HR']['MemberTableField.ss']['DELETEMEMBER'] = 'Obriši člana';
 $lang['hr_HR']['MemberTableField.ss']['EDITMEMBER'] = 'Uredi člana';
 $lang['hr_HR']['MemberTableField.ss']['SHOWMEMBER'] = 'Pokaži ovog člana';
+$lang['hr_HR']['ModelAdmin']['CREATEBUTTON'] = 'Kreiraj \'%s\'';
 $lang['hr_HR']['PageComment']['COMMENTBY'] = 'Komentar od \'%s\' na %s';
+$lang['hr_HR']['PageComment']['PLURALNAME'] = 'Komentari na stranici';
+$lang['hr_HR']['PageComment']['SINGULARNAME'] = 'Komentar na stranici';
 $lang['hr_HR']['PageCommentInterface.ss']['COMMENTS'] = 'Komentari';
 $lang['hr_HR']['PageCommentInterface.ss']['NEXT'] = 'slijedeći';
 $lang['hr_HR']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'Na ovoj stranici nema komentara';
@@ -216,12 +214,14 @@ $lang['hr_HR']['PageCommentInterface_singlecomment.ss']['ISNTSPAM'] = 'ovaj kome
 $lang['hr_HR']['PageCommentInterface_singlecomment.ss']['ISSPAM'] = 'ovaj komentar je \'spam\'';
 $lang['hr_HR']['PageCommentInterface_singlecomment.ss']['PBY'] = 'Poslano od';
 $lang['hr_HR']['PageCommentInterface_singlecomment.ss']['REMCOM'] = 'obriši ovaj komentar';
+$lang['hr_HR']['ReportAdmin']['MENUTITLE'] = 'Izvještaji';
 $lang['hr_HR']['ReportAdmin_left.ss']['REPORTS'] = 'Izvještaji';
 $lang['hr_HR']['ReportAdmin_right.ss']['WELCOME1'] = 'Dobrodošli na';
 $lang['hr_HR']['ReportAdmin_right.ss']['WELCOME2'] = 'Sekcija izvještaja. Molim odaberite izvještaj.';
 $lang['hr_HR']['ReportAdmin_SiteTree.ss']['REPORTS'] = 'Izvještaji';
 $lang['hr_HR']['SecurityAdmin']['ADDMEMBER'] = 'Dodaj člana';
 $lang['hr_HR']['SecurityAdmin']['MENUTITLE'] = 'Sigurnost';
+$lang['hr_HR']['SecurityAdmin']['MENUTITLE'] = 'Sigurnost';
 $lang['hr_HR']['SecurityAdmin']['NEWGROUP'] = 'Nova Grupa';
 $lang['hr_HR']['SecurityAdmin']['SAVE'] = 'Spremi';
 $lang['hr_HR']['SecurityAdmin']['SGROUPS'] = 'Sigurnosne grupe';
@@ -242,9 +242,6 @@ $lang['hr_HR']['StaticExporter']['BASEURL'] = 'Osnovni URL';
 $lang['hr_HR']['StaticExporter']['EXPORTTO'] = 'Izvezi u taj direktorij';
 $lang['hr_HR']['StaticExporter']['FOLDEREXPORT'] = 'Direktorij za izvoz na';
 $lang['hr_HR']['StaticExporter']['NAME'] = 'Statični exporter';
-$lang['hr_HR']['StaticExporter']['ONETHATEXISTS'] = 'Molimo odredite direktorij koji postoji';
-$lang['hr_HR']['TaskList.ss']['BY'] = 'by';
-$lang['hr_HR']['ThumbnailStripField']['NOTAFOLDER'] = 'Ovo nije direktorij';
 $lang['hr_HR']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Odaberite direktorij)';
 $lang['hr_HR']['ViewArchivedEmail.ss']['CANACCESS'] = 'Na slijedećem linku možete pristupiti arhiviranoj stranici:';
 $lang['hr_HR']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Zatražili ste sadržaj naše stranice ';
diff --git a/lang/hu_HU.php b/lang/hu_HU.php
index 0ab5d070..638b7450 100644
--- a/lang/hu_HU.php
+++ b/lang/hu_HU.php
@@ -17,59 +17,77 @@ if(array_key_exists('hu_HU', $lang) && is_array($lang['hu_HU'])) {
 }
 
 $lang['hu_HU']['AssetAdmin']['CHOOSEFILE'] = 'Válassz fájlt';
-$lang['hu_HU']['AssetAdmin']['CONTENTMODBY'] = 'A tartalmat módosíthatja';
-$lang['hu_HU']['AssetAdmin']['CONTENTUSABLEBY'] = 'A tartalom használatára jogosult ';
 $lang['hu_HU']['AssetAdmin']['DELETEDX'] = '%s fájl törölve. %s';
 $lang['hu_HU']['AssetAdmin']['FILESREADY'] = 'Feltöltésre készen álló fájlok:';
+$lang['hu_HU']['AssetAdmin']['FOLDERDELETED'] = 'mappa törölve.';
+$lang['hu_HU']['AssetAdmin']['FOLDERSDELETED'] = 'mappák törölve.';
 $lang['hu_HU']['AssetAdmin']['MENUTITLE'] = 'Fájlok és képek';
-$lang['hu_HU']['AssetAdmin']['MENUTITLE'] = 'Fájlok & Képek';
+$lang['hu_HU']['AssetAdmin']['MENUTITLE'] = 'Fájlok és Képek';
 $lang['hu_HU']['AssetAdmin']['MOVEDX'] = '%s fájl áthelyezve.';
 $lang['hu_HU']['AssetAdmin']['NEWFOLDER'] = 'Új mappa';
+$lang['hu_HU']['AssetAdmin']['NOTEMP'] = 'A feltöltések számára nincs ideiglenes mappa. Kérjük, állítsa be az "upload_tmp_dir" értékét a php.ini-ben.';
 $lang['hu_HU']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Nem volt semmi, amit fel lehetett volna tölteni.';
 $lang['hu_HU']['AssetAdmin']['NOWBROKEN'] = 'Ezen oldalak linkjei hibásak lettek: ';
-$lang['hu_HU']['AssetAdmin']['OWNER'] = 'Tulajdonos';
+$lang['hu_HU']['AssetAdmin']['NOWBROKEN2'] = 'A tulajdonosaik kaptak e-mailt, és rendbe hozzák az oldalakat.';
 $lang['hu_HU']['AssetAdmin']['SAVEDFILE'] = '%s fájl elmentésre került.';
 $lang['hu_HU']['AssetAdmin']['SAVEFOLDERNAME'] = 'Mappanév mentése';
+$lang['hu_HU']['AssetAdmin']['THUMBSDELETED'] = 'Minden nem használt miniatűr törölve lett';
 $lang['hu_HU']['AssetAdmin']['UPLOAD'] = 'Alább felsorolt fájlok feltöltése';
 $lang['hu_HU']['AssetAdmin']['UPLOADEDX'] = '%s fájl feltöltve.';
 $lang['hu_HU']['AssetAdmin_left.ss']['CREATE'] = 'Létrehozás';
 $lang['hu_HU']['AssetAdmin_left.ss']['DELETE'] = 'Törlés';
 $lang['hu_HU']['AssetAdmin_left.ss']['DELFOLDERS'] = 'Kiválasztott mappák törlése.';
+$lang['hu_HU']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = '"Fogd és vidd" átrendezés engedélyezése';
 $lang['hu_HU']['AssetAdmin_left.ss']['FOLDERS'] = 'Mappák';
 $lang['hu_HU']['AssetAdmin_left.ss']['GO'] = 'Mehet';
-$lang['hu_HU']['AssetAdmin_left.ss']['SELECTTODEL'] = 'Válaszd ki a mappákat, amiket töröni szeretnél, majd kattints a lentebbi gombra.';
-$lang['hu_HU']['AssetAdmin_left.ss']['TOREORG'] = 'A mappák újraszervezéséhez helyezd őket a kívánt helyre az egérrel.';
+$lang['hu_HU']['AssetAdmin_left.ss']['SELECTTODEL'] = 'Válaszd ki a mappákat, amiket törölni szeretnél, majd kattints a lenti gombra.';
+$lang['hu_HU']['AssetAdmin_left.ss']['TOREORG'] = 'A mappák újraszervezéséhez húzd őket a kívánt helyre az egérrel.';
 $lang['hu_HU']['AssetAdmin_right.ss']['CHOOSEPAGE'] = 'Kérünk, válassz egy oldalt a bal oldali listából.';
 $lang['hu_HU']['AssetAdmin_right.ss']['WELCOME'] = 'Üdvözöllek itt:';
 $lang['hu_HU']['AssetAdmin_uploadiframe.ss']['PERMFAILED'] = 'Nincs jogosultságod fájlokat feltölteni ebbe a mappába.';
+$lang['hu_HU']['AssetTableField']['CAPTION'] = 'Címke';
 $lang['hu_HU']['AssetTableField']['CREATED'] = 'Először feltöltve';
 $lang['hu_HU']['AssetTableField']['DIM'] = 'Képméret';
+$lang['hu_HU']['AssetTableField']['DIMLIMT'] = 'A méretek korlátozása a felbukkanó ablakban';
+$lang['hu_HU']['AssetTableField']['EDITIMAGE'] = 'A kép szerkesztése';
 $lang['hu_HU']['AssetTableField']['FILENAME'] = 'Fájlnév';
+$lang['hu_HU']['AssetTableField']['GALLERYOPTIONS'] = 'Galéria beállításai';
+$lang['hu_HU']['AssetTableField']['IMAGE'] = 'Kép';
+$lang['hu_HU']['AssetTableField']['ISFLASH'] = 'Egy Flash dokumentum';
 $lang['hu_HU']['AssetTableField']['LASTEDIT'] = 'Utoljára változott';
+$lang['hu_HU']['AssetTableField']['MAIN'] = 'Elsődleges';
 $lang['hu_HU']['AssetTableField']['NOLINKS'] = 'Ezen fájlra nem mutat link egy oldalról sem.';
 $lang['hu_HU']['AssetTableField']['OWNER'] = 'Tulajdonos';
 $lang['hu_HU']['AssetTableField']['PAGESLINKING'] = 'A következő oldalak mutatanak erre a fájlra: ';
+$lang['hu_HU']['AssetTableField']['POPUPHEIGHT'] = 'Felbukkanás magassága';
+$lang['hu_HU']['AssetTableField']['POPUPWIDTH'] = 'Felbukkanás szélessége';
 $lang['hu_HU']['AssetTableField']['SIZE'] = 'Méret';
 $lang['hu_HU']['AssetTableField.ss']['DELFILE'] = 'Fájl törlése';
-$lang['hu_HU']['AssetTableField.ss']['DRAGTOFOLDER'] = 'A fájlt az áthelyezéshez, húzd a bal oldalon lévő mappába.';
+$lang['hu_HU']['AssetTableField.ss']['DRAGTOFOLDER'] = 'A fájlt az áthelyezéshez húzd a bal oldalon lévő mappába.';
+$lang['hu_HU']['AssetTableField']['SWFFILEOPTIONS'] = 'SWF fájl beállításai';
 $lang['hu_HU']['AssetTableField']['TITLE'] = 'Cím';
 $lang['hu_HU']['AssetTableField']['TYPE'] = 'Típus';
+$lang['hu_HU']['AssetTableField']['URL'] = 'URL';
 $lang['hu_HU']['CMSLeft.ss']['DELPAGE'] = 'Oldalak törlése…';
 $lang['hu_HU']['CMSLeft.ss']['DELPAGES'] = 'Kiválasztott oldalak törlése';
 $lang['hu_HU']['CMSLeft.ss']['GO'] = 'Mehet';
 $lang['hu_HU']['CMSLeft.ss']['NEWPAGE'] = 'Új oldal...';
-$lang['hu_HU']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Válszd ki a törlendő oldalakat, majd kattints a lentebbi gombra.';
-$lang['hu_HU']['CMSLeft.ss']['SITECONT'] = 'Oldaltartalom';
+$lang['hu_HU']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Válaszd ki a törlendő oldalakat, majd kattints a lenti gombra.';
+$lang['hu_HU']['CMSLeft.ss']['SITECONT'] = 'Honlaptartalom';
+$lang['hu_HU']['CMSMain']['ACCESS'] = '\'%s\' elérése (%s)';
+$lang['hu_HU']['CMSMain']['ACCESSALLINTERFACES'] = 'Elérés minden CMS interfészhez';
 $lang['hu_HU']['CMSMain']['CANCEL'] = 'Mégse';
 $lang['hu_HU']['CMSMain']['CHOOSEREPORT'] = '(Válassz egy jelentést.)';
 $lang['hu_HU']['CMSMain']['COMPARINGV'] = 'A #%d és a #%d verziót hasonlítod össze.';
 $lang['hu_HU']['CMSMain']['COPYPUBTOSTAGE'] = 'Biztosan át akarod másolni a publikált tartalmat az fázisoldalra?';
-$lang['hu_HU']['CMSMain']['DELETEFP'] = 'Törlés a publikált weblapról';
+$lang['hu_HU']['CMSMain']['DELETE'] = 'Törlés a piszkozat oldalról';
+$lang['hu_HU']['CMSMain']['DESCREMOVED'] = 'és %s leszármazott';
 $lang['hu_HU']['CMSMain']['EMAIL'] = 'E-mail';
 $lang['hu_HU']['CMSMain']['GO'] = 'Mehet';
-$lang['hu_HU']['CMSMain']['MENUTITLE'] = 'Oldaltartalom';
+$lang['hu_HU']['CMSMain']['MENUTITLE'] = 'Honlaptartalom';
+$lang['hu_HU']['CMSMain']['MENUTITLE'] = 'Honlaptartalom';
 $lang['hu_HU']['CMSMain']['METADESCOPT'] = 'Leírás';
-$lang['hu_HU']['CMSMain']['METAKEYWORDSOPT'] = 'Kulcsaszavak';
+$lang['hu_HU']['CMSMain']['METAKEYWORDSOPT'] = 'Kulcsszavak';
 $lang['hu_HU']['CMSMain']['NEW'] = 'Új';
 $lang['hu_HU']['CMSMain']['NOCONTENT'] = 'nincs tartalom';
 $lang['hu_HU']['CMSMain']['NOTHINGASSIGNED'] = 'Nincs semmi se hozzádrendelve.';
@@ -88,10 +106,12 @@ $lang['hu_HU']['CMSMain']['PUBALLCONFIRM'] = 'Minden oldal publikálása, fázis
 $lang['hu_HU']['CMSMain']['PUBALLFUN'] = '"Összes publikálása" funkció';
 $lang['hu_HU']['CMSMain']['PUBALLFUN2'] = 'Ennek a gombnak a megnyomásával ugyanazt érheted el, mintha az összes oldalon megnyomnád a publikálás gombot. Akkor célszerű használni, ha a tartalom nagy változáson ment keresztül, mint például az oldal kezdeti felépítésénél.';
 $lang['hu_HU']['CMSMain']['PUBPAGES'] = 'Befejezve: %d oldal publikálva.';
+$lang['hu_HU']['CMSMain']['REMOVED'] = '\'%s\' törölve az éles oldalról';
 $lang['hu_HU']['CMSMain']['REMOVEDFD'] = 'Eltávolítva a piszkozatoldalról.';
 $lang['hu_HU']['CMSMain']['REMOVEDPAGE'] = '„%s” törlésre került a publikált oldalról.';
-$lang['hu_HU']['CMSMain']['RESTORE'] = 'Visszaállítás';
-$lang['hu_HU']['CMSMain']['RESTORED'] = '„%s” sikeresen visszaállításra került.';
+$lang['hu_HU']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = '\'%s\' törlése a piszkozatoldalról';
+$lang['hu_HU']['CMSMain']['REPORT'] = 'Jelentés';
+$lang['hu_HU']['CMSMain']['RESTORED'] = '\'%s\' sikeresen visszaállításra került.';
 $lang['hu_HU']['CMSMain']['ROLLBACK'] = 'Visszaállítás ehhez a verzióhoz';
 $lang['hu_HU']['CMSMain']['ROLLEDBACKPUB'] = 'Visszaállítva a publikált verzióhoz. Az új verziószám #%d.';
 $lang['hu_HU']['CMSMain']['ROLLEDBACKVERSION'] = 'Visszaálítva a #%d verzióra. Az új verziószám #%d.';
@@ -104,12 +124,12 @@ $lang['hu_HU']['CMSMain']['VIEWING'] = 'Jelenleg a #%d verziót nézed. Létreho
 $lang['hu_HU']['CMSMain']['VISITRESTORE'] = 'Látogasd meg: restorepage/(ID)';
 $lang['hu_HU']['CMSMain']['WAITINGON'] = 'Ezen az <b>%d</b> oldalon más emberekre vársz, hogy dolgozzanak rajta.';
 $lang['hu_HU']['CMSMain']['WORKTODO'] = 'Ezen a <b>%d</b> oldalon még el kell végezned néhány dolgot.';
+$lang['hu_HU']['CMSMain_dialog.ss']['BUTTONNOTFOUND'] = 'A gomb neve nem található';
 $lang['hu_HU']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'Hozzáadva a piszkozatoldalhoz, még nem publikálva';
 $lang['hu_HU']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Kritérium hozzáadása…';
 $lang['hu_HU']['CMSMain_left.ss']['BATCHACTIONS'] = 'Kötegelt műveletek';
-$lang['hu_HU']['CMSMain_left.ss']['CHANGED'] = 'megváltozatva';
-$lang['hu_HU']['CMSMain_left.ss']['CLOSEBOX'] = 'Kattints ide a doboz bezáráshoz.';
-$lang['hu_HU']['CMSMain_left.ss']['COMMENTS'] = 'Megjegyzések';
+$lang['hu_HU']['CMSMain_left.ss']['CHANGED'] = 'megváltoztatva';
+$lang['hu_HU']['CMSMain_left.ss']['CLOSEBOX'] = 'kattints ide a doboz bezáráshoz';
 $lang['hu_HU']['CMSMain_left.ss']['COMPAREMODE'] = 'Összehasonlító mód (kattints a két összehasonlítandó oldalra lejjebb)';
 $lang['hu_HU']['CMSMain_left.ss']['CREATE'] = 'Létrehozás';
 $lang['hu_HU']['CMSMain_left.ss']['DEL'] = 'törölve';
@@ -119,21 +139,20 @@ $lang['hu_HU']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Piszkozatoldalon szerkesztv
 $lang['hu_HU']['CMSMain_left.ss']['EDITEDSINCE'] = 'Szerkesztve ezóta';
 $lang['hu_HU']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'A fogd &amp; vidd típusú újrarendezés engedélyezése';
 $lang['hu_HU']['CMSMain_left.ss']['GO'] = 'Mehet';
+$lang['hu_HU']['CMSMain_left.ss']['HIDDEN'] = 'rejtett';
 $lang['hu_HU']['CMSMain_left.ss']['KEY'] = 'Kulcs:';
-$lang['hu_HU']['CMSMain_left.ss']['NEW'] = 'Új';
-$lang['hu_HU']['CMSMain_left.ss']['OPENBOX'] = 'Kattints ide a doboz kinyitásához.';
+$lang['hu_HU']['CMSMain_left.ss']['NEW'] = 'új';
+$lang['hu_HU']['CMSMain_left.ss']['OPENBOX'] = 'kattints ide a doboz kinyitásához';
 $lang['hu_HU']['CMSMain_left.ss']['PAGEVERSIONH'] = 'Oldal-verzióelőzmények';
 $lang['hu_HU']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Kiválasztott oldalak publikálása';
 $lang['hu_HU']['CMSMain_left.ss']['SEARCH'] = 'Keresés';
 $lang['hu_HU']['CMSMain_left.ss']['SEARCHTITLE'] = 'Keresés az URL-ekben, a címekben, a menü címekben és a tartalmakban';
-$lang['hu_HU']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Válaszd ki a megváltozatatandó oldalakat, majd kattints egy műveletre:';
+$lang['hu_HU']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Válaszd ki a megváltoztatandó oldalakat, majd kattints egy műveletre:';
 $lang['hu_HU']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Válaszd ki az oldalakat, melyeket duplikálni szeretnél, azt hogy az aloldalait is át szeretnéd-e másolni, illetve hogy hova szeretnéd helyezni a duplikátumot.';
 $lang['hu_HU']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Csak megváltozott oldalak mutatása';
 $lang['hu_HU']['CMSMain_left.ss']['SHOWUNPUB'] = 'Nem publikált verziók megjelenítése';
-$lang['hu_HU']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Oldaltartalom és szerkezet';
+$lang['hu_HU']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Honlaptartalom és -szerkezet';
 $lang['hu_HU']['CMSMain_left.ss']['SITEREPORTS'] = 'Oldal jelentések';
-$lang['hu_HU']['CMSMain_left.ss']['TASKLIST'] = 'Feladatlista';
-$lang['hu_HU']['CMSMain_left.ss']['WAITINGON'] = 'Várakozunk';
 $lang['hu_HU']['CMSMain_right.ss']['ANYMESSAGE'] = 'Van valami üzeneted a szerkesztőnek?';
 $lang['hu_HU']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Kérünk, válassz egy oldalt a bal oldali listából.';
 $lang['hu_HU']['CMSMain_right.ss']['LOADING'] = 'Töltés...';
@@ -150,83 +169,202 @@ $lang['hu_HU']['CMSMain_versions.ss']['WHEN'] = 'Mikor';
 $lang['hu_HU']['CMSRight.ss']['CHOOSEPAGE'] = 'Kérünk, válassz egy oldalt a bal oldali listából.';
 $lang['hu_HU']['CMSRight.ss']['ECONTENT'] = 'Tartalom szerkesztése';
 $lang['hu_HU']['CMSRight.ss']['WELCOMETO'] = 'Üdvözlünk itt:';
-$lang['hu_HU']['CommentAdmin']['MENUTITLE'] = 'Megyjegyzések';
+$lang['hu_HU']['CommentAdmin']['ACCEPT'] = 'Jóváhagyás';
+$lang['hu_HU']['CommentAdmin']['APPROVED'] = '%s hozzászólás jóváhagyva.';
+$lang['hu_HU']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Jóváhagyott hozzászólások';
+$lang['hu_HU']['CommentAdmin']['AUTHOR'] = 'Szerző';
+$lang['hu_HU']['CommentAdmin']['COMMENT'] = 'Hozzászólás';
+$lang['hu_HU']['CommentAdmin']['COMMENTS'] = 'Hozzászólások';
+$lang['hu_HU']['CommentAdmin']['COMMENTSAWAITINGMODERATION'] = 'Moderálandó hozzászólások';
+$lang['hu_HU']['CommentAdmin']['DATEPOSTED'] = 'Elküldés dátuma';
+$lang['hu_HU']['CommentAdmin']['DELETE'] = 'Törlés';
+$lang['hu_HU']['CommentAdmin']['DELETEALL'] = 'Mind törlése';
+$lang['hu_HU']['CommentAdmin']['DELETED'] = '%s hozzászólás törölve.';
+$lang['hu_HU']['CommentAdmin']['MARKASNOTSPAM'] = 'Ez nem spam';
+$lang['hu_HU']['CommentAdmin']['MARKEDNOTSPAM'] = '%s hozzászólás jelölve mint \'nem spam\'.';
+$lang['hu_HU']['CommentAdmin']['MARKEDSPAM'] = '%s hozzászólás spamként jelölve.';
 $lang['hu_HU']['CommentAdmin']['MENUTITLE'] = 'Hozzászólások';
+$lang['hu_HU']['CommentAdmin']['MENUTITLE'] = 'Hozzászólások';
+$lang['hu_HU']['CommentAdmin']['NAME'] = 'Név';
+$lang['hu_HU']['CommentAdmin']['PAGE'] = 'Oldal';
+$lang['hu_HU']['CommentAdmin']['SPAM'] = 'Spam';
+$lang['hu_HU']['CommentAdmin']['SPAMMARKED'] = 'Ez spam';
+$lang['hu_HU']['CommentAdmin_left.ss']['COMMENTS'] = 'Hozzászólások';
+$lang['hu_HU']['CommentAdmin_right.ss']['WELCOME1'] = 'Üdvözöljük a';
+$lang['hu_HU']['CommentAdmin_right.ss']['WELCOME2'] = 'Hozzászólás-kezelőben. Kérjük, válasszon egy mappát a bal oldali fában.';
+$lang['hu_HU']['CommentAdmin_SiteTree.ss']['APPROVED'] = 'Jóváhagyva';
+$lang['hu_HU']['CommentAdmin_SiteTree.ss']['AWAITMODERATION'] = 'Moderációra vár';
+$lang['hu_HU']['CommentAdmin_SiteTree.ss']['COMMENTS'] = 'Hozzászólások';
+$lang['hu_HU']['CommentAdmin_SiteTree.ss']['SPAM'] = 'Spam';
 $lang['hu_HU']['CommentList.ss']['CREATEDW'] = 'A jegyzetek akkor kerülnek létrehozásra amikor a „munkafolyamat műveletek” egyike elvégzésre kerül: publikálás, visszavonás vagy elküldés.';
 $lang['hu_HU']['CommentList.ss']['NOCOM'] = 'Nincsenek megjegyzések ezen az oldalon.';
+$lang['hu_HU']['CommentTableField']['FILTER'] = 'Szűrés';
+$lang['hu_HU']['CommentTableField']['SEARCH'] = 'Keresés';
+$lang['hu_HU']['CommentTableField.ss']['APPROVE'] = 'jóváhagy';
+$lang['hu_HU']['CommentTableField.ss']['APPROVECOMMENT'] = 'A hozzászólás jóváhagyása';
+$lang['hu_HU']['CommentTableField.ss']['DELETE'] = 'töröl';
+$lang['hu_HU']['CommentTableField.ss']['DELETEROW'] = 'A sor törlése';
+$lang['hu_HU']['CommentTableField.ss']['EDIT'] = 'szerkeszt';
+$lang['hu_HU']['CommentTableField.ss']['MARKASSPAM'] = 'Ez a hozzászólás spam';
+$lang['hu_HU']['CommentTableField.ss']['MARKNOSPAM'] = 'Ez a hozzászólás nem spam';
+$lang['hu_HU']['CommentTableField.ss']['NOITEMSFOUND'] = 'Nincs elem';
+$lang['hu_HU']['CommentTableField.ss']['SPAM'] = 'spam';
+$lang['hu_HU']['ComplexTableField']['CLOSEPOPUP'] = 'Ablak bezárása';
+$lang['hu_HU']['ComplexTableField']['SUCCESSADD'] = '%s %s %s hozzáadva';
+$lang['hu_HU']['ImageEditor.ss']['ACTIONS'] = 'műveletek';
+$lang['hu_HU']['ImageEditor.ss']['ADJUST'] = 'igazít';
+$lang['hu_HU']['ImageEditor.ss']['APPLY'] = 'alkalmaz';
+$lang['hu_HU']['ImageEditor.ss']['BLUR'] = 'életlenítés';
+$lang['hu_HU']['ImageEditor.ss']['BRIGHTNESS'] = 'fényesség';
 $lang['hu_HU']['ImageEditor.ss']['CANCEL'] = 'mégse';
+$lang['hu_HU']['ImageEditor.ss']['CONTRAST'] = 'kontraszt';
 $lang['hu_HU']['ImageEditor.ss']['CROP'] = 'kivágás';
+$lang['hu_HU']['ImageEditor.ss']['CURRENTACTION'] = 'aktuális&nbsp;művelet';
+$lang['hu_HU']['ImageEditor.ss']['EFFECTS'] = 'effektek';
+$lang['hu_HU']['ImageEditor.ss']['EXIT'] = 'kilépés';
+$lang['hu_HU']['ImageEditor.ss']['GAMMA'] = 'gamma';
+$lang['hu_HU']['ImageEditor.ss']['GREYSCALE'] = 'szürkeárnyalat';
 $lang['hu_HU']['ImageEditor.ss']['HEIGHT'] = 'magasság';
 $lang['hu_HU']['ImageEditor.ss']['REDO'] = 'visszaállítás';
 $lang['hu_HU']['ImageEditor.ss']['ROT'] = 'elforgatás';
 $lang['hu_HU']['ImageEditor.ss']['SAVE'] = 'kép&nbsp;elmentése';
+$lang['hu_HU']['ImageEditor.ss']['SEPIA'] = 'szépia';
 $lang['hu_HU']['ImageEditor.ss']['UNDO'] = 'visszavonás';
 $lang['hu_HU']['ImageEditor.ss']['UNTITLED'] = 'Cím nélküli dokumentum';
 $lang['hu_HU']['ImageEditor.ss']['WIDTH'] = 'szélesség';
 $lang['hu_HU']['LeftAndMain']['CHANGEDURL'] = 'Az URL megváltoztaásra került „%s”-re.';
 $lang['hu_HU']['LeftAndMain']['COMMENTS'] = 'Hozzászólások';
-$lang['hu_HU']['LeftAndMain']['FILESIMAGES'] = 'Fájlok & Képek';
+$lang['hu_HU']['LeftAndMain']['FILESIMAGES'] = 'Fájlok és képek';
 $lang['hu_HU']['LeftAndMain']['HELP'] = 'Segítség';
 $lang['hu_HU']['LeftAndMain']['PAGETYPE'] = 'Oldal típusa:';
 $lang['hu_HU']['LeftAndMain']['PERMAGAIN'] = 'Kiléptetésre kerültél a CMS-ből. Ha újra be szeretnél lépni, add meg alább a felhasználóneved és jelszavad.';
 $lang['hu_HU']['LeftAndMain']['PERMALREADY'] = 'Nincs jogosultságod a CMS ezen részének megtekintéséhez. Ha be szeretnél jelentkezni más felhasználóként, lejjebb megteheted.';
 $lang['hu_HU']['LeftAndMain']['PERMDEFAULT'] = 'A CMS- be való belépéshez, kérünk válassz egy azonosítási módot, és írd be az azonosítási infomációkat.';
 $lang['hu_HU']['LeftAndMain']['PLEASESAVE'] = 'Kérjük, mentsd el az oldalt: az oldalt nem lehetett frissíteni, mivel még nem került elmentésre.';
-$lang['hu_HU']['LeftAndMain']['REPORTS'] = 'Riportok';
+$lang['hu_HU']['LeftAndMain']['REPORTS'] = 'Jelentések';
 $lang['hu_HU']['LeftAndMain']['REQUESTERROR'] = 'Hiba a lekérésben.';
 $lang['hu_HU']['LeftAndMain']['SAVED'] = 'Elmentve.';
 $lang['hu_HU']['LeftAndMain']['SAVEDUP'] = 'Elmentve.';
 $lang['hu_HU']['LeftAndMain']['SECURITY'] = 'Biztonság';
-$lang['hu_HU']['LeftAndMain']['SITECONTENTLEFT'] = 'Oldal tartalma';
+$lang['hu_HU']['LeftAndMain']['SITECONTENT'] = 'Honlaptartalom';
+$lang['hu_HU']['LeftAndMain']['SITECONTENTLEFT'] = 'Honlaptartalom';
 $lang['hu_HU']['LeftAndMain.ss']['APPVERSIONTEXT1'] = 'Ez a ';
 $lang['hu_HU']['LeftAndMain.ss']['APPVERSIONTEXT2'] = 'verzió ami éppen fut, gyakorlatilag ez a CVS ág.';
 $lang['hu_HU']['LeftAndMain.ss']['ARCHS'] = 'Archivált oldal';
 $lang['hu_HU']['LeftAndMain.ss']['DRAFTS'] = 'Piszkozatoldal';
 $lang['hu_HU']['LeftAndMain.ss']['EDIT'] = 'Szerkesztés';
+$lang['hu_HU']['LeftAndMain.ss']['EDITINCMS'] = 'Az oldal szerkesztése a CMS-ben';
 $lang['hu_HU']['LeftAndMain.ss']['EDITPROFILE'] = 'Profil';
 $lang['hu_HU']['LeftAndMain.ss']['LOADING'] = 'Töltés...';
 $lang['hu_HU']['LeftAndMain.ss']['LOGGEDINAS'] = 'Bejelentkezve:';
 $lang['hu_HU']['LeftAndMain.ss']['LOGOUT'] = 'Kijelentkezés';
 $lang['hu_HU']['LeftAndMain.ss']['PUBLIS'] = 'Publikált oldal';
+$lang['hu_HU']['LeftAndMain.ss']['REQUIREJS'] = 'A CMS a JavaScript engedélyezését igényli.';
 $lang['hu_HU']['LeftAndMain.ss']['SSWEB'] = 'Silverstripe weboldal';
+$lang['hu_HU']['LeftAndMain.ss']['VIEWINDRAFT'] = 'Az oldal megtekintése a piszkozat oldalon';
+$lang['hu_HU']['LeftAndMain.ss']['VIEWINPUBLISHED'] = 'Az oldal megtekintése a publikált oldalon';
 $lang['hu_HU']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Oldal nézet: ';
+$lang['hu_HU']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' sikeresen publikálva';
 $lang['hu_HU']['LeftAndMain']['STATUSTO'] = 'Az állapot megváltoztatásra került „%s”-re.';
-$lang['hu_HU']['LeftAndMain']['TREESITECONTENT'] = 'Oldal tartalma';
-$lang['hu_HU']['MemberList']['ADD'] = 'Hozzáadás';
-$lang['hu_HU']['MemberList']['EMAIL'] = 'E-mail';
-$lang['hu_HU']['MemberList']['FILTERBYG'] = 'Szűrés csoport szerint';
-$lang['hu_HU']['MemberList']['FN'] = 'Keresztnév';
-$lang['hu_HU']['MemberList']['PASSWD'] = 'Jelszó';
-$lang['hu_HU']['MemberList']['SEARCH'] = 'Keresés';
-$lang['hu_HU']['MemberList']['SN'] = 'Családi név';
+$lang['hu_HU']['LeftAndMain']['TREESITECONTENT'] = 'Honlap tartalma';
 $lang['hu_HU']['MemberList.ss']['FILTER'] = 'Szűrés';
+$lang['hu_HU']['MemberList_PageControls.ss']['DISPLAYING'] = 'Bemutatás';
+$lang['hu_HU']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'tagok';
+$lang['hu_HU']['MemberList_PageControls.ss']['LASTMEMBERS'] = 'tagok';
+$lang['hu_HU']['MemberList_PageControls.ss']['NEXTMEMBERS'] = 'tagok';
+$lang['hu_HU']['MemberList_PageControls.ss']['PREVIOUSMEMBERS'] = 'tagok';
+$lang['hu_HU']['MemberList_PageControls.ss']['VIEWFIRST'] = 'Elsőt mutat';
+$lang['hu_HU']['MemberList_PageControls.ss']['VIEWLAST'] = 'Utolsót mutat';
+$lang['hu_HU']['MemberList_PageControls.ss']['VIEWNEXT'] = 'Következőt mutat';
+$lang['hu_HU']['MemberList_PageControls.ss']['VIEWPREVIOUS'] = 'Előzőt mutat';
 $lang['hu_HU']['MemberList_Table.ss']['EMAIL'] = 'E-mail cím';
 $lang['hu_HU']['MemberList_Table.ss']['FN'] = 'Keresztnév';
 $lang['hu_HU']['MemberList_Table.ss']['PASSWD'] = 'Jelszó';
 $lang['hu_HU']['MemberList_Table.ss']['SN'] = 'Családi név';
 $lang['hu_HU']['MemberTableField']['ADD'] = 'Hozzáadás';
 $lang['hu_HU']['MemberTableField']['ADDEDTOGROUP'] = 'Tag hozzáadásra került a csoporthoz.';
+$lang['hu_HU']['MemberTableField']['ADDINGFIELD'] = 'Hozzáadás meghiúsult';
+$lang['hu_HU']['MemberTableField']['ANYGROUP'] = 'Bármely csoport';
+$lang['hu_HU']['MemberTableField']['ASC'] = 'Növekvő';
+$lang['hu_HU']['MemberTableField']['DESC'] = 'Csökkenő';
+$lang['hu_HU']['MemberTableField']['EMAIL'] = 'E-mail';
+$lang['hu_HU']['MemberTableField']['FILTER'] = 'Szűrés';
+$lang['hu_HU']['MemberTableField']['FILTERBYGROUP'] = 'Szűrés csoportra';
+$lang['hu_HU']['MemberTableField']['FIRSTNAME'] = 'Keresztnév';
+$lang['hu_HU']['MemberTableField']['ORDERBY'] = 'Rendezés';
+$lang['hu_HU']['MemberTableField']['SEARCH'] = 'Keresés';
 $lang['hu_HU']['MemberTableField.ss']['ADDNEW'] = 'Új hozzáadása';
 $lang['hu_HU']['MemberTableField.ss']['DELETEMEMBER'] = 'Tag törlése';
 $lang['hu_HU']['MemberTableField.ss']['EDITMEMBER'] = 'Tag szerkesztése';
-$lang['hu_HU']['MemberTableField.ss']['SHOWMEMBER'] = 'Ezen tag mutatása';
-$lang['hu_HU']['ModelAdmin']['CLASSTYPE'] = 'Típus';
-$lang['hu_HU']['PageComment']['COMMENTBY'] = 'Küldte %s a %s oldalhoz';
-$lang['hu_HU']['PageCommentInterface.ss']['COMMENTS'] = 'Megjegyzések';
+$lang['hu_HU']['MemberTableField.ss']['SHOWMEMBER'] = 'Tag megtekintése';
+$lang['hu_HU']['MemberTableField']['SURNAME'] = 'Családi név';
+$lang['hu_HU']['ModelAdmin']['ADDBUTTON'] = 'Hozzáadás';
+$lang['hu_HU']['ModelAdmin']['ADDFORM'] = 'Töltsd ki az űrlapot egy %s hozzáadásához.';
+$lang['hu_HU']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Eredményoszlopok kiválasztása';
+$lang['hu_HU']['ModelAdmin']['CLEAR_SEARCH'] = 'Keresés törlése';
+$lang['hu_HU']['ModelAdmin']['CREATEBUTTON'] = '\'%s\' létrehozása';
+$lang['hu_HU']['ModelAdmin']['DELETE'] = 'Törlés';
+$lang['hu_HU']['ModelAdmin']['DELETEDRECORDS'] = '%s sor törölve.';
+$lang['hu_HU']['ModelAdmin']['FOUNDRESULTS'] = 'A keresés %s megfelelő elemet talált';
+$lang['hu_HU']['ModelAdmin']['GOBACK'] = 'Vissza';
+$lang['hu_HU']['ModelAdmin']['GOFORWARD'] = 'Előre';
+$lang['hu_HU']['ModelAdmin']['IMPORT'] = 'Betöltés CSV-ből';
+$lang['hu_HU']['ModelAdmin']['IMPORTEDRECORDS'] = '%s sor betöltve.';
+$lang['hu_HU']['ModelAdmin']['ITEMNOTFOUND'] = 'Nem találom az elemet.';
+$lang['hu_HU']['ModelAdmin']['LOADEDFOREDITING'] = '\'%s\' betöltése szerkesztésre.';
+$lang['hu_HU']['ModelAdmin']['NOCSVFILE'] = 'Kérünk, válaszd ki a betöltendő CSV fájlt';
+$lang['hu_HU']['ModelAdmin']['NOIMPORT'] = 'Nincs mit betölteni';
+$lang['hu_HU']['ModelAdmin']['NORESULTS'] = 'Nincs találat';
+$lang['hu_HU']['ModelAdmin']['SAVE'] = 'Mentés';
+$lang['hu_HU']['ModelAdmin']['SEARCHRESULTS'] = 'Keresési eredmények';
+$lang['hu_HU']['ModelAdmin']['SELECTALL'] = 'mind kiválasztása';
+$lang['hu_HU']['ModelAdmin']['SELECTNONE'] = 'kiválasztás törlése';
+$lang['hu_HU']['ModelAdmin']['UPDATEDRECORDS'] = '%s sor frissítve.';
+$lang['hu_HU']['ModelAdmin_ImportSpec.ss']['IMPORTSPECFIELDS'] = 'Adatbázis oszlopok';
+$lang['hu_HU']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = '%s specifikációjának mutatása';
+$lang['hu_HU']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Relációk';
+$lang['hu_HU']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = '%s specifikációja';
+$lang['hu_HU']['ModelAdmin_left.ss']['ADDLISTING'] = 'Hozzáadás';
+$lang['hu_HU']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Betöltés';
+$lang['hu_HU']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Keresés';
+$lang['hu_HU']['ModelAdmin_right.ss']['WELCOME1'] = 'Köszönt Téged a %s. Kérjük, válassz egy bejegyzést a bal oldali sávban.';
+$lang['hu_HU']['ModelSidebar.ss']['SEARCHLISTINGS'] = 'Keresés';
+$lang['hu_HU']['PageComment']['Comment'] = 'Hozzászólás';
+$lang['hu_HU']['PageComment']['COMMENTBY'] = 'Küldte \'%s\' a \'%s\' oldalhoz';
+$lang['hu_HU']['PageComment']['IsSpam'] = 'Spam?';
+$lang['hu_HU']['PageComment']['Name'] = 'Szerző neve';
+$lang['hu_HU']['PageComment']['NeedsModeration'] = 'Moderálást igényel?';
+$lang['hu_HU']['PageComment']['PLURALNAME'] = 'Oldalhozzászólások';
+$lang['hu_HU']['PageComment']['SINGULARNAME'] = 'Oldalhozzászólás';
+$lang['hu_HU']['PageCommentInterface']['COMMENTERURL'] = 'A honlapod URL-je';
+$lang['hu_HU']['PageCommentInterface']['POST'] = 'Beküldés';
+$lang['hu_HU']['PageCommentInterface']['SPAMQUESTION'] = 'Válaszolj a következő kérdésre: %s';
+$lang['hu_HU']['PageCommentInterface.ss']['COMMENTS'] = 'Eddigi hozzászólások';
 $lang['hu_HU']['PageCommentInterface.ss']['NEXT'] = 'következő';
-$lang['hu_HU']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'Még senki sem fűzött megjegyzést az oldalhoz. ';
-$lang['hu_HU']['PageCommentInterface.ss']['POSTCOM'] = 'Megjegyzés küldése';
+$lang['hu_HU']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'Még senki nem szólt hozzá ehhez az oldalhoz.';
+$lang['hu_HU']['PageCommentInterface.ss']['POSTCOM'] = 'Hozzászólás küldése';
 $lang['hu_HU']['PageCommentInterface.ss']['PREV'] = 'előző';
-$lang['hu_HU']['PageCommentInterface_singlecomment.ss']['ISNTSPAM'] = 'Ez a megjegyzés nem levélszemét';
-$lang['hu_HU']['PageCommentInterface_singlecomment.ss']['ISSPAM'] = 'Ez a megjegyzés spam';
-$lang['hu_HU']['PageCommentInterface_singlecomment.ss']['PBY'] = 'Küldte: ';
-$lang['hu_HU']['PageCommentInterface_singlecomment.ss']['REMCOM'] = 'A megjegyzés eltávolítása';
-$lang['hu_HU']['ReportAdmin']['MENUTITLE'] = 'Riportok';
+$lang['hu_HU']['PageCommentInterface.ss']['RSSFEEDALLCOMMENTS'] = 'RSS feed minden hozzászólásra';
+$lang['hu_HU']['PageCommentInterface.ss']['RSSFEEDCOMMENTS'] = 'A hozzászólások RSS folyamként';
+$lang['hu_HU']['PageCommentInterface.ss']['RSSVIEWALLCOMMENTS'] = 'Összes hozzászólás megtekintése';
+$lang['hu_HU']['PageCommentInterface']['YOURCOMMENT'] = 'Hozzászólásod';
+$lang['hu_HU']['PageCommentInterface']['YOURNAME'] = 'A neved';
+$lang['hu_HU']['PageCommentInterface_Controller']['SPAMQUESTION'] = 'Válaszolj a következő kérdésre: %s';
+$lang['hu_HU']['PageCommentInterface_Form']['AWAITINGMODERATION'] = 'Hozzászólását fogadtuk, moderálásra vár.';
+$lang['hu_HU']['PageCommentInterface_Form']['MSGYOUPOSTED'] = 'Az elküldött üzenet:';
+$lang['hu_HU']['PageCommentInterface_Form']['SPAMDETECTED'] = 'Spamtalálat!!';
+$lang['hu_HU']['PageCommentInterface_singlecomment.ss']['APPROVE'] = 'a hozzászólás jóváhagyása';
+$lang['hu_HU']['PageCommentInterface_singlecomment.ss']['ISNTSPAM'] = 'ez a hozzászólás nem spam';
+$lang['hu_HU']['PageCommentInterface_singlecomment.ss']['ISSPAM'] = 'ez a hozzászólás spam';
+$lang['hu_HU']['PageCommentInterface_singlecomment.ss']['PBY'] = 'Beküldte: ';
+$lang['hu_HU']['PageCommentInterface_singlecomment.ss']['REMCOM'] = 'a hozzászólás törlése';
+$lang['hu_HU']['ReportAdmin']['MENUTITLE'] = 'Jelentések';
 $lang['hu_HU']['ReportAdmin_left.ss']['REPORTS'] = 'Jelentések';
 $lang['hu_HU']['ReportAdmin_right.ss']['WELCOME1'] = 'Üdvözlünk';
 $lang['hu_HU']['ReportAdmin_right.ss']['WELCOME2'] = 'jelentések részében. Kérünk, válassz egy jelentést a bal oldalról.';
 $lang['hu_HU']['ReportAdmin_SiteTree.ss']['REPORTS'] = 'Jelentések';
 $lang['hu_HU']['SecurityAdmin']['ADDMEMBER'] = 'Tag hozzáadása';
+$lang['hu_HU']['SecurityAdmin']['EDITPERMISSIONS'] = 'Jogosultságok és IP címek szerkesztése minden csoportban';
 $lang['hu_HU']['SecurityAdmin']['MENUTITLE'] = 'Biztonság';
 $lang['hu_HU']['SecurityAdmin']['MENUTITLE'] = 'Biztonság';
 $lang['hu_HU']['SecurityAdmin']['NEWGROUP'] = 'Új csoport';
@@ -235,25 +373,38 @@ $lang['hu_HU']['SecurityAdmin']['SGROUPS'] = 'Biztonsági csoportok';
 $lang['hu_HU']['SecurityAdmin_left.ss']['CREATE'] = 'Létrehozás';
 $lang['hu_HU']['SecurityAdmin_left.ss']['DEL'] = 'Törlés';
 $lang['hu_HU']['SecurityAdmin_left.ss']['DELGROUPS'] = 'Kiválasztott csoportok törlése';
+$lang['hu_HU']['SecurityAdmin_left.ss']['ENABLEDRAGGING'] = '"Fogd és vidd" átrendezés engedélyezése';
 $lang['hu_HU']['SecurityAdmin_left.ss']['GO'] = 'Mehet';
 $lang['hu_HU']['SecurityAdmin_left.ss']['SECGROUPS'] = 'Biztonsági csoportok';
 $lang['hu_HU']['SecurityAdmin_left.ss']['SELECT'] = 'Válaszd ki a törlendő oldalakat, majd kattints a lenti gombra';
-$lang['hu_HU']['SecurityAdmin_left.ss']['TOREORG'] = 'Az oldal újraszervezéséhez, rendezd az oldalakat az egérrel a kívánt helyre. ';
+$lang['hu_HU']['SecurityAdmin_left.ss']['TOREORG'] = 'Az oldal újraszervezéséhez húzd az oldalakat az egérrel a kívánt helyre.';
 $lang['hu_HU']['SecurityAdmin_right.ss']['WELCOME1'] = 'Üdvözlünk';
 $lang['hu_HU']['SecurityAdmin_right.ss']['WELCOME2'] = 'biztonság adminisztrátori részében. Kérünk, válassz egy csoportot a bal oldalról.';
 $lang['hu_HU']['SideReport']['EMPTYPAGES'] = 'Üres oldalak';
 $lang['hu_HU']['SideReport']['LAST2WEEKS'] = 'Elmúlt 2 héten belül szerkesztett oldalak';
 $lang['hu_HU']['SideReport']['REPEMPTY'] = 'A %s jelentés üres.';
+$lang['hu_HU']['SideReport']['TODO'] = 'Teendő';
 $lang['hu_HU']['StaticExporter']['BASEURL'] = 'Alap URL';
 $lang['hu_HU']['StaticExporter']['EXPORTTO'] = 'Exportálás abba a mappába';
 $lang['hu_HU']['StaticExporter']['FOLDEREXPORT'] = 'Exportálás célmappája';
 $lang['hu_HU']['StaticExporter']['NAME'] = 'Statikus exportáló';
-$lang['hu_HU']['StaticExporter']['ONETHATEXISTS'] = 'Kérünk, adj meg egy létező mappát.';
-$lang['hu_HU']['TaskList.ss']['BY'] = 'által';
-$lang['hu_HU']['ThumbnailStripField']['NOTAFOLDER'] = 'Ez nem egy mappa.';
+$lang['hu_HU']['TableListField_PageControls.ss']['DISPLAYING'] = 'Bemutatás';
+$lang['hu_HU']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Első mutatása';
+$lang['hu_HU']['TableListField_PageControls.ss']['VIEWLAST'] = 'Utolsó mutatása';
+$lang['hu_HU']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Következő mutatása';
+$lang['hu_HU']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Előző mutatása';
+$lang['hu_HU']['ThumbnailStripField']['NOFLASHFOUND'] = 'Nincs Flash állomány';
+$lang['hu_HU']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'Nincs Flash állomány itt:';
+$lang['hu_HU']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'Nincs kép itt:';
+$lang['hu_HU']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Nincs kép';
 $lang['hu_HU']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Válassz egy mappát felülről)';
 $lang['hu_HU']['ViewArchivedEmail.ss']['CANACCESS'] = 'Az archivált oldalt elérheted ezen a linken:';
-$lang['hu_HU']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Azt kérted, hogy megnézhesd az oldalunk tartalmát ekkor:';
+$lang['hu_HU']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Azt kérted, hogy megnézhesd a honlapunk tartalmát ekkor:';
 $lang['hu_HU']['WaitingOn.ss']['ATO'] = 'címezve neki:';
+$lang['hu_HU']['WidgetAreaEditor.ss']['AVAILABLE'] = 'Elérhető eszközök';
+$lang['hu_HU']['WidgetAreaEditor.ss']['INUSE'] = 'Aktuálisan használt eszközök';
+$lang['hu_HU']['WidgetAreaEditor.ss']['NOAVAIL'] = 'Nincs elérhető eszköz.';
+$lang['hu_HU']['WidgetAreaEditor.ss']['TOADD'] = 'Eszközök hozzáadásához húzza őket ide a bal oldalról.';
+$lang['hu_HU']['WidgetEditor.ss']['DELETE'] = 'Törlés';
 
 ?>
\ No newline at end of file
diff --git a/lang/id_ID.php b/lang/id_ID.php
index ca37152a..6b8541d5 100644
--- a/lang/id_ID.php
+++ b/lang/id_ID.php
@@ -17,8 +17,6 @@ if(array_key_exists('id_ID', $lang) && is_array($lang['id_ID'])) {
 }
 
 $lang['id_ID']['AssetAdmin']['CHOOSEFILE'] = 'Pilih file';
-$lang['id_ID']['AssetAdmin']['CONTENTMODBY'] = 'Konten dapat diubah oleh';
-$lang['id_ID']['AssetAdmin']['CONTENTUSABLEBY'] = 'Konten dapat digunakan oleh';
 $lang['id_ID']['AssetAdmin']['DELETEDX'] = 'Telah menghapus %s file.%s';
 $lang['id_ID']['AssetAdmin']['FILESREADY'] = 'File siap untuk di-upload';
 $lang['id_ID']['AssetAdmin']['FOLDERDELETED'] = 'Folder telah dihapus.';
@@ -31,7 +29,6 @@ $lang['id_ID']['AssetAdmin']['NOTEMP'] = 'Tidak ada folder sementara untuk uploa
 $lang['id_ID']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Tidak ada apa-apa untuk di-upload';
 $lang['id_ID']['AssetAdmin']['NOWBROKEN'] = 'Halaman ini memiliki link yang rusak:';
 $lang['id_ID']['AssetAdmin']['NOWBROKEN2'] = 'Pemilik-pemiliknya telah di-email dan mereka akan perbaiki halaman-halaman itu.';
-$lang['id_ID']['AssetAdmin']['OWNER'] = 'Pemilik';
 $lang['id_ID']['AssetAdmin']['SAVEDFILE'] = 'Telah menyimpan file %s';
 $lang['id_ID']['AssetAdmin']['SAVEFOLDERNAME'] = 'Simpan nama folder';
 $lang['id_ID']['AssetAdmin']['THUMBSDELETED'] = 'Semua thumbnail-thumbnail yang tidak terpakai telah dihapus';
@@ -85,7 +82,6 @@ $lang['id_ID']['CMSMain']['CHOOSEREPORT'] = '(Pilih laporan)';
 $lang['id_ID']['CMSMain']['COMPARINGV'] = 'Anda membandingkan versi #%d dan #%d';
 $lang['id_ID']['CMSMain']['COPYPUBTOSTAGE'] = 'Apakah Anda yakin untu menkopi konten yang dipublikasi kepada situs pentahapan? ';
 $lang['id_ID']['CMSMain']['DELETE'] = 'Hapus dari situs draft';
-$lang['id_ID']['CMSMain']['DELETEFP'] = 'Hapus dari situs yang telah dipublikasi';
 $lang['id_ID']['CMSMain']['DESCREMOVED'] = 'dan %s peranakan-peranakan';
 $lang['id_ID']['CMSMain']['EMAIL'] = 'Email';
 $lang['id_ID']['CMSMain']['GO'] = 'Maju';
@@ -116,7 +112,6 @@ $lang['id_ID']['CMSMain']['REMOVEDFD'] = 'Pindahkan dari situs draft';
 $lang['id_ID']['CMSMain']['REMOVEDPAGE'] = 'Pindahkan \'%s\' dari situs yang dipublikasi';
 $lang['id_ID']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Menghapus \'%s\' dari situs draft';
 $lang['id_ID']['CMSMain']['REPORT'] = 'Laporan';
-$lang['id_ID']['CMSMain']['RESTORE'] = 'Kembalikan';
 $lang['id_ID']['CMSMain']['RESTORED'] = 'Penempatan ulang dari \'%s\' sukses';
 $lang['id_ID']['CMSMain']['ROLLBACK'] = 'Putar mundur ke versi ini';
 $lang['id_ID']['CMSMain']['ROLLEDBACKPUB'] = 'Putar mundur ke versi yang dipublikasi. Nomor versi yang baru adalah #%d ';
@@ -137,7 +132,6 @@ $lang['id_ID']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Tambahkan Kriteria';
 $lang['id_ID']['CMSMain_left.ss']['BATCHACTIONS'] = 'Aksi Batch';
 $lang['id_ID']['CMSMain_left.ss']['CHANGED'] = 'diubah';
 $lang['id_ID']['CMSMain_left.ss']['CLOSEBOX'] = 'klik untuk menutup kotak';
-$lang['id_ID']['CMSMain_left.ss']['COMMENTS'] = 'Komentar';
 $lang['id_ID']['CMSMain_left.ss']['COMPAREMODE'] = 'Mode membandingkan (klik2 dibawah)';
 $lang['id_ID']['CMSMain_left.ss']['CREATE'] = 'Buat';
 $lang['id_ID']['CMSMain_left.ss']['DEL'] = 'terhapus';
@@ -160,8 +154,6 @@ $lang['id_ID']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Perlihatkan hanya halama
 $lang['id_ID']['CMSMain_left.ss']['SHOWUNPUB'] = 'Perlihatkan versi yang tidak dipublikasikan';
 $lang['id_ID']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Isi dan Struktur Situs';
 $lang['id_ID']['CMSMain_left.ss']['SITEREPORTS'] = 'Laporan Situs';
-$lang['id_ID']['CMSMain_left.ss']['TASKLIST'] = 'Daftar Tugas';
-$lang['id_ID']['CMSMain_left.ss']['WAITINGON'] = 'Menunggu';
 $lang['id_ID']['CMSMain_right.ss']['ANYMESSAGE'] = 'Apakah Anda mempunyai pesan dari editor?';
 $lang['id_ID']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Hrap pilih halaman dari sebelah kiri';
 $lang['id_ID']['CMSMain_right.ss']['LOADING'] = 'Memuat';
@@ -275,19 +267,9 @@ $lang['id_ID']['LeftAndMain.ss']['SSWEB'] = 'Situs Web Silverstripe';
 $lang['id_ID']['LeftAndMain.ss']['VIEWINDRAFT'] = 'Tampilkan Halaman pada Situs Draft';
 $lang['id_ID']['LeftAndMain.ss']['VIEWINPUBLISHED'] = 'Tampilkan Halaman pada Situs yang Diterbitkan';
 $lang['id_ID']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Pandangan halaman:';
+$lang['id_ID']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' telah sukses diterbitkan';
 $lang['id_ID']['LeftAndMain']['STATUSTO'] = 'Status berubah ke \'%s\'';
 $lang['id_ID']['LeftAndMain']['TREESITECONTENT'] = 'Konten Site';
-$lang['id_ID']['MemberList']['ADD'] = 'Tambah';
-$lang['id_ID']['MemberList']['ANYGROUP'] = 'Grup apapun';
-$lang['id_ID']['MemberList']['ASC'] = 'Urut Naik';
-$lang['id_ID']['MemberList']['DESC'] = 'Urut Turun';
-$lang['id_ID']['MemberList']['EMAIL'] = 'Email';
-$lang['id_ID']['MemberList']['FILTERBYG'] = 'Saring berdasarkan grup';
-$lang['id_ID']['MemberList']['FN'] = 'Nama Depan';
-$lang['id_ID']['MemberList']['ORDERBY'] = 'Urut berdasarkan';
-$lang['id_ID']['MemberList']['PASSWD'] = 'Password';
-$lang['id_ID']['MemberList']['SEARCH'] = 'Cari';
-$lang['id_ID']['MemberList']['SN'] = 'Nama Panggilan';
 $lang['id_ID']['MemberList.ss']['FILTER'] = 'Saring';
 $lang['id_ID']['MemberList_PageControls.ss']['DISPLAYING'] = 'Menampilkan';
 $lang['id_ID']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'anggota';
@@ -324,7 +306,6 @@ $lang['id_ID']['MemberTableField']['SURNAME'] = 'Nama Belakang';
 $lang['id_ID']['ModelAdmin']['ADDBUTTON'] = 'Tambah';
 $lang['id_ID']['ModelAdmin']['ADDFORM'] = 'Isi formulir ini untuk menambahkan %s ke database.';
 $lang['id_ID']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Pilih kolum-kolum hasil...';
-$lang['id_ID']['ModelAdmin']['CLASSTYPE'] = 'Tipe';
 $lang['id_ID']['ModelAdmin']['CLEAR_SEARCH'] = 'Hapus Pencarian';
 $lang['id_ID']['ModelAdmin']['CREATEBUTTON'] = 'Buat \'%s\'';
 $lang['id_ID']['ModelAdmin']['DELETE'] = 'Hapus';
@@ -349,7 +330,6 @@ $lang['id_ID']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Tampilkan Spesif
 $lang['id_ID']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Hubungan-hubungan';
 $lang['id_ID']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Spesifikasi untuk %s';
 $lang['id_ID']['ModelAdmin_left.ss']['ADDLISTING'] = 'Tambah';
-$lang['id_ID']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Tambah';
 $lang['id_ID']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Impor';
 $lang['id_ID']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Cari';
 $lang['id_ID']['ModelAdmin_right.ss']['WELCOME1'] = 'Selamat datang ke %s. Mohon pilih salah satu masukan di bagian kiri.';
@@ -409,7 +389,6 @@ $lang['id_ID']['StaticExporter']['BASEURL'] = 'Base URL';
 $lang['id_ID']['StaticExporter']['EXPORTTO'] = 'Ekspor ke folder itu';
 $lang['id_ID']['StaticExporter']['FOLDEREXPORT'] = 'Folder untuk eksport ke';
 $lang['id_ID']['StaticExporter']['NAME'] = 'Eksporter Statis';
-$lang['id_ID']['StaticExporter']['ONETHATEXISTS'] = 'Harap rincikan folder yang ada';
 $lang['id_ID']['TableListField_PageControls.ss']['DISPLAYING'] = 'Menampilkan';
 $lang['id_ID']['TableListField_PageControls.ss']['OF'] = 'dari';
 $lang['id_ID']['TableListField_PageControls.ss']['TO'] = 'ke';
@@ -417,12 +396,10 @@ $lang['id_ID']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Simak pertama';
 $lang['id_ID']['TableListField_PageControls.ss']['VIEWLAST'] = 'Simak terakhir';
 $lang['id_ID']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Simak berikutnya';
 $lang['id_ID']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Simak sebelumnya';
-$lang['id_ID']['TaskList.ss']['BY'] = 'oleh';
 $lang['id_ID']['ThumbnailStripField']['NOFLASHFOUND'] = 'Tidak ada file flash ditemukan';
 $lang['id_ID']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'Tidak ada file flash ditemukan dalam';
 $lang['id_ID']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'Tidak ada gambar ditemukan dalam';
 $lang['id_ID']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Tidak ada gambar yang ditemukan';
-$lang['id_ID']['ThumbnailStripField']['NOTAFOLDER'] = 'Ini bukan folder';
 $lang['id_ID']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Pilih folder atau cari di atas)';
 $lang['id_ID']['ViewArchivedEmail.ss']['CANACCESS'] = 'Anda dapat mengakses situs yang telah diarsip pada link ini:';
 $lang['id_ID']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Anda telah meminta untuk melihat konten dari situs kami pada tanggal ';
diff --git a/lang/it_IT.php b/lang/it_IT.php
index b1404bed..011dbf1c 100644
--- a/lang/it_IT.php
+++ b/lang/it_IT.php
@@ -17,20 +17,18 @@ if(array_key_exists('it_IT', $lang) && is_array($lang['it_IT'])) {
 }
 
 $lang['it_IT']['AssetAdmin']['CHOOSEFILE'] = 'Scegli file';
-$lang['it_IT']['AssetAdmin']['CONTENTMODBY'] = 'Contenuto modificabile da';
-$lang['it_IT']['AssetAdmin']['CONTENTUSABLEBY'] = 'Contenuto utilizzabile da';
 $lang['it_IT']['AssetAdmin']['DELETEDX'] = 'Cancellati %s file.%s';
 $lang['it_IT']['AssetAdmin']['FILESREADY'] = 'File pronti per il caricamento:';
 $lang['it_IT']['AssetAdmin']['FOLDERDELETED'] = 'cartella cancellata.';
 $lang['it_IT']['AssetAdmin']['FOLDERSDELETED'] = 'cartelle cancellate.';
 $lang['it_IT']['AssetAdmin']['MENUTITLE'] = 'File & Immagini';
+$lang['it_IT']['AssetAdmin']['MENUTITLE'] = 'File & immagini';
 $lang['it_IT']['AssetAdmin']['MOVEDX'] = 'Spostati %s file';
 $lang['it_IT']['AssetAdmin']['NEWFOLDER'] = 'NuovaCartella';
 $lang['it_IT']['AssetAdmin']['NOTEMP'] = 'Non è presente una cartella temporanea per l\'upload. Configura upload_tmp_dir nel file php.ini.';
 $lang['it_IT']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Non c\'è niente da caricare';
 $lang['it_IT']['AssetAdmin']['NOWBROKEN'] = 'Queste pagine hanno ora link non funzionanti:';
 $lang['it_IT']['AssetAdmin']['NOWBROKEN2'] = 'I rispettivi proprietari sono stati contattati via email e risolveranno i problemi riscontrati in quelle pagine.';
-$lang['it_IT']['AssetAdmin']['OWNER'] = 'Proprietario';
 $lang['it_IT']['AssetAdmin']['SAVEDFILE'] = 'Salvato file %s';
 $lang['it_IT']['AssetAdmin']['SAVEFOLDERNAME'] = 'Salva il nome della cartella';
 $lang['it_IT']['AssetAdmin']['THUMBSDELETED'] = 'Tutte le icone non utilizzate sono state cancellate';
@@ -79,16 +77,17 @@ $lang['it_IT']['CMSLeft.ss']['NEWPAGE'] = 'Nuova pagina...';
 $lang['it_IT']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Seleziona le pagine che vuoi cancellare e clicca il bottone di seguito';
 $lang['it_IT']['CMSLeft.ss']['SITECONT'] = 'Contenuto del sito';
 $lang['it_IT']['CMSMain']['ACCESS'] = 'Accedi a %s nel CMS';
+$lang['it_IT']['CMSMain']['ACCESSALLINTERFACES'] = 'Accesso a tutte le interfaccia CMS';
 $lang['it_IT']['CMSMain']['CANCEL'] = 'Cancella';
 $lang['it_IT']['CMSMain']['CHOOSEREPORT'] = '(Scegli un report)';
 $lang['it_IT']['CMSMain']['COMPARINGV'] = 'Stai comparando le versioni #%d e #%d';
 $lang['it_IT']['CMSMain']['COPYPUBTOSTAGE'] = 'Vuoi veramente copiare il contenuto pubblicato nel sito di stage?';
 $lang['it_IT']['CMSMain']['DELETE'] = 'Cancella dal sito bozza';
-$lang['it_IT']['CMSMain']['DELETEFP'] = 'Cancella dal sito di pubblicazione';
 $lang['it_IT']['CMSMain']['DESCREMOVED'] = 'e %s discendenti';
 $lang['it_IT']['CMSMain']['EMAIL'] = 'Email';
 $lang['it_IT']['CMSMain']['GO'] = 'Vai';
 $lang['it_IT']['CMSMain']['MENUTITLE'] = 'Contenuto del sito';
+$lang['it_IT']['CMSMain']['MENUTITLE'] = 'Contenuto del sito';
 $lang['it_IT']['CMSMain']['METADESCOPT'] = 'Descrizione';
 $lang['it_IT']['CMSMain']['METAKEYWORDSOPT'] = 'Parole chiavi';
 $lang['it_IT']['CMSMain']['NEW'] = 'Nuova';
@@ -114,7 +113,6 @@ $lang['it_IT']['CMSMain']['REMOVEDFD'] = 'Cancella dal sito bozza';
 $lang['it_IT']['CMSMain']['REMOVEDPAGE'] = 'Rimossa \'%s\' dal sito di pubblicazione';
 $lang['it_IT']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Cacellato \'%s\' dal sito bozza';
 $lang['it_IT']['CMSMain']['REPORT'] = 'Report';
-$lang['it_IT']['CMSMain']['RESTORE'] = 'Ripristina';
 $lang['it_IT']['CMSMain']['RESTORED'] = '\'%s\' ripristinato correttamente';
 $lang['it_IT']['CMSMain']['ROLLBACK'] = 'Ripristina a questa versione';
 $lang['it_IT']['CMSMain']['ROLLEDBACKPUB'] = 'Ripristinata la versione di pubblicazione. Il nuovo numero di versione è #%d';
@@ -135,7 +133,6 @@ $lang['it_IT']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Aggiungi criterio...';
 $lang['it_IT']['CMSMain_left.ss']['BATCHACTIONS'] = 'Azioni di massa';
 $lang['it_IT']['CMSMain_left.ss']['CHANGED'] = 'modificato';
 $lang['it_IT']['CMSMain_left.ss']['CLOSEBOX'] = 'clicca per chiudere il box';
-$lang['it_IT']['CMSMain_left.ss']['COMMENTS'] = 'Commenti';
 $lang['it_IT']['CMSMain_left.ss']['COMPAREMODE'] = 'Modalità confronto';
 $lang['it_IT']['CMSMain_left.ss']['CREATE'] = 'Crea';
 $lang['it_IT']['CMSMain_left.ss']['DEL'] = 'cancellato';
@@ -158,8 +155,6 @@ $lang['it_IT']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Visualizza solamente le
 $lang['it_IT']['CMSMain_left.ss']['SHOWUNPUB'] = 'Visulizza le versioni non pubblicate';
 $lang['it_IT']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Contenuto del sito e struttura';
 $lang['it_IT']['CMSMain_left.ss']['SITEREPORTS'] = 'Report del sito';
-$lang['it_IT']['CMSMain_left.ss']['TASKLIST'] = 'Lista dei compiti da fare';
-$lang['it_IT']['CMSMain_left.ss']['WAITINGON'] = 'In attesa';
 $lang['it_IT']['CMSMain_right.ss']['ANYMESSAGE'] = 'Hai alcun messaggio per il tuo editor?';
 $lang['it_IT']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Per favore scegli una pagina sulla sinistra.';
 $lang['it_IT']['CMSMain_right.ss']['LOADING'] = 'caricamento...';
@@ -191,6 +186,7 @@ $lang['it_IT']['CommentAdmin']['MARKASNOTSPAM'] = 'Non è spam';
 $lang['it_IT']['CommentAdmin']['MARKEDNOTSPAM'] = 'Marcati %s commenti come non-spam.';
 $lang['it_IT']['CommentAdmin']['MARKEDSPAM'] = '%s commenti segnalati come spam.';
 $lang['it_IT']['CommentAdmin']['MENUTITLE'] = 'Commenti';
+$lang['it_IT']['CommentAdmin']['MENUTITLE'] = 'Commenti';
 $lang['it_IT']['CommentAdmin']['NAME'] = 'Nome';
 $lang['it_IT']['CommentAdmin']['PAGE'] = 'Pagina';
 $lang['it_IT']['CommentAdmin']['SPAM'] = 'Spam';
@@ -219,29 +215,42 @@ $lang['it_IT']['CommentTableField.ss']['SPAM'] = 'spam';
 $lang['it_IT']['ComplexTableField']['CLOSEPOPUP'] = 'Chiudi Finestra';
 $lang['it_IT']['ComplexTableField']['SUCCESSADD'] = 'Aggiunto %s %s %s';
 $lang['it_IT']['ImageEditor.ss']['ACTIONS'] = 'azioni';
+$lang['it_IT']['ImageEditor.ss']['ADJUST'] = 'correggi';
 $lang['it_IT']['ImageEditor.ss']['APPLY'] = 'applica';
+$lang['it_IT']['ImageEditor.ss']['BLUR'] = 'sfocatura';
+$lang['it_IT']['ImageEditor.ss']['BRIGHTNESS'] = 'brillantezza';
 $lang['it_IT']['ImageEditor.ss']['CANCEL'] = 'cancella';
+$lang['it_IT']['ImageEditor.ss']['CONTRAST'] = 'contrasto';
 $lang['it_IT']['ImageEditor.ss']['CROP'] = 'ritaglia';
 $lang['it_IT']['ImageEditor.ss']['CURRENTACTION'] = 'azione&nbsp;attuale';
 $lang['it_IT']['ImageEditor.ss']['EDITFUNCTIONS'] = 'funzioni&nbsp;modifica';
+$lang['it_IT']['ImageEditor.ss']['EFFECTS'] = 'effetti';
 $lang['it_IT']['ImageEditor.ss']['EXIT'] = 'esci';
+$lang['it_IT']['ImageEditor.ss']['GAMMA'] = 'gamma';
+$lang['it_IT']['ImageEditor.ss']['GREYSCALE'] = 'scala di grigi';
 $lang['it_IT']['ImageEditor.ss']['HEIGHT'] = 'altezza';
 $lang['it_IT']['ImageEditor.ss']['REDO'] = 'rifai';
 $lang['it_IT']['ImageEditor.ss']['ROT'] = 'ruota';
 $lang['it_IT']['ImageEditor.ss']['SAVE'] = 'salva&nbsp;immagine';
+$lang['it_IT']['ImageEditor.ss']['SEPIA'] = 'seppia';
 $lang['it_IT']['ImageEditor.ss']['UNDO'] = 'annulla';
 $lang['it_IT']['ImageEditor.ss']['UNTITLED'] = 'Documento senza titolo';
 $lang['it_IT']['ImageEditor.ss']['WIDTH'] = 'larghezza';
 $lang['it_IT']['LeftAndMain']['CHANGEDURL'] = 'Cambiato URL in \'%s\'';
+$lang['it_IT']['LeftAndMain']['COMMENTS'] = 'Commenti';
+$lang['it_IT']['LeftAndMain']['FILESIMAGES'] = 'File & immagini';
 $lang['it_IT']['LeftAndMain']['HELP'] = 'Aiuto';
 $lang['it_IT']['LeftAndMain']['PAGETYPE'] = 'Tipo di pagina:';
 $lang['it_IT']['LeftAndMain']['PERMAGAIN'] = 'Sei stato sloggato dal CMS. Se desideri autenticarti nuovamente, inserisci qui sotto nome utente e password.';
 $lang['it_IT']['LeftAndMain']['PERMALREADY'] = 'Siamo spiacenti, ma non puoi accedere a questa sezione del CMS. Se desideri autenticarti come qualcun altro, fallo qui sotto.';
 $lang['it_IT']['LeftAndMain']['PERMDEFAULT'] = 'Inserisci il tuo indirizzo email e password per accedere al CMS.';
 $lang['it_IT']['LeftAndMain']['PLEASESAVE'] = 'Per favore salva la pagina: La stessa potrebbe non venire aggiornata se non si provvede quanto prima a salvarla.';
+$lang['it_IT']['LeftAndMain']['REPORTS'] = 'Rapporti';
 $lang['it_IT']['LeftAndMain']['REQUESTERROR'] = 'Errore nella richiesta';
 $lang['it_IT']['LeftAndMain']['SAVED'] = 'salvato';
 $lang['it_IT']['LeftAndMain']['SAVEDUP'] = 'Salvato';
+$lang['it_IT']['LeftAndMain']['SECURITY'] = 'Sicurezza';
+$lang['it_IT']['LeftAndMain']['SITECONTENT'] = 'Contenuto del sito';
 $lang['it_IT']['LeftAndMain']['SITECONTENTLEFT'] = 'Contenuto del sito';
 $lang['it_IT']['LeftAndMain.ss']['APPVERSIONTEXT1'] = 'Questa è la';
 $lang['it_IT']['LeftAndMain.ss']['APPVERSIONTEXT2'] = 'versione che stai utilizzando al momento, tecnicamente è il ramo CVS';
@@ -259,19 +268,9 @@ $lang['it_IT']['LeftAndMain.ss']['SSWEB'] = 'Sito web Silverstripe';
 $lang['it_IT']['LeftAndMain.ss']['VIEWINDRAFT'] = 'Visualizza la pagina nel sito bozza';
 $lang['it_IT']['LeftAndMain.ss']['VIEWINPUBLISHED'] = 'Visualizza la pagina nel sito in produzione';
 $lang['it_IT']['LeftAndMain.ss']['VIEWPAGEIN'] = 'vista pagina:';
+$lang['it_IT']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' pubblicata con successo';
 $lang['it_IT']['LeftAndMain']['STATUSTO'] = 'Stato cambiato a \'%s\'';
 $lang['it_IT']['LeftAndMain']['TREESITECONTENT'] = 'Contenuto del sito';
-$lang['it_IT']['MemberList']['ADD'] = 'Aggiungi';
-$lang['it_IT']['MemberList']['ANYGROUP'] = 'Qualsiasi gruppo';
-$lang['it_IT']['MemberList']['ASC'] = 'Ascendente';
-$lang['it_IT']['MemberList']['DESC'] = 'Discendente';
-$lang['it_IT']['MemberList']['EMAIL'] = 'Email';
-$lang['it_IT']['MemberList']['FILTERBYG'] = 'Filtra per gruppo';
-$lang['it_IT']['MemberList']['FN'] = 'Nome';
-$lang['it_IT']['MemberList']['ORDERBY'] = 'Ordina per';
-$lang['it_IT']['MemberList']['PASSWD'] = 'Password';
-$lang['it_IT']['MemberList']['SEARCH'] = 'Cerca';
-$lang['it_IT']['MemberList']['SN'] = 'Cognome';
 $lang['it_IT']['MemberList.ss']['FILTER'] = 'Filtro';
 $lang['it_IT']['MemberList_PageControls.ss']['DISPLAYING'] = 'Mostra';
 $lang['it_IT']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'membri';
@@ -308,16 +307,18 @@ $lang['it_IT']['MemberTableField']['SURNAME'] = 'Cognome';
 $lang['it_IT']['ModelAdmin']['ADDBUTTON'] = 'Aggiungi';
 $lang['it_IT']['ModelAdmin']['ADDFORM'] = 'Riempi questo form per aggiungere %s al database.';
 $lang['it_IT']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Seleziona la colonna dei risultati...';
-$lang['it_IT']['ModelAdmin']['CLASSTYPE'] = 'Tipo';
 $lang['it_IT']['ModelAdmin']['CLEAR_SEARCH'] = 'Resetta Ricerca';
+$lang['it_IT']['ModelAdmin']['CREATEBUTTON'] = 'Crea \'%s\'';
 $lang['it_IT']['ModelAdmin']['DELETE'] = 'Cancella';
 $lang['it_IT']['ModelAdmin']['DELETEDRECORDS'] = 'Cancellati %s records.';
 $lang['it_IT']['ModelAdmin']['FOUNDRESULTS'] = 'La tua ricerca ha trovato %s oggetti corrispondenti';
 $lang['it_IT']['ModelAdmin']['GOBACK'] = 'Indietro';
+$lang['it_IT']['ModelAdmin']['GOFORWARD'] = 'Avanza';
 $lang['it_IT']['ModelAdmin']['IMPORT'] = 'Importa da CSV';
 $lang['it_IT']['ModelAdmin']['IMPORTEDRECORDS'] = 'Importati %s records.';
 $lang['it_IT']['ModelAdmin']['ITEMNOTFOUND'] = 'Non trovo questo oggetto';
 $lang['it_IT']['ModelAdmin']['LOADEDFOREDITING'] = 'Caricato \'%s\' per modifiche.';
+$lang['it_IT']['ModelAdmin']['NOCSVFILE'] = 'Cerca un file CSV da importare';
 $lang['it_IT']['ModelAdmin']['NOIMPORT'] = 'Nulla da importare.';
 $lang['it_IT']['ModelAdmin']['NORESULTS'] = 'La tua ricerca non ha prodotto nessun risultato';
 $lang['it_IT']['ModelAdmin']['SAVE'] = 'Salva';
@@ -330,11 +331,17 @@ $lang['it_IT']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Mostra specifich
 $lang['it_IT']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Relazioni';
 $lang['it_IT']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Specifiche per %s';
 $lang['it_IT']['ModelAdmin_left.ss']['ADDLISTING'] = 'Aggiungi Gruppo';
-$lang['it_IT']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Aggiungi';
 $lang['it_IT']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Importa';
 $lang['it_IT']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Ricerca Gruppi';
 $lang['it_IT']['ModelAdmin_right.ss']['WELCOME1'] = 'Benvenuto a %s. Seleziona una delle voci nel riquadro di sinistra.';
+$lang['it_IT']['PageComment']['Comment'] = 'Commento';
 $lang['it_IT']['PageComment']['COMMENTBY'] = 'Commento da \'%s\' su %s';
+$lang['it_IT']['PageComment']['IsSpam'] = 'Spam?';
+$lang['it_IT']['PageComment']['Name'] = 'Nome dell\'autore';
+$lang['it_IT']['PageComment']['NeedsModeration'] = 'Necessita di moderazione?';
+$lang['it_IT']['PageComment']['PLURALNAME'] = 'Commenti alla pagina';
+$lang['it_IT']['PageComment']['SINGULARNAME'] = 'Commento alla pagina';
+$lang['it_IT']['PageCommentInterface']['COMMENTERURL'] = 'URL del tuo sito';
 $lang['it_IT']['PageCommentInterface']['POST'] = 'Invia';
 $lang['it_IT']['PageCommentInterface']['SPAMQUESTION'] = 'Domanda di protezione anti-spam: %s';
 $lang['it_IT']['PageCommentInterface.ss']['COMMENTS'] = 'Commenti';
@@ -342,7 +349,9 @@ $lang['it_IT']['PageCommentInterface.ss']['NEXT'] = 'prossimo';
 $lang['it_IT']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'Nessuno ha aggiunto ancora un commento in questa pagina.';
 $lang['it_IT']['PageCommentInterface.ss']['POSTCOM'] = 'Inserisci il tuo commento';
 $lang['it_IT']['PageCommentInterface.ss']['PREV'] = 'precedente';
+$lang['it_IT']['PageCommentInterface.ss']['RSSFEEDALLCOMMENTS'] = 'Alimentazione RSS per tutti i commenti';
 $lang['it_IT']['PageCommentInterface.ss']['RSSFEEDCOMMENTS'] = 'Feed RSS per i commenti in questa pagina';
+$lang['it_IT']['PageCommentInterface.ss']['RSSVIEWALLCOMMENTS'] = 'Vedi tutti i commenti';
 $lang['it_IT']['PageCommentInterface']['YOURCOMMENT'] = 'Commenti';
 $lang['it_IT']['PageCommentInterface']['YOURNAME'] = 'Il tuo nome';
 $lang['it_IT']['PageCommentInterface_Controller']['SPAMQUESTION'] = 'Domanda di protezione spam: %s';
@@ -354,6 +363,7 @@ $lang['it_IT']['PageCommentInterface_singlecomment.ss']['ISNTSPAM'] = 'questo co
 $lang['it_IT']['PageCommentInterface_singlecomment.ss']['ISSPAM'] = 'questo commento è spam';
 $lang['it_IT']['PageCommentInterface_singlecomment.ss']['PBY'] = 'Inserito da';
 $lang['it_IT']['PageCommentInterface_singlecomment.ss']['REMCOM'] = 'rimuovi questo commento';
+$lang['it_IT']['ReportAdmin']['MENUTITLE'] = 'Rapporti';
 $lang['it_IT']['ReportAdmin_left.ss']['REPORTS'] = 'Report';
 $lang['it_IT']['ReportAdmin_right.ss']['WELCOME1'] = 'Benvenuto su';
 $lang['it_IT']['ReportAdmin_right.ss']['WELCOME2'] = 'Sezione di reporting. Per favore scegli un report specifico sulla sinistra.';
@@ -361,6 +371,7 @@ $lang['it_IT']['ReportAdmin_SiteTree.ss']['REPORTS'] = 'Report';
 $lang['it_IT']['SecurityAdmin']['ADDMEMBER'] = 'Aggiungi membro';
 $lang['it_IT']['SecurityAdmin']['EDITPERMISSIONS'] = 'Modifica i permessi e gli indirizzi IP in ogni gruppo';
 $lang['it_IT']['SecurityAdmin']['MENUTITLE'] = 'Sicurezza';
+$lang['it_IT']['SecurityAdmin']['MENUTITLE'] = 'Sicurezza';
 $lang['it_IT']['SecurityAdmin']['NEWGROUP'] = 'Nuovo gruppo';
 $lang['it_IT']['SecurityAdmin']['SAVE'] = 'Salva';
 $lang['it_IT']['SecurityAdmin']['SGROUPS'] = 'Gruppi di sicurezza';
@@ -382,10 +393,16 @@ $lang['it_IT']['StaticExporter']['BASEURL'] = 'URL di base';
 $lang['it_IT']['StaticExporter']['EXPORTTO'] = 'Esporta in questa cartella';
 $lang['it_IT']['StaticExporter']['FOLDEREXPORT'] = 'Cartella dove esportare';
 $lang['it_IT']['StaticExporter']['NAME'] = 'Sistema di esportazione statico';
-$lang['it_IT']['StaticExporter']['ONETHATEXISTS'] = 'Per favore specifica una cartella esistente';
-$lang['it_IT']['TaskList.ss']['BY'] = 'da';
+$lang['it_IT']['TableListField_PageControls.ss']['OF'] = 'di';
+$lang['it_IT']['TableListField_PageControls.ss']['TO'] = 'a';
+$lang['it_IT']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Vedi prima';
+$lang['it_IT']['TableListField_PageControls.ss']['VIEWLAST'] = 'Vedi infine';
+$lang['it_IT']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Vedi successivo';
+$lang['it_IT']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Vedi precedente';
+$lang['it_IT']['ThumbnailStripField']['NOFLASHFOUND'] = 'Nessun file flash trovato';
+$lang['it_IT']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'Nessun file flash trovato in';
+$lang['it_IT']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'Nessun immagine trovata in';
 $lang['it_IT']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Nessuna immagine trovata in';
-$lang['it_IT']['ThumbnailStripField']['NOTAFOLDER'] = 'Questa non è una cartella';
 $lang['it_IT']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Scegli una cartella qui sopra)';
 $lang['it_IT']['ViewArchivedEmail.ss']['CANACCESS'] = 'Puoi accedere al sito archiviato da questo indirizzo:';
 $lang['it_IT']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Hai chiesto di visualizzare il contenuto del nostro sito il';
diff --git a/lang/ja_JP.php b/lang/ja_JP.php
index b06106b3..510401e1 100644
--- a/lang/ja_JP.php
+++ b/lang/ja_JP.php
@@ -17,8 +17,6 @@ if(array_key_exists('ja_JP', $lang) && is_array($lang['ja_JP'])) {
 }
 
 $lang['ja_JP']['AssetAdmin']['CHOOSEFILE'] = 'ファイルを選択';
-$lang['ja_JP']['AssetAdmin']['CONTENTMODBY'] = 'コンテンツは修正可能です。';
-$lang['ja_JP']['AssetAdmin']['CONTENTUSABLEBY'] = 'コンテンツは使用可能です。';
 $lang['ja_JP']['AssetAdmin']['DELETEDX'] = ' %sファイルを消去してください。';
 $lang['ja_JP']['AssetAdmin']['FILESREADY'] = '送信待ちのファイル';
 $lang['ja_JP']['AssetAdmin']['FOLDERDELETED'] = 'フォルダを削除しました。';
@@ -30,13 +28,12 @@ $lang['ja_JP']['AssetAdmin']['NEWFOLDER'] = '新規フォルダ';
 $lang['ja_JP']['AssetAdmin']['NOTEMP'] = 'アップロードするためのフォルダがありません。php.iniにupload_tmp_dirを設定してください。';
 $lang['ja_JP']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'アップロードされていません';
 $lang['ja_JP']['AssetAdmin']['NOWBROKEN'] = 'この先のページには進めません。:';
-$lang['ja_JP']['AssetAdmin']['NOWBROKEN2'] = '所有者は、Eメールとそれらのページを用意することができます。';
-$lang['ja_JP']['AssetAdmin']['OWNER'] = 'オーナー';
+$lang['ja_JP']['AssetAdmin']['NOWBROKEN2'] = '所有者は、メールとそれらのページを用意することができます。';
 $lang['ja_JP']['AssetAdmin']['SAVEDFILE'] = ' %sは保存されました。';
 $lang['ja_JP']['AssetAdmin']['SAVEFOLDERNAME'] = '保存するフォルダ名';
 $lang['ja_JP']['AssetAdmin']['THUMBSDELETED'] = 'すべての未使用のサムネイルは、消去されました。';
-$lang['ja_JP']['AssetAdmin']['UPLOAD'] = '以下のファイルをアップしてください。';
-$lang['ja_JP']['AssetAdmin']['UPLOADEDX'] = '%S 個のファイルをアップロードしました';
+$lang['ja_JP']['AssetAdmin']['UPLOAD'] = '以下のファイルをアップロード';
+$lang['ja_JP']['AssetAdmin']['UPLOADEDX'] = '%s 個のファイルをアップロードしました';
 $lang['ja_JP']['AssetAdmin_left.ss']['CREATE'] = '作成';
 $lang['ja_JP']['AssetAdmin_left.ss']['DELETE'] = '削除';
 $lang['ja_JP']['AssetAdmin_left.ss']['DELFOLDERS'] = '選択したフォルダを削除します';
@@ -48,11 +45,11 @@ $lang['ja_JP']['AssetAdmin_left.ss']['TOREORG'] = 'フォルダーを再編成
 $lang['ja_JP']['AssetAdmin_right.ss']['CHOOSEPAGE'] = '左からページを選択してください。';
 $lang['ja_JP']['AssetAdmin_right.ss']['WELCOME'] = 'ようこそ';
 $lang['ja_JP']['AssetAdmin_uploadiframe.ss']['PERMFAILED'] = 'このフォルダにアップロードする権限がありません。';
-$lang['ja_JP']['AssetTableField']['CAPTION'] = 'キャンプ所ん';
+$lang['ja_JP']['AssetTableField']['CAPTION'] = 'キャプション';
 $lang['ja_JP']['AssetTableField']['CREATED'] = '最初のアップロード';
 $lang['ja_JP']['AssetTableField']['DIM'] = '容量';
 $lang['ja_JP']['AssetTableField']['DIMLIMT'] = 'ポップアップウインドウのサイズを制限してください。';
-$lang['ja_JP']['AssetTableField']['EDITIMAGE'] = 'この画像を編集してください。';
+$lang['ja_JP']['AssetTableField']['EDITIMAGE'] = 'この画像を編集';
 $lang['ja_JP']['AssetTableField']['FILENAME'] = 'ファイル名';
 $lang['ja_JP']['AssetTableField']['GALLERYOPTIONS'] = 'ギャラリー オプション';
 $lang['ja_JP']['AssetTableField']['IMAGE'] = '画像';
@@ -73,6 +70,7 @@ $lang['ja_JP']['AssetTableField']['SWFFILEOPTIONS'] = 'SWFファイルのオプ
 $lang['ja_JP']['AssetTableField']['TITLE'] = 'タイトル';
 $lang['ja_JP']['AssetTableField']['TYPE'] = 'タイプ';
 $lang['ja_JP']['AssetTableField']['URL'] = 'URL';
+$lang['ja_JP']['CMSBatchActions']['PUBLISHING_PAGES'] = '公開ページ';
 $lang['ja_JP']['CMSLeft.ss']['DELPAGE'] = 'ページ削除';
 $lang['ja_JP']['CMSLeft.ss']['DELPAGES'] = '選択されたページを削除します';
 $lang['ja_JP']['CMSLeft.ss']['GO'] = 'Go';
@@ -80,14 +78,14 @@ $lang['ja_JP']['CMSLeft.ss']['NEWPAGE'] = '新しいページ';
 $lang['ja_JP']['CMSLeft.ss']['SELECTPAGESDEL'] = '削除したいページを選択し、ボタンをクリックしてください';
 $lang['ja_JP']['CMSLeft.ss']['SITECONT'] = 'サイトコンテンツ';
 $lang['ja_JP']['CMSMain']['ACCESS'] = ' %s にあるCMSにアクセスします';
+$lang['ja_JP']['CMSMain']['ACCESSALLINTERFACES'] = 'すべてのCMSインターフェースにアクセス';
 $lang['ja_JP']['CMSMain']['CANCEL'] = 'キャンセル';
 $lang['ja_JP']['CMSMain']['CHOOSEREPORT'] = '(レポートを選択)';
 $lang['ja_JP']['CMSMain']['COMPARINGV'] = '#%d と #%d を比較しています';
 $lang['ja_JP']['CMSMain']['COPYPUBTOSTAGE'] = 'ステージサイトに公開された内容をコピーしますか？';
 $lang['ja_JP']['CMSMain']['DELETE'] = 'ドラフトサイトから削除';
-$lang['ja_JP']['CMSMain']['DELETEFP'] = '公開サイトから削除する';
 $lang['ja_JP']['CMSMain']['DESCREMOVED'] = ' %s 由来';
-$lang['ja_JP']['CMSMain']['EMAIL'] = 'メール';
+$lang['ja_JP']['CMSMain']['EMAIL'] = 'メールアドレス';
 $lang['ja_JP']['CMSMain']['GO'] = '実行';
 $lang['ja_JP']['CMSMain']['MENUTITLE'] = 'サイトコンテンツ';
 $lang['ja_JP']['CMSMain']['MENUTITLE'] = 'サイトコンテンツ';
@@ -114,8 +112,8 @@ $lang['ja_JP']['CMSMain']['PUBPAGES'] = '完了: %d を公開に設定しまし
 $lang['ja_JP']['CMSMain']['REMOVED'] = '有効なサイトから \'%s\'%s を削除してください。';
 $lang['ja_JP']['CMSMain']['REMOVEDFD'] = '下書きのサイトから取り除く';
 $lang['ja_JP']['CMSMain']['REMOVEDPAGE'] = '公開サイトから%Sを取り除きました';
+$lang['ja_JP']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'ドラフトサイトから %s を削除';
 $lang['ja_JP']['CMSMain']['REPORT'] = 'レポート';
-$lang['ja_JP']['CMSMain']['RESTORE'] = 'リストア';
 $lang['ja_JP']['CMSMain']['RESTORED'] = '\'%s\' のリストアを行いました';
 $lang['ja_JP']['CMSMain']['ROLLBACK'] = 'このバージョンに戻す';
 $lang['ja_JP']['CMSMain']['ROLLEDBACKPUB'] = '公開バージョンを戻しました。新しいバージョンは #%d です。';
@@ -134,12 +132,11 @@ $lang['ja_JP']['CMSMain_dialog.ss']['NOLINKED'] = 'window.linkedObjectが見つ
 $lang['ja_JP']['CMSMain_left.ss']['ADDEDNOTPUB'] = '下書きに保存しましたが、まだ公開されていません。';
 $lang['ja_JP']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = '基準の追加...';
 $lang['ja_JP']['CMSMain_left.ss']['BATCHACTIONS'] = 'バッチ処理';
-$lang['ja_JP']['CMSMain_left.ss']['CHANGED'] = '変更しました';
+$lang['ja_JP']['CMSMain_left.ss']['CHANGED'] = '更新';
 $lang['ja_JP']['CMSMain_left.ss']['CLOSEBOX'] = 'クリックでボックスを閉じます';
-$lang['ja_JP']['CMSMain_left.ss']['COMMENTS'] = 'コメント';
-$lang['ja_JP']['CMSMain_left.ss']['COMPAREMODE'] = '比較モード(比較する２をクリック)';
+$lang['ja_JP']['CMSMain_left.ss']['COMPAREMODE'] = '比較モード(2つを選択)';
 $lang['ja_JP']['CMSMain_left.ss']['CREATE'] = '作成';
-$lang['ja_JP']['CMSMain_left.ss']['DEL'] = '削除しました';
+$lang['ja_JP']['CMSMain_left.ss']['DEL'] = '削除';
 $lang['ja_JP']['CMSMain_left.ss']['DELETECONFIRM'] = '選択したページを削除';
 $lang['ja_JP']['CMSMain_left.ss']['DELETEDSTILLLIVE'] = '草稿サイトから削除されますが、まだ有効なサイトです';
 $lang['ja_JP']['CMSMain_left.ss']['EDITEDNOTPUB'] = '下書きを編集しましたが、まだ公開されていません。';
@@ -147,7 +144,7 @@ $lang['ja_JP']['CMSMain_left.ss']['EDITEDSINCE'] = '編集に続いて';
 $lang['ja_JP']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'ドラッグ &amp; ドロップを有効にする';
 $lang['ja_JP']['CMSMain_left.ss']['GO'] = '実行';
 $lang['ja_JP']['CMSMain_left.ss']['KEY'] = '値 :';
-$lang['ja_JP']['CMSMain_left.ss']['NEW'] = '新しい';
+$lang['ja_JP']['CMSMain_left.ss']['NEW'] = '新規';
 $lang['ja_JP']['CMSMain_left.ss']['OPENBOX'] = 'クリックでボックスを開きます';
 $lang['ja_JP']['CMSMain_left.ss']['PAGEVERSIONH'] = 'ページ変更履歴';
 $lang['ja_JP']['CMSMain_left.ss']['PUBLISHCONFIRM'] = '選択されたページを公開';
@@ -159,8 +156,6 @@ $lang['ja_JP']['CMSMain_left.ss']['SHOWONLYCHANGED'] = '変更されたページ
 $lang['ja_JP']['CMSMain_left.ss']['SHOWUNPUB'] = '非公開のものを表示';
 $lang['ja_JP']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'サイト内容と構造';
 $lang['ja_JP']['CMSMain_left.ss']['SITEREPORTS'] = 'サイトレポート';
-$lang['ja_JP']['CMSMain_left.ss']['TASKLIST'] = 'タスクリスト';
-$lang['ja_JP']['CMSMain_left.ss']['WAITINGON'] = '処理待ち';
 $lang['ja_JP']['CMSMain_right.ss']['ANYMESSAGE'] = 'エディターにメッセージを送りますか？';
 $lang['ja_JP']['CMSMain_right.ss']['CHOOSEPAGE'] = '左側からページを選択してください';
 $lang['ja_JP']['CMSMain_right.ss']['LOADING'] = '読み込み中...';
@@ -174,7 +169,7 @@ $lang['ja_JP']['CMSMain_versions.ss']['NOTPUB'] = '非公開';
 $lang['ja_JP']['CMSMain_versions.ss']['PUBR'] = '投稿者';
 $lang['ja_JP']['CMSMain_versions.ss']['UNKNOWN'] = '不明';
 $lang['ja_JP']['CMSMain_versions.ss']['WHEN'] = 'いつ';
-$lang['ja_JP']['CMSRight.ss']['CHOOSEPAGE'] = '左側のメニューからページを選択しってください';
+$lang['ja_JP']['CMSRight.ss']['CHOOSEPAGE'] = '左側のメニューからページを選択してください';
 $lang['ja_JP']['CMSRight.ss']['ECONTENT'] = 'コンテンツ編集';
 $lang['ja_JP']['CMSRight.ss']['WELCOMETO'] = 'ようこそ';
 $lang['ja_JP']['CommentAdmin']['ACCEPT'] = '承認';
@@ -226,14 +221,19 @@ $lang['ja_JP']['ImageEditor.ss']['APPLY'] = '適用';
 $lang['ja_JP']['ImageEditor.ss']['BLUR'] = 'ブラー';
 $lang['ja_JP']['ImageEditor.ss']['BRIGHTNESS'] = '明度';
 $lang['ja_JP']['ImageEditor.ss']['CANCEL'] = 'キャンセル';
+$lang['ja_JP']['ImageEditor.ss']['CONTRAST'] = 'コントラスト';
 $lang['ja_JP']['ImageEditor.ss']['CROP'] = '切り取る';
 $lang['ja_JP']['ImageEditor.ss']['CURRENTACTION'] = '傾向&nbsp;アクション';
 $lang['ja_JP']['ImageEditor.ss']['EDITFUNCTIONS'] = '編集&nbsp;機能';
+$lang['ja_JP']['ImageEditor.ss']['EFFECTS'] = 'エフェクト';
 $lang['ja_JP']['ImageEditor.ss']['EXIT'] = 'exit';
+$lang['ja_JP']['ImageEditor.ss']['GAMMA'] = 'ガンマ';
+$lang['ja_JP']['ImageEditor.ss']['GREYSCALE'] = 'グレースケール';
 $lang['ja_JP']['ImageEditor.ss']['HEIGHT'] = '高さ';
 $lang['ja_JP']['ImageEditor.ss']['REDO'] = '進む';
 $lang['ja_JP']['ImageEditor.ss']['ROT'] = '回転';
 $lang['ja_JP']['ImageEditor.ss']['SAVE'] = '画像を保存';
+$lang['ja_JP']['ImageEditor.ss']['SEPIA'] = 'セピア';
 $lang['ja_JP']['ImageEditor.ss']['UNDO'] = 'もどる';
 $lang['ja_JP']['ImageEditor.ss']['UNTITLED'] = '名無しの文書';
 $lang['ja_JP']['ImageEditor.ss']['WIDTH'] = '幅';
@@ -244,7 +244,7 @@ $lang['ja_JP']['LeftAndMain']['HELP'] = 'ヘルプ';
 $lang['ja_JP']['LeftAndMain']['PAGETYPE'] = 'ページタイプ:';
 $lang['ja_JP']['LeftAndMain']['PERMAGAIN'] = 'ログアウトしました。 再度ログインしたい場合は、ユーザー名とパスワードを入力してください。';
 $lang['ja_JP']['LeftAndMain']['PERMALREADY'] = '恐れ入りますが、アクセスできません。別ユーザーでログインしたい場合は、下記をから。';
-$lang['ja_JP']['LeftAndMain']['PERMDEFAULT'] = 'CMSにアクセスするために、Eメールアドレスとパスワードを入力してください。';
+$lang['ja_JP']['LeftAndMain']['PERMDEFAULT'] = 'CMSにアクセスするために、メールアドレスとパスワードを入力してください。';
 $lang['ja_JP']['LeftAndMain']['PLEASESAVE'] = '保存してください: 保存してないため更新できません。';
 $lang['ja_JP']['LeftAndMain']['REPORTS'] = 'レポート';
 $lang['ja_JP']['LeftAndMain']['REQUESTERROR'] = 'リクエストエラー';
@@ -272,17 +272,6 @@ $lang['ja_JP']['LeftAndMain.ss']['VIEWPAGEIN'] = 'ページ確認 :';
 $lang['ja_JP']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' が公開されました';
 $lang['ja_JP']['LeftAndMain']['STATUSTO'] = '\'%s\' に変更しました';
 $lang['ja_JP']['LeftAndMain']['TREESITECONTENT'] = 'サイト内容';
-$lang['ja_JP']['MemberList']['ADD'] = '追加';
-$lang['ja_JP']['MemberList']['ANYGROUP'] = 'Any group';
-$lang['ja_JP']['MemberList']['ASC'] = '昇順';
-$lang['ja_JP']['MemberList']['DESC'] = '降順';
-$lang['ja_JP']['MemberList']['EMAIL'] = 'Eメール';
-$lang['ja_JP']['MemberList']['FILTERBYG'] = 'グループ指定';
-$lang['ja_JP']['MemberList']['FN'] = '名前';
-$lang['ja_JP']['MemberList']['ORDERBY'] = '並び順';
-$lang['ja_JP']['MemberList']['PASSWD'] = 'パスワード';
-$lang['ja_JP']['MemberList']['SEARCH'] = '検索';
-$lang['ja_JP']['MemberList']['SN'] = '姓';
 $lang['ja_JP']['MemberList.ss']['FILTER'] = 'フィルター';
 $lang['ja_JP']['MemberList_PageControls.ss']['DISPLAYING'] = '表示中';
 $lang['ja_JP']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'メンバー';
@@ -319,17 +308,18 @@ $lang['ja_JP']['MemberTableField']['SURNAME'] = '名字';
 $lang['ja_JP']['ModelAdmin']['ADDBUTTON'] = '追加';
 $lang['ja_JP']['ModelAdmin']['ADDFORM'] = '%s をデータベースに追加するために、今フォームを記述してください';
 $lang['ja_JP']['ModelAdmin']['CHOOSE_COLUMNS'] = '結果の列から選択してください';
-$lang['ja_JP']['ModelAdmin']['CLASSTYPE'] = 'タイプ';
 $lang['ja_JP']['ModelAdmin']['CLEAR_SEARCH'] = '検索結果を消去';
 $lang['ja_JP']['ModelAdmin']['CREATEBUTTON'] = '\'%s\' を作成';
 $lang['ja_JP']['ModelAdmin']['DELETE'] = '削除';
 $lang['ja_JP']['ModelAdmin']['DELETEDRECORDS'] = 'レコード %s 件を削除しました';
 $lang['ja_JP']['ModelAdmin']['FOUNDRESULTS'] = '%s に該当するアイテムは見つかりません';
 $lang['ja_JP']['ModelAdmin']['GOBACK'] = '戻る';
+$lang['ja_JP']['ModelAdmin']['GOFORWARD'] = '進める';
 $lang['ja_JP']['ModelAdmin']['IMPORT'] = 'CSVファイルからインポートする';
 $lang['ja_JP']['ModelAdmin']['IMPORTEDRECORDS'] = 'レコード %s 件をインポートしました';
 $lang['ja_JP']['ModelAdmin']['ITEMNOTFOUND'] = '見つかりませんでした';
 $lang['ja_JP']['ModelAdmin']['LOADEDFOREDITING'] = '\'%s\' の編集画面をロードしています';
+$lang['ja_JP']['ModelAdmin']['NOCSVFILE'] = 'インポートするためのCSVファイルを参照してください';
 $lang['ja_JP']['ModelAdmin']['NOIMPORT'] = 'インポートするものがありません';
 $lang['ja_JP']['ModelAdmin']['NORESULTS'] = '結果がありません';
 $lang['ja_JP']['ModelAdmin']['SAVE'] = '保存';
@@ -338,28 +328,36 @@ $lang['ja_JP']['ModelAdmin']['SELECTALL'] = 'すべて選択';
 $lang['ja_JP']['ModelAdmin']['SELECTNONE'] = 'ひとつ選択';
 $lang['ja_JP']['ModelAdmin']['UPDATEDRECORDS'] = 'レコード %s 件をアップデートしました';
 $lang['ja_JP']['ModelAdmin_ImportSpec.ss']['IMPORTSPECFIELDS'] = 'データベースコラム';
+$lang['ja_JP']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = '%sの仕様を表示';
 $lang['ja_JP']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = '関係';
+$lang['ja_JP']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = '%sの仕様';
 $lang['ja_JP']['ModelAdmin_left.ss']['ADDLISTING'] = 'リストに追加';
-$lang['ja_JP']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = '追加';
 $lang['ja_JP']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'インポート';
 $lang['ja_JP']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = '検索';
 $lang['ja_JP']['ModelAdmin_right.ss']['WELCOME1'] = '%s へようこそ。左のパネルから記事を一つ選んでください';
+$lang['ja_JP']['PageComment']['Comment'] = 'コメント';
 $lang['ja_JP']['PageComment']['COMMENTBY'] = 'Comment by \'%s\' on %s';
+$lang['ja_JP']['PageComment']['IsSpam'] = 'スパム？';
+$lang['ja_JP']['PageComment']['Name'] = '作者名';
+$lang['ja_JP']['PageComment']['NeedsModeration'] = '管理が必要ですか？';
 $lang['ja_JP']['PageComment']['PLURALNAME'] = 'ページのコメント';
 $lang['ja_JP']['PageComment']['SINGULARNAME'] = 'ページのコメント';
-$lang['ja_JP']['PageCommentInterface']['POST'] = '投函';
+$lang['ja_JP']['PageCommentInterface']['COMMENTERURL'] = 'WebサイトのURL';
+$lang['ja_JP']['PageCommentInterface']['POST'] = '投稿';
 $lang['ja_JP']['PageCommentInterface']['SPAMQUESTION'] = '迷惑メール保護の為の質問: %s';
 $lang['ja_JP']['PageCommentInterface.ss']['COMMENTS'] = 'コメント';
 $lang['ja_JP']['PageCommentInterface.ss']['NEXT'] = '次ページ';
 $lang['ja_JP']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'このページにはコメントはありません。';
 $lang['ja_JP']['PageCommentInterface.ss']['POSTCOM'] = 'コメントする';
 $lang['ja_JP']['PageCommentInterface.ss']['PREV'] = '前ページ';
-$lang['ja_JP']['PageCommentInterface.ss']['RSSFEEDCOMMENTS'] = 'このページのコメントにRSS feedがあります';
+$lang['ja_JP']['PageCommentInterface.ss']['RSSFEEDALLCOMMENTS'] = 'すべてのコメントのRSSフィード';
+$lang['ja_JP']['PageCommentInterface.ss']['RSSFEEDCOMMENTS'] = 'このページのコメントにRSSフィードがあります';
+$lang['ja_JP']['PageCommentInterface.ss']['RSSVIEWALLCOMMENTS'] = 'すべてのコメントを表示';
 $lang['ja_JP']['PageCommentInterface']['YOURCOMMENT'] = 'コメント';
 $lang['ja_JP']['PageCommentInterface']['YOURNAME'] = '名前';
 $lang['ja_JP']['PageCommentInterface_Controller']['SPAMQUESTION'] = '迷惑メール保護の為の質問: %s';
 $lang['ja_JP']['PageCommentInterface_Form']['AWAITINGMODERATION'] = 'あなたのコメントを投稿しました。承認されるまでお待ちください。';
-$lang['ja_JP']['PageCommentInterface_Form']['MSGYOUPOSTED'] = '投函したメッセージは〜でした:';
+$lang['ja_JP']['PageCommentInterface_Form']['MSGYOUPOSTED'] = '投稿したメッセージ:';
 $lang['ja_JP']['PageCommentInterface_Form']['SPAMDETECTED'] = '迷惑メールを検出!!';
 $lang['ja_JP']['PageCommentInterface_singlecomment.ss']['APPROVE'] = 'コメントを承認する';
 $lang['ja_JP']['PageCommentInterface_singlecomment.ss']['ISNTSPAM'] = 'このコメントはスパムでありません';
@@ -389,18 +387,24 @@ $lang['ja_JP']['SecurityAdmin_left.ss']['TOREORG'] = 'サイトを再編成す
 $lang['ja_JP']['SecurityAdmin_right.ss']['WELCOME1'] = 'ようこそ';
 $lang['ja_JP']['SecurityAdmin_right.ss']['WELCOME2'] = 'セキュリティ管理について  左のグループから選択してください';
 $lang['ja_JP']['SideReport']['EMPTYPAGES'] = 'ページがありません';
-$lang['ja_JP']['SideReport']['LAST2WEEKS'] = '２週間以内の変更ページ';
+$lang['ja_JP']['SideReport']['LAST2WEEKS'] = '2週間以内の変更ページ';
 $lang['ja_JP']['SideReport']['REPEMPTY'] = '%s のレポートはありません';
 $lang['ja_JP']['SideReport']['TODO'] = '編集予定';
 $lang['ja_JP']['StaticExporter']['BASEURL'] = 'ベースURL';
 $lang['ja_JP']['StaticExporter']['EXPORTTO'] = 'あのフォルダに出力してください。';
 $lang['ja_JP']['StaticExporter']['FOLDEREXPORT'] = 'エクスポート先のフォルダ';
 $lang['ja_JP']['StaticExporter']['NAME'] = '固定のエクスポート先';
-$lang['ja_JP']['StaticExporter']['ONETHATEXISTS'] = '実在するフォルダを指定してください';
 $lang['ja_JP']['TableListField_PageControls.ss']['DISPLAYING'] = '表示中';
-$lang['ja_JP']['TaskList.ss']['BY'] = 'by';
+$lang['ja_JP']['TableListField_PageControls.ss']['OF'] = 'of';
+$lang['ja_JP']['TableListField_PageControls.ss']['TO'] = 'to';
+$lang['ja_JP']['TableListField_PageControls.ss']['VIEWFIRST'] = '最初を表示';
+$lang['ja_JP']['TableListField_PageControls.ss']['VIEWLAST'] = '最後を表示';
+$lang['ja_JP']['TableListField_PageControls.ss']['VIEWNEXT'] = '次を表示';
+$lang['ja_JP']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = '前を表示';
+$lang['ja_JP']['ThumbnailStripField']['NOFLASHFOUND'] = 'Flashファイルが見つかりません';
+$lang['ja_JP']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = '次のフォルダにFlashファイルはありません：';
+$lang['ja_JP']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = '次のフォルダに画像ファイルはありません：';
 $lang['ja_JP']['ThumbnailStripField']['NOIMAGESFOUND'] = 'の中から画像は見つかりませんでした';
-$lang['ja_JP']['ThumbnailStripField']['NOTAFOLDER'] = 'フォルダーではありません';
 $lang['ja_JP']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(上記のフォルダを選択してください。)';
 $lang['ja_JP']['ViewArchivedEmail.ss']['CANACCESS'] = 'このリンクから、保管されたサイトにアクセスできます。';
 $lang['ja_JP']['ViewArchivedEmail.ss']['HAVEASKED'] = 'You have asked to view the content of our site on';
diff --git a/lang/lc_XX.php b/lang/lc_XX.php
index d75980c7..8ce49308 100644
--- a/lang/lc_XX.php
+++ b/lang/lc_XX.php
@@ -17,8 +17,6 @@ if(array_key_exists('lc_XX', $lang) && is_array($lang['lc_XX'])) {
 }
 
 $lang['lc_XX']['AssetAdmin']['CHOOSEFILE'] = 'CHOOSE FIEL';
-$lang['lc_XX']['AssetAdmin']['CONTENTMODBY'] = 'CONTENT MODIFIABLE BY';
-$lang['lc_XX']['AssetAdmin']['CONTENTUSABLEBY'] = 'CONTENT USABLE BY';
 $lang['lc_XX']['AssetAdmin']['DELETEDX'] = 'DELETD %s FILEZ.%s';
 $lang['lc_XX']['AssetAdmin']['FILESREADY'] = 'FILEZ READY 2 UPLOAD:';
 $lang['lc_XX']['AssetAdmin']['MENUTITLE'] = 'FILEZ N IMAGEZ';
@@ -27,7 +25,6 @@ $lang['lc_XX']['AssetAdmin']['MOVEDX'] = 'MOVD %s FILEZ';
 $lang['lc_XX']['AssetAdmin']['NEWFOLDER'] = 'NEW FOLDR';
 $lang['lc_XX']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'THAR WUZ NUTHIN 2 UPLOAD';
 $lang['lc_XX']['AssetAdmin']['NOWBROKEN'] = 'THEES PAGEZ NAO HAS BROKD LINKZ:';
-$lang['lc_XX']['AssetAdmin']['OWNER'] = '0WN3R';
 $lang['lc_XX']['AssetAdmin']['SAVEDFILE'] = 'SAVD FILE %s';
 $lang['lc_XX']['AssetAdmin']['SAVEFOLDERNAME'] = 'SAVE TEH FOLDR NAYM';
 $lang['lc_XX']['AssetAdmin']['UPLOAD'] = 'UPLOAD FILEZ LISTD BELOW';
@@ -65,7 +62,6 @@ $lang['lc_XX']['CMSMain']['CANCEL'] = 'DUNT DO DAT!';
 $lang['lc_XX']['CMSMain']['CHOOSEREPORT'] = '(PIK REPORT)';
 $lang['lc_XX']['CMSMain']['COMPARINGV'] = 'U R COMPAERING VERSHUNZ #%d and #%d';
 $lang['lc_XX']['CMSMain']['COPYPUBTOSTAGE'] = 'R U SHUR 2 COPY TEH PUBLISHD CONTENT 2 TEH STAGE SIET?';
-$lang['lc_XX']['CMSMain']['DELETEFP'] = 'DELETE FROM TEH PUBLISHD SITE';
 $lang['lc_XX']['CMSMain']['EMAIL'] = 'EMAIL';
 $lang['lc_XX']['CMSMain']['GO'] = 'GO';
 $lang['lc_XX']['CMSMain']['MENUTITLE'] = 'SITEZ CONTENT';
@@ -93,7 +89,6 @@ FURST BUILT.';
 $lang['lc_XX']['CMSMain']['PUBPAGES'] = 'DUN: PUBLISHD %d PAGEZ';
 $lang['lc_XX']['CMSMain']['REMOVEDFD'] = 'REMOVD FRUM TEH DRAFT SIET';
 $lang['lc_XX']['CMSMain']['REMOVEDPAGE'] = 'REMOVED %Z FROM TEH PUBLISHD SITE.';
-$lang['lc_XX']['CMSMain']['RESTORE'] = 'RESTOREZ';
 $lang['lc_XX']['CMSMain']['RESTORED'] = 'I R HAV RESTURD \'%s\' SUCCESSFULLIEZ SO IT IZ NOW RESTORD';
 $lang['lc_XX']['CMSMain']['ROLLBACK'] = 'BAK 2 DIS VERSHUN';
 $lang['lc_XX']['CMSMain']['ROLLEDBACKPUB'] = 'ROLLD BAK 2 PUBLISHD VERSHUN. NEW VERSHUN NUMBR IZ #%d';
@@ -112,7 +107,6 @@ $lang['lc_XX']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'ADD TEH CRATERIA PLZ..
 $lang['lc_XX']['CMSMain_left.ss']['BATCHACTIONS'] = 'BATCH ACSHUNZ';
 $lang['lc_XX']['CMSMain_left.ss']['CHANGED'] = 'CHANGD';
 $lang['lc_XX']['CMSMain_left.ss']['CLOSEBOX'] = 'CLICK 2 CLOOZ DAT BOX';
-$lang['lc_XX']['CMSMain_left.ss']['COMMENTS'] = 'COMMENTZ';
 $lang['lc_XX']['CMSMain_left.ss']['COMPAREMODE'] = 'CUMPARE MODE (CLICK 2 BELOW)';
 $lang['lc_XX']['CMSMain_left.ss']['CREATE'] = 'CREATE';
 $lang['lc_XX']['CMSMain_left.ss']['DEL'] = 'DELETD';
@@ -135,8 +129,6 @@ $lang['lc_XX']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'SHOW ONLY CHANGD PAGEZ';
 $lang['lc_XX']['CMSMain_left.ss']['SHOWUNPUB'] = 'SHOW UNPUBLISHED VERSHUNZ';
 $lang['lc_XX']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'SITE CONTENT N STRUKSHUR';
 $lang['lc_XX']['CMSMain_left.ss']['SITEREPORTS'] = 'SEIT REPORTZ';
-$lang['lc_XX']['CMSMain_left.ss']['TASKLIST'] = 'TASKLIST';
-$lang['lc_XX']['CMSMain_left.ss']['WAITINGON'] = 'WAITIN ON';
 $lang['lc_XX']['CMSMain_right.ss']['ANYMESSAGE'] = 'DO U HAS ANY MESAGE 4 UR EDITOR?';
 $lang['lc_XX']['CMSMain_right.ss']['CHOOSEPAGE'] = 'PLZ CHOOSE PAEG FRUM TEH LEFT.';
 $lang['lc_XX']['CMSMain_right.ss']['LOADING'] = 'LOADIN!!11!!!...';
@@ -194,13 +186,6 @@ $lang['lc_XX']['LeftAndMain.ss']['SSWEB'] = 'TEH SILVERSTRIPEZ WEBSEIT';
 $lang['lc_XX']['LeftAndMain.ss']['VIEWPAGEIN'] = 'PAEG VIEW:';
 $lang['lc_XX']['LeftAndMain']['STATUSTO'] = 'STATUS CHANGD 2 \'%s\'';
 $lang['lc_XX']['LeftAndMain']['TREESITECONTENT'] = 'SITEZ CONTENT';
-$lang['lc_XX']['MemberList']['ADD'] = 'ADD PLZ';
-$lang['lc_XX']['MemberList']['EMAIL'] = 'EMAIL';
-$lang['lc_XX']['MemberList']['FILTERBYG'] = 'FILTR BY GROUP';
-$lang['lc_XX']['MemberList']['FN'] = 'FURST NAYM';
-$lang['lc_XX']['MemberList']['PASSWD'] = 'PASWORD';
-$lang['lc_XX']['MemberList']['SEARCH'] = 'SEARCH';
-$lang['lc_XX']['MemberList']['SN'] = 'SURNAYM';
 $lang['lc_XX']['MemberList.ss']['FILTER'] = 'FILTR';
 $lang['lc_XX']['MemberList_Table.ss']['EMAIL'] = 'EMAIL ADDRESZ';
 $lang['lc_XX']['MemberList_Table.ss']['FN'] = 'FURSTNAYM';
@@ -212,7 +197,6 @@ $lang['lc_XX']['MemberTableField.ss']['ADDNEW'] = 'ADD NEW 1!';
 $lang['lc_XX']['MemberTableField.ss']['DELETEMEMBER'] = 'DELETE THIZ MEMBR';
 $lang['lc_XX']['MemberTableField.ss']['EDITMEMBER'] = 'EDIT DIS MEMBR';
 $lang['lc_XX']['MemberTableField.ss']['SHOWMEMBER'] = 'SHOW DIS MEMBR';
-$lang['lc_XX']['ModelAdmin']['CLASSTYPE'] = 'TYPE';
 $lang['lc_XX']['PageComment']['COMMENTBY'] = 'COMMENT BY \'%s\' ON %s';
 $lang['lc_XX']['PageCommentInterface.ss']['COMMENTS'] = 'COMMENTZ';
 $lang['lc_XX']['PageCommentInterface.ss']['NEXT'] = 'NEXT (GOGOGO)';
@@ -250,9 +234,6 @@ $lang['lc_XX']['StaticExporter']['BASEURL'] = 'TEH BASE URL';
 $lang['lc_XX']['StaticExporter']['EXPORTTO'] = 'EXPORT 2 DAT FOLDR';
 $lang['lc_XX']['StaticExporter']['FOLDEREXPORT'] = 'FOLDR 2 EXPORT 2';
 $lang['lc_XX']['StaticExporter']['NAME'] = 'STATIC EXPORTR';
-$lang['lc_XX']['StaticExporter']['ONETHATEXISTS'] = 'PLZ SPECIFY FOLDR DAT EXISTS';
-$lang['lc_XX']['TaskList.ss']['BY'] = 'BY';
-$lang['lc_XX']['ThumbnailStripField']['NOTAFOLDER'] = 'DIS AR TEH NOT FOLDR';
 $lang['lc_XX']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(PIK FOLDR ABOOV)';
 $lang['lc_XX']['ViewArchivedEmail.ss']['CANACCESS'] = 'U CAN ACCES TEH ARCHIVD SIET AT DIS LINK:';
 $lang['lc_XX']['ViewArchivedEmail.ss']['HAVEASKED'] = 'YOUZ HAVE ASKED 2 VIEW TEH CONTENT OV OUR SITE ON';
diff --git a/lang/lt_LT.php b/lang/lt_LT.php
new file mode 100644
index 00000000..494869eb
--- /dev/null
+++ b/lang/lt_LT.php
@@ -0,0 +1,446 @@
+<?php
+
+/**
+ * Lithuanian (Lithuania) language pack
+ * @package cms
+ * @subpackage i18n
+ */
+
+i18n::include_locale_file('cms', 'en_US');
+
+global $lang;
+
+if(array_key_exists('lt_LT', $lang) && is_array($lang['lt_LT'])) {
+	$lang['lt_LT'] = array_merge($lang['en_US'], $lang['lt_LT']);
+} else {
+	$lang['lt_LT'] = $lang['en_US'];
+}
+
+$lang['lt_LT']['AssetAdmin']['CHOOSEFILE'] = 'Pasirinkite bylą';
+$lang['lt_LT']['AssetAdmin']['DELETEDX'] = 'Ištrinta bylų %s.%s';
+$lang['lt_LT']['AssetAdmin']['FILESREADY'] = 'Bylos, paruoštos įkėlimui:';
+$lang['lt_LT']['AssetAdmin']['FOLDERDELETED'] = 'direktorija ištrinta.';
+$lang['lt_LT']['AssetAdmin']['FOLDERSDELETED'] = 'direktorijos ištrintos.';
+$lang['lt_LT']['AssetAdmin']['MENUTITLE'] = 'Bylos ir paveikslėliai';
+$lang['lt_LT']['AssetAdmin']['MENUTITLE'] = 'Bylos ir paveikslėliai';
+$lang['lt_LT']['AssetAdmin']['MOVEDX'] = 'Perkela bylų: %s';
+$lang['lt_LT']['AssetAdmin']['NEWFOLDER'] = 'Nauja direktorija';
+$lang['lt_LT']['AssetAdmin']['NOTEMP'] = 'Nėra laikinų direktorijų įkėlimui. Nurodykite upload_tmp_dir byloje php.ini.';
+$lang['lt_LT']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Nėra ką įkelti';
+$lang['lt_LT']['AssetAdmin']['NOWBROKEN'] = 'Šie puslapiai turi nebegaliojančias nuorodas:';
+$lang['lt_LT']['AssetAdmin']['NOWBROKEN2'] = 'Jų savininkai buvo informuoti ir tie puslapiai bus ištaisyti.';
+$lang['lt_LT']['AssetAdmin']['SAVEDFILE'] = 'Išsaugota byla %s';
+$lang['lt_LT']['AssetAdmin']['SAVEFOLDERNAME'] = 'Išsaugoti direktorijos pavadinimą';
+$lang['lt_LT']['AssetAdmin']['THUMBSDELETED'] = 'Visos %s nepanaudotos ikonos ištrintos';
+$lang['lt_LT']['AssetAdmin']['UPLOAD'] = 'Įkelti žemiau nurodytas bylas';
+$lang['lt_LT']['AssetAdmin']['UPLOADEDX'] = 'Įkelta bylų: %s';
+$lang['lt_LT']['AssetAdmin_left.ss']['CREATE'] = 'Sukurti';
+$lang['lt_LT']['AssetAdmin_left.ss']['DELETE'] = 'Ištrinti';
+$lang['lt_LT']['AssetAdmin_left.ss']['DELFOLDERS'] = 'Ištrinti pažymėtas direktorijas';
+$lang['lt_LT']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Galima keisti puslapius vietomis';
+$lang['lt_LT']['AssetAdmin_left.ss']['FILESYSTEMSYNC'] = 'Ieškoti naujų failų';
+$lang['lt_LT']['AssetAdmin_left.ss']['FILESYSTEMSYNC_DESC'] = 'SilverStripe pati tvarko savo failų ir paveikslėlių duomenų bazę, laikomą assets/ aplanke. Paspauskite šį mygtuką, kad atnaujinti duomenų bazę, jei paveikslėlius įterpėte per FTP, ar kitu būdu.';
+$lang['lt_LT']['AssetAdmin_left.ss']['FOLDERS'] = 'Direktorijos';
+$lang['lt_LT']['AssetAdmin_left.ss']['GO'] = 'Eiti';
+$lang['lt_LT']['AssetAdmin_left.ss']['SELECTTODEL'] = 'Pažymėkite direktorijas, kurias norite ištrinti, ir spauskite žemiau esantį mygtuką';
+$lang['lt_LT']['AssetAdmin_left.ss']['TOREORG'] = 'Norėdami pertvarkyti direktorijų eiliškumą tempkite jas pagal savo pageidavimą.';
+$lang['lt_LT']['AssetAdmin_right.ss']['CHOOSEPAGE'] = 'Pasirinkite puslapį iš esančių kairėje.';
+$lang['lt_LT']['AssetAdmin_right.ss']['WELCOME'] = 'Sveiki atvykę į';
+$lang['lt_LT']['AssetAdmin_uploadiframe.ss']['PERMFAILED'] = 'Jums nepakanka teisių bylų įkėlimui į šią direktoriją.';
+$lang['lt_LT']['AssetAdmin_uploadiframe.ss']['TITLE'] = 'Paveikslėlių įdėjimo freimas';
+$lang['lt_LT']['AssetTableField']['CAPTION'] = 'Antraštė';
+$lang['lt_LT']['AssetTableField']['CREATED'] = 'Pirmą kartą įkelta';
+$lang['lt_LT']['AssetTableField']['DIM'] = 'Matmenys';
+$lang['lt_LT']['AssetTableField']['DIMLIMT'] = 'Riboti dydį iššokančiuose languose';
+$lang['lt_LT']['AssetTableField']['EDITIMAGE'] = 'Redaguoti šį paveikslėlį';
+$lang['lt_LT']['AssetTableField']['FILENAME'] = 'Bylos pavadinimas';
+$lang['lt_LT']['AssetTableField']['GALLERYOPTIONS'] = 'Galerijų parinktys';
+$lang['lt_LT']['AssetTableField']['IMAGE'] = 'Paveikslėlis';
+$lang['lt_LT']['AssetTableField']['ISFLASH'] = 'Flash byla';
+$lang['lt_LT']['AssetTableField']['LASTEDIT'] = 'Paskutinį kartą keista';
+$lang['lt_LT']['AssetTableField']['MAIN'] = 'Pagrindinis';
+$lang['lt_LT']['AssetTableField']['NOLINKS'] = 'Į šį puslapį nėra jokių nuorodų iš kitų puslapių';
+$lang['lt_LT']['AssetTableField']['OWNER'] = 'Savininkas';
+$lang['lt_LT']['AssetTableField']['PAGESLINKING'] = 'Į šią bylą turi nuorodas šie puslapiai:';
+$lang['lt_LT']['AssetTableField']['POPUPHEIGHT'] = 'Popup aukštis';
+$lang['lt_LT']['AssetTableField']['POPUPWIDTH'] = 'Popup plotis';
+$lang['lt_LT']['AssetTableField']['SIZE'] = 'Dydis';
+$lang['lt_LT']['AssetTableField.ss']['DELFILE'] = 'Ištrinti šią bylą';
+$lang['lt_LT']['AssetTableField.ss']['DRAGTOFOLDER'] = 'Bylos perkėlimui tempkite ją į direktoriją, esančią kairėje';
+$lang['lt_LT']['AssetTableField.ss']['EDIT'] = 'Redaguoti nuosavybę';
+$lang['lt_LT']['AssetTableField.ss']['SHOW'] = 'Rodyti nuosavybę';
+$lang['lt_LT']['AssetTableField']['SWFFILEOPTIONS'] = 'SWF bylų parinktys';
+$lang['lt_LT']['AssetTableField']['TITLE'] = 'Pavadinimas';
+$lang['lt_LT']['AssetTableField']['TYPE'] = 'Tipas';
+$lang['lt_LT']['AssetTableField']['URL'] = 'URL adresas';
+$lang['lt_LT']['CMSBatchActions']['DELETED_PAGES'] = 'Iš publikuojamos svetainės ištrinti %d puslapiai';
+$lang['lt_LT']['CMSBatchActions']['DELETE_PAGES'] = 'Trinti iš publikuojamos svetainės';
+$lang['lt_LT']['CMSBatchActions']['DELETING_PAGES'] = 'Trinti pasirinktus puslapius iš publikuojamos svetainės';
+$lang['lt_LT']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Publikuoti %d puslapiai';
+$lang['lt_LT']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Publikuojami puslapiai';
+$lang['lt_LT']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publikuoti';
+$lang['lt_LT']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'Nepublikuoti %d puslapiai';
+$lang['lt_LT']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'Nepublikuojami puslapiai';
+$lang['lt_LT']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'Nepublikuoti';
+$lang['lt_LT']['CMSLeft.ss']['DELPAGE'] = 'Ištrinti puslapius...';
+$lang['lt_LT']['CMSLeft.ss']['DELPAGES'] = 'Ištrinti pažymėtus puslapius';
+$lang['lt_LT']['CMSLeft.ss']['GO'] = 'Eiti';
+$lang['lt_LT']['CMSLeft.ss']['NEWPAGE'] = 'Naujas puslapis...';
+$lang['lt_LT']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Pažymėkite norimus ištrinti puslapius ir paspauskite žemiau esantį mygtuką';
+$lang['lt_LT']['CMSLeft.ss']['SITECONT'] = 'Svetainės turinys';
+$lang['lt_LT']['CMSMain']['ACCESS'] = 'Prieiga prie \'%s\' (%s)';
+$lang['lt_LT']['CMSMain']['ACCESSALLINTERFACES'] = 'Prieiga prie visų TVS sąsajų';
+$lang['lt_LT']['CMSMain']['CANCEL'] = 'Atšaukti';
+$lang['lt_LT']['CMSMain']['CHOOSEREPORT'] = '(pasirinkite ataskaitą)';
+$lang['lt_LT']['CMSMain']['COMPARINGV'] = 'Lyginamos versijos %s ir %s';
+$lang['lt_LT']['CMSMain']['COPYPUBTOSTAGE'] = 'Ar tikrai norite kopijuoti paskelbtą turinį į etapo svetainę?';
+$lang['lt_LT']['CMSMain']['DELETE'] = 'Ištrinti iš juodraščių';
+$lang['lt_LT']['CMSMain']['DESCREMOVED'] = 'ir %s palikuonys';
+$lang['lt_LT']['CMSMain']['EMAIL'] = 'E. paštas';
+$lang['lt_LT']['CMSMain']['GO'] = 'Eiti';
+$lang['lt_LT']['CMSMain']['MENUTITLE'] = 'Svetainės turinys';
+$lang['lt_LT']['CMSMain']['MENUTITLE'] = 'Svetainės turinys';
+$lang['lt_LT']['CMSMain']['MENUTITLEOPT'] = 'Navigacijos žymė';
+$lang['lt_LT']['CMSMain']['METADESCOPT'] = 'Aprašymas';
+$lang['lt_LT']['CMSMain']['METAKEYWORDSOPT'] = 'Raktažodžiai';
+$lang['lt_LT']['CMSMain']['NEW'] = 'Nauja';
+$lang['lt_LT']['CMSMain']['NOCONTENT'] = 'be turinio';
+$lang['lt_LT']['CMSMain']['NOTHINGASSIGNED'] = 'Jums nieko nepriskirta.';
+$lang['lt_LT']['CMSMain']['NOWAITINGON'] = 'Jūs nieko nelaukiate.';
+$lang['lt_LT']['CMSMain']['NOWBROKEN'] = 'Šie puslapiai turi nebegaliojančias nuorodas:';
+$lang['lt_LT']['CMSMain']['NOWBROKEN2'] = 'Puslapių kūrėjams išsiųsti pranešimai dėl pakoregavimo.';
+$lang['lt_LT']['CMSMain']['OK'] = 'Gerai';
+$lang['lt_LT']['CMSMain']['PAGEDEL'] = 'ištrintas puslapis %d';
+$lang['lt_LT']['CMSMain']['PAGENOTEXISTS'] = 'Tokio puslapio nėra';
+$lang['lt_LT']['CMSMain']['PAGEPUB'] = 'publikuotas puslapis %d ';
+$lang['lt_LT']['CMSMain']['PAGESDEL'] = 'ištrinta puslapių: %d';
+$lang['lt_LT']['CMSMain']['PAGESPUB'] = 'publikuota puslapių: %d ';
+$lang['lt_LT']['CMSMain']['PAGETYPEOPT'] = 'Puslapio tipas';
+$lang['lt_LT']['CMSMain']['PRINT'] = 'Spausdinti';
+$lang['lt_LT']['CMSMain']['PUBALLCONFIRM'] = 'Nukopijavę turinį paskelbti turite kiekvieną puslapį atskirai';
+$lang['lt_LT']['CMSMain']['PUBALLFUN'] = '"Publikuoti viską" funkcionalumas';
+$lang['lt_LT']['CMSMain']['PUBALLFUN2'] = 'Šio mygtuko paspaudimas yra lygiavertis kiekvieno puslapio atskiram paskelbimui. Tai naudinga kai atliekama visa aibė pakeitimų įvairiuose svetainės puslapiuose.';
+$lang['lt_LT']['CMSMain']['PUBPAGES'] = 'Atlikta - publikuota puslapių: %d';
+$lang['lt_LT']['CMSMain']['REMOVED'] = 'Ištrinta \'%s\'%s iš svetainės';
+$lang['lt_LT']['CMSMain']['REMOVEDFD'] = 'Pašalinta iš juodraščių';
+$lang['lt_LT']['CMSMain']['REMOVEDPAGE'] = 'Pašalinta iš juodraščių: \'%s\'';
+$lang['lt_LT']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Ištrinta \'%s\' iš juodraščių';
+$lang['lt_LT']['CMSMain']['REPORT'] = 'Ataskaita';
+$lang['lt_LT']['CMSMain']['RESTORED'] = 'Atstatyta \'%s\'';
+$lang['lt_LT']['CMSMain']['ROLLBACK'] = 'Sugrąžinti į šią versiją';
+$lang['lt_LT']['CMSMain']['ROLLEDBACKPUB'] = 'Atstatyta į publikuotą versiją #%d. Naujos versijos numeris #%d';
+$lang['lt_LT']['CMSMain']['ROLLEDBACKVERSION'] = 'Atstatyta į versiją #%d. Naujos versijos numeris #%d';
+$lang['lt_LT']['CMSMain']['SAVE'] = 'Išsaugoti';
+$lang['lt_LT']['CMSMain']['SENTTO'] = 'Nusiųsta patvirtinimui: %s %s.';
+$lang['lt_LT']['CMSMain']['STATUSOPT'] = 'Statusas';
+$lang['lt_LT']['CMSMain']['TITLEOPT'] = 'Pavadinimas';
+$lang['lt_LT']['CMSMain']['TOTALPAGES'] = 'Viso puslapių:';
+$lang['lt_LT']['CMSMain']['VERSIONSNOPAGE'] = 'Nepavyko rasti puslapio #%d';
+$lang['lt_LT']['CMSMain']['VIEWING'] = 'Jūs žiūrite versiją#%s, sukurtą %s%s';
+$lang['lt_LT']['CMSMain']['VISITRESTORE'] = 'aplankykite restorepage/(ID)';
+$lang['lt_LT']['CMSMain']['WAITINGON'] = 'Jūs laukiate kol kiti paredaguos šiuos puslapius: <b>%d</b>.';
+$lang['lt_LT']['CMSMain']['WORKTODO'] = 'Jūs turite neatliktų užduočių šiuose puslapiuose: <b>%d</b>.';
+$lang['lt_LT']['CMSMain_dialog.ss']['BUTTONNOTFOUND'] = 'Nėra mygtuko pavadinimo';
+$lang['lt_LT']['CMSMain_dialog.ss']['NOLINKED'] = 'Nepavyko rasti window.linkedObject, kad nusiųsti mygtuko paspaudimą gryžimui į pagrindinį langą';
+$lang['lt_LT']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'Pridėtas prie juodraščių, bet dar nepublikuotas';
+$lang['lt_LT']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Pridėti kriterijų...';
+$lang['lt_LT']['CMSMain_left.ss']['BATCHACTIONS'] = 'Grupės veiksmai';
+$lang['lt_LT']['CMSMain_left.ss']['CHANGED'] = 'pakeista';
+$lang['lt_LT']['CMSMain_left.ss']['CLEARTITLE'] = 'Išvalyti paiešką ir peržiūrėti visus elementus';
+$lang['lt_LT']['CMSMain_left.ss']['CLOSEBOX'] = 'spauskite norėdami uždaryti';
+$lang['lt_LT']['CMSMain_left.ss']['COMPAREMODE'] = 'Palyginimo režimas (spauskite 2 žemiau)';
+$lang['lt_LT']['CMSMain_left.ss']['CREATE'] = 'Sukurti';
+$lang['lt_LT']['CMSMain_left.ss']['DEL'] = 'ištrinta';
+$lang['lt_LT']['CMSMain_left.ss']['DELETECONFIRM'] = 'Ištrinti pažymėtus puslapius';
+$lang['lt_LT']['CMSMain_left.ss']['DELETEDSTILLLIVE'] = 'Ištrinta iš juodraščių, bet tebėra viešoje svetainėje';
+$lang['lt_LT']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Redaguota juodraščiuose, bet dar nepublikuota';
+$lang['lt_LT']['CMSMain_left.ss']['EDITEDSINCE'] = 'Redaguojamas nuo';
+$lang['lt_LT']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Galima keisti puslapius vietomis';
+$lang['lt_LT']['CMSMain_left.ss']['GO'] = 'Eiti';
+$lang['lt_LT']['CMSMain_left.ss']['HIDDEN'] = 'paslėptas';
+$lang['lt_LT']['CMSMain_left.ss']['KEY'] = 'Raktas:';
+$lang['lt_LT']['CMSMain_left.ss']['NEW'] = 'naujas';
+$lang['lt_LT']['CMSMain_left.ss']['NOTINMENU'] = 'Išbraukti iš navigacijos meniu';
+$lang['lt_LT']['CMSMain_left.ss']['OPENBOX'] = 'spauskite norėdami atidaryti';
+$lang['lt_LT']['CMSMain_left.ss']['PAGEVERSIONH'] = 'Puslapio versijų istorija';
+$lang['lt_LT']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publikuoti pažymėtus puslapius';
+$lang['lt_LT']['CMSMain_left.ss']['SEARCH'] = 'Paieška';
+$lang['lt_LT']['CMSMain_left.ss']['SEARCHTITLE'] = 'Ieškoti tarp URL adresų, Pavadinimų, Meniu pavadinimų, &amp; Turinys';
+$lang['lt_LT']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Pažymėkite puslapius, kuriuos norite keisti ir paspauskite veiksmą:';
+$lang['lt_LT']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Pasirinkite puslapį, kurį norite dubliuoti, nurodykite ar jo "vaikai" turėtų būti irgi kopijuojami bei į kurią vietą patalpinti dublikatą.';
+$lang['lt_LT']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Rodyti tik redaguotus puslapius';
+$lang['lt_LT']['CMSMain_left.ss']['SHOWUNPUB'] = 'Rodyti nepublikuotas versijas';
+$lang['lt_LT']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Svetainės turinys ir struktūra';
+$lang['lt_LT']['CMSMain_left.ss']['SITEREPORTS'] = 'Svetainės ataskaitos';
+$lang['lt_LT']['CMSMain_right.ss']['ANYMESSAGE'] = 'Ar Jūs turite kokią nors žinutę dėl redagavimo?';
+$lang['lt_LT']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Pasirinkite puslapį iš esančių kairėje.';
+$lang['lt_LT']['CMSMain_right.ss']['LOADING'] = 'kraunama...';
+$lang['lt_LT']['CMSMain_right.ss']['MESSAGE'] = 'Žinutė';
+$lang['lt_LT']['CMSMain_right.ss']['SENDTO'] = 'Siųsti';
+$lang['lt_LT']['CMSMain_right.ss']['STATUS'] = 'Statusas';
+$lang['lt_LT']['CMSMain_right.ss']['SUBMIT'] = 'Nusiųsti patvirtinimui';
+$lang['lt_LT']['CMSMain_right.ss']['WELCOMETO'] = 'Sveiki atvykę į';
+$lang['lt_LT']['CMSMain_versions.ss']['AUTHOR'] = 'Autorius';
+$lang['lt_LT']['CMSMain_versions.ss']['NOTPUB'] = 'Dar nepublikuota';
+$lang['lt_LT']['CMSMain_versions.ss']['PUBR'] = 'Publikavo';
+$lang['lt_LT']['CMSMain_versions.ss']['UNKNOWN'] = 'Nežinoma';
+$lang['lt_LT']['CMSMain_versions.ss']['WHEN'] = 'Kada';
+$lang['lt_LT']['CMSRight.ss']['CHOOSEPAGE'] = 'Pasirinkite puslapį iš esančių kairėje.';
+$lang['lt_LT']['CMSRight.ss']['ECONTENT'] = 'Redaguoti turinį';
+$lang['lt_LT']['CMSRight.ss']['WELCOMETO'] = 'Sveiki atvykę į';
+$lang['lt_LT']['CommentAdmin']['ACCEPT'] = 'Patvirtinti';
+$lang['lt_LT']['CommentAdmin']['APPROVED'] = 'Patvirtinta komentarų: %s.';
+$lang['lt_LT']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Patvirtinti komentarai';
+$lang['lt_LT']['CommentAdmin']['AUTHOR'] = 'Autorius';
+$lang['lt_LT']['CommentAdmin']['COMMENT'] = 'Komentaras';
+$lang['lt_LT']['CommentAdmin']['COMMENTERURL'] = 'URL';
+$lang['lt_LT']['CommentAdmin']['COMMENTS'] = 'Komentarai';
+$lang['lt_LT']['CommentAdmin']['COMMENTSAWAITINGMODERATION'] = 'Komentarai, laukiantys moderavimo';
+$lang['lt_LT']['CommentAdmin']['DATEPOSTED'] = 'Parašyta';
+$lang['lt_LT']['CommentAdmin']['DELETE'] = 'Ištrinti';
+$lang['lt_LT']['CommentAdmin']['DELETEALL'] = 'Ištinti viską';
+$lang['lt_LT']['CommentAdmin']['DELETED'] = 'Ištrinti %s komentarai';
+$lang['lt_LT']['CommentAdmin']['MARKASNOTSPAM'] = 'Pažymėti kaip ne slamštą';
+$lang['lt_LT']['CommentAdmin']['MARKEDNOTSPAM'] = 'Pažymėta %s komentarai kaip spamas';
+$lang['lt_LT']['CommentAdmin']['MARKEDSPAM'] = 'Pažymėta %s kometarai kaip spamas';
+$lang['lt_LT']['CommentAdmin']['MENUTITLE'] = 'Komentarai';
+$lang['lt_LT']['CommentAdmin']['MENUTITLE'] = 'Komentarai';
+$lang['lt_LT']['CommentAdmin']['NAME'] = 'Vardas';
+$lang['lt_LT']['CommentAdmin']['PAGE'] = 'Puslapis';
+$lang['lt_LT']['CommentAdmin']['SPAM'] = 'Spamas';
+$lang['lt_LT']['CommentAdmin']['SPAMMARKED'] = 'Pažymėti kaip slamštą';
+$lang['lt_LT']['CommentAdmin_left.ss']['COMMENTS'] = 'Komentarai';
+$lang['lt_LT']['CommentAdmin_right.ss']['WELCOME1'] = 'Sveiki atvykę į';
+$lang['lt_LT']['CommentAdmin_right.ss']['WELCOME2'] = 'komentarų valdymas. Pasirinkite direktoriją iš esančių kairėje.';
+$lang['lt_LT']['CommentAdmin_SiteTree.ss']['APPROVED'] = 'Patvirtinta';
+$lang['lt_LT']['CommentAdmin_SiteTree.ss']['AWAITMODERATION'] = 'Laukiama moderavimo';
+$lang['lt_LT']['CommentAdmin_SiteTree.ss']['COMMENTS'] = 'Komentarai';
+$lang['lt_LT']['CommentAdmin_SiteTree.ss']['SPAM'] = 'Spamas';
+$lang['lt_LT']['CommentList.ss']['CREATEDW'] = 'Komentarai bus sukuriami kai naudosite šiuos veiksmus - Paskelbti, Atmesti, Pridėti.';
+$lang['lt_LT']['CommentList.ss']['NOCOM'] = 'Šiame puslapyje komentarų dar nėra.';
+$lang['lt_LT']['CommentTableField']['FILTER'] = 'Filtruoti';
+$lang['lt_LT']['CommentTableField']['SEARCH'] = 'Ieškoti';
+$lang['lt_LT']['CommentTableField.ss']['APPROVE'] = 'patvirtinti';
+$lang['lt_LT']['CommentTableField.ss']['APPROVECOMMENT'] = 'Patvirtinti šį komentarą';
+$lang['lt_LT']['CommentTableField.ss']['DELETE'] = 'ištrinti';
+$lang['lt_LT']['CommentTableField.ss']['DELETEROW'] = 'Ištrinti šią eilutę';
+$lang['lt_LT']['CommentTableField.ss']['EDIT'] = 'redaguoti';
+$lang['lt_LT']['CommentTableField.ss']['HAM'] = 'ham';
+$lang['lt_LT']['CommentTableField.ss']['MARKASSPAM'] = 'Pažymėti šį komentarą kaip spamą';
+$lang['lt_LT']['CommentTableField.ss']['MARKNOSPAM'] = 'Pažymėti šį komentarą kaip ne spamą';
+$lang['lt_LT']['CommentTableField.ss']['NOITEMSFOUND'] = 'Nieko nerasta';
+$lang['lt_LT']['CommentTableField.ss']['SPAM'] = 'spamas';
+$lang['lt_LT']['ComplexTableField']['CLOSEPOPUP'] = 'Uždaryti';
+$lang['lt_LT']['ComplexTableField']['SUCCESSADD'] = 'Pridėta %s %s %s';
+$lang['lt_LT']['ImageEditor.ss']['ACTIONS'] = 'veiksmai';
+$lang['lt_LT']['ImageEditor.ss']['ADJUST'] = 'koreguoti';
+$lang['lt_LT']['ImageEditor.ss']['APPLY'] = 'taikyti';
+$lang['lt_LT']['ImageEditor.ss']['BLUR'] = 'migla';
+$lang['lt_LT']['ImageEditor.ss']['BRIGHTNESS'] = 'šviesumas';
+$lang['lt_LT']['ImageEditor.ss']['CANCEL'] = 'atšaukti';
+$lang['lt_LT']['ImageEditor.ss']['CONTRAST'] = 'kontrastas';
+$lang['lt_LT']['ImageEditor.ss']['CROP'] = 'apkirpti';
+$lang['lt_LT']['ImageEditor.ss']['CURRENTACTION'] = 'current&nbsp;action';
+$lang['lt_LT']['ImageEditor.ss']['EDITFUNCTIONS'] = 'edit&nbsp;functions';
+$lang['lt_LT']['ImageEditor.ss']['EFFECTS'] = 'efektai';
+$lang['lt_LT']['ImageEditor.ss']['EXIT'] = 'išeiti';
+$lang['lt_LT']['ImageEditor.ss']['GAMMA'] = 'gama';
+$lang['lt_LT']['ImageEditor.ss']['GREYSCALE'] = 'juoda-balta';
+$lang['lt_LT']['ImageEditor.ss']['HEIGHT'] = 'aukštis';
+$lang['lt_LT']['ImageEditor.ss']['REDO'] = 'redo';
+$lang['lt_LT']['ImageEditor.ss']['ROT'] = 'pasukti';
+$lang['lt_LT']['ImageEditor.ss']['SAVE'] = 'išsaugoti&nbsp;paveikslėlį';
+$lang['lt_LT']['ImageEditor.ss']['SEPIA'] = 'sepia';
+$lang['lt_LT']['ImageEditor.ss']['UNDO'] = 'undo';
+$lang['lt_LT']['ImageEditor.ss']['UNTITLED'] = 'Nepavadintas dokumentas';
+$lang['lt_LT']['ImageEditor.ss']['WIDTH'] = 'plotis';
+$lang['lt_LT']['LeftAndMain']['CANT_REORGANISE'] = 'Jūs neturite teisių svetainės schemos pakeitimams. Jūsų pakeitimai neišsaugoti. ';
+$lang['lt_LT']['LeftAndMain']['CHANGEDURL'] = 'URL adresas pakeistas į \'%s\'';
+$lang['lt_LT']['LeftAndMain']['COMMENTS'] = 'Komentarai';
+$lang['lt_LT']['LeftAndMain']['FILESIMAGES'] = 'Bylos ir paveikslėliai';
+$lang['lt_LT']['LeftAndMain']['HELP'] = 'Pagalba';
+$lang['lt_LT']['LeftAndMain']['PAGETYPE'] = 'Puslapio tipas:';
+$lang['lt_LT']['LeftAndMain']['PERMAGAIN'] = 'Jūs atsijungėte iš TVS. Jei norite prisijungti iš naujo, įveskite vartotojo vardą ir slaptažodį.';
+$lang['lt_LT']['LeftAndMain']['PERMALREADY'] = 'Jūs neturite prieigos teisių į šią TVS dalį. Jeigu norite prisijunkite kitu vardu.';
+$lang['lt_LT']['LeftAndMain']['PERMDEFAULT'] = 'Prisijungimui prie TVS įveskite savo e. paštą ir slaptažodį.';
+$lang['lt_LT']['LeftAndMain']['PLEASESAVE'] = 'Išsaugokite puslapį: šis puslapis negali būti atnaujintas kol jo neišsaugojote.';
+$lang['lt_LT']['LeftAndMain']['REPORTS'] = 'Ataskaitos';
+$lang['lt_LT']['LeftAndMain']['REQUESTERROR'] = 'Klaida užklausoje';
+$lang['lt_LT']['LeftAndMain']['SAVED'] = 'išsaugota';
+$lang['lt_LT']['LeftAndMain']['SAVEDUP'] = 'Išsaugota';
+$lang['lt_LT']['LeftAndMain']['SECURITY'] = 'Saugumas';
+$lang['lt_LT']['LeftAndMain']['SITECONTENT'] = 'Svetainės turinys';
+$lang['lt_LT']['LeftAndMain']['SITECONTENTLEFT'] = 'Svetainės turinys';
+$lang['lt_LT']['LeftAndMain.ss']['APPVERSIONTEXT1'] = 'Tai yra';
+$lang['lt_LT']['LeftAndMain.ss']['APPVERSIONTEXT2'] = 'versija, kurią Jūs naudojate, techniškai tai yra TVS atšaka';
+$lang['lt_LT']['LeftAndMain.ss']['ARCHS'] = 'Archyvuotas';
+$lang['lt_LT']['LeftAndMain.ss']['DRAFTS'] = 'Juodraštis';
+$lang['lt_LT']['LeftAndMain.ss']['EDIT'] = 'Redagavimas';
+$lang['lt_LT']['LeftAndMain.ss']['EDITINCMS'] = 'Redaguoti šį puslapį per TVS';
+$lang['lt_LT']['LeftAndMain.ss']['EDITPROFILE'] = 'Profilis';
+$lang['lt_LT']['LeftAndMain.ss']['LOADING'] = 'Kraunama...';
+$lang['lt_LT']['LeftAndMain.ss']['LOGGEDINAS'] = 'Prisijungė';
+$lang['lt_LT']['LeftAndMain.ss']['LOGOUT'] = 'Atsijungti';
+$lang['lt_LT']['LeftAndMain.ss']['PUBLIS'] = 'Publikuotas';
+$lang['lt_LT']['LeftAndMain.ss']['REQUIREJS'] = 'TVS reikalauja aktyvuoti javascript';
+$lang['lt_LT']['LeftAndMain.ss']['SSWEB'] = 'Silverstripe tinklalapis';
+$lang['lt_LT']['LeftAndMain.ss']['VIEWINDRAFT'] = 'Žiūrėti puslapį kaip juodraštį';
+$lang['lt_LT']['LeftAndMain.ss']['VIEWINPUBLISHED'] = 'Žiūrėti puslapį oficialioje svetainėje';
+$lang['lt_LT']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Puslapio vaizdas';
+$lang['lt_LT']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = 'Sėkmingai publikuota \'%s\'';
+$lang['lt_LT']['LeftAndMain']['STATUSTO'] = 'Statusas pakeistas į \'%s\'';
+$lang['lt_LT']['LeftAndMain']['TREESITECONTENT'] = 'Svetainės turinys';
+$lang['lt_LT']['MemberList.ss']['FILTER'] = 'Filtruoti';
+$lang['lt_LT']['MemberList_PageControls.ss']['DISPLAYING'] = 'Rodoma';
+$lang['lt_LT']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'nariai';
+$lang['lt_LT']['MemberList_PageControls.ss']['LASTMEMBERS'] = 'nariai';
+$lang['lt_LT']['MemberList_PageControls.ss']['NEXTMEMBERS'] = 'nariai';
+$lang['lt_LT']['MemberList_PageControls.ss']['OF'] = 'iš';
+$lang['lt_LT']['MemberList_PageControls.ss']['PREVIOUSMEMBERS'] = 'nariai';
+$lang['lt_LT']['MemberList_PageControls.ss']['TO'] = 'į';
+$lang['lt_LT']['MemberList_PageControls.ss']['VIEWFIRST'] = 'Žiūrėti pirmą';
+$lang['lt_LT']['MemberList_PageControls.ss']['VIEWLAST'] = 'Žiūrėti paskutinį';
+$lang['lt_LT']['MemberList_PageControls.ss']['VIEWNEXT'] = 'Žiūrėti sekantį';
+$lang['lt_LT']['MemberList_PageControls.ss']['VIEWPREVIOUS'] = 'Žiūrėti ankstesnį';
+$lang['lt_LT']['MemberList_Table.ss']['EMAIL'] = 'E. pašto adresas';
+$lang['lt_LT']['MemberList_Table.ss']['FN'] = 'Vardas';
+$lang['lt_LT']['MemberList_Table.ss']['PASSWD'] = 'Slaptažodis';
+$lang['lt_LT']['MemberList_Table.ss']['SN'] = 'Pavardė';
+$lang['lt_LT']['MemberTableField']['ADD'] = 'Pridėti';
+$lang['lt_LT']['MemberTableField']['ADDEDTOGROUP'] = 'Į grupę pridėtas narys';
+$lang['lt_LT']['MemberTableField']['ADDINGFIELD'] = 'Pridėti nepavyko';
+$lang['lt_LT']['MemberTableField']['ANYGROUP'] = 'Bet kuri grupė';
+$lang['lt_LT']['MemberTableField']['ASC'] = 'A-Z';
+$lang['lt_LT']['MemberTableField']['DESC'] = 'Z-A';
+$lang['lt_LT']['MemberTableField']['EMAIL'] = 'El.paštas';
+$lang['lt_LT']['MemberTableField']['ERRORADDINGUSER'] = 'Ivyko klaida įtraukiant naudotoją i grupę: %s';
+$lang['lt_LT']['MemberTableField']['FILTER'] = 'Filtruoti';
+$lang['lt_LT']['MemberTableField']['FILTERBYGROUP'] = 'Filtruoti pagal grupę';
+$lang['lt_LT']['MemberTableField']['FIRSTNAME'] = 'Vardas';
+$lang['lt_LT']['MemberTableField']['ORDERBY'] = 'Rūšiuoti pagal';
+$lang['lt_LT']['MemberTableField']['SEARCH'] = 'Ieškoti';
+$lang['lt_LT']['MemberTableField.ss']['ADDNEW'] = 'Pridėti naują';
+$lang['lt_LT']['MemberTableField.ss']['DELETEMEMBER'] = 'Ištrinti šį narį';
+$lang['lt_LT']['MemberTableField.ss']['EDITMEMBER'] = 'Redaguoti šį narį';
+$lang['lt_LT']['MemberTableField.ss']['NOITEMSFOUND'] = 'Elementų nerasta';
+$lang['lt_LT']['MemberTableField.ss']['SHOWMEMBER'] = 'Rodyti narį';
+$lang['lt_LT']['MemberTableField']['SURNAME'] = 'Pavardė';
+$lang['lt_LT']['ModelAdmin']['ADDBUTTON'] = 'Pridėti';
+$lang['lt_LT']['ModelAdmin']['ADDFORM'] = 'Užpildykite šią formą, kad %s pridėti į duomenų bazę.';
+$lang['lt_LT']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Pasirinkti rezultatų stulpelius...';
+$lang['lt_LT']['ModelAdmin']['CLEAR_SEARCH'] = 'Išvalyti paiešką';
+$lang['lt_LT']['ModelAdmin']['CREATEBUTTON'] = 'Sukurti \'%s\'';
+$lang['lt_LT']['ModelAdmin']['DELETE'] = 'Ištrinti';
+$lang['lt_LT']['ModelAdmin']['DELETEDRECORDS'] = 'Ištrinta įrašų: %s.';
+$lang['lt_LT']['ModelAdmin']['FOUNDRESULTS'] = 'Pagal Jūsų paiešką pavyko rasti: %s';
+$lang['lt_LT']['ModelAdmin']['GOBACK'] = 'Atgal';
+$lang['lt_LT']['ModelAdmin']['GOFORWARD'] = 'Pirmyn';
+$lang['lt_LT']['ModelAdmin']['IMPORT'] = 'Importuoti iš CSV';
+$lang['lt_LT']['ModelAdmin']['IMPORTEDRECORDS'] = 'Importuota įrašų: %s.';
+$lang['lt_LT']['ModelAdmin']['ITEMNOTFOUND'] = 'Nepavyko rasti šios prekės';
+$lang['lt_LT']['ModelAdmin']['LOADEDFOREDITING'] = 'Užkrauta redagavimui: \'%s\'.';
+$lang['lt_LT']['ModelAdmin']['NOCSVFILE'] = 'Pasirinkite CSV bylą importui';
+$lang['lt_LT']['ModelAdmin']['NOIMPORT'] = 'Nėra ką importuoti';
+$lang['lt_LT']['ModelAdmin']['NORESULTS'] = 'Be rezultatų';
+$lang['lt_LT']['ModelAdmin']['SAVE'] = 'Išsaugoti';
+$lang['lt_LT']['ModelAdmin']['SEARCHFOR'] = 'Ieškoti:';
+$lang['lt_LT']['ModelAdmin']['SEARCHRESULTS'] = 'Paieškos rezultatai';
+$lang['lt_LT']['ModelAdmin']['SELECTALL'] = 'pažymėti viską';
+$lang['lt_LT']['ModelAdmin']['SELECTNONE'] = 'nieko nežymėti';
+$lang['lt_LT']['ModelAdmin']['UPDATEDRECORDS'] = 'Atnaujinta įrašų: %s.';
+$lang['lt_LT']['ModelAdmin_ImportSpec.ss']['IMPORTSPECFIELDS'] = 'Duomenų bazės stulpeliai';
+$lang['lt_LT']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Rodyti specifikacijas %s';
+$lang['lt_LT']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Ryšiai';
+$lang['lt_LT']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Specifikacijos %s';
+$lang['lt_LT']['ModelAdmin_left.ss']['ADDLISTING'] = 'Pridėti';
+$lang['lt_LT']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Importuoti';
+$lang['lt_LT']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Ieškoti';
+$lang['lt_LT']['ModelAdmin_right.ss']['WELCOME1'] = 'Sveiki atvykę į %s. Pasirinkite vieną iš kairėje esančių nuorodų.';
+$lang['lt_LT']['ModelSidebar.ss']['ADDLISTING'] = 'Įtraukti';
+$lang['lt_LT']['ModelSidebar.ss']['IMPORT_TAB_HEADER'] = 'Importuoti';
+$lang['lt_LT']['ModelSidebar.ss']['SEARCHLISTINGS'] = 'Ieškoti';
+$lang['lt_LT']['PageComment']['Comment'] = 'Komentaras';
+$lang['lt_LT']['PageComment']['COMMENTBY'] = 'Komentavo \'%s\' %s';
+$lang['lt_LT']['PageComment']['IsSpam'] = 'Spamas?';
+$lang['lt_LT']['PageComment']['Name'] = 'Autoriaus vardas';
+$lang['lt_LT']['PageComment']['NeedsModeration'] = 'Reikia moderuoti?';
+$lang['lt_LT']['PageComment']['PLURALNAME'] = 'Puslapio komentarai';
+$lang['lt_LT']['PageComment']['SINGULARNAME'] = 'Puslapio komentaras';
+$lang['lt_LT']['PageCommentInterface']['COMMENTERURL'] = 'Jūsų svetainės URL adresas';
+$lang['lt_LT']['PageCommentInterface']['POST'] = 'Paskelbti';
+$lang['lt_LT']['PageCommentInterface']['SPAMQUESTION'] = 'Spamo apsaugos klausimas: %s';
+$lang['lt_LT']['PageCommentInterface.ss']['COMMENTLOGINERROR'] = 'Jūs negalite komentuoti kol neprisijungėte';
+$lang['lt_LT']['PageCommentInterface.ss']['COMMENTPERMISSIONERROR'] = 'ir jūs neturite reikiamų teisių';
+$lang['lt_LT']['PageCommentInterface.ss']['COMMENTPOSTLOGIN'] = 'Prisijungti čia';
+$lang['lt_LT']['PageCommentInterface.ss']['COMMENTS'] = 'Komentarai';
+$lang['lt_LT']['PageCommentInterface.ss']['COMMENTSDISABLED'] = 'Komentavimas išjungtas';
+$lang['lt_LT']['PageCommentInterface.ss']['NEXT'] = 'sekantis';
+$lang['lt_LT']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'Šiame puslapyje komentarų dar nėra.';
+$lang['lt_LT']['PageCommentInterface.ss']['POSTCOM'] = 'Publikuoti komentarą';
+$lang['lt_LT']['PageCommentInterface.ss']['PREV'] = 'ankstesnis';
+$lang['lt_LT']['PageCommentInterface.ss']['RSSFEEDALLCOMMENTS'] = 'RSS naujienos visiems komentarams';
+$lang['lt_LT']['PageCommentInterface.ss']['RSSFEEDCOMMENTS'] = 'Šio puslapio komentarų RSS naujienos';
+$lang['lt_LT']['PageCommentInterface.ss']['RSSVIEWALLCOMMENTS'] = 'Žiūrėti visus komentarus';
+$lang['lt_LT']['PageCommentInterface']['YOURCOMMENT'] = 'Komentarai';
+$lang['lt_LT']['PageCommentInterface']['YOURNAME'] = 'Jūsų vardas';
+$lang['lt_LT']['PageCommentInterface_Controller']['SPAMQUESTION'] = 'Spamo apsaugos klausimas: %s';
+$lang['lt_LT']['PageCommentInterface_Form']['AWAITINGMODERATION'] = 'Jūsų komentaras išsiųstas ir dabar laukia moderavimo.';
+$lang['lt_LT']['PageCommentInterface_Form']['MSGYOUPOSTED'] = 'Jūsų paskelbta žinutė buvo:';
+$lang['lt_LT']['PageCommentInterface_Form']['SPAMDETECTED'] = 'Aptiktas spamas!!!';
+$lang['lt_LT']['PageCommentInterface_singlecomment.ss']['APPROVE'] = 'patvirtinti šį komentarą';
+$lang['lt_LT']['PageCommentInterface_singlecomment.ss']['ISNTSPAM'] = 'šis komentaras nėra šiukšlė';
+$lang['lt_LT']['PageCommentInterface_singlecomment.ss']['ISSPAM'] = 'šis komentaras yra šiukšlė';
+$lang['lt_LT']['PageCommentInterface_singlecomment.ss']['PBY'] = 'Publikavo';
+$lang['lt_LT']['PageCommentInterface_singlecomment.ss']['REMCOM'] = 'pašalinti komentarą';
+$lang['lt_LT']['ReportAdmin']['MENUTITLE'] = 'Ataskaitos';
+$lang['lt_LT']['ReportAdmin_left.ss']['REPORTS'] = 'Ataskaitos';
+$lang['lt_LT']['ReportAdmin_right.ss']['WELCOME1'] = 'Sveiki atvykę į';
+$lang['lt_LT']['ReportAdmin_right.ss']['WELCOME2'] = 'Ataskaitų sritis. Pasirinkite ataskaitos tipą iš esančių kairėje.';
+$lang['lt_LT']['ReportAdmin_SiteTree.ss']['REPORTS'] = 'Ataskaitos';
+$lang['lt_LT']['SecurityAdmin']['ADDMEMBER'] = 'Pridėti narį';
+$lang['lt_LT']['SecurityAdmin']['EDITPERMISSIONS'] = 'Redaguoti kiekvienos grupės leidimus ir IP adresus';
+$lang['lt_LT']['SecurityAdmin']['MENUTITLE'] = 'Saugumas';
+$lang['lt_LT']['SecurityAdmin']['MENUTITLE'] = 'Saugumas';
+$lang['lt_LT']['SecurityAdmin']['NEWGROUP'] = 'Nauja grupė';
+$lang['lt_LT']['SecurityAdmin']['SAVE'] = 'Išsaugoti';
+$lang['lt_LT']['SecurityAdmin']['SGROUPS'] = 'Saugumo grupės';
+$lang['lt_LT']['SecurityAdmin_left.ss']['CREATE'] = 'Sukurti';
+$lang['lt_LT']['SecurityAdmin_left.ss']['DEL'] = 'Ištrinti';
+$lang['lt_LT']['SecurityAdmin_left.ss']['DELGROUPS'] = 'Ištrinti pažymėtas grupes';
+$lang['lt_LT']['SecurityAdmin_left.ss']['ENABLEDRAGGING'] = 'Galima keisti puslapius vietomis';
+$lang['lt_LT']['SecurityAdmin_left.ss']['GO'] = 'Eiti';
+$lang['lt_LT']['SecurityAdmin_left.ss']['SECGROUPS'] = 'Saugumo grupės';
+$lang['lt_LT']['SecurityAdmin_left.ss']['SELECT'] = 'Pasirinkite puslapį, kurį norite ištrinti, ir paspauskite žemiau esantį mygtuką';
+$lang['lt_LT']['SecurityAdmin_left.ss']['TOREORG'] = 'Norėdami pertvarkyti savo svetainę, tempkite puslapius pagal savo pageidavimą.';
+$lang['lt_LT']['SecurityAdmin_right.ss']['WELCOME1'] = 'Sveiki atvykę į';
+$lang['lt_LT']['SecurityAdmin_right.ss']['WELCOME2'] = 'Saugumo administravimo sritis. Pasirinkite grupę iš esančių kairėje.';
+$lang['lt_LT']['SideReport']['EMPTYPAGES'] = 'Tušti puslapiai';
+$lang['lt_LT']['SideReport']['LAST2WEEKS'] = 'Per paskutines 2 savaites redaguoti puslapiai';
+$lang['lt_LT']['SideReport']['REPEMPTY'] = '%s ataskaita yra tuščia.';
+$lang['lt_LT']['SideReport']['TODO'] = 'Reikia atlikti';
+$lang['lt_LT']['StaticExporter']['BASEURL'] = 'Pagrindinis URL adresas';
+$lang['lt_LT']['StaticExporter']['EXPORTTO'] = 'Eksportuoti į direktoriją';
+$lang['lt_LT']['StaticExporter']['FOLDEREXPORT'] = 'Į kokią direktoriją eksportuoti';
+$lang['lt_LT']['StaticExporter']['NAME'] = 'Statinis eksportuotojas';
+$lang['lt_LT']['TableListField_PageControls.ss']['DISPLAYING'] = 'Rodoma';
+$lang['lt_LT']['TableListField_PageControls.ss']['OF'] = 'iš';
+$lang['lt_LT']['TableListField_PageControls.ss']['TO'] = 'į';
+$lang['lt_LT']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Žiūrėti pirmą';
+$lang['lt_LT']['TableListField_PageControls.ss']['VIEWLAST'] = 'Žiūrėti paskutinį';
+$lang['lt_LT']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Žiūrėti sekantį';
+$lang['lt_LT']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Žiūrėti ankstesnį';
+$lang['lt_LT']['ThumbnailStripField']['NOFLASHFOUND'] = 'Flash bylų nerasta';
+$lang['lt_LT']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'Flash bylų nerasta';
+$lang['lt_LT']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'Nerasta jokių paveikslėlių';
+$lang['lt_LT']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Nerasta paveikslėlių';
+$lang['lt_LT']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(pasirinkite direktoriją arba ieškokite aukščiau)';
+$lang['lt_LT']['ViewArchivedEmail.ss']['CANACCESS'] = 'Ši nuoroda Jus nukreips į archyvo svetainę:';
+$lang['lt_LT']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Jūs norėjote peržiūrėti savo svetainės turinį';
+$lang['lt_LT']['WaitingOn.ss']['ATO'] = 'priskirta';
+$lang['lt_LT']['WidgetAreaEditor.ss']['AVAILABLE'] = 'Galimi widgets';
+$lang['lt_LT']['WidgetAreaEditor.ss']['INUSE'] = 'Dabar naudojami widgets';
+$lang['lt_LT']['WidgetAreaEditor.ss']['NOAVAIL'] = 'Nėra galimų widgets';
+$lang['lt_LT']['WidgetAreaEditor.ss']['TOADD'] = 'Norėdami pridėti widgets, tempkite juos iš kairės pusės į čia.';
+$lang['lt_LT']['WidgetEditor.ss']['DELETE'] = 'Ištrinti';
+
+?>
\ No newline at end of file
diff --git a/lang/ms_MY.php b/lang/ms_MY.php
index 31d8c44a..0ccb21b6 100644
--- a/lang/ms_MY.php
+++ b/lang/ms_MY.php
@@ -17,8 +17,6 @@ if(array_key_exists('ms_MY', $lang) && is_array($lang['ms_MY'])) {
 }
 
 $lang['ms_MY']['AssetAdmin']['CHOOSEFILE'] = 'Pilih fail';
-$lang['ms_MY']['AssetAdmin']['CONTENTMODBY'] = 'Kandungan boleh diubah oleh';
-$lang['ms_MY']['AssetAdmin']['CONTENTUSABLEBY'] = 'Kandungan boleh digunakan oleh';
 $lang['ms_MY']['AssetAdmin']['DELETEDX'] = 'Fail %s telah dipadamkan. %s';
 $lang['ms_MY']['AssetAdmin']['FILESREADY'] = 'Fail-fail sedia untuk muatnaik:';
 $lang['ms_MY']['AssetAdmin']['FOLDERDELETED'] = 'folder telah dihapuskan';
@@ -31,7 +29,6 @@ $lang['ms_MY']['AssetAdmin']['NOTEMP'] = 'Tiada folder sementara untuk muatnaik.
 $lang['ms_MY']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Tiada apa untuk dimuatnaik';
 $lang['ms_MY']['AssetAdmin']['NOWBROKEN'] = 'Mukasurat berikut mengandungi pautan bermasalah';
 $lang['ms_MY']['AssetAdmin']['NOWBROKEN2'] = 'Pemilik-pemilik telah dihubungi melalui email dan mereka akan memperbaiki mukasurat terlibat.';
-$lang['ms_MY']['AssetAdmin']['OWNER'] = 'Pemilik';
 $lang['ms_MY']['AssetAdmin']['SAVEDFILE'] = 'Fail %s telah disimpan';
 $lang['ms_MY']['AssetAdmin']['SAVEFOLDERNAME'] = 'Simpan nama folder';
 $lang['ms_MY']['AssetAdmin']['THUMBSDELETED'] = 'Kesemua thumbnail yang tidak digunakan telah dihapuskan';
@@ -85,7 +82,6 @@ $lang['ms_MY']['CMSMain']['CHOOSEREPORT'] = '(Pilih jenis laporan)';
 $lang['ms_MY']['CMSMain']['COMPARINGV'] = 'Anda sedang membandingkan versi #%d dan #%d';
 $lang['ms_MY']['CMSMain']['COPYPUBTOSTAGE'] = 'Anda pasti untuk menyalin kandungan laman sebenar ke laman perantara?';
 $lang['ms_MY']['CMSMain']['DELETE'] = 'Hapuskan dari laman draf';
-$lang['ms_MY']['CMSMain']['DELETEFP'] = 'Padam dari laman sebenar';
 $lang['ms_MY']['CMSMain']['DESCREMOVED'] = 'dan %s mukasurat berkaitan';
 $lang['ms_MY']['CMSMain']['EMAIL'] = 'Emel';
 $lang['ms_MY']['CMSMain']['GO'] = 'Terus';
@@ -116,7 +112,6 @@ $lang['ms_MY']['CMSMain']['REMOVEDFD'] = 'Telah dipadam dari laman draf';
 $lang['ms_MY']['CMSMain']['REMOVEDPAGE'] = '\'%s\' telah dikeluarkan dari laman sebenar';
 $lang['ms_MY']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = '\'%s\' telah dihapuskan dari laman draf';
 $lang['ms_MY']['CMSMain']['REPORT'] = 'Laporan';
-$lang['ms_MY']['CMSMain']['RESTORE'] = 'Kembalikan';
 $lang['ms_MY']['CMSMain']['RESTORED'] = '\'%s\' telah berjaya dikembalikan';
 $lang['ms_MY']['CMSMain']['ROLLBACK'] = 'Undur ke versi ini';
 $lang['ms_MY']['CMSMain']['ROLLEDBACKPUB'] = 'Dikembalikan ke versi sebenar. Nombor versi yang baru adalah #%d ';
@@ -137,7 +132,6 @@ $lang['ms_MY']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Tambah Kriteria...';
 $lang['ms_MY']['CMSMain_left.ss']['BATCHACTIONS'] = 'Tindakan Pukal';
 $lang['ms_MY']['CMSMain_left.ss']['CHANGED'] = 'diubah';
 $lang['ms_MY']['CMSMain_left.ss']['CLOSEBOX'] = 'klik untuk menutup kotak';
-$lang['ms_MY']['CMSMain_left.ss']['COMMENTS'] = 'Komen';
 $lang['ms_MY']['CMSMain_left.ss']['COMPAREMODE'] = 'Mod membanding (pilih 2 di bawah)';
 $lang['ms_MY']['CMSMain_left.ss']['CREATE'] = 'Hasilkan';
 $lang['ms_MY']['CMSMain_left.ss']['DEL'] = 'dipadam';
@@ -160,8 +154,6 @@ $lang['ms_MY']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Tunjukkan mukasurat yang
 $lang['ms_MY']['CMSMain_left.ss']['SHOWUNPUB'] = 'Paparkan version yang belum diterbitkan';
 $lang['ms_MY']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Struktur dan Kandungan Laman';
 $lang['ms_MY']['CMSMain_left.ss']['SITEREPORTS'] = 'Laporan laman web';
-$lang['ms_MY']['CMSMain_left.ss']['TASKLIST'] = 'Senarai tugasan';
-$lang['ms_MY']['CMSMain_left.ss']['WAITINGON'] = 'Sedang menanti';
 $lang['ms_MY']['CMSMain_right.ss']['ANYMESSAGE'] = 'Sebarang mesej untuk editor anda?';
 $lang['ms_MY']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Pilih sebarang halaman dari pilihan di kiri.';
 $lang['ms_MY']['CMSMain_right.ss']['LOADING'] = 'tunggu sebentar...';
@@ -255,17 +247,6 @@ $lang['ms_MY']['LeftAndMain.ss']['SSWEB'] = 'Laman web Silverstripe';
 $lang['ms_MY']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Capaian mukasurat:';
 $lang['ms_MY']['LeftAndMain']['STATUSTO'] = 'Status telah diubahh kepada \'%s\'';
 $lang['ms_MY']['LeftAndMain']['TREESITECONTENT'] = 'Kandungan Laman';
-$lang['ms_MY']['MemberList']['ADD'] = 'Tambah';
-$lang['ms_MY']['MemberList']['ANYGROUP'] = 'Sebarang kumpulan';
-$lang['ms_MY']['MemberList']['ASC'] = 'Menaik';
-$lang['ms_MY']['MemberList']['DESC'] = 'Menurun';
-$lang['ms_MY']['MemberList']['EMAIL'] = 'Emel';
-$lang['ms_MY']['MemberList']['FILTERBYG'] = 'Saring mengikut kumpulan';
-$lang['ms_MY']['MemberList']['FN'] = 'Nama';
-$lang['ms_MY']['MemberList']['ORDERBY'] = 'Susunan mengikut';
-$lang['ms_MY']['MemberList']['PASSWD'] = 'Katalaluan';
-$lang['ms_MY']['MemberList']['SEARCH'] = 'Carian';
-$lang['ms_MY']['MemberList']['SN'] = 'Nama keluarga';
 $lang['ms_MY']['MemberList.ss']['FILTER'] = 'Saring';
 $lang['ms_MY']['MemberList_Table.ss']['EMAIL'] = 'Alamat Emel';
 $lang['ms_MY']['MemberList_Table.ss']['FN'] = 'Nama';
@@ -288,7 +269,6 @@ $lang['ms_MY']['MemberTableField.ss']['DELETEMEMBER'] = 'Padamkan ahli ini';
 $lang['ms_MY']['MemberTableField.ss']['EDITMEMBER'] = 'Sunting ahli ini';
 $lang['ms_MY']['MemberTableField.ss']['SHOWMEMBER'] = 'Paparkan ahli ini';
 $lang['ms_MY']['MemberTableField']['SURNAME'] = 'Nama Keluarga';
-$lang['ms_MY']['ModelAdmin']['CLASSTYPE'] = 'Jenis';
 $lang['ms_MY']['ModelAdmin']['CREATEBUTTON'] = 'Bentukkan \'%s\'';
 $lang['ms_MY']['PageComment']['COMMENTBY'] = 'Komen oleh \'%s\' tentang %s';
 $lang['ms_MY']['PageComment']['PLURALNAME'] = 'Komen-komen Mukasurat';
@@ -340,10 +320,7 @@ $lang['ms_MY']['StaticExporter']['BASEURL'] = 'URL dasar';
 $lang['ms_MY']['StaticExporter']['EXPORTTO'] = 'Eksport kepada fail lipatan itu';
 $lang['ms_MY']['StaticExporter']['FOLDEREXPORT'] = 'Folder destinasi eksport';
 $lang['ms_MY']['StaticExporter']['NAME'] = 'Pengeksport static';
-$lang['ms_MY']['StaticExporter']['ONETHATEXISTS'] = 'Nyatakan atau pilih folder yang sedia ada';
-$lang['ms_MY']['TaskList.ss']['BY'] = 'oleh';
 $lang['ms_MY']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Tiada imej ditemui';
-$lang['ms_MY']['ThumbnailStripField']['NOTAFOLDER'] = 'Ini bukan folder';
 $lang['ms_MY']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Pilih folder di atas)';
 $lang['ms_MY']['ViewArchivedEmail.ss']['CANACCESS'] = 'Lihat laman yang telah diarkib menggunakan pautan ini:';
 $lang['ms_MY']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Anda berhajat untuk melihat kandungan laman kami pada';
diff --git a/lang/nb_NO.php b/lang/nb_NO.php
index 6bb5a26c..4b293f14 100644
--- a/lang/nb_NO.php
+++ b/lang/nb_NO.php
@@ -17,8 +17,6 @@ if(array_key_exists('nb_NO', $lang) && is_array($lang['nb_NO'])) {
 }
 
 $lang['nb_NO']['AssetAdmin']['CHOOSEFILE'] = 'Velg fil';
-$lang['nb_NO']['AssetAdmin']['CONTENTMODBY'] = 'Innhold kan endres av';
-$lang['nb_NO']['AssetAdmin']['CONTENTUSABLEBY'] = 'Innhold kan brukes av';
 $lang['nb_NO']['AssetAdmin']['DELETEDX'] = 'Slettet %s filer. %s';
 $lang['nb_NO']['AssetAdmin']['FILESREADY'] = 'Filer klare for opplasting:';
 $lang['nb_NO']['AssetAdmin']['FOLDERDELETED'] = 'slettet mapper.';
@@ -31,7 +29,6 @@ $lang['nb_NO']['AssetAdmin']['NOTEMP'] = 'Det er ikke noen midlertidig mappe for
 $lang['nb_NO']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Det fantes ingenting å laste opp';
 $lang['nb_NO']['AssetAdmin']['NOWBROKEN'] = 'Disse sidene har ødelagte linker:';
 $lang['nb_NO']['AssetAdmin']['NOWBROKEN2'] = 'Det er sendt e-post til eierene, og de vil rette opp sidene.';
-$lang['nb_NO']['AssetAdmin']['OWNER'] = 'Eier';
 $lang['nb_NO']['AssetAdmin']['SAVEDFILE'] = 'Lagret filen %s';
 $lang['nb_NO']['AssetAdmin']['SAVEFOLDERNAME'] = 'Lagre mappenavn';
 $lang['nb_NO']['AssetAdmin']['THUMBSDELETED'] = 'Alle ubrukte miniatyrbilder har blitt slettet';
@@ -86,7 +83,6 @@ $lang['nb_NO']['CMSMain']['CHOOSEREPORT'] = '(Velg en rapport)';
 $lang['nb_NO']['CMSMain']['COMPARINGV'] = 'Du sammenligner versjonene #%d og #%d';
 $lang['nb_NO']['CMSMain']['COPYPUBTOSTAGE'] = 'Er du sikker på at du vil kopiere det publiserte innholdet til utkast?';
 $lang['nb_NO']['CMSMain']['DELETE'] = 'Slett fra utkast';
-$lang['nb_NO']['CMSMain']['DELETEFP'] = 'Fjern fra publisert side';
 $lang['nb_NO']['CMSMain']['DESCREMOVED'] = 'og %s undersider';
 $lang['nb_NO']['CMSMain']['EMAIL'] = 'Epost';
 $lang['nb_NO']['CMSMain']['GO'] = 'Utfør';
@@ -117,7 +113,6 @@ $lang['nb_NO']['CMSMain']['REMOVEDFD'] = 'Fjernet fra utkast-siden';
 $lang['nb_NO']['CMSMain']['REMOVEDPAGE'] = 'Fjernet %s fra den publiserte siden.';
 $lang['nb_NO']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Fjernet \'%s\' fra utkast for nettsted';
 $lang['nb_NO']['CMSMain']['REPORT'] = 'Rapport';
-$lang['nb_NO']['CMSMain']['RESTORE'] = 'Gjenopprett';
 $lang['nb_NO']['CMSMain']['RESTORED'] = '%s vellykket gjenopprettet';
 $lang['nb_NO']['CMSMain']['ROLLBACK'] = 'Rull tilbake til denne versjonen';
 $lang['nb_NO']['CMSMain']['ROLLEDBACKPUB'] = 'Rullet tilbake til publisert versjon. Ny versjon er #%d';
@@ -138,7 +133,6 @@ $lang['nb_NO']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Legg til kriterie';
 $lang['nb_NO']['CMSMain_left.ss']['BATCHACTIONS'] = 'Avanserte oppg.';
 $lang['nb_NO']['CMSMain_left.ss']['CHANGED'] = 'endret';
 $lang['nb_NO']['CMSMain_left.ss']['CLOSEBOX'] = 'Klikk for å lukke boksen';
-$lang['nb_NO']['CMSMain_left.ss']['COMMENTS'] = 'Kommentarer';
 $lang['nb_NO']['CMSMain_left.ss']['COMPAREMODE'] = 'Sammenligningsmodus (klikk 2 under)';
 $lang['nb_NO']['CMSMain_left.ss']['CREATE'] = 'Opprett';
 $lang['nb_NO']['CMSMain_left.ss']['DEL'] = 'slettet';
@@ -161,8 +155,6 @@ $lang['nb_NO']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Vis bare redigerte sider
 $lang['nb_NO']['CMSMain_left.ss']['SHOWUNPUB'] = 'Vis upubliserte versjoner';
 $lang['nb_NO']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Innhold og struktur for nettsted';
 $lang['nb_NO']['CMSMain_left.ss']['SITEREPORTS'] = 'Rapporter';
-$lang['nb_NO']['CMSMain_left.ss']['TASKLIST'] = 'Oppgaveliste';
-$lang['nb_NO']['CMSMain_left.ss']['WAITINGON'] = 'Venter på';
 $lang['nb_NO']['CMSMain_right.ss']['ANYMESSAGE'] = 'Har du en melding til din redaktør?';
 $lang['nb_NO']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Venligst velg en side fra venstre kolonne.';
 $lang['nb_NO']['CMSMain_right.ss']['LOADING'] = 'laster inn...';
@@ -279,17 +271,6 @@ $lang['nb_NO']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Se side:';
 $lang['nb_NO']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = 'Publisert med \'%ers\' suksess';
 $lang['nb_NO']['LeftAndMain']['STATUSTO'] = 'Status endret til %s';
 $lang['nb_NO']['LeftAndMain']['TREESITECONTENT'] = 'Nettsidens innhold';
-$lang['nb_NO']['MemberList']['ADD'] = 'Legg til';
-$lang['nb_NO']['MemberList']['ANYGROUP'] = 'Hvilket som helst gruppe';
-$lang['nb_NO']['MemberList']['ASC'] = 'Stigende';
-$lang['nb_NO']['MemberList']['DESC'] = 'Synkende';
-$lang['nb_NO']['MemberList']['EMAIL'] = 'Epost';
-$lang['nb_NO']['MemberList']['FILTERBYG'] = 'Filtrer etter gruppe';
-$lang['nb_NO']['MemberList']['FN'] = 'Fornavn';
-$lang['nb_NO']['MemberList']['ORDERBY'] = 'Sortert etter';
-$lang['nb_NO']['MemberList']['PASSWD'] = 'Passord';
-$lang['nb_NO']['MemberList']['SEARCH'] = 'Søk';
-$lang['nb_NO']['MemberList']['SN'] = 'Etternavn';
 $lang['nb_NO']['MemberList.ss']['FILTER'] = 'Filter';
 $lang['nb_NO']['MemberList_PageControls.ss']['DISPLAYING'] = 'Viser';
 $lang['nb_NO']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'medlemmer';
@@ -326,7 +307,6 @@ $lang['nb_NO']['MemberTableField']['SURNAME'] = 'Etternavn';
 $lang['nb_NO']['ModelAdmin']['ADDBUTTON'] = 'Legg til';
 $lang['nb_NO']['ModelAdmin']['ADDFORM'] = 'Fyll ut skjemaet for å legge en %s til databasen';
 $lang['nb_NO']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Velg resultat kolonner...';
-$lang['nb_NO']['ModelAdmin']['CLASSTYPE'] = 'Type';
 $lang['nb_NO']['ModelAdmin']['CLEAR_SEARCH'] = 'Tøm søk';
 $lang['nb_NO']['ModelAdmin']['CREATEBUTTON'] = 'Opprett';
 $lang['nb_NO']['ModelAdmin']['DELETE'] = 'Slett';
@@ -351,7 +331,6 @@ $lang['nb_NO']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Vis spesifikasjo
 $lang['nb_NO']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Relasjoner';
 $lang['nb_NO']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Spesifikasjon for %s';
 $lang['nb_NO']['ModelAdmin_left.ss']['ADDLISTING'] = 'Legg til en liste';
-$lang['nb_NO']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Legg til';
 $lang['nb_NO']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Importer';
 $lang['nb_NO']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Søkelister';
 $lang['nb_NO']['ModelAdmin_right.ss']['WELCOME1'] = 'Velkommen til %s. Vennligst velg et av oppføringene i venstre panel.';
@@ -414,7 +393,6 @@ $lang['nb_NO']['StaticExporter']['BASEURL'] = 'Base URL';
 $lang['nb_NO']['StaticExporter']['EXPORTTO'] = 'Eksporter til den mappen';
 $lang['nb_NO']['StaticExporter']['FOLDEREXPORT'] = 'Mappe å eksportere til';
 $lang['nb_NO']['StaticExporter']['NAME'] = 'Statistikk eksportør';
-$lang['nb_NO']['StaticExporter']['ONETHATEXISTS'] = 'Vennligst spesifiser en mappe som eksisterer';
 $lang['nb_NO']['TableListField_PageControls.ss']['DISPLAYING'] = 'Viser';
 $lang['nb_NO']['TableListField_PageControls.ss']['OF'] = 'av';
 $lang['nb_NO']['TableListField_PageControls.ss']['TO'] = 'til';
@@ -422,12 +400,10 @@ $lang['nb_NO']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Vis først';
 $lang['nb_NO']['TableListField_PageControls.ss']['VIEWLAST'] = 'Vis sist';
 $lang['nb_NO']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Vis neste';
 $lang['nb_NO']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Vis forrige';
-$lang['nb_NO']['TaskList.ss']['BY'] = 'av';
 $lang['nb_NO']['ThumbnailStripField']['NOFLASHFOUND'] = 'Ingen flashfiler funnet';
 $lang['nb_NO']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'Ingen flashfiler funnet i';
 $lang['nb_NO']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'Ingen bilder funnet i';
 $lang['nb_NO']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Ingen bilder funnet i ';
-$lang['nb_NO']['ThumbnailStripField']['NOTAFOLDER'] = 'Dette er ikke en mappe';
 $lang['nb_NO']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Velg en mappe over)';
 $lang['nb_NO']['ViewArchivedEmail.ss']['CANACCESS'] = 'Du kan nå nettstedets arkiv på denne linken:';
 $lang['nb_NO']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Du ønsker å se innholdet på vår nettside på';
diff --git a/lang/ne_NP.php b/lang/ne_NP.php
index cc7401c7..06802c38 100644
--- a/lang/ne_NP.php
+++ b/lang/ne_NP.php
@@ -17,8 +17,6 @@ if(array_key_exists('ne_NP', $lang) && is_array($lang['ne_NP'])) {
 }
 
 $lang['ne_NP']['AssetAdmin']['CHOOSEFILE'] = 'फाइल छान्नुहोस्';
-$lang['ne_NP']['AssetAdmin']['CONTENTMODBY'] = 'सामाग्री परिवर्तनिय';
-$lang['ne_NP']['AssetAdmin']['CONTENTUSABLEBY'] = 'सामाग्री प्रयोगयोग्य';
 $lang['ne_NP']['AssetAdmin']['DELETEDX'] = '%s फाइलहरु फालियो । %s';
 $lang['ne_NP']['AssetAdmin']['FILESREADY'] = 'उप्लोओद हुन तयार फाइलहरु:';
 $lang['ne_NP']['AssetAdmin']['MENUTITLE'] = 'फाइल र तस्बिरहरु';
@@ -26,7 +24,6 @@ $lang['ne_NP']['AssetAdmin']['MOVEDX'] = '%s फाइलहरु सारी
 $lang['ne_NP']['AssetAdmin']['NEWFOLDER'] = 'नयाँ फोल्डर';
 $lang['ne_NP']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'उप्लोओद गर्न केही पनी छैन';
 $lang['ne_NP']['AssetAdmin']['NOWBROKEN'] = 'पजेहरुमा टुटेका लिन्कहरु छन् :';
-$lang['ne_NP']['AssetAdmin']['OWNER'] = 'मालिक';
 $lang['ne_NP']['AssetAdmin']['SAVEDFILE'] = '%s फाइल सेभ गरियो';
 $lang['ne_NP']['AssetAdmin']['SAVEFOLDERNAME'] = 'फोल्डरको नाम सेभ गर्नुस्';
 $lang['ne_NP']['AssetAdmin']['UPLOAD'] = 'तल भएका फाइलहरु उप्लोओद गर्नुस्';
@@ -63,7 +60,6 @@ $lang['ne_NP']['CMSMain']['CANCEL'] = 'क्यान्सिल गर्न
 $lang['ne_NP']['CMSMain']['CHOOSEREPORT'] = '(एउटा रिपोर्ट छानुस्)';
 $lang['ne_NP']['CMSMain']['COMPARINGV'] = 'तपाईं #%d र #%d बिच तुलना गर्दै हुनुहुन्छ ।';
 $lang['ne_NP']['CMSMain']['COPYPUBTOSTAGE'] = 'तपाईं साचिकै प्रकाशित सामाग्रीलाई स्टेज साईटमा कपि गर्न चाहानुहुन्छ ?';
-$lang['ne_NP']['CMSMain']['DELETEFP'] = 'प्रकाशित साईट बाट हटाइएको छ';
 $lang['ne_NP']['CMSMain']['EMAIL'] = 'ईमेल';
 $lang['ne_NP']['CMSMain']['GO'] = 'जाउ';
 $lang['ne_NP']['CMSMain']['MENUTITLE'] = 'साईट सामाग्री';
@@ -89,7 +85,6 @@ $lang['ne_NP']['CMSMain']['PUBALLFUN2'] = 'यो बटन थिचे,प्
 $lang['ne_NP']['CMSMain']['PUBPAGES'] = 'भयो: प्रकाशित %d पेजहरु';
 $lang['ne_NP']['CMSMain']['REMOVEDFD'] = 'द्रफ्त साईट बाट हटाइयो';
 $lang['ne_NP']['CMSMain']['REMOVEDPAGE'] = '\'%s\'लाई प्रकाशित साईटबाट हटाइयो ।';
-$lang['ne_NP']['CMSMain']['RESTORE'] = 'पुनर्स्थापना';
 $lang['ne_NP']['CMSMain']['RESTORED'] = '\'%s\' लाइ सफलतापूर्वक पुनर्स्थापना गरियो';
 $lang['ne_NP']['CMSMain']['ROLLBACK'] = 'यो संस्करणमा पुन जाने';
 $lang['ne_NP']['CMSMain']['ROLLEDBACKPUB'] = 'प्रकाशित संस्करणमा गइयो ।  नयाँ संस्करण नम्बर #%d हो ।';
@@ -108,7 +103,6 @@ $lang['ne_NP']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'मापडन्ण
 $lang['ne_NP']['CMSMain_left.ss']['BATCHACTIONS'] = 'ब्याच कार्य';
 $lang['ne_NP']['CMSMain_left.ss']['CHANGED'] = 'परिवर्तन गरियो';
 $lang['ne_NP']['CMSMain_left.ss']['CLOSEBOX'] = 'यो बक्स बन्दगर्न थिचनुहोस्';
-$lang['ne_NP']['CMSMain_left.ss']['COMMENTS'] = 'प्रतिक्रियाहरु';
 $lang['ne_NP']['CMSMain_left.ss']['COMPAREMODE'] = 'तुलनागर्ने मोड (तल २ थिचनुहोस्स)';
 $lang['ne_NP']['CMSMain_left.ss']['CREATE'] = 'बनउ';
 $lang['ne_NP']['CMSMain_left.ss']['DEL'] = 'हटाईयो';
@@ -131,8 +125,6 @@ $lang['ne_NP']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'परिवर्तन
 $lang['ne_NP']['CMSMain_left.ss']['SHOWUNPUB'] = 'प्रकाशित नभएका संस्करणहरु देखाउनुहोस्';
 $lang['ne_NP']['CMSMain_left.ss']['SITECONTENT TITLE'] = ' साईट सामाग्री र बनोट';
 $lang['ne_NP']['CMSMain_left.ss']['SITEREPORTS'] = 'साईट रिपोर्टहरु';
-$lang['ne_NP']['CMSMain_left.ss']['TASKLIST'] = 'कार्य तालिका';
-$lang['ne_NP']['CMSMain_left.ss']['WAITINGON'] = 'कुर्दै छ';
 $lang['ne_NP']['CMSMain_right.ss']['ANYMESSAGE'] = 'के तपाईंसँग तपाईंको सम्पादकलाई कुनै सन्देश छ ?';
 $lang['ne_NP']['CMSMain_right.ss']['CHOOSEPAGE'] = 'कृपया बाँयाबाट एउटा पेज छन्नुहोस् ।';
 $lang['ne_NP']['CMSMain_right.ss']['LOADING'] = 'लोओडिङ...';
@@ -186,13 +178,6 @@ $lang['ne_NP']['LeftAndMain.ss']['SSWEB'] = 'सिल्भरस्त्र
 $lang['ne_NP']['LeftAndMain.ss']['VIEWPAGEIN'] = 'पेज हेर्नुस्:';
 $lang['ne_NP']['LeftAndMain']['STATUSTO'] = 'स्तिति \'%s\' मा बदलियो';
 $lang['ne_NP']['LeftAndMain']['TREESITECONTENT'] = 'साईट सामाग्री';
-$lang['ne_NP']['MemberList']['ADD'] = 'थप';
-$lang['ne_NP']['MemberList']['EMAIL'] = 'ईमेल';
-$lang['ne_NP']['MemberList']['FILTERBYG'] = 'समुहबाट छन्नुहोस्';
-$lang['ne_NP']['MemberList']['FN'] = 'पहिलो नाम';
-$lang['ne_NP']['MemberList']['PASSWD'] = 'पासओड';
-$lang['ne_NP']['MemberList']['SEARCH'] = 'खोज';
-$lang['ne_NP']['MemberList']['SN'] = 'थर';
 $lang['ne_NP']['MemberList.ss']['FILTER'] = 'फिल्टर';
 $lang['ne_NP']['MemberList_Table.ss']['EMAIL'] = 'ईमेल ठेगाना';
 $lang['ne_NP']['MemberList_Table.ss']['FN'] = 'पहिलो नाम';
@@ -239,9 +224,6 @@ $lang['ne_NP']['StaticExporter']['BASEURL'] = 'बेस यू.र्.ल्';
 $lang['ne_NP']['StaticExporter']['EXPORTTO'] = 'त्यो फोल्डरमा निर्यात गर्नुहोस् ';
 $lang['ne_NP']['StaticExporter']['FOLDEREXPORT'] = 'फोल्डर आयत गने ';
 $lang['ne_NP']['StaticExporter']['NAME'] = 'स्टाटिक एक्स्प्लोरेर';
-$lang['ne_NP']['StaticExporter']['ONETHATEXISTS'] = 'कृपया भएको फोल्डर छन्नुहोस् ';
-$lang['ne_NP']['TaskList.ss']['BY'] = 'योद्वरा';
-$lang['ne_NP']['ThumbnailStripField']['NOTAFOLDER'] = 'यो फोल्डर होइन';
 $lang['ne_NP']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(माथिबाट एउटा फोल्डर छन्नुहोस्)';
 $lang['ne_NP']['ViewArchivedEmail.ss']['CANACCESS'] = 'तपाईंले archived साईट यो लिन्कमा भेट्न सक्नुहुन्छ:';
 $lang['ne_NP']['ViewArchivedEmail.ss']['HAVEASKED'] = 'तपाईंले हाम्रो साइटको सामाग्री यसमा हेन खोजनु भयो';
diff --git a/lang/nl_NL.php b/lang/nl_NL.php
index 62e7c991..ce25155c 100644
--- a/lang/nl_NL.php
+++ b/lang/nl_NL.php
@@ -17,8 +17,6 @@ if(array_key_exists('nl_NL', $lang) && is_array($lang['nl_NL'])) {
 }
 
 $lang['nl_NL']['AssetAdmin']['CHOOSEFILE'] = 'Kies een bestand ';
-$lang['nl_NL']['AssetAdmin']['CONTENTMODBY'] = 'Inhoud bewerkbaar door';
-$lang['nl_NL']['AssetAdmin']['CONTENTUSABLEBY'] = 'Inhoud bruikbaar door';
 $lang['nl_NL']['AssetAdmin']['DELETEDX'] = '%s bestanden verwijderd.%s';
 $lang['nl_NL']['AssetAdmin']['FILESREADY'] = 'Bestanden geselecteerd om te uploaden:';
 $lang['nl_NL']['AssetAdmin']['FOLDERDELETED'] = 'map verwijderd.';
@@ -31,16 +29,17 @@ $lang['nl_NL']['AssetAdmin']['NOTEMP'] = 'Er is geen tijdelijke map voor upoads.
 $lang['nl_NL']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Er was niets om te uploaden';
 $lang['nl_NL']['AssetAdmin']['NOWBROKEN'] = 'De volgende pagina\'s hebben nu gebroken links:';
 $lang['nl_NL']['AssetAdmin']['NOWBROKEN2'] = 'De beheerders hebben een email ontvangen en zullen de pagina\'s herstellen.';
-$lang['nl_NL']['AssetAdmin']['OWNER'] = 'Eigenaar';
 $lang['nl_NL']['AssetAdmin']['SAVEDFILE'] = 'Bestand "%s" bewaard';
 $lang['nl_NL']['AssetAdmin']['SAVEFOLDERNAME'] = 'Bewaar map naam';
-$lang['nl_NL']['AssetAdmin']['THUMBSDELETED'] = 'Alle niet-gebruikte miniatuur afbeeldingen zijn verwijderd';
+$lang['nl_NL']['AssetAdmin']['THUMBSDELETED'] = 'Alle ongebruikte miniatuur afbeeldingen zijn verwijderd';
 $lang['nl_NL']['AssetAdmin']['UPLOAD'] = 'Upload onderstaande bestanden';
 $lang['nl_NL']['AssetAdmin']['UPLOADEDX'] = '%s bestanden geupload';
 $lang['nl_NL']['AssetAdmin_left.ss']['CREATE'] = 'Aanmaken';
 $lang['nl_NL']['AssetAdmin_left.ss']['DELETE'] = 'Verwijder';
 $lang['nl_NL']['AssetAdmin_left.ss']['DELFOLDERS'] = 'De geselecteerde mappen verwijderen';
-$lang['nl_NL']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Rangschikken met drag &amp; drop toestaan';
+$lang['nl_NL']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Drag & drop herordenen toestaan';
+$lang['nl_NL']['AssetAdmin_left.ss']['FILESYSTEMSYNC'] = 'Zoek naar nieuwe bestanden';
+$lang['nl_NL']['AssetAdmin_left.ss']['FILESYSTEMSYNC_DESC'] = 'Silverstripe houdt een eigen database bij van bestanden en afbeeldingen in de assets/ map. Klik op deze knop om de database bij te werken, als er bestanden buiten Silverstripe om, bijvoorbeeld via FPT, zijn toegevoegd aan de assets map.';
 $lang['nl_NL']['AssetAdmin_left.ss']['FOLDERS'] = 'Mappen';
 $lang['nl_NL']['AssetAdmin_left.ss']['GO'] = 'Doen';
 $lang['nl_NL']['AssetAdmin_left.ss']['SELECTTODEL'] = 'Selecteer de mappen die U wilt verwijderen en klik op de onderstaande knop';
@@ -48,6 +47,7 @@ $lang['nl_NL']['AssetAdmin_left.ss']['TOREORG'] = 'Herschik de mappen door ze te
 $lang['nl_NL']['AssetAdmin_right.ss']['CHOOSEPAGE'] = 'Kies een pagina aan de linker kant.';
 $lang['nl_NL']['AssetAdmin_right.ss']['WELCOME'] = 'Welkom bij';
 $lang['nl_NL']['AssetAdmin_uploadiframe.ss']['PERMFAILED'] = 'U heeft geen bevoegdheid om bestanden te uploaden naar deze map.';
+$lang['nl_NL']['AssetAdmin_uploadiframe.ss']['TITLE'] = 'Afbeelding Upload Iframe';
 $lang['nl_NL']['AssetTableField']['CAPTION'] = 'Onderschrift';
 $lang['nl_NL']['AssetTableField']['CREATED'] = 'Eerste upload';
 $lang['nl_NL']['AssetTableField']['DIM'] = 'Dimensies';
@@ -73,24 +73,34 @@ $lang['nl_NL']['AssetTableField']['SWFFILEOPTIONS'] = 'Opties voor SWF-bestand';
 $lang['nl_NL']['AssetTableField']['TITLE'] = 'Titel';
 $lang['nl_NL']['AssetTableField']['TYPE'] = 'Type';
 $lang['nl_NL']['AssetTableField']['URL'] = 'URL';
+$lang['nl_NL']['CMSBatchActions']['DELETED_PAGES'] = '%d pagina\'s verwijderd van de gepubliceerde site';
+$lang['nl_NL']['CMSBatchActions']['DELETE_PAGES'] = 'Verwijder van gepubliceerde site';
+$lang['nl_NL']['CMSBatchActions']['DELETING_PAGES'] = 'Verwijder geselecteerde pagina\'s van de gepubliceerde site';
+$lang['nl_NL']['CMSBatchActions']['PUBLISHED_PAGES'] = '%d pagina\'s gepubliceerd';
+$lang['nl_NL']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Pagina\'s publiceren';
+$lang['nl_NL']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publiceer';
+$lang['nl_NL']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'Publicatie van %d pagina\'s ingetrokken';
+$lang['nl_NL']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'Publicatie pagina\'s intrekken';
+$lang['nl_NL']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'Publicatie intrekken';
 $lang['nl_NL']['CMSLeft.ss']['DELPAGE'] = 'Pagina verwijderen...';
 $lang['nl_NL']['CMSLeft.ss']['DELPAGES'] = 'Geselecteerde pagina\'s verwijderen';
 $lang['nl_NL']['CMSLeft.ss']['GO'] = 'Doen';
 $lang['nl_NL']['CMSLeft.ss']['NEWPAGE'] = 'Nieuwe Pagina...';
 $lang['nl_NL']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Selecteer de pagina\'s welke U wilt verwijderen en klik op de onderstaande button';
 $lang['nl_NL']['CMSLeft.ss']['SITECONT'] = 'Site Inhoud';
-$lang['nl_NL']['CMSMain']['ACCESS'] = 'Toegang tot \'%s\' (%s)';
+$lang['nl_NL']['CMSMain']['ACCESS'] = 'Toegang tot \'%s\'';
+$lang['nl_NL']['CMSMain']['ACCESSALLINTERFACES'] = 'Toegang tot alle CMS onderdelen';
 $lang['nl_NL']['CMSMain']['CANCEL'] = 'Annuleren';
 $lang['nl_NL']['CMSMain']['CHOOSEREPORT'] = '(Kies een verslag)';
 $lang['nl_NL']['CMSMain']['COMPARINGV'] = 'U vergelijkt versies %s en %s';
 $lang['nl_NL']['CMSMain']['COPYPUBTOSTAGE'] = 'Wilt U echt de inhoud van de gepubliceerde site kopieren naar de concept site?';
 $lang['nl_NL']['CMSMain']['DELETE'] = 'Verwijderen uit de concept-site';
-$lang['nl_NL']['CMSMain']['DELETEFP'] = 'Uit de gepubliceerde site verwijderen';
 $lang['nl_NL']['CMSMain']['DESCREMOVED'] = 'en %s nakomelingen';
 $lang['nl_NL']['CMSMain']['EMAIL'] = 'Email';
 $lang['nl_NL']['CMSMain']['GO'] = 'Doen';
 $lang['nl_NL']['CMSMain']['MENUTITLE'] = 'Site Inhoud';
 $lang['nl_NL']['CMSMain']['MENUTITLE'] = 'Pagina Inhoud';
+$lang['nl_NL']['CMSMain']['MENUTITLEOPT'] = 'Menu titel';
 $lang['nl_NL']['CMSMain']['METADESCOPT'] = 'Omschrijving';
 $lang['nl_NL']['CMSMain']['METAKEYWORDSOPT'] = 'Sleutelwoorden';
 $lang['nl_NL']['CMSMain']['NEW'] = 'Nieuw';
@@ -116,7 +126,6 @@ $lang['nl_NL']['CMSMain']['REMOVEDFD'] = 'Verwijderd uit de concept site';
 $lang['nl_NL']['CMSMain']['REMOVEDPAGE'] = '\'%s\' verwijderd uit de gepubliceerde site';
 $lang['nl_NL']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Verwijderde \'%s\' uit de concept-site';
 $lang['nl_NL']['CMSMain']['REPORT'] = 'Rapport';
-$lang['nl_NL']['CMSMain']['RESTORE'] = 'Herstellen';
 $lang['nl_NL']['CMSMain']['RESTORED'] = 'Herstellen van \'%s\' is succesvol verlopen.';
 $lang['nl_NL']['CMSMain']['ROLLBACK'] = 'Terugzetten naar deze versie';
 $lang['nl_NL']['CMSMain']['ROLLEDBACKPUB'] = 'Teruggezet naar de gepubliceerde versie. Het nieuwe versie nummer is #%d';
@@ -124,6 +133,7 @@ $lang['nl_NL']['CMSMain']['ROLLEDBACKVERSION'] = 'Teruggezet naar versie #%d. He
 $lang['nl_NL']['CMSMain']['SAVE'] = 'Bewaar';
 $lang['nl_NL']['CMSMain']['SENTTO'] = 'Verzend naar %s %s voor goedkeuring.';
 $lang['nl_NL']['CMSMain']['STATUSOPT'] = 'Status';
+$lang['nl_NL']['CMSMain']['TITLEOPT'] = 'Titel';
 $lang['nl_NL']['CMSMain']['TOTALPAGES'] = 'Totaal aantal pagina\'s: ';
 $lang['nl_NL']['CMSMain']['VERSIONSNOPAGE'] = 'Pagina #%d kon niet worden gevonden.';
 $lang['nl_NL']['CMSMain']['VIEWING'] = 'U bekijkt versie #%s, aangemaakt op %s door %s';
@@ -133,11 +143,11 @@ $lang['nl_NL']['CMSMain']['WORKTODO'] = 'Aan deze <b>%d</b> paginas moet nog doo
 $lang['nl_NL']['CMSMain_dialog.ss']['BUTTONNOTFOUND'] = 'Kan de naam van de knop niet vinden';
 $lang['nl_NL']['CMSMain_dialog.ss']['NOLINKED'] = 'Kan window.linkedObject niet vinden, die de klik op de knop terug moet sturen naar het hoofd venster';
 $lang['nl_NL']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'Toegevoegd aan de concept site, maar nog niet gepubliceerd';
-$lang['nl_NL']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Criteria toevoegen...';
+$lang['nl_NL']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Criteria toevoegen';
 $lang['nl_NL']['CMSMain_left.ss']['BATCHACTIONS'] = 'Batch acties';
 $lang['nl_NL']['CMSMain_left.ss']['CHANGED'] = 'veranderd';
+$lang['nl_NL']['CMSMain_left.ss']['CLEARTITLE'] = 'Bekijk alle items.';
 $lang['nl_NL']['CMSMain_left.ss']['CLOSEBOX'] = 'klik om dit venster te sluiten';
-$lang['nl_NL']['CMSMain_left.ss']['COMMENTS'] = 'Reacties';
 $lang['nl_NL']['CMSMain_left.ss']['COMPAREMODE'] = 'Vergelijk modus (beneden 2 aanklikken)';
 $lang['nl_NL']['CMSMain_left.ss']['CREATE'] = 'Aanmaken';
 $lang['nl_NL']['CMSMain_left.ss']['DEL'] = 'verwijderd';
@@ -147,8 +157,10 @@ $lang['nl_NL']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Gewijzigd op de concept sit
 $lang['nl_NL']['CMSMain_left.ss']['EDITEDSINCE'] = 'Gewijzigd Sinds';
 $lang['nl_NL']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Drag & drop herordenen toestaan';
 $lang['nl_NL']['CMSMain_left.ss']['GO'] = 'Doen';
+$lang['nl_NL']['CMSMain_left.ss']['HIDDEN'] = 'verborgen';
 $lang['nl_NL']['CMSMain_left.ss']['KEY'] = 'Legenda:';
 $lang['nl_NL']['CMSMain_left.ss']['NEW'] = 'nieuw';
+$lang['nl_NL']['CMSMain_left.ss']['NOTINMENU'] = 'Uitgesloten van de navigatie menu\'s';
 $lang['nl_NL']['CMSMain_left.ss']['OPENBOX'] = 'klik om dit venster te openen';
 $lang['nl_NL']['CMSMain_left.ss']['PAGEVERSIONH'] = 'Versies van deze pagina';
 $lang['nl_NL']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Geselecteerde pagina\'s publiceren';
@@ -160,8 +172,6 @@ $lang['nl_NL']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Alleen gewijzigde pagina
 $lang['nl_NL']['CMSMain_left.ss']['SHOWUNPUB'] = 'Niet gepubliceerde versies laten zien';
 $lang['nl_NL']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Site Inhoud en Structuur';
 $lang['nl_NL']['CMSMain_left.ss']['SITEREPORTS'] = 'Site Verslagen';
-$lang['nl_NL']['CMSMain_left.ss']['TASKLIST'] = 'Taaklijst';
-$lang['nl_NL']['CMSMain_left.ss']['WAITINGON'] = 'Wachtend op';
 $lang['nl_NL']['CMSMain_right.ss']['ANYMESSAGE'] = 'Heeft U een bericht voor uw editor?';
 $lang['nl_NL']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Kies een pagina aan de linkerkant.';
 $lang['nl_NL']['CMSMain_right.ss']['LOADING'] = 'aan het laden...';
@@ -183,6 +193,7 @@ $lang['nl_NL']['CommentAdmin']['APPROVED'] = '%s reacties aanvaard.';
 $lang['nl_NL']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Goedgekeurde Reacties';
 $lang['nl_NL']['CommentAdmin']['AUTHOR'] = 'Auteur';
 $lang['nl_NL']['CommentAdmin']['COMMENT'] = 'Reactie';
+$lang['nl_NL']['CommentAdmin']['COMMENTERURL'] = 'URL';
 $lang['nl_NL']['CommentAdmin']['COMMENTS'] = 'Reacties';
 $lang['nl_NL']['CommentAdmin']['COMMENTSAWAITINGMODERATION'] = 'Reacties die op goedkeuring wachten';
 $lang['nl_NL']['CommentAdmin']['DATEPOSTED'] = 'Geplaatst op';
@@ -222,20 +233,28 @@ $lang['nl_NL']['CommentTableField.ss']['SPAM'] = 'spam';
 $lang['nl_NL']['ComplexTableField']['CLOSEPOPUP'] = 'Sluit Popup';
 $lang['nl_NL']['ComplexTableField']['SUCCESSADD'] = 'Toegevoegd %s %s %s';
 $lang['nl_NL']['ImageEditor.ss']['ACTIONS'] = 'acties';
+$lang['nl_NL']['ImageEditor.ss']['ADJUST'] = 'aanpassen';
 $lang['nl_NL']['ImageEditor.ss']['APPLY'] = 'toepassen';
+$lang['nl_NL']['ImageEditor.ss']['BLUR'] = 'vervagen';
+$lang['nl_NL']['ImageEditor.ss']['BRIGHTNESS'] = 'helderheid';
 $lang['nl_NL']['ImageEditor.ss']['CANCEL'] = 'annuleren';
+$lang['nl_NL']['ImageEditor.ss']['CONTRAST'] = 'contract';
 $lang['nl_NL']['ImageEditor.ss']['CROP'] = 'crop';
 $lang['nl_NL']['ImageEditor.ss']['CURRENTACTION'] = 'huidige actie';
 $lang['nl_NL']['ImageEditor.ss']['EDITFUNCTIONS'] = 'bewerk functies';
 $lang['nl_NL']['ImageEditor.ss']['EFFECTS'] = 'effecten';
 $lang['nl_NL']['ImageEditor.ss']['EXIT'] = 'verlaten';
+$lang['nl_NL']['ImageEditor.ss']['GAMMA'] = 'gamma';
+$lang['nl_NL']['ImageEditor.ss']['GREYSCALE'] = 'grijstinten';
 $lang['nl_NL']['ImageEditor.ss']['HEIGHT'] = 'hoogte';
 $lang['nl_NL']['ImageEditor.ss']['REDO'] = 'opnieuw';
 $lang['nl_NL']['ImageEditor.ss']['ROT'] = 'roteren';
 $lang['nl_NL']['ImageEditor.ss']['SAVE'] = 'afbeelding bewaren';
+$lang['nl_NL']['ImageEditor.ss']['SEPIA'] = 'sepia';
 $lang['nl_NL']['ImageEditor.ss']['UNDO'] = 'ongedaan maken';
 $lang['nl_NL']['ImageEditor.ss']['UNTITLED'] = 'Untitled Document';
 $lang['nl_NL']['ImageEditor.ss']['WIDTH'] = 'breedte';
+$lang['nl_NL']['LeftAndMain']['CANT_REORGANISE'] = 'Je hebt niet de juiste rechten om de site structuur te wijzigen. De veranderingen zijn niet opgeslagen.';
 $lang['nl_NL']['LeftAndMain']['CHANGEDURL'] = '  URL veranderd in \'%s\'';
 $lang['nl_NL']['LeftAndMain']['COMMENTS'] = 'Reacties';
 $lang['nl_NL']['LeftAndMain']['FILESIMAGES'] = 'Bestanden & Afbeeldingen';
@@ -261,7 +280,7 @@ $lang['nl_NL']['LeftAndMain.ss']['EDITINCMS'] = 'Wijzig deze pagina in het CMS';
 $lang['nl_NL']['LeftAndMain.ss']['EDITPROFILE'] = 'Profiel';
 $lang['nl_NL']['LeftAndMain.ss']['LOADING'] = 'Aan het laden...';
 $lang['nl_NL']['LeftAndMain.ss']['LOGGEDINAS'] = 'Ingelogd als';
-$lang['nl_NL']['LeftAndMain.ss']['LOGOUT'] = 'uitloggen';
+$lang['nl_NL']['LeftAndMain.ss']['LOGOUT'] = 'Uitloggen';
 $lang['nl_NL']['LeftAndMain.ss']['PUBLIS'] = 'Gepubliceerde Site';
 $lang['nl_NL']['LeftAndMain.ss']['REQUIREJS'] = 'Het CMS vereist dat je JavaScript aan hebt staan.';
 $lang['nl_NL']['LeftAndMain.ss']['SSWEB'] = 'Silverstripe Website';
@@ -271,17 +290,6 @@ $lang['nl_NL']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Pagina weergave:';
 $lang['nl_NL']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' is succesvol gepubliceerd ';
 $lang['nl_NL']['LeftAndMain']['STATUSTO'] = '  Status veranderd naar \'%s\'';
 $lang['nl_NL']['LeftAndMain']['TREESITECONTENT'] = 'Site Inhoud';
-$lang['nl_NL']['MemberList']['ADD'] = 'Toevoegen';
-$lang['nl_NL']['MemberList']['ANYGROUP'] = 'Elke groep';
-$lang['nl_NL']['MemberList']['ASC'] = 'Oplopend';
-$lang['nl_NL']['MemberList']['DESC'] = 'Aflopend';
-$lang['nl_NL']['MemberList']['EMAIL'] = 'Email';
-$lang['nl_NL']['MemberList']['FILTERBYG'] = 'Filter op groep';
-$lang['nl_NL']['MemberList']['FN'] = 'Voornaam';
-$lang['nl_NL']['MemberList']['ORDERBY'] = 'Rangschik naar';
-$lang['nl_NL']['MemberList']['PASSWD'] = 'Wachtwoord';
-$lang['nl_NL']['MemberList']['SEARCH'] = 'Zoeken';
-$lang['nl_NL']['MemberList']['SN'] = 'Achternaam';
 $lang['nl_NL']['MemberList.ss']['FILTER'] = 'Filter';
 $lang['nl_NL']['MemberList_PageControls.ss']['DISPLAYING'] = 'Tonen';
 $lang['nl_NL']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'leden';
@@ -305,6 +313,7 @@ $lang['nl_NL']['MemberTableField']['ANYGROUP'] = 'Elke groep';
 $lang['nl_NL']['MemberTableField']['ASC'] = 'Oplopend';
 $lang['nl_NL']['MemberTableField']['DESC'] = 'Aflopend';
 $lang['nl_NL']['MemberTableField']['EMAIL'] = 'Email';
+$lang['nl_NL']['MemberTableField']['ERRORADDINGUSER'] = 'Fout bij het toewijzen van de gebruiker aan de group : %s';
 $lang['nl_NL']['MemberTableField']['FILTER'] = 'Filter';
 $lang['nl_NL']['MemberTableField']['FILTERBYGROUP'] = 'Filter per groep';
 $lang['nl_NL']['MemberTableField']['FIRSTNAME'] = 'Voornaam';
@@ -313,25 +322,28 @@ $lang['nl_NL']['MemberTableField']['SEARCH'] = 'Zoeken';
 $lang['nl_NL']['MemberTableField.ss']['ADDNEW'] = 'Nieuwe';
 $lang['nl_NL']['MemberTableField.ss']['DELETEMEMBER'] = 'Dit lid verwijderen';
 $lang['nl_NL']['MemberTableField.ss']['EDITMEMBER'] = 'Dit lid wijzigen';
+$lang['nl_NL']['MemberTableField.ss']['NOITEMSFOUND'] = 'Geen items gevonden';
 $lang['nl_NL']['MemberTableField.ss']['SHOWMEMBER'] = 'Dit lid tonen';
 $lang['nl_NL']['MemberTableField']['SURNAME'] = 'Achternaam';
 $lang['nl_NL']['ModelAdmin']['ADDBUTTON'] = 'Toevoegen';
 $lang['nl_NL']['ModelAdmin']['ADDFORM'] = 'Vul dit formulier in voor het toevoegen van %s aan de database.';
 $lang['nl_NL']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Selecteer kolommen met resultaat ...';
-$lang['nl_NL']['ModelAdmin']['CLASSTYPE'] = 'Type';
 $lang['nl_NL']['ModelAdmin']['CLEAR_SEARCH'] = 'Zoek opschonen';
 $lang['nl_NL']['ModelAdmin']['CREATEBUTTON'] = 'Creëer \'%s\'';
 $lang['nl_NL']['ModelAdmin']['DELETE'] = 'Verwijderen';
 $lang['nl_NL']['ModelAdmin']['DELETEDRECORDS'] = '%s Verwijderde resultaten.';
 $lang['nl_NL']['ModelAdmin']['FOUNDRESULTS'] = 'Uw zoekopdracht heeft %s overeenkomende objecten gevonden';
 $lang['nl_NL']['ModelAdmin']['GOBACK'] = 'Terug';
+$lang['nl_NL']['ModelAdmin']['GOFORWARD'] = 'Vooruit';
 $lang['nl_NL']['ModelAdmin']['IMPORT'] = 'Importeren vanuit CSV';
 $lang['nl_NL']['ModelAdmin']['IMPORTEDRECORDS'] = '%s Geïmporteerde resultaten.';
 $lang['nl_NL']['ModelAdmin']['ITEMNOTFOUND'] = 'Ik kan dat object niet vinden';
 $lang['nl_NL']['ModelAdmin']['LOADEDFOREDITING'] = '\'%s\' Geladen voor bewerking.';
+$lang['nl_NL']['ModelAdmin']['NOCSVFILE'] = 'Selecteer een CSV bestand op uw computer om te importeren';
 $lang['nl_NL']['ModelAdmin']['NOIMPORT'] = 'Niks om te importeren';
 $lang['nl_NL']['ModelAdmin']['NORESULTS'] = 'Uw zoekopdracht heeft geen resultaten opgeleverd';
 $lang['nl_NL']['ModelAdmin']['SAVE'] = 'Opslaan';
+$lang['nl_NL']['ModelAdmin']['SEARCHFOR'] = 'Zoek op:';
 $lang['nl_NL']['ModelAdmin']['SEARCHRESULTS'] = 'Zoekresultaten';
 $lang['nl_NL']['ModelAdmin']['SELECTALL'] = 'selecteer alles';
 $lang['nl_NL']['ModelAdmin']['SELECTNONE'] = 'selecteer niets';
@@ -341,20 +353,27 @@ $lang['nl_NL']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Toon specificati
 $lang['nl_NL']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Relaties';
 $lang['nl_NL']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Specificatie voor %s';
 $lang['nl_NL']['ModelAdmin_left.ss']['ADDLISTING'] = 'Toevoegen';
-$lang['nl_NL']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Toevoegen';
 $lang['nl_NL']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Importeer';
 $lang['nl_NL']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Zoeken';
 $lang['nl_NL']['ModelAdmin_right.ss']['WELCOME1'] = 'Welkom op %s. Kies één van de items in het linker deelvenster.';
+$lang['nl_NL']['ModelSidebar.ss']['ADDLISTING'] = 'Toevoegen';
+$lang['nl_NL']['ModelSidebar.ss']['IMPORT_TAB_HEADER'] = 'Importeren';
+$lang['nl_NL']['ModelSidebar.ss']['SEARCHLISTINGS'] = 'Zoeken';
 $lang['nl_NL']['PageComment']['Comment'] = 'Commentaar';
 $lang['nl_NL']['PageComment']['COMMENTBY'] = 'Reactie van \'%s\' op %s';
 $lang['nl_NL']['PageComment']['IsSpam'] = 'Spam?';
 $lang['nl_NL']['PageComment']['Name'] = 'Auteur naam ';
+$lang['nl_NL']['PageComment']['NeedsModeration'] = 'Goedkeuring vereist?';
 $lang['nl_NL']['PageComment']['PLURALNAME'] = 'Pagina Commentaren ';
 $lang['nl_NL']['PageComment']['SINGULARNAME'] = 'Pagina Comentaar';
 $lang['nl_NL']['PageCommentInterface']['COMMENTERURL'] = 'De URL van uw website';
 $lang['nl_NL']['PageCommentInterface']['POST'] = 'Plaats reactie';
 $lang['nl_NL']['PageCommentInterface']['SPAMQUESTION'] = 'Anti-spam vraag: %s';
+$lang['nl_NL']['PageCommentInterface.ss']['COMMENTLOGINERROR'] = 'Je mag geen reacties plaatsen, wanneer je niet bent ingelogd';
+$lang['nl_NL']['PageCommentInterface.ss']['COMMENTPERMISSIONERROR'] = 'en als je de juiste rechten hebt.';
+$lang['nl_NL']['PageCommentInterface.ss']['COMMENTPOSTLOGIN'] = 'Log hier in';
 $lang['nl_NL']['PageCommentInterface.ss']['COMMENTS'] = 'Reacties';
+$lang['nl_NL']['PageCommentInterface.ss']['COMMENTSDISABLED'] = 'De reactiemogelijkheid is uitgeschakeld';
 $lang['nl_NL']['PageCommentInterface.ss']['NEXT'] = 'volgende';
 $lang['nl_NL']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'Er heeft nog niemand gereageerd op deze pagina.';
 $lang['nl_NL']['PageCommentInterface.ss']['POSTCOM'] = 'Plaats uw reactie';
@@ -388,7 +407,7 @@ $lang['nl_NL']['SecurityAdmin']['SGROUPS'] = 'Beveiligingsgroepen';
 $lang['nl_NL']['SecurityAdmin_left.ss']['CREATE'] = 'Aanmaken';
 $lang['nl_NL']['SecurityAdmin_left.ss']['DEL'] = 'Verwijderen';
 $lang['nl_NL']['SecurityAdmin_left.ss']['DELGROUPS'] = 'Geselecteerde groepen verwijderen';
-$lang['nl_NL']['SecurityAdmin_left.ss']['ENABLEDRAGGING'] = 'Rangschikken met drag &amp; drop toestaan';
+$lang['nl_NL']['SecurityAdmin_left.ss']['ENABLEDRAGGING'] = 'Drag & drop herordenen toestaan';
 $lang['nl_NL']['SecurityAdmin_left.ss']['GO'] = 'Doen';
 $lang['nl_NL']['SecurityAdmin_left.ss']['SECGROUPS'] = 'Beveiligingsgroepen';
 $lang['nl_NL']['SecurityAdmin_left.ss']['SELECT'] = 'Selecteer de pagina\'s welke U wilt verwijderen en klik op onderstaande knop';
@@ -403,19 +422,17 @@ $lang['nl_NL']['StaticExporter']['BASEURL'] = 'Basis URL';
 $lang['nl_NL']['StaticExporter']['EXPORTTO'] = 'Exporteren naar die map';
 $lang['nl_NL']['StaticExporter']['FOLDEREXPORT'] = 'Map waarnaar geëxporteerd moet worden';
 $lang['nl_NL']['StaticExporter']['NAME'] = 'Statische export';
-$lang['nl_NL']['StaticExporter']['ONETHATEXISTS'] = 'Geef een map op die bestaat';
+$lang['nl_NL']['TableListField_PageControls.ss']['DISPLAYING'] = 'Toont';
 $lang['nl_NL']['TableListField_PageControls.ss']['OF'] = 'of';
 $lang['nl_NL']['TableListField_PageControls.ss']['TO'] = 'naar';
 $lang['nl_NL']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Bekijk eerste';
 $lang['nl_NL']['TableListField_PageControls.ss']['VIEWLAST'] = 'Bekijk laatste';
 $lang['nl_NL']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Bekijk volgende';
 $lang['nl_NL']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Bekijk vorige';
-$lang['nl_NL']['TaskList.ss']['BY'] = 'door';
 $lang['nl_NL']['ThumbnailStripField']['NOFLASHFOUND'] = 'Geen flash bestanden gevonden';
 $lang['nl_NL']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'Geen flash bestanden gevonden in';
 $lang['nl_NL']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'Geen afbeeldingen gevonden in';
 $lang['nl_NL']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Geen afbeeldingen gevonden';
-$lang['nl_NL']['ThumbnailStripField']['NOTAFOLDER'] = 'Dit is geen map';
 $lang['nl_NL']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Kies een map of zoek hierboven)';
 $lang['nl_NL']['ViewArchivedEmail.ss']['CANACCESS'] = 'U kunt de gearchiveerde site bekijken via deze link:';
 $lang['nl_NL']['ViewArchivedEmail.ss']['HAVEASKED'] = 'U heeft de inhoud van onze site opgevraagd op';
diff --git a/lang/pl_PL.php b/lang/pl_PL.php
index bf94bff6..409b17c6 100644
--- a/lang/pl_PL.php
+++ b/lang/pl_PL.php
@@ -17,8 +17,6 @@ if(array_key_exists('pl_PL', $lang) && is_array($lang['pl_PL'])) {
 }
 
 $lang['pl_PL']['AssetAdmin']['CHOOSEFILE'] = 'Wybierz plik';
-$lang['pl_PL']['AssetAdmin']['CONTENTMODBY'] = 'Zawartość modyfikowalna przez';
-$lang['pl_PL']['AssetAdmin']['CONTENTUSABLEBY'] = 'Zawartość używalna przez ';
 $lang['pl_PL']['AssetAdmin']['DELETEDX'] = 'Usunięto %s plików. %s';
 $lang['pl_PL']['AssetAdmin']['FILESREADY'] = 'Pliki gotowe do wgrania';
 $lang['pl_PL']['AssetAdmin']['FOLDERDELETED'] = 'katalog został usunięty.';
@@ -31,7 +29,6 @@ $lang['pl_PL']['AssetAdmin']['NOTEMP'] = 'Nie ma ustawionego folderu tymczasoweg
 $lang['pl_PL']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Nie ma nic do wgrania';
 $lang['pl_PL']['AssetAdmin']['NOWBROKEN'] = 'Te strony mają zepsute linki';
 $lang['pl_PL']['AssetAdmin']['NOWBROKEN2'] = 'Ich właściciele zostali powiadomieni przez e-maile i poprawią te strony.';
-$lang['pl_PL']['AssetAdmin']['OWNER'] = 'Właściciel';
 $lang['pl_PL']['AssetAdmin']['SAVEDFILE'] = 'Zapisano plik %s';
 $lang['pl_PL']['AssetAdmin']['SAVEFOLDERNAME'] = 'Zapisz nazwę folderu';
 $lang['pl_PL']['AssetAdmin']['THUMBSDELETED'] = 'Wszystkie nieużywane miniatury zostały usunięte.';
@@ -73,6 +70,7 @@ $lang['pl_PL']['AssetTableField']['SWFFILEOPTIONS'] = 'Opcje Pliku SWF';
 $lang['pl_PL']['AssetTableField']['TITLE'] = 'Tytuł';
 $lang['pl_PL']['AssetTableField']['TYPE'] = 'Rodzaj';
 $lang['pl_PL']['AssetTableField']['URL'] = 'URL';
+$lang['pl_PL']['CMSBatchActions']['PUBLISH_PAGES'] = 'Opublikuj';
 $lang['pl_PL']['CMSLeft.ss']['DELPAGE'] = 'Usuń strony ...';
 $lang['pl_PL']['CMSLeft.ss']['DELPAGES'] = 'Usuń zaznaczone strony';
 $lang['pl_PL']['CMSLeft.ss']['GO'] = 'Idż';
@@ -85,7 +83,6 @@ $lang['pl_PL']['CMSMain']['CHOOSEREPORT'] = '(Wybierz raport)';
 $lang['pl_PL']['CMSMain']['COMPARINGV'] = 'Porównaj wersję #%d i #%d';
 $lang['pl_PL']['CMSMain']['COPYPUBTOSTAGE'] = 'Naprawdę chcesz skopiować publikowaną treść tej strony?';
 $lang['pl_PL']['CMSMain']['DELETE'] = 'Usuń ze strony roboczej';
-$lang['pl_PL']['CMSMain']['DELETEFP'] = 'usuń z opublikowanej strony';
 $lang['pl_PL']['CMSMain']['DESCREMOVED'] = 'i %s potomków';
 $lang['pl_PL']['CMSMain']['EMAIL'] = 'E-mail';
 $lang['pl_PL']['CMSMain']['GO'] = 'Idź';
@@ -116,7 +113,6 @@ $lang['pl_PL']['CMSMain']['REMOVEDFD'] = 'Usuń ze strony roboczej';
 $lang['pl_PL']['CMSMain']['REMOVEDPAGE'] = 'Usunięto \'%s\' z opublikowanej strony';
 $lang['pl_PL']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Usunięto \'%s\' z wersji roboczej strony';
 $lang['pl_PL']['CMSMain']['REPORT'] = 'Raport';
-$lang['pl_PL']['CMSMain']['RESTORE'] = 'Odzyskaj';
 $lang['pl_PL']['CMSMain']['RESTORED'] = 'Odzyskiwanie\'%s\' udane';
 $lang['pl_PL']['CMSMain']['ROLLBACK'] = 'Wróć do tej wersji.';
 $lang['pl_PL']['CMSMain']['ROLLEDBACKPUB'] = 'Poprzednia opublikowana wersja. Nowy numer wersji to #%d';
@@ -124,6 +120,7 @@ $lang['pl_PL']['CMSMain']['ROLLEDBACKVERSION'] = 'Poprzednia wersja to #%d. Nowy
 $lang['pl_PL']['CMSMain']['SAVE'] = 'Zapisz';
 $lang['pl_PL']['CMSMain']['SENTTO'] = 'Wysłano do %s %s po akceptację';
 $lang['pl_PL']['CMSMain']['STATUSOPT'] = 'Status';
+$lang['pl_PL']['CMSMain']['TITLEOPT'] = 'Tytuł';
 $lang['pl_PL']['CMSMain']['TOTALPAGES'] = 'W sumie stron:';
 $lang['pl_PL']['CMSMain']['VERSIONSNOPAGE'] = 'Nie można znaleźć strony #%d';
 $lang['pl_PL']['CMSMain']['VIEWING'] = 'Oglądasz wersję #%d, stworzoną %s';
@@ -137,7 +134,6 @@ $lang['pl_PL']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Dodaj kryterium ...';
 $lang['pl_PL']['CMSMain_left.ss']['BATCHACTIONS'] = 'Akcja pliku';
 $lang['pl_PL']['CMSMain_left.ss']['CHANGED'] = 'zmienione';
 $lang['pl_PL']['CMSMain_left.ss']['CLOSEBOX'] = 'kliknij aby zamknąć';
-$lang['pl_PL']['CMSMain_left.ss']['COMMENTS'] = 'Komentarze';
 $lang['pl_PL']['CMSMain_left.ss']['COMPAREMODE'] = 'Tryb porównania (wybierz 2 poniżej)';
 $lang['pl_PL']['CMSMain_left.ss']['CREATE'] = 'Stwórz';
 $lang['pl_PL']['CMSMain_left.ss']['DEL'] = 'usunięte';
@@ -147,8 +143,10 @@ $lang['pl_PL']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Zmieniłeś oczekującą st
 $lang['pl_PL']['CMSMain_left.ss']['EDITEDSINCE'] = 'Edytowane od';
 $lang['pl_PL']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Zezwól na zmianę przenieś i puść ';
 $lang['pl_PL']['CMSMain_left.ss']['GO'] = 'idź';
+$lang['pl_PL']['CMSMain_left.ss']['HIDDEN'] = 'ukryte';
 $lang['pl_PL']['CMSMain_left.ss']['KEY'] = 'Klucz:';
 $lang['pl_PL']['CMSMain_left.ss']['NEW'] = 'nowy';
+$lang['pl_PL']['CMSMain_left.ss']['NOTINMENU'] = 'Nie pokazuj w menu';
 $lang['pl_PL']['CMSMain_left.ss']['OPENBOX'] = 'kliknij aby otworzyć';
 $lang['pl_PL']['CMSMain_left.ss']['PAGEVERSIONH'] = 'Wersja archiwalna strony';
 $lang['pl_PL']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publikuj zaznaczone strony';
@@ -160,8 +158,6 @@ $lang['pl_PL']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Pokaż tylko zmienione s
 $lang['pl_PL']['CMSMain_left.ss']['SHOWUNPUB'] = 'pokaż nieopublikowane wersje';
 $lang['pl_PL']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Zawartość i struktura strony';
 $lang['pl_PL']['CMSMain_left.ss']['SITEREPORTS'] = 'Raporty strony';
-$lang['pl_PL']['CMSMain_left.ss']['TASKLIST'] = 'Lista zadań';
-$lang['pl_PL']['CMSMain_left.ss']['WAITINGON'] = 'Czekam na';
 $lang['pl_PL']['CMSMain_right.ss']['ANYMESSAGE'] = 'Czy masz jakieś wiadomości do edytowania? ';
 $lang['pl_PL']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Proszę wybrać stronę po lewej';
 $lang['pl_PL']['CMSMain_right.ss']['LOADING'] = 'wczytuję...';
@@ -276,17 +272,6 @@ $lang['pl_PL']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Widok strony:';
 $lang['pl_PL']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = 'Opublikowano \'%s\' poprawnie';
 $lang['pl_PL']['LeftAndMain']['STATUSTO'] = 'Status zmieniony na \'%s\'';
 $lang['pl_PL']['LeftAndMain']['TREESITECONTENT'] = 'Zawartość strony';
-$lang['pl_PL']['MemberList']['ADD'] = 'Dodaj';
-$lang['pl_PL']['MemberList']['ANYGROUP'] = 'Dowolna grupa';
-$lang['pl_PL']['MemberList']['ASC'] = 'Rosnąco';
-$lang['pl_PL']['MemberList']['DESC'] = 'Malejąco';
-$lang['pl_PL']['MemberList']['EMAIL'] = 'Email';
-$lang['pl_PL']['MemberList']['FILTERBYG'] = 'Szukaj według grup';
-$lang['pl_PL']['MemberList']['FN'] = 'Imię';
-$lang['pl_PL']['MemberList']['ORDERBY'] = 'Sortuj według';
-$lang['pl_PL']['MemberList']['PASSWD'] = 'Hasło';
-$lang['pl_PL']['MemberList']['SEARCH'] = 'Szukaj';
-$lang['pl_PL']['MemberList']['SN'] = 'Nazwisko';
 $lang['pl_PL']['MemberList.ss']['FILTER'] = 'Filtr';
 $lang['pl_PL']['MemberList_PageControls.ss']['DISPLAYING'] = 'Wyświetlono';
 $lang['pl_PL']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'użytkownicy';
@@ -323,7 +308,6 @@ $lang['pl_PL']['MemberTableField']['SURNAME'] = 'Nazwisko';
 $lang['pl_PL']['ModelAdmin']['ADDBUTTON'] = 'Dodaj';
 $lang['pl_PL']['ModelAdmin']['ADDFORM'] = 'Wypełnij formularz aby dodać %s do bazy danych';
 $lang['pl_PL']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Wybierz kolumny wyniku...';
-$lang['pl_PL']['ModelAdmin']['CLASSTYPE'] = 'Typ';
 $lang['pl_PL']['ModelAdmin']['CLEAR_SEARCH'] = 'Wyczyść Wyszukiwanie';
 $lang['pl_PL']['ModelAdmin']['CREATEBUTTON'] = 'Stwórz \'%s\'';
 $lang['pl_PL']['ModelAdmin']['DELETE'] = 'Usuń';
@@ -348,10 +332,12 @@ $lang['pl_PL']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Pokaż specyfika
 $lang['pl_PL']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Relacje';
 $lang['pl_PL']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Specyfikacja %s';
 $lang['pl_PL']['ModelAdmin_left.ss']['ADDLISTING'] = 'Dodaj Listing';
-$lang['pl_PL']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Dodaj';
 $lang['pl_PL']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Importuj';
 $lang['pl_PL']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Przeszukaj Listingi';
 $lang['pl_PL']['ModelAdmin_right.ss']['WELCOME1'] = 'Witaj w %s. Wybierz jeden z wpisów po lewej.';
+$lang['pl_PL']['ModelSidebar.ss']['ADDLISTING'] = 'Dodaj';
+$lang['pl_PL']['ModelSidebar.ss']['IMPORT_TAB_HEADER'] = 'Importuj';
+$lang['pl_PL']['ModelSidebar.ss']['SEARCHLISTINGS'] = 'Szukaj';
 $lang['pl_PL']['PageComment']['Comment'] = 'Komentarz';
 $lang['pl_PL']['PageComment']['COMMENTBY'] = 'Komentarz \'%s\' do %s';
 $lang['pl_PL']['PageComment']['IsSpam'] = 'Spam?';
@@ -411,7 +397,6 @@ $lang['pl_PL']['StaticExporter']['BASEURL'] = 'Podstawowy URL';
 $lang['pl_PL']['StaticExporter']['EXPORTTO'] = 'Eksportuj do tego folderu';
 $lang['pl_PL']['StaticExporter']['FOLDEREXPORT'] = 'Folder przeniesiony do';
 $lang['pl_PL']['StaticExporter']['NAME'] = 'Statyczny eksport';
-$lang['pl_PL']['StaticExporter']['ONETHATEXISTS'] = 'Proszę wybierz dostępny folder';
 $lang['pl_PL']['TableListField_PageControls.ss']['DISPLAYING'] = 'Wyświetlane';
 $lang['pl_PL']['TableListField_PageControls.ss']['OF'] = 'z';
 $lang['pl_PL']['TableListField_PageControls.ss']['TO'] = 'do';
@@ -419,12 +404,10 @@ $lang['pl_PL']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Zobacz pierwszy
 $lang['pl_PL']['TableListField_PageControls.ss']['VIEWLAST'] = 'Zobacz ostatni';
 $lang['pl_PL']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Zobacz następny';
 $lang['pl_PL']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Zobacz poprzedni';
-$lang['pl_PL']['TaskList.ss']['BY'] = 'przez';
 $lang['pl_PL']['ThumbnailStripField']['NOFLASHFOUND'] = 'Nie znaleziono żadnych plików flash';
 $lang['pl_PL']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'Nie znaleziono plików flash w';
 $lang['pl_PL']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'Nie znaleziono obrazków w';
 $lang['pl_PL']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Nie znaleziono obrazków w';
-$lang['pl_PL']['ThumbnailStripField']['NOTAFOLDER'] = 'To nie jest folder';
 $lang['pl_PL']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Wybierz powyższy folder)
 ';
 $lang['pl_PL']['ViewArchivedEmail.ss']['CANACCESS'] = 'Masz dostęp do archiwalnej strony pod adresem:';
diff --git a/lang/pt_BR.php b/lang/pt_BR.php
index d3b06c22..6a452b23 100644
--- a/lang/pt_BR.php
+++ b/lang/pt_BR.php
@@ -17,8 +17,6 @@ if(array_key_exists('pt_BR', $lang) && is_array($lang['pt_BR'])) {
 }
 
 $lang['pt_BR']['AssetAdmin']['CHOOSEFILE'] = 'Selecione Arquivo';
-$lang['pt_BR']['AssetAdmin']['CONTENTMODBY'] = 'Conteúdos modificáveis por';
-$lang['pt_BR']['AssetAdmin']['CONTENTUSABLEBY'] = 'Conteúdo utilizável por';
 $lang['pt_BR']['AssetAdmin']['DELETEDX'] = '%s files.%s apagados';
 $lang['pt_BR']['AssetAdmin']['FILESREADY'] = 'Arquivos prontos para upload:';
 $lang['pt_BR']['AssetAdmin']['FOLDERDELETED'] = 'pasta excluída.';
@@ -31,7 +29,6 @@ $lang['pt_BR']['AssetAdmin']['NOTEMP'] = 'Não existe pasta para aquivos tempor
 $lang['pt_BR']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Não há nada para fazer upload';
 $lang['pt_BR']['AssetAdmin']['NOWBROKEN'] = 'As páginas listadas a seguir possuem links quebrados:';
 $lang['pt_BR']['AssetAdmin']['NOWBROKEN2'] = 'Os proprietários foram notificados por e-mail e em breve estarão corrigindo as páginas.';
-$lang['pt_BR']['AssetAdmin']['OWNER'] = 'Dono';
 $lang['pt_BR']['AssetAdmin']['SAVEDFILE'] = 'Arquivo guardado %s';
 $lang['pt_BR']['AssetAdmin']['SAVEFOLDERNAME'] = 'Salvar nome da pasta';
 $lang['pt_BR']['AssetAdmin']['THUMBSDELETED'] = 'Todas as miniaturas que não estavam sendo usadas foram excluídas.';
@@ -40,7 +37,7 @@ $lang['pt_BR']['AssetAdmin']['UPLOADEDX'] = 'Upload de %s arquivos';
 $lang['pt_BR']['AssetAdmin_left.ss']['CREATE'] = 'Criar';
 $lang['pt_BR']['AssetAdmin_left.ss']['DELETE'] = 'Remover';
 $lang['pt_BR']['AssetAdmin_left.ss']['DELFOLDERS'] = 'Remover as pastas selecionadas';
-$lang['pt_BR']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Permitir reordenar com arrastar e soltar';
+$lang['pt_BR']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Permitir ordenar (arrastar &amp; soltar)';
 $lang['pt_BR']['AssetAdmin_left.ss']['FOLDERS'] = 'Pastas';
 $lang['pt_BR']['AssetAdmin_left.ss']['GO'] = 'Ir';
 $lang['pt_BR']['AssetAdmin_left.ss']['SELECTTODEL'] = 'Selecione as pastas que deseja remover e, em seguida, clique no botão abaixo';
@@ -86,7 +83,6 @@ $lang['pt_BR']['CMSMain']['CHOOSEREPORT'] = 'Selecione relatório';
 $lang['pt_BR']['CMSMain']['COMPARINGV'] = 'Você está comparando as versões %s e %s';
 $lang['pt_BR']['CMSMain']['COPYPUBTOSTAGE'] = 'Pretende mesmo copiar o conteúdo publicado para o site?';
 $lang['pt_BR']['CMSMain']['DELETE'] = 'Excluir do rascunho do site';
-$lang['pt_BR']['CMSMain']['DELETEFP'] = 'Remover do site publicado';
 $lang['pt_BR']['CMSMain']['DESCREMOVED'] = 'e %s descendentes';
 $lang['pt_BR']['CMSMain']['EMAIL'] = 'E-mail';
 $lang['pt_BR']['CMSMain']['GO'] = 'Ir';
@@ -117,7 +113,6 @@ $lang['pt_BR']['CMSMain']['REMOVEDFD'] = 'Remover do rascunho do site';
 $lang['pt_BR']['CMSMain']['REMOVEDPAGE'] = 'Removido \'%s\' do site publicado';
 $lang['pt_BR']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Removido \'%s\'  do site de rascunho';
 $lang['pt_BR']['CMSMain']['REPORT'] = 'Relatório';
-$lang['pt_BR']['CMSMain']['RESTORE'] = 'Restaurar';
 $lang['pt_BR']['CMSMain']['RESTORED'] = '\'%s\' restaurado com sucesso';
 $lang['pt_BR']['CMSMain']['ROLLBACK'] = 'Reverter para esta versão';
 $lang['pt_BR']['CMSMain']['ROLLEDBACKPUB'] = 'Reverteu para a versão publicada. A n´mero da nova versão é #%d';
@@ -138,7 +133,6 @@ $lang['pt_BR']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Adicionar Critério...
 $lang['pt_BR']['CMSMain_left.ss']['BATCHACTIONS'] = 'Ações em massa';
 $lang['pt_BR']['CMSMain_left.ss']['CHANGED'] = 'alterado';
 $lang['pt_BR']['CMSMain_left.ss']['CLOSEBOX'] = 'clique para fechar caixa';
-$lang['pt_BR']['CMSMain_left.ss']['COMMENTS'] = 'Comentários';
 $lang['pt_BR']['CMSMain_left.ss']['COMPAREMODE'] = 'Modo de comparação (clique 2 abaixo)';
 $lang['pt_BR']['CMSMain_left.ss']['CREATE'] = 'Criar';
 $lang['pt_BR']['CMSMain_left.ss']['DEL'] = 'removido';
@@ -146,7 +140,7 @@ $lang['pt_BR']['CMSMain_left.ss']['DELETECONFIRM'] = 'Remover as páginas seleci
 $lang['pt_BR']['CMSMain_left.ss']['DELETEDSTILLLIVE'] = 'Remover do rascunho do site mas manter no site publicado';
 $lang['pt_BR']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Editar no site rascunho e não publicar';
 $lang['pt_BR']['CMSMain_left.ss']['EDITEDSINCE'] = 'Editado desde';
-$lang['pt_BR']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Permitir reordenamento tipo arrastar e largar';
+$lang['pt_BR']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Permitir ordenar (arrastar &amp; soltar)';
 $lang['pt_BR']['CMSMain_left.ss']['GO'] = 'Ir';
 $lang['pt_BR']['CMSMain_left.ss']['KEY'] = 'Chave:';
 $lang['pt_BR']['CMSMain_left.ss']['NEW'] = 'novo';
@@ -161,8 +155,6 @@ $lang['pt_BR']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Mostrar somente páginas
 $lang['pt_BR']['CMSMain_left.ss']['SHOWUNPUB'] = 'Exibir versões não publicadas';
 $lang['pt_BR']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Conteúdo do Site e Estrutura';
 $lang['pt_BR']['CMSMain_left.ss']['SITEREPORTS'] = 'Relatórios do Site';
-$lang['pt_BR']['CMSMain_left.ss']['TASKLIST'] = 'Lista de Tarefas';
-$lang['pt_BR']['CMSMain_left.ss']['WAITINGON'] = 'Aguardando';
 $lang['pt_BR']['CMSMain_right.ss']['ANYMESSAGE'] = 'Você têm alguma mensagem para o seu editor?';
 $lang['pt_BR']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Por favor, escolha uma página à esquerda.';
 $lang['pt_BR']['CMSMain_right.ss']['LOADING'] = 'carregando...';
@@ -279,17 +271,6 @@ $lang['pt_BR']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Visualização da página:';
 $lang['pt_BR']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = 'Publicado \'%s\' com sucesso';
 $lang['pt_BR']['LeftAndMain']['STATUSTO'] = 'Status alterado para \'%s\'';
 $lang['pt_BR']['LeftAndMain']['TREESITECONTENT'] = 'Conteúdo do Site';
-$lang['pt_BR']['MemberList']['ADD'] = 'Adicionar';
-$lang['pt_BR']['MemberList']['ANYGROUP'] = 'Grupo Qualque';
-$lang['pt_BR']['MemberList']['ASC'] = 'Ascendente';
-$lang['pt_BR']['MemberList']['DESC'] = 'Descendente';
-$lang['pt_BR']['MemberList']['EMAIL'] = 'Email';
-$lang['pt_BR']['MemberList']['FILTERBYG'] = 'Filtar por grupo';
-$lang['pt_BR']['MemberList']['FN'] = 'Primeiro Nome';
-$lang['pt_BR']['MemberList']['ORDERBY'] = 'Ordenar por';
-$lang['pt_BR']['MemberList']['PASSWD'] = 'Senha';
-$lang['pt_BR']['MemberList']['SEARCH'] = 'Busca';
-$lang['pt_BR']['MemberList']['SN'] = 'Sobrenome';
 $lang['pt_BR']['MemberList.ss']['FILTER'] = 'Filtros';
 $lang['pt_BR']['MemberList_PageControls.ss']['DISPLAYING'] = 'Carregando';
 $lang['pt_BR']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'usuários';
@@ -326,7 +307,6 @@ $lang['pt_BR']['MemberTableField']['SURNAME'] = 'Sobrenome';
 $lang['pt_BR']['ModelAdmin']['ADDBUTTON'] = 'Incluir';
 $lang['pt_BR']['ModelAdmin']['ADDFORM'] = 'Preencha este formulário para incluir %s no banco de dados';
 $lang['pt_BR']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Selecione colunas de resultado...';
-$lang['pt_BR']['ModelAdmin']['CLASSTYPE'] = 'Tipo';
 $lang['pt_BR']['ModelAdmin']['CLEAR_SEARCH'] = 'Limpar pesquisa';
 $lang['pt_BR']['ModelAdmin']['CREATEBUTTON'] = 'Criar \'%s\'';
 $lang['pt_BR']['ModelAdmin']['DELETE'] = 'Excluir';
@@ -351,7 +331,6 @@ $lang['pt_BR']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Mostrar dados do
 $lang['pt_BR']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Relacionamentos';
 $lang['pt_BR']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Dados do %s';
 $lang['pt_BR']['ModelAdmin_left.ss']['ADDLISTING'] = 'Incluir';
-$lang['pt_BR']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Incluir';
 $lang['pt_BR']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Importar';
 $lang['pt_BR']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Pesquisia';
 $lang['pt_BR']['ModelAdmin_right.ss']['WELCOME1'] = 'Bem vindo a %s. Por favor, escolha uma das opções no painel esquerdo';
@@ -399,7 +378,7 @@ $lang['pt_BR']['SecurityAdmin']['SGROUPS'] = 'Grupos de segurança';
 $lang['pt_BR']['SecurityAdmin_left.ss']['CREATE'] = 'Criar';
 $lang['pt_BR']['SecurityAdmin_left.ss']['DEL'] = 'Remover';
 $lang['pt_BR']['SecurityAdmin_left.ss']['DELGROUPS'] = 'Remover os grupos selecionados';
-$lang['pt_BR']['SecurityAdmin_left.ss']['ENABLEDRAGGING'] = 'Permitir reordenar com arrastar e soltar';
+$lang['pt_BR']['SecurityAdmin_left.ss']['ENABLEDRAGGING'] = 'Permitir ordenar (arrastar &amp; soltar)';
 $lang['pt_BR']['SecurityAdmin_left.ss']['GO'] = 'Ir';
 $lang['pt_BR']['SecurityAdmin_left.ss']['SECGROUPS'] = 'Grupos de Segurança';
 $lang['pt_BR']['SecurityAdmin_left.ss']['SELECT'] = 'Selecione as páginas que deseja remover e clique no botão abaixo';
@@ -414,7 +393,6 @@ $lang['pt_BR']['StaticExporter']['BASEURL'] = 'URL Base';
 $lang['pt_BR']['StaticExporter']['EXPORTTO'] = 'Exportar para a pasta';
 $lang['pt_BR']['StaticExporter']['FOLDEREXPORT'] = 'Pasta para exportar para';
 $lang['pt_BR']['StaticExporter']['NAME'] = 'Relatório estático';
-$lang['pt_BR']['StaticExporter']['ONETHATEXISTS'] = 'Especifique uma pasta que existe';
 $lang['pt_BR']['TableListField_PageControls.ss']['DISPLAYING'] = 'Mostrando';
 $lang['pt_BR']['TableListField_PageControls.ss']['OF'] = 'de';
 $lang['pt_BR']['TableListField_PageControls.ss']['TO'] = 'para';
@@ -422,12 +400,10 @@ $lang['pt_BR']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Ver o Primeiro'
 $lang['pt_BR']['TableListField_PageControls.ss']['VIEWLAST'] = 'Ver o Ultimo';
 $lang['pt_BR']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Ver o próximo';
 $lang['pt_BR']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Ver o anterior';
-$lang['pt_BR']['TaskList.ss']['BY'] = 'por';
 $lang['pt_BR']['ThumbnailStripField']['NOFLASHFOUND'] = 'Nenhum arquivo flash encontrado';
 $lang['pt_BR']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'Nenhum arquivo flash encontrado';
 $lang['pt_BR']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'Nenhum imagem encontrada';
 $lang['pt_BR']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Nenhuma imagem encontrada';
-$lang['pt_BR']['ThumbnailStripField']['NOTAFOLDER'] = 'Isto não é uma pasta';
 $lang['pt_BR']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Selecione uma pasta ou realize uma pesquisa)';
 $lang['pt_BR']['ViewArchivedEmail.ss']['CANACCESS'] = 'Pode aceder ao site arquivado através deste link:';
 $lang['pt_BR']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Você pediu para ver o conteúdo do nosso site em';
diff --git a/lang/pt_PT.php b/lang/pt_PT.php
index 3f30504c..9c295c6b 100644
--- a/lang/pt_PT.php
+++ b/lang/pt_PT.php
@@ -17,8 +17,6 @@ if(array_key_exists('pt_PT', $lang) && is_array($lang['pt_PT'])) {
 }
 
 $lang['pt_PT']['AssetAdmin']['CHOOSEFILE'] = 'Escolha ficheiro ';
-$lang['pt_PT']['AssetAdmin']['CONTENTMODBY'] = 'Conteúdo modificável por';
-$lang['pt_PT']['AssetAdmin']['CONTENTUSABLEBY'] = 'Conteúdo usável por';
 $lang['pt_PT']['AssetAdmin']['DELETEDX'] = '%s ficheiros apagado(s).%s';
 $lang['pt_PT']['AssetAdmin']['FILESREADY'] = 'Ficheiros prontos a enviar:';
 $lang['pt_PT']['AssetAdmin']['FOLDERDELETED'] = 'Pasta Apagada.';
@@ -30,7 +28,6 @@ $lang['pt_PT']['AssetAdmin']['NEWFOLDER'] = 'Nova Pasta';
 $lang['pt_PT']['AssetAdmin']['NOTEMP'] = 'Não existe nenhuma pasta temporária para o envio de ficheiros. Por favor adicione upload_tmp_dir no ficheiro php.ini.';
 $lang['pt_PT']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Não existe nada para enviar';
 $lang['pt_PT']['AssetAdmin']['NOWBROKEN'] = 'Esta páginas contêm agora links quebrados:';
-$lang['pt_PT']['AssetAdmin']['OWNER'] = 'Proprietário';
 $lang['pt_PT']['AssetAdmin']['SAVEDFILE'] = 'Ficheiro %s gravado';
 $lang['pt_PT']['AssetAdmin']['SAVEFOLDERNAME'] = 'Gravar nome da pasta';
 $lang['pt_PT']['AssetAdmin']['UPLOAD'] = 'Enviar os ficheiros abaixo';
@@ -72,7 +69,6 @@ $lang['pt_PT']['CMSMain']['CHOOSEREPORT'] = '(Escolha Relatório)';
 $lang['pt_PT']['CMSMain']['COMPARINGV'] = 'Encontra-se a comparar a versão #%s e #%s';
 $lang['pt_PT']['CMSMain']['COPYPUBTOSTAGE'] = 'Tem a certeza que deseja copiar o conteúdo publicado para o site de rascunho?';
 $lang['pt_PT']['CMSMain']['DELETE'] = 'Apagar do site de rascunho';
-$lang['pt_PT']['CMSMain']['DELETEFP'] = 'Apagado do site publicado';
 $lang['pt_PT']['CMSMain']['EMAIL'] = 'Email';
 $lang['pt_PT']['CMSMain']['GO'] = 'Ir';
 $lang['pt_PT']['CMSMain']['MENUTITLE'] = 'Conteúdo do Site';
@@ -106,7 +102,6 @@ $lang['pt_PT']['CMSMain']['REMOVEDFD'] = 'Removido do site de rascunho';
 $lang['pt_PT']['CMSMain']['REMOVEDPAGE'] = '\'%s\' removido do site publicado';
 $lang['pt_PT']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Página \'%s\' apagada do site de rascunho';
 $lang['pt_PT']['CMSMain']['REPORT'] = 'Relatório';
-$lang['pt_PT']['CMSMain']['RESTORE'] = 'Restaurar';
 $lang['pt_PT']['CMSMain']['RESTORED'] = '\'%s\' restaurado com sucesso';
 $lang['pt_PT']['CMSMain']['ROLLBACK'] = 'Reverter para esta versão';
 $lang['pt_PT']['CMSMain']['ROLLEDBACKPUB'] = 'Revertido para a versão publicada. Novo número de versão é #%d';
@@ -126,7 +121,6 @@ $lang['pt_PT']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Adicionar Critério...
 $lang['pt_PT']['CMSMain_left.ss']['BATCHACTIONS'] = 'Acções de Volume';
 $lang['pt_PT']['CMSMain_left.ss']['CHANGED'] = 'alterado';
 $lang['pt_PT']['CMSMain_left.ss']['CLOSEBOX'] = 'clique para fechar esta caixa';
-$lang['pt_PT']['CMSMain_left.ss']['COMMENTS'] = 'Comentários';
 $lang['pt_PT']['CMSMain_left.ss']['COMPAREMODE'] = 'Modo de Comparação (clicar 2 abaixo)';
 $lang['pt_PT']['CMSMain_left.ss']['CREATE'] = 'Criar';
 $lang['pt_PT']['CMSMain_left.ss']['DEL'] = 'apagado';
@@ -149,8 +143,6 @@ $lang['pt_PT']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Mostrar apenas páginas
 $lang['pt_PT']['CMSMain_left.ss']['SHOWUNPUB'] = 'Mostrar versões não publicadas';
 $lang['pt_PT']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Conteúdo do Site e Estrutura';
 $lang['pt_PT']['CMSMain_left.ss']['SITEREPORTS'] = 'Relatórios do Site';
-$lang['pt_PT']['CMSMain_left.ss']['TASKLIST'] = 'Lista de Tarefas';
-$lang['pt_PT']['CMSMain_left.ss']['WAITINGON'] = 'A esperar por';
 $lang['pt_PT']['CMSMain_right.ss']['ANYMESSAGE'] = 'Tem alguma mensagem para o seu editor?';
 $lang['pt_PT']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Por favor escolha uma página na esquerda.';
 $lang['pt_PT']['CMSMain_right.ss']['LOADING'] = 'a carregar...';
@@ -249,17 +241,6 @@ $lang['pt_PT']['LeftAndMain.ss']['VIEWINPUBLISHED'] = 'Ver a página no site pub
 $lang['pt_PT']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Ver Página:';
 $lang['pt_PT']['LeftAndMain']['STATUSTO'] = 'Estado alterado para \'%s\'';
 $lang['pt_PT']['LeftAndMain']['TREESITECONTENT'] = 'Conteúdo';
-$lang['pt_PT']['MemberList']['ADD'] = 'Adicionar';
-$lang['pt_PT']['MemberList']['ANYGROUP'] = 'Qualquer grupo';
-$lang['pt_PT']['MemberList']['ASC'] = 'Ascendente';
-$lang['pt_PT']['MemberList']['DESC'] = 'Descendente';
-$lang['pt_PT']['MemberList']['EMAIL'] = 'Email';
-$lang['pt_PT']['MemberList']['FILTERBYG'] = 'Filtrar por grupo';
-$lang['pt_PT']['MemberList']['FN'] = 'Primeiro Nome';
-$lang['pt_PT']['MemberList']['ORDERBY'] = 'Ordenar por';
-$lang['pt_PT']['MemberList']['PASSWD'] = 'Password';
-$lang['pt_PT']['MemberList']['SEARCH'] = 'Procurar';
-$lang['pt_PT']['MemberList']['SN'] = 'Sobrenome';
 $lang['pt_PT']['MemberList.ss']['FILTER'] = 'Filtro';
 $lang['pt_PT']['MemberList_PageControls.ss']['NEXTMEMBERS'] = 'Membros';
 $lang['pt_PT']['MemberList_PageControls.ss']['VIEWNEXT'] = 'Ver próximo';
@@ -283,7 +264,6 @@ $lang['pt_PT']['MemberTableField.ss']['DELETEMEMBER'] = 'Apagar este membro';
 $lang['pt_PT']['MemberTableField.ss']['EDITMEMBER'] = 'Editar este membro';
 $lang['pt_PT']['MemberTableField.ss']['SHOWMEMBER'] = 'Mostrar este membro';
 $lang['pt_PT']['MemberTableField']['SURNAME'] = 'Apelido';
-$lang['pt_PT']['ModelAdmin']['CLASSTYPE'] = 'tipo';
 $lang['pt_PT']['ModelAdmin']['CREATEBUTTON'] = 'Criar \'%s\'';
 $lang['pt_PT']['PageComment']['COMMENTBY'] = 'Comentário por \'%s\' em \'%s\'';
 $lang['pt_PT']['PageComment']['PLURALNAME'] = 'Comentários da página';
@@ -333,10 +313,7 @@ $lang['pt_PT']['StaticExporter']['BASEURL'] = 'URL Base';
 $lang['pt_PT']['StaticExporter']['EXPORTTO'] = 'Exportar para esta pasta';
 $lang['pt_PT']['StaticExporter']['FOLDEREXPORT'] = 'Pasta para onde exportar';
 $lang['pt_PT']['StaticExporter']['NAME'] = 'Exportador estático';
-$lang['pt_PT']['StaticExporter']['ONETHATEXISTS'] = 'Por favor, especifique uma pasta existente';
-$lang['pt_PT']['TaskList.ss']['BY'] = 'por';
 $lang['pt_PT']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Imagens não encontradas em';
-$lang['pt_PT']['ThumbnailStripField']['NOTAFOLDER'] = 'Não é uma pasta';
 $lang['pt_PT']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Escolha uma pasta acima)';
 $lang['pt_PT']['ViewArchivedEmail.ss']['CANACCESS'] = 'Pode aceder ao site arquivado através deste link:';
 $lang['pt_PT']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Pediu para ver o conteúdo do seu site em';
diff --git a/lang/ru_RU.php b/lang/ru_RU.php
index 52e5ee3f..538b91a7 100644
--- a/lang/ru_RU.php
+++ b/lang/ru_RU.php
@@ -17,8 +17,6 @@ if(array_key_exists('ru_RU', $lang) && is_array($lang['ru_RU'])) {
 }
 
 $lang['ru_RU']['AssetAdmin']['CHOOSEFILE'] = 'Выберите файл';
-$lang['ru_RU']['AssetAdmin']['CONTENTMODBY'] = 'Редакторы содержимого:';
-$lang['ru_RU']['AssetAdmin']['CONTENTUSABLEBY'] = 'Пользователи содержимого:';
 $lang['ru_RU']['AssetAdmin']['DELETEDX'] = 'Удалено файлов: %s. %s';
 $lang['ru_RU']['AssetAdmin']['FILESREADY'] = 'Файлы готовые к загрузке:';
 $lang['ru_RU']['AssetAdmin']['FOLDERDELETED'] = 'папка удалена.';
@@ -31,7 +29,6 @@ $lang['ru_RU']['AssetAdmin']['NOTEMP'] = 'Временная папка для 
 $lang['ru_RU']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Ничего не было для загрузки';
 $lang['ru_RU']['AssetAdmin']['NOWBROKEN'] = 'Эти страницы сейчас содержат неверные ссылки:';
 $lang['ru_RU']['AssetAdmin']['NOWBROKEN2'] = 'Их владельцы уведомлены по email и исправят эти страницы.';
-$lang['ru_RU']['AssetAdmin']['OWNER'] = 'Владелец';
 $lang['ru_RU']['AssetAdmin']['SAVEDFILE'] = 'Файл %s сохранен';
 $lang['ru_RU']['AssetAdmin']['SAVEFOLDERNAME'] = 'Сохранить имя папки';
 $lang['ru_RU']['AssetAdmin']['THUMBSDELETED'] = 'Все неиспользуемые миниатюры были удалены';
@@ -86,7 +83,6 @@ $lang['ru_RU']['CMSMain']['CHOOSEREPORT'] = '(Выберите отчёт)';
 $lang['ru_RU']['CMSMain']['COMPARINGV'] = 'Вы сравниваете версии #%d и #%d';
 $lang['ru_RU']['CMSMain']['COPYPUBTOSTAGE'] = 'Вы действительно хотите скопировать опубликованное содержимое в черновой сайт?';
 $lang['ru_RU']['CMSMain']['DELETE'] = 'Удалить с чернового сайта';
-$lang['ru_RU']['CMSMain']['DELETEFP'] = 'Удалить с опубликованного сайта';
 $lang['ru_RU']['CMSMain']['DESCREMOVED'] = 'и %s зависимых';
 $lang['ru_RU']['CMSMain']['EMAIL'] = 'Email';
 $lang['ru_RU']['CMSMain']['GO'] = 'Перейти';
@@ -117,7 +113,6 @@ $lang['ru_RU']['CMSMain']['REMOVEDFD'] = 'Удалено с чернового 
 $lang['ru_RU']['CMSMain']['REMOVEDPAGE'] = 'Удалено \'%s\' с опубликованного сайта';
 $lang['ru_RU']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Удалено \'%s\' с чернового сайта';
 $lang['ru_RU']['CMSMain']['REPORT'] = 'Отчет';
-$lang['ru_RU']['CMSMain']['RESTORE'] = 'Восстановить';
 $lang['ru_RU']['CMSMain']['RESTORED'] = '\'%s\' успешно восстановлено';
 $lang['ru_RU']['CMSMain']['ROLLBACK'] = 'Откатить до этой версии';
 $lang['ru_RU']['CMSMain']['ROLLEDBACKPUB'] = 'Произведен откат до опубликованной версии. Новая версия #%d';
@@ -138,7 +133,6 @@ $lang['ru_RU']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Добавить кр
 $lang['ru_RU']['CMSMain_left.ss']['BATCHACTIONS'] = 'Пакетные действия';
 $lang['ru_RU']['CMSMain_left.ss']['CHANGED'] = 'изменено';
 $lang['ru_RU']['CMSMain_left.ss']['CLOSEBOX'] = 'нажмите, чтобы закрыть окно';
-$lang['ru_RU']['CMSMain_left.ss']['COMMENTS'] = 'Комментарии';
 $lang['ru_RU']['CMSMain_left.ss']['COMPAREMODE'] = 'Режим сравнения (кликните 2 ниже)';
 $lang['ru_RU']['CMSMain_left.ss']['CREATE'] = 'Создать';
 $lang['ru_RU']['CMSMain_left.ss']['DEL'] = 'удалено';
@@ -161,8 +155,6 @@ $lang['ru_RU']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Показать тол
 $lang['ru_RU']['CMSMain_left.ss']['SHOWUNPUB'] = 'Показать неопубликованные';
 $lang['ru_RU']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Содержимое и Структура сайта';
 $lang['ru_RU']['CMSMain_left.ss']['SITEREPORTS'] = 'Отчеты сайта';
-$lang['ru_RU']['CMSMain_left.ss']['TASKLIST'] = 'Список задач';
-$lang['ru_RU']['CMSMain_left.ss']['WAITINGON'] = 'Ожидание';
 $lang['ru_RU']['CMSMain_right.ss']['ANYMESSAGE'] = 'У Вас есть сообщение для вашего редактора?';
 $lang['ru_RU']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Пожалуйста, выберите слева страницу.';
 $lang['ru_RU']['CMSMain_right.ss']['LOADING'] = 'загрузка...';
@@ -279,17 +271,6 @@ $lang['ru_RU']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Вид страниц:';
 $lang['ru_RU']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = 'Запись \'%s\' опубликована';
 $lang['ru_RU']['LeftAndMain']['STATUSTO'] = 'Статус изменен на \'%s\'';
 $lang['ru_RU']['LeftAndMain']['TREESITECONTENT'] = 'Содержимое сайта';
-$lang['ru_RU']['MemberList']['ADD'] = 'Добавить';
-$lang['ru_RU']['MemberList']['ANYGROUP'] = 'Любая группа';
-$lang['ru_RU']['MemberList']['ASC'] = 'По возрастанию';
-$lang['ru_RU']['MemberList']['DESC'] = 'По убыванию';
-$lang['ru_RU']['MemberList']['EMAIL'] = 'Email';
-$lang['ru_RU']['MemberList']['FILTERBYG'] = 'Фильтр по группе';
-$lang['ru_RU']['MemberList']['FN'] = 'Имя';
-$lang['ru_RU']['MemberList']['ORDERBY'] = 'Сортировать';
-$lang['ru_RU']['MemberList']['PASSWD'] = 'Пароль';
-$lang['ru_RU']['MemberList']['SEARCH'] = 'Найти';
-$lang['ru_RU']['MemberList']['SN'] = 'Фамилия';
 $lang['ru_RU']['MemberList.ss']['FILTER'] = 'Фильтр';
 $lang['ru_RU']['MemberList_PageControls.ss']['DISPLAYING'] = 'Показано';
 $lang['ru_RU']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'участников';
@@ -326,7 +307,6 @@ $lang['ru_RU']['MemberTableField']['SURNAME'] = 'Фамилия';
 $lang['ru_RU']['ModelAdmin']['ADDBUTTON'] = 'Добавить';
 $lang['ru_RU']['ModelAdmin']['ADDFORM'] = 'Заполните эту форму, чтобы добавить %s в базу данных.';
 $lang['ru_RU']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Выберете столбцы...';
-$lang['ru_RU']['ModelAdmin']['CLASSTYPE'] = 'Тип';
 $lang['ru_RU']['ModelAdmin']['CLEAR_SEARCH'] = 'Очистить результат поиска';
 $lang['ru_RU']['ModelAdmin']['CREATEBUTTON'] = 'Создать \'%s\'';
 $lang['ru_RU']['ModelAdmin']['DELETE'] = 'Удалить';
@@ -351,7 +331,6 @@ $lang['ru_RU']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Показать
 $lang['ru_RU']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Связи';
 $lang['ru_RU']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Спецификация для %s';
 $lang['ru_RU']['ModelAdmin_left.ss']['ADDLISTING'] = 'Добавить список';
-$lang['ru_RU']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Добавить';
 $lang['ru_RU']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Импорт';
 $lang['ru_RU']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Списки поиска';
 $lang['ru_RU']['ModelAdmin_right.ss']['WELCOME1'] = 'Доро пожаловать %s. Выберите запись в левой панели.';
@@ -414,7 +393,6 @@ $lang['ru_RU']['StaticExporter']['BASEURL'] = 'Базовый URL';
 $lang['ru_RU']['StaticExporter']['EXPORTTO'] = 'Экспорт в эту папку';
 $lang['ru_RU']['StaticExporter']['FOLDEREXPORT'] = 'Папка для экспорта';
 $lang['ru_RU']['StaticExporter']['NAME'] = 'Статический экспорт';
-$lang['ru_RU']['StaticExporter']['ONETHATEXISTS'] = 'Пожалуйста, укажите существующую папку';
 $lang['ru_RU']['TableListField_PageControls.ss']['DISPLAYING'] = 'Отображение';
 $lang['ru_RU']['TableListField_PageControls.ss']['OF'] = ' ';
 $lang['ru_RU']['TableListField_PageControls.ss']['TO'] = ' ';
@@ -422,12 +400,10 @@ $lang['ru_RU']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Первый';
 $lang['ru_RU']['TableListField_PageControls.ss']['VIEWLAST'] = 'Последний';
 $lang['ru_RU']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Следующий';
 $lang['ru_RU']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Предыдущий';
-$lang['ru_RU']['TaskList.ss']['BY'] = '-';
 $lang['ru_RU']['ThumbnailStripField']['NOFLASHFOUND'] = 'Flash-файлы не найдены';
 $lang['ru_RU']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'Флеш-файлов не найдено в';
 $lang['ru_RU']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'Картинок не найдено в';
 $lang['ru_RU']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Не найдено изображений в';
-$lang['ru_RU']['ThumbnailStripField']['NOTAFOLDER'] = 'Это не папка';
 $lang['ru_RU']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Выберите выше папку)';
 $lang['ru_RU']['ViewArchivedEmail.ss']['CANACCESS'] = 'Вы можете посмотреть архивную версию сайта по этой ссылке:';
 $lang['ru_RU']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Вы запросили просмотр содержимого нашего сайта за';
diff --git a/lang/si_LK.php b/lang/si_LK.php
index d99edde6..c4d9266c 100644
--- a/lang/si_LK.php
+++ b/lang/si_LK.php
@@ -17,8 +17,6 @@ if(array_key_exists('si_LK', $lang) && is_array($lang['si_LK'])) {
 }
 
 $lang['si_LK']['AssetAdmin']['CHOOSEFILE'] = 'ලිපිය තෝරන්න';
-$lang['si_LK']['AssetAdmin']['CONTENTMODBY'] = 'අන්ර්ගතය වෙනස් කල හැකි';
-$lang['si_LK']['AssetAdmin']['CONTENTUSABLEBY'] = 'අන්ර්ගතය පාවිච්චි කල හැකි';
 $lang['si_LK']['AssetAdmin']['DELETEDX'] = '%s ලිපි මකන ලදී. %s';
 $lang['si_LK']['AssetAdmin']['FILESREADY'] = 'ලිපි අප්ලෝඩ් කිරීමට සුදානම්';
 $lang['si_LK']['AssetAdmin']['FOLDERDELETED'] = 'ගොනුව මකා ඇත';
@@ -29,7 +27,6 @@ $lang['si_LK']['AssetAdmin']['MOVEDX'] = '%s ලිපි මාරු කරන
 $lang['si_LK']['AssetAdmin']['NEWFOLDER'] = 'අලත් ගොනුවක්';
 $lang['si_LK']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'අප්ලෝඩ් කිරීමට කිසිවක් නැත';
 $lang['si_LK']['AssetAdmin']['NOWBROKEN'] = 'මෙම පිටු වලට කැඩුනු බැදීම් ඇත';
-$lang['si_LK']['AssetAdmin']['OWNER'] = 'අයිතිකරැ';
 $lang['si_LK']['AssetAdmin']['SAVEDFILE'] = 'ලිපිය සේවි කරන ලදී';
 $lang['si_LK']['AssetAdmin']['SAVEFOLDERNAME'] = 'සේවි කරන ගොනු නම ';
 $lang['si_LK']['AssetAdmin']['UPLOAD'] = 'පහත ලිපි අප්ලෝඩ් කරන්න';
@@ -77,7 +74,6 @@ $lang['si_LK']['CMSMain']['CHOOSEREPORT'] = '(වාර්තාවක් තෝ
 $lang['si_LK']['CMSMain']['COMPARINGV'] = 'ඹබ #%d හා #%d සංස්කරන සසදයි';
 $lang['si_LK']['CMSMain']['COPYPUBTOSTAGE'] = 'ඹබට ප්රසිද්ධ කළ පිටුව වේදිකාවට පිටපත් කරන්න අවශයයද?';
 $lang['si_LK']['CMSMain']['DELETE'] = 'කටු අඩවියෙන් මකන්න';
-$lang['si_LK']['CMSMain']['DELETEFP'] = 'ප්රසිද්ධ කල අඩවියෙන් ගලවන්න';
 $lang['si_LK']['CMSMain']['EMAIL'] = 'ඊමේල්';
 $lang['si_LK']['CMSMain']['GO'] = 'යන්න';
 $lang['si_LK']['CMSMain']['MENUTITLE'] = 'වෙබ අඩවි අන්තර්ගතය';
@@ -105,7 +101,6 @@ $lang['si_LK']['CMSMain']['REMOVEDFD'] = 'කටු අඩවියෙන් ග
 $lang['si_LK']['CMSMain']['REMOVEDPAGE'] = '\'%s\'  ප්රසිද්ධ කල අඩවියෙන් ගලවන ලදී';
 $lang['si_LK']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'කටු අඩවියෙන් \'%s\' මකන ලදී';
 $lang['si_LK']['CMSMain']['REPORT'] = 'වාර්තා';
-$lang['si_LK']['CMSMain']['RESTORE'] = 'ප්රතිස්තාපනය කරන්න';
 $lang['si_LK']['CMSMain']['RESTORED'] = '\'%s\' සාර්තකව ප්රතිස්තාපනය ';
 $lang['si_LK']['CMSMain']['ROLLBACK'] = 'මෙම සංස්රනය ඉවත් කරනන්න';
 $lang['si_LK']['CMSMain']['ROLLEDBACKPUB'] = 'ප්රසිද්ධ කල සංස්කරනයට ගෙන යන ලදී. නව සංස්කරන අංකය #%d';
@@ -124,7 +119,6 @@ $lang['si_LK']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'මිමිම එක
 $lang['si_LK']['CMSMain_left.ss']['BATCHACTIONS'] = 'කන්ඩායම් වැඩ';
 $lang['si_LK']['CMSMain_left.ss']['CHANGED'] = 'වෙනස් කරන ලදී';
 $lang['si_LK']['CMSMain_left.ss']['CLOSEBOX'] = 'වැසීමට ඔබන්න';
-$lang['si_LK']['CMSMain_left.ss']['COMMENTS'] = 'විචාර';
 $lang['si_LK']['CMSMain_left.ss']['COMPAREMODE'] = 'සංසන්දනය කිරීම (පහත 2 ඹබන්න)';
 $lang['si_LK']['CMSMain_left.ss']['CREATE'] = 'හදන්න';
 $lang['si_LK']['CMSMain_left.ss']['DEL'] = 'මකන ලද';
@@ -147,8 +141,6 @@ $lang['si_LK']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'වෙනස් පි
 $lang['si_LK']['CMSMain_left.ss']['SHOWUNPUB'] = 'ප්‍රකාශයට පත් නොකරන ලද සංස්කරන';
 $lang['si_LK']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'වෙබ අඩවි අන්තර්ගතය සහ සැකසුම';
 $lang['si_LK']['CMSMain_left.ss']['SITEREPORTS'] = 'අඩවි වාර්තා';
-$lang['si_LK']['CMSMain_left.ss']['TASKLIST'] = 'වැඩ ලැයිස්තුව';
-$lang['si_LK']['CMSMain_left.ss']['WAITINGON'] = 'බලාපොරොත්තු වෙන් සිටියි';
 $lang['si_LK']['CMSMain_right.ss']['ANYMESSAGE'] = 'ඹබගේ සංස්කාරකට පනිවුඩ තිබේද?';
 $lang['si_LK']['CMSMain_right.ss']['CHOOSEPAGE'] = 'වමෙන් පිටුවක් තෝරනන';
 $lang['si_LK']['CMSMain_right.ss']['LOADING'] = 'ලෝඩ් වෙමින් පවතියි';
@@ -241,17 +233,6 @@ $lang['si_LK']['LeftAndMain.ss']['VIEWPAGEIN'] = 'පිටු දර්ශන
 $lang['si_LK']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' සාර්තකව ප්රසිද්ද කරන ලදී';
 $lang['si_LK']['LeftAndMain']['STATUSTO'] = 'තත්වය වෙනස් කරන ලදී';
 $lang['si_LK']['LeftAndMain']['TREESITECONTENT'] = 'වෙබ අඩවි අන්තර්ගතය';
-$lang['si_LK']['MemberList']['ADD'] = 'එකතු කරන්න';
-$lang['si_LK']['MemberList']['ANYGROUP'] = 'ඕනෑම කණ්ඩායමක්';
-$lang['si_LK']['MemberList']['ASC'] = 'ආරෝහණය';
-$lang['si_LK']['MemberList']['DESC'] = 'අවරෝහණය';
-$lang['si_LK']['MemberList']['EMAIL'] = 'ඊමේල් ';
-$lang['si_LK']['MemberList']['FILTERBYG'] = 'කන්ඩායමෙන් වෙන් කරන්න';
-$lang['si_LK']['MemberList']['FN'] = 'මුල් නම';
-$lang['si_LK']['MemberList']['ORDERBY'] = 'සැකසීම';
-$lang['si_LK']['MemberList']['PASSWD'] = 'මුරපදය';
-$lang['si_LK']['MemberList']['SEARCH'] = 'සොයන්න';
-$lang['si_LK']['MemberList']['SN'] = 'වාසගම';
 $lang['si_LK']['MemberList.ss']['FILTER'] = 'පෙරන්න';
 $lang['si_LK']['MemberList_PageControls.ss']['DISPLAYING'] = 'දර්ශනය වේ';
 $lang['si_LK']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'සාමාජිකයන්';
@@ -284,7 +265,6 @@ $lang['si_LK']['MemberTableField.ss']['DELETEMEMBER'] = 'මෙම සාමා
 $lang['si_LK']['MemberTableField.ss']['EDITMEMBER'] = 'මෙම සාමාජිකයා සංස්කරනය කරන්න';
 $lang['si_LK']['MemberTableField.ss']['SHOWMEMBER'] = 'මෙම සාමාජිකයා පෙන්වන්න';
 $lang['si_LK']['MemberTableField']['SURNAME'] = 'වාසගම';
-$lang['si_LK']['ModelAdmin']['CLASSTYPE'] = 'ලියන්න';
 $lang['si_LK']['ModelAdmin']['CREATEBUTTON'] = '\'%s\' හදන්න';
 $lang['si_LK']['PageComment']['COMMENTBY'] = '\'%s\' විසින් %s  විචාර කරන ලදී';
 $lang['si_LK']['PageComment']['PLURALNAME'] = 'පිටු විචාර';
@@ -332,10 +312,7 @@ $lang['si_LK']['StaticExporter']['BASEURL'] = 'පාදම් URL';
 $lang['si_LK']['StaticExporter']['EXPORTTO'] = 'ඵම ගොනුවට අපනයනය කරන්නන';
 $lang['si_LK']['StaticExporter']['FOLDEREXPORT'] = 'අපනයනය කරන ගොනුව';
 $lang['si_LK']['StaticExporter']['NAME'] = 'ස්තිතික අපනයනය කරන්නා';
-$lang['si_LK']['StaticExporter']['ONETHATEXISTS'] = 'පවතින ගොනුවක් තෝරන්න';
-$lang['si_LK']['TaskList.ss']['BY'] = 'විසින්';
 $lang['si_LK']['ThumbnailStripField']['NOIMAGESFOUND'] = 'පිංතූර නැත';
-$lang['si_LK']['ThumbnailStripField']['NOTAFOLDER'] = 'මෙය ගොනුවක් නොවේ';
 $lang['si_LK']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(ඉහතින් ගොනුවක් තෝරන්න)';
 $lang['si_LK']['ViewArchivedEmail.ss']['CANACCESS'] = 'මෙම බැදීමෙන් පැරනි අඩවියට ප්රවිෂ්ට විය හැක';
 $lang['si_LK']['ViewArchivedEmail.ss']['HAVEASKED'] = 'ඹබට අපගේ වෙබ් අඩවිය නිරීක්ශනය කරන ලෙස ඉල්ලා ඇත';
diff --git a/lang/sk_SK.php b/lang/sk_SK.php
index c91e9614..839fce13 100644
--- a/lang/sk_SK.php
+++ b/lang/sk_SK.php
@@ -17,16 +17,14 @@ if(array_key_exists('sk_SK', $lang) && is_array($lang['sk_SK'])) {
 }
 
 $lang['sk_SK']['AssetAdmin']['CHOOSEFILE'] = 'Vybrať súbor';
-$lang['sk_SK']['AssetAdmin']['CONTENTMODBY'] = 'Obsah upraviteľný pre';
-$lang['sk_SK']['AssetAdmin']['CONTENTUSABLEBY'] = 'Obsah použiteľný pre';
 $lang['sk_SK']['AssetAdmin']['DELETEDX'] = 'Odstránených %s súborov.%s';
 $lang['sk_SK']['AssetAdmin']['FILESREADY'] = 'Súbory pripravené na nahranie:';
 $lang['sk_SK']['AssetAdmin']['MENUTITLE'] = 'Súbory a obrázky';
+$lang['sk_SK']['AssetAdmin']['MENUTITLE'] = 'Súbory a obrázky';
 $lang['sk_SK']['AssetAdmin']['MOVEDX'] = 'Presunuté %s súbory';
 $lang['sk_SK']['AssetAdmin']['NEWFOLDER'] = 'Nový Adresár';
 $lang['sk_SK']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Žiadne súbory na nahranie';
 $lang['sk_SK']['AssetAdmin']['NOWBROKEN'] = 'Tieto stránky majú momentálne nefunkčné odkazy:';
-$lang['sk_SK']['AssetAdmin']['OWNER'] = 'Vlastník';
 $lang['sk_SK']['AssetAdmin']['SAVEDFILE'] = 'Súbor uložený %s';
 $lang['sk_SK']['AssetAdmin']['SAVEFOLDERNAME'] = 'Uložiť meno adresára';
 $lang['sk_SK']['AssetAdmin']['UPLOAD'] = 'Nahrať nižšie vypísané súbory';
@@ -34,6 +32,7 @@ $lang['sk_SK']['AssetAdmin']['UPLOADEDX'] = 'Nahraných %s súborov';
 $lang['sk_SK']['AssetAdmin_left.ss']['CREATE'] = 'Vytvoriť';
 $lang['sk_SK']['AssetAdmin_left.ss']['DELETE'] = 'Vymazať';
 $lang['sk_SK']['AssetAdmin_left.ss']['DELFOLDERS'] = 'Vymazať vybrané adresáre';
+$lang['sk_SK']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Povoliť jednoduché organizovanie pretiahnutím';
 $lang['sk_SK']['AssetAdmin_left.ss']['FOLDERS'] = 'Adresáre';
 $lang['sk_SK']['AssetAdmin_left.ss']['GO'] = 'Vykonať';
 $lang['sk_SK']['AssetAdmin_left.ss']['SELECTTODEL'] = 'Vyberte adresáre, ktoré chcete vymazať a kliknite na tlačidlo nižšie';
@@ -43,16 +42,22 @@ $lang['sk_SK']['AssetAdmin_right.ss']['WELCOME'] = 'Vitajte v';
 $lang['sk_SK']['AssetAdmin_uploadiframe.ss']['PERMFAILED'] = 'Nemáte oprávnenie nahrávať súbory do tohto adresára.';
 $lang['sk_SK']['AssetTableField']['CREATED'] = 'Prvýkrát nahrané';
 $lang['sk_SK']['AssetTableField']['DIM'] = 'Rozmery';
+$lang['sk_SK']['AssetTableField']['EDITIMAGE'] = 'Upraviť obrázok';
 $lang['sk_SK']['AssetTableField']['FILENAME'] = 'Názov';
+$lang['sk_SK']['AssetTableField']['GALLERYOPTIONS'] = 'Nastavenia galérie';
+$lang['sk_SK']['AssetTableField']['IMAGE'] = 'Obrázok';
 $lang['sk_SK']['AssetTableField']['LASTEDIT'] = 'Posledne zmenené';
 $lang['sk_SK']['AssetTableField']['NOLINKS'] = 'Na tento súbor nevedie odkaz zo žiadnej stránky';
 $lang['sk_SK']['AssetTableField']['OWNER'] = 'Vlastník';
 $lang['sk_SK']['AssetTableField']['PAGESLINKING'] = 'Nasledujúce stránky odkazujú na tento súbor:';
+$lang['sk_SK']['AssetTableField']['POPUPHEIGHT'] = 'Výška popup okna';
+$lang['sk_SK']['AssetTableField']['POPUPWIDTH'] = 'Šírka popup okna';
 $lang['sk_SK']['AssetTableField']['SIZE'] = 'Veľkosť';
 $lang['sk_SK']['AssetTableField.ss']['DELFILE'] = 'Vymazať tento súbor';
 $lang['sk_SK']['AssetTableField.ss']['DRAGTOFOLDER'] = 'Súbor presuniete pretiahnutím do adresára vľavo';
 $lang['sk_SK']['AssetTableField']['TITLE'] = 'Titulok';
 $lang['sk_SK']['AssetTableField']['TYPE'] = 'Typ';
+$lang['sk_SK']['AssetTableField']['URL'] = 'URL';
 $lang['sk_SK']['CMSLeft.ss']['DELPAGE'] = 'Vymazať stránky...';
 $lang['sk_SK']['CMSLeft.ss']['DELPAGES'] = 'Vymazať vybrané stránky';
 $lang['sk_SK']['CMSLeft.ss']['GO'] = 'Vykonať';
@@ -63,10 +68,10 @@ $lang['sk_SK']['CMSMain']['CANCEL'] = 'Zrušiť';
 $lang['sk_SK']['CMSMain']['CHOOSEREPORT'] = '(Vyberte správu)';
 $lang['sk_SK']['CMSMain']['COMPARINGV'] = 'Porovnávate verzie #%d a #%d';
 $lang['sk_SK']['CMSMain']['COPYPUBTOSTAGE'] = 'Naozaj chcete skopírovať publikovaný obsah do úschovne?';
-$lang['sk_SK']['CMSMain']['DELETEFP'] = 'Vymazať z publikovaných článkov';
 $lang['sk_SK']['CMSMain']['EMAIL'] = 'Pošli e-mailom';
 $lang['sk_SK']['CMSMain']['GO'] = 'Vykonať';
 $lang['sk_SK']['CMSMain']['MENUTITLE'] = 'Obsah webu';
+$lang['sk_SK']['CMSMain']['MENUTITLE'] = 'Obsah webu';
 $lang['sk_SK']['CMSMain']['METADESCOPT'] = 'Popis';
 $lang['sk_SK']['CMSMain']['METAKEYWORDSOPT'] = 'Kľúčové slová';
 $lang['sk_SK']['CMSMain']['NEW'] = 'Nový';
@@ -89,7 +94,7 @@ $lang['sk_SK']['CMSMain']['PUBALLFUN2'] = 'Stlačením tohto tlačidla vykonáte
 $lang['sk_SK']['CMSMain']['PUBPAGES'] = 'Dokončené: Publikovaných %d stránok';
 $lang['sk_SK']['CMSMain']['REMOVEDFD'] = 'Vymazané z rozpísaných článkov';
 $lang['sk_SK']['CMSMain']['REMOVEDPAGE'] = 'Odstránené \'%s\' z publikovaného webu';
-$lang['sk_SK']['CMSMain']['RESTORE'] = 'Obnoviť';
+$lang['sk_SK']['CMSMain']['REPORT'] = 'Report';
 $lang['sk_SK']['CMSMain']['RESTORED'] = 'Obnovenie %s úspešné';
 $lang['sk_SK']['CMSMain']['ROLLBACK'] = 'Návrat späť na túto verziu';
 $lang['sk_SK']['CMSMain']['ROLLEDBACKPUB'] = 'Vrátené späť na publikovanú verziu. Číslo novej verzie je #%d';
@@ -109,7 +114,6 @@ $lang['sk_SK']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Pridať kritérium...'
 $lang['sk_SK']['CMSMain_left.ss']['BATCHACTIONS'] = 'Hromadné akcie';
 $lang['sk_SK']['CMSMain_left.ss']['CHANGED'] = 'zmenené';
 $lang['sk_SK']['CMSMain_left.ss']['CLOSEBOX'] = 'kliknite pre zatvorenie tohto poľa';
-$lang['sk_SK']['CMSMain_left.ss']['COMMENTS'] = 'Komentáre';
 $lang['sk_SK']['CMSMain_left.ss']['COMPAREMODE'] = 'Porovnávací mód (kliknite nižšie)';
 $lang['sk_SK']['CMSMain_left.ss']['CREATE'] = 'Vytvoriť';
 $lang['sk_SK']['CMSMain_left.ss']['DEL'] = 'odstránené';
@@ -117,8 +121,9 @@ $lang['sk_SK']['CMSMain_left.ss']['DELETECONFIRM'] = 'Vymazať vybrané stránky
 $lang['sk_SK']['CMSMain_left.ss']['DELETEDSTILLLIVE'] = 'Odstránené z návrhu webu ale stále na aktuálnom webe';
 $lang['sk_SK']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Upravené na návrhovom webe, ešte nepublikované ';
 $lang['sk_SK']['CMSMain_left.ss']['EDITEDSINCE'] = 'Upravené od';
-$lang['sk_SK']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Povoliť jednoduché organizovanie pretiahnutím';
+$lang['sk_SK']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Povoliť jednoduché organizovanie drag & drop';
 $lang['sk_SK']['CMSMain_left.ss']['GO'] = 'Vykonať';
+$lang['sk_SK']['CMSMain_left.ss']['HIDDEN'] = 'skrité';
 $lang['sk_SK']['CMSMain_left.ss']['KEY'] = 'Kľúč:';
 $lang['sk_SK']['CMSMain_left.ss']['NEW'] = 'nový';
 $lang['sk_SK']['CMSMain_left.ss']['OPENBOX'] = 'kliknite pre otvorenie tohto poľa';
@@ -132,8 +137,6 @@ $lang['sk_SK']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Ukázať len zmenené st
 $lang['sk_SK']['CMSMain_left.ss']['SHOWUNPUB'] = 'Ukázať nepublikované verzie';
 $lang['sk_SK']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Obsah a štruktúra webu';
 $lang['sk_SK']['CMSMain_left.ss']['SITEREPORTS'] = 'Správy webu';
-$lang['sk_SK']['CMSMain_left.ss']['TASKLIST'] = 'Zoznam úloh';
-$lang['sk_SK']['CMSMain_left.ss']['WAITINGON'] = 'Čaká sa na ';
 $lang['sk_SK']['CMSMain_right.ss']['ANYMESSAGE'] = 'Máte nejaké správy pre svojho editora?';
 $lang['sk_SK']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Prosím vyberte si stránku zľava.';
 $lang['sk_SK']['CMSMain_right.ss']['LOADING'] = 'nahrávam...';
@@ -150,9 +153,25 @@ $lang['sk_SK']['CMSMain_versions.ss']['WHEN'] = 'Kedy';
 $lang['sk_SK']['CMSRight.ss']['CHOOSEPAGE'] = 'Prosím vyberte si stránku zľava.';
 $lang['sk_SK']['CMSRight.ss']['ECONTENT'] = 'Upraviť obsah';
 $lang['sk_SK']['CMSRight.ss']['WELCOMETO'] = 'Vitajte na';
+$lang['sk_SK']['CommentAdmin']['AUTHOR'] = 'Autor';
+$lang['sk_SK']['CommentAdmin']['COMMENT'] = 'Komentár';
+$lang['sk_SK']['CommentAdmin']['COMMENTS'] = 'Komentáre';
+$lang['sk_SK']['CommentAdmin']['DELETE'] = 'Vymazať';
+$lang['sk_SK']['CommentAdmin']['DELETEALL'] = 'Vymazať všetko';
 $lang['sk_SK']['CommentAdmin']['MENUTITLE'] = 'Komentáre';
+$lang['sk_SK']['CommentAdmin']['MENUTITLE'] = 'Komentáre';
+$lang['sk_SK']['CommentAdmin']['PAGE'] = 'Stránka';
+$lang['sk_SK']['CommentAdmin']['SPAMMARKED'] = 'Označiť ako spam';
+$lang['sk_SK']['CommentAdmin_left.ss']['COMMENTS'] = 'Komentáre';
+$lang['sk_SK']['CommentAdmin_SiteTree.ss']['COMMENTS'] = 'Komentáre';
 $lang['sk_SK']['CommentList.ss']['CREATEDW'] = 'Komentáre sa vytvárajú vždy keď vykonáte nejakú pracovnú akciu - Publikovanie, Odmietnutie, Odovzdanie.';
 $lang['sk_SK']['CommentList.ss']['NOCOM'] = 'Na stránke sa nenachádzajú žiadne komentáre.';
+$lang['sk_SK']['CommentTableField.ss']['DELETE'] = 'vymazať';
+$lang['sk_SK']['CommentTableField.ss']['DELETEROW'] = 'Vymazať riadok';
+$lang['sk_SK']['CommentTableField.ss']['EDIT'] = 'editovať';
+$lang['sk_SK']['CommentTableField.ss']['MARKASSPAM'] = 'Označiť komentár ako spam';
+$lang['sk_SK']['CommentTableField.ss']['SPAM'] = 'spam';
+$lang['sk_SK']['ComplexTableField']['CLOSEPOPUP'] = 'Zatvoriť okno';
 $lang['sk_SK']['ImageEditor.ss']['CANCEL'] = 'zrušiť';
 $lang['sk_SK']['ImageEditor.ss']['CROP'] = 'orezať';
 $lang['sk_SK']['ImageEditor.ss']['HEIGHT'] = 'výška';
@@ -163,15 +182,20 @@ $lang['sk_SK']['ImageEditor.ss']['UNDO'] = 'späť';
 $lang['sk_SK']['ImageEditor.ss']['UNTITLED'] = 'Nepomenovaný dokument';
 $lang['sk_SK']['ImageEditor.ss']['WIDTH'] = 'šírka';
 $lang['sk_SK']['LeftAndMain']['CHANGEDURL'] = 'URL adresa zmenená na \'%s\'';
+$lang['sk_SK']['LeftAndMain']['COMMENTS'] = 'Komentáre';
+$lang['sk_SK']['LeftAndMain']['FILESIMAGES'] = 'Súbory a obrázky';
 $lang['sk_SK']['LeftAndMain']['HELP'] = 'Pomoc';
 $lang['sk_SK']['LeftAndMain']['PAGETYPE'] = 'Typ stránky:';
 $lang['sk_SK']['LeftAndMain']['PERMAGAIN'] = 'Boli ste odhlásený';
 $lang['sk_SK']['LeftAndMain']['PERMALREADY'] = 'Je mi ľúto, ale nemáte prístup k tejto časti CMS. Ak sa chcete prihlásiť ako niekto iný, urobte tak nižšie';
 $lang['sk_SK']['LeftAndMain']['PERMDEFAULT'] = 'Vyberte si prosím metódu autentifikácie a zadajte svoje prístupové údaje k CMS.';
 $lang['sk_SK']['LeftAndMain']['PLEASESAVE'] = 'Prosím uložte stránku: Táto stránka nemôže byť aktualizovaná, lebo ešte nebola uložená.';
+$lang['sk_SK']['LeftAndMain']['REPORTS'] = 'Reporty';
 $lang['sk_SK']['LeftAndMain']['REQUESTERROR'] = 'Chyba v požiadavke';
 $lang['sk_SK']['LeftAndMain']['SAVED'] = 'uložené';
 $lang['sk_SK']['LeftAndMain']['SAVEDUP'] = 'Uložené';
+$lang['sk_SK']['LeftAndMain']['SECURITY'] = 'Bezpečnosť';
+$lang['sk_SK']['LeftAndMain']['SITECONTENT'] = 'Obsah webu';
 $lang['sk_SK']['LeftAndMain']['SITECONTENTLEFT'] = 'Obsah webu';
 $lang['sk_SK']['LeftAndMain.ss']['APPVERSIONTEXT1'] = 'Toto je';
 $lang['sk_SK']['LeftAndMain.ss']['APPVERSIONTEXT2'] = 'verzia, ktorú teraz používate je technicky CVS vetva';
@@ -183,17 +207,11 @@ $lang['sk_SK']['LeftAndMain.ss']['LOADING'] = 'Nahrávam...';
 $lang['sk_SK']['LeftAndMain.ss']['LOGGEDINAS'] = 'Prihlásený ako';
 $lang['sk_SK']['LeftAndMain.ss']['LOGOUT'] = 'odhlásiť';
 $lang['sk_SK']['LeftAndMain.ss']['PUBLIS'] = 'Publikovaný web';
+$lang['sk_SK']['LeftAndMain.ss']['REQUIREJS'] = 'CMS vyžaduje povolený JavaScript.';
 $lang['sk_SK']['LeftAndMain.ss']['SSWEB'] = 'Silverstripe Website';
 $lang['sk_SK']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Zobrazenie stránky:';
 $lang['sk_SK']['LeftAndMain']['STATUSTO'] = 'Stav zmenený na \'%s\'';
 $lang['sk_SK']['LeftAndMain']['TREESITECONTENT'] = 'Obsah webu';
-$lang['sk_SK']['MemberList']['ADD'] = 'Pridať';
-$lang['sk_SK']['MemberList']['EMAIL'] = 'E-mailová adresa';
-$lang['sk_SK']['MemberList']['FILTERBYG'] = 'Filtrovať podľa skupiny';
-$lang['sk_SK']['MemberList']['FN'] = 'Krstné meno';
-$lang['sk_SK']['MemberList']['PASSWD'] = 'Heslo';
-$lang['sk_SK']['MemberList']['SEARCH'] = 'Hľadať';
-$lang['sk_SK']['MemberList']['SN'] = 'Priezvisko';
 $lang['sk_SK']['MemberList.ss']['FILTER'] = 'Filtrovanie';
 $lang['sk_SK']['MemberList_Table.ss']['EMAIL'] = 'E-mailová adresa';
 $lang['sk_SK']['MemberList_Table.ss']['FN'] = 'Krstné meno';
@@ -201,11 +219,23 @@ $lang['sk_SK']['MemberList_Table.ss']['PASSWD'] = 'Heslo';
 $lang['sk_SK']['MemberList_Table.ss']['SN'] = 'Priezvisko';
 $lang['sk_SK']['MemberTableField']['ADD'] = 'Pridať';
 $lang['sk_SK']['MemberTableField']['ADDEDTOGROUP'] = 'Člen pridaný do skupiny';
+$lang['sk_SK']['MemberTableField']['EMAIL'] = 'E-mail';
+$lang['sk_SK']['MemberTableField']['FIRSTNAME'] = 'Meno';
 $lang['sk_SK']['MemberTableField.ss']['ADDNEW'] = 'Pridať nový';
 $lang['sk_SK']['MemberTableField.ss']['DELETEMEMBER'] = 'Vymazať tohto člena';
 $lang['sk_SK']['MemberTableField.ss']['EDITMEMBER'] = 'Upraviť tohto člena';
 $lang['sk_SK']['MemberTableField.ss']['SHOWMEMBER'] = 'Zobraziť tohto člena';
+$lang['sk_SK']['MemberTableField']['SURNAME'] = 'Priezvisko';
+$lang['sk_SK']['ModelAdmin']['ADDBUTTON'] = 'Pridať';
+$lang['sk_SK']['ModelAdmin']['CREATEBUTTON'] = 'Vytvoriť \'%s\'';
+$lang['sk_SK']['ModelAdmin']['DELETE'] = 'Vymazať';
+$lang['sk_SK']['ModelAdmin']['GOBACK'] = 'Späť';
+$lang['sk_SK']['ModelAdmin']['IMPORT'] = 'Importovať z CSV';
+$lang['sk_SK']['ModelAdmin']['SAVE'] = 'Uložiť';
+$lang['sk_SK']['PageComment']['Comment'] = 'Komentár';
 $lang['sk_SK']['PageComment']['COMMENTBY'] = 'Komentáre od \'%s\' na %s';
+$lang['sk_SK']['PageComment']['IsSpam'] = 'Spam?';
+$lang['sk_SK']['PageComment']['Name'] = 'Meno autora';
 $lang['sk_SK']['PageCommentInterface.ss']['COMMENTS'] = 'Komentáre';
 $lang['sk_SK']['PageCommentInterface.ss']['NEXT'] = 'ďalší';
 $lang['sk_SK']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'Nikto na tejto stránke ešte nepridal komentár.';
@@ -215,18 +245,21 @@ $lang['sk_SK']['PageCommentInterface_singlecomment.ss']['ISNTSPAM'] = 'tento kom
 $lang['sk_SK']['PageCommentInterface_singlecomment.ss']['ISSPAM'] = 'tento komentár je spam';
 $lang['sk_SK']['PageCommentInterface_singlecomment.ss']['PBY'] = 'Zaslal';
 $lang['sk_SK']['PageCommentInterface_singlecomment.ss']['REMCOM'] = 'odstrániť tento komentár';
+$lang['sk_SK']['ReportAdmin']['MENUTITLE'] = 'Reporty';
 $lang['sk_SK']['ReportAdmin_left.ss']['REPORTS'] = 'Správy';
 $lang['sk_SK']['ReportAdmin_right.ss']['WELCOME1'] = 'Vitajte v';
 $lang['sk_SK']['ReportAdmin_right.ss']['WELCOME2'] = 'správach. Prosím vyberte si správu zľava.';
 $lang['sk_SK']['ReportAdmin_SiteTree.ss']['REPORTS'] = 'Správy';
 $lang['sk_SK']['SecurityAdmin']['ADDMEMBER'] = 'Pridať člena';
 $lang['sk_SK']['SecurityAdmin']['MENUTITLE'] = 'Bezpečnosť';
+$lang['sk_SK']['SecurityAdmin']['MENUTITLE'] = 'Bezpečnosť';
 $lang['sk_SK']['SecurityAdmin']['NEWGROUP'] = 'Nová skupina';
 $lang['sk_SK']['SecurityAdmin']['SAVE'] = 'Uložiť';
 $lang['sk_SK']['SecurityAdmin']['SGROUPS'] = 'Bezpečnostné skupiny';
 $lang['sk_SK']['SecurityAdmin_left.ss']['CREATE'] = 'Vytvoriť';
 $lang['sk_SK']['SecurityAdmin_left.ss']['DEL'] = 'Vymazať';
 $lang['sk_SK']['SecurityAdmin_left.ss']['DELGROUPS'] = 'Vymazať vybrané skupiny';
+$lang['sk_SK']['SecurityAdmin_left.ss']['ENABLEDRAGGING'] = 'Povoliť jednoduché organizovanie pretiahnutím';
 $lang['sk_SK']['SecurityAdmin_left.ss']['GO'] = 'Vykonať';
 $lang['sk_SK']['SecurityAdmin_left.ss']['SECGROUPS'] = 'Bezpečnostné skupiny';
 $lang['sk_SK']['SecurityAdmin_left.ss']['SELECT'] = 'Vyberte stránky, ktoré chcete vymazať a potom kliknite na tlačidlo nižšie';
@@ -240,12 +273,10 @@ $lang['sk_SK']['StaticExporter']['BASEURL'] = 'Základná URL adresa';
 $lang['sk_SK']['StaticExporter']['EXPORTTO'] = 'Exportovať do tohto adresára';
 $lang['sk_SK']['StaticExporter']['FOLDEREXPORT'] = 'Adresár, kam sa má exportovať';
 $lang['sk_SK']['StaticExporter']['NAME'] = 'Statický export';
-$lang['sk_SK']['StaticExporter']['ONETHATEXISTS'] = 'Prosím uveďte adresár, ktorý existuje';
-$lang['sk_SK']['TaskList.ss']['BY'] = '-';
-$lang['sk_SK']['ThumbnailStripField']['NOTAFOLDER'] = 'Toto nie je adresár';
 $lang['sk_SK']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Vyberte adresár vyššie)';
 $lang['sk_SK']['ViewArchivedEmail.ss']['CANACCESS'] = 'Archivovaný web môžete navštíviť týmto odkazom:';
 $lang['sk_SK']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Požiadali ste o zobrazenie obsahu webu z';
 $lang['sk_SK']['WaitingOn.ss']['ATO'] = 'pridelené k';
+$lang['sk_SK']['WidgetEditor.ss']['DELETE'] = 'Vymazať';
 
 ?>
\ No newline at end of file
diff --git a/lang/sr_RS.php b/lang/sr_RS.php
index f9ce3641..f08f091c 100644
--- a/lang/sr_RS.php
+++ b/lang/sr_RS.php
@@ -17,8 +17,6 @@ if(array_key_exists('sr_RS', $lang) && is_array($lang['sr_RS'])) {
 }
 
 $lang['sr_RS']['AssetAdmin']['CHOOSEFILE'] = 'Изаберите датотеку';
-$lang['sr_RS']['AssetAdmin']['CONTENTMODBY'] = 'Садржај могу да мењају';
-$lang['sr_RS']['AssetAdmin']['CONTENTUSABLEBY'] = 'Садржај могу да користе';
 $lang['sr_RS']['AssetAdmin']['DELETEDX'] = 'Обрисано %s датотека. %s';
 $lang['sr_RS']['AssetAdmin']['FILESREADY'] = 'Датотеке спремне за достављање:';
 $lang['sr_RS']['AssetAdmin']['FOLDERDELETED'] = 'фасцикла обрисана.';
@@ -29,7 +27,6 @@ $lang['sr_RS']['AssetAdmin']['MOVEDX'] = 'Премештено %s датотек
 $lang['sr_RS']['AssetAdmin']['NEWFOLDER'] = 'Нова фасцикла';
 $lang['sr_RS']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Нема датотека за достављање';
 $lang['sr_RS']['AssetAdmin']['NOWBROKEN'] = 'Ове стране сада имају неисправне линкове:';
-$lang['sr_RS']['AssetAdmin']['OWNER'] = 'Власник';
 $lang['sr_RS']['AssetAdmin']['SAVEDFILE'] = 'Сачувана датотека %s';
 $lang['sr_RS']['AssetAdmin']['SAVEFOLDERNAME'] = 'Сачувај име фасцикле';
 $lang['sr_RS']['AssetAdmin']['THUMBSDELETED'] = 'Сви некоришћени умањени прикази су обрисани';
@@ -79,7 +76,6 @@ $lang['sr_RS']['CMSMain']['CANCEL'] = 'Откажи';
 $lang['sr_RS']['CMSMain']['CHOOSEREPORT'] = '(Изаберите извештај)';
 $lang['sr_RS']['CMSMain']['COMPARINGV'] = 'Упоређујете верзије #%d и #%d';
 $lang['sr_RS']['CMSMain']['COPYPUBTOSTAGE'] = 'Да ли заиста желите да копирате објављени садржај на живи сајт?';
-$lang['sr_RS']['CMSMain']['DELETEFP'] = 'Избриши са објављеног сајта';
 $lang['sr_RS']['CMSMain']['EMAIL'] = 'Е-пошта';
 $lang['sr_RS']['CMSMain']['GO'] = 'Иди';
 $lang['sr_RS']['CMSMain']['MENUTITLE'] = 'Садржај сајта';
@@ -106,7 +102,6 @@ $lang['sr_RS']['CMSMain']['PUBALLFUN2'] = 'Притиском на ово дуг
 $lang['sr_RS']['CMSMain']['PUBPAGES'] = 'Завршено: Објављено %d страна';
 $lang['sr_RS']['CMSMain']['REMOVEDFD'] = 'Уклоњено са сајта са нацртима';
 $lang['sr_RS']['CMSMain']['REMOVEDPAGE'] = 'Страна \'%s\' је уклоњена са објављеног сајта';
-$lang['sr_RS']['CMSMain']['RESTORE'] = 'Врати';
 $lang['sr_RS']['CMSMain']['RESTORED'] = '\'%s\' је успешно враћен';
 $lang['sr_RS']['CMSMain']['ROLLBACK'] = 'Врати се на ову верзију';
 $lang['sr_RS']['CMSMain']['ROLLEDBACKPUB'] = 'Враћено на објављену еврзију. Број нове верзије је #%d';
@@ -125,7 +120,6 @@ $lang['sr_RS']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Додај крите
 $lang['sr_RS']['CMSMain_left.ss']['BATCHACTIONS'] = 'Рутинске акције';
 $lang['sr_RS']['CMSMain_left.ss']['CHANGED'] = 'промењено';
 $lang['sr_RS']['CMSMain_left.ss']['CLOSEBOX'] = 'кликните да бисте затворили одељак';
-$lang['sr_RS']['CMSMain_left.ss']['COMMENTS'] = 'Коментари';
 $lang['sr_RS']['CMSMain_left.ss']['COMPAREMODE'] = 'Мод за упоређивање (кликните на две испод)';
 $lang['sr_RS']['CMSMain_left.ss']['CREATE'] = 'Направи';
 $lang['sr_RS']['CMSMain_left.ss']['DEL'] = 'обрисано';
@@ -148,8 +142,6 @@ $lang['sr_RS']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Прикажи само
 $lang['sr_RS']['CMSMain_left.ss']['SHOWUNPUB'] = 'Прикажи необјављене верзије';
 $lang['sr_RS']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Садржај сајта и структура';
 $lang['sr_RS']['CMSMain_left.ss']['SITEREPORTS'] = 'Извештаји о сајту';
-$lang['sr_RS']['CMSMain_left.ss']['TASKLIST'] = 'Списак задатака';
-$lang['sr_RS']['CMSMain_left.ss']['WAITINGON'] = 'Чекам на';
 $lang['sr_RS']['CMSMain_right.ss']['ANYMESSAGE'] = 'Да ли имате неку поруку за вашег уредника?';
 $lang['sr_RS']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Изаберите страну са леве стране.';
 $lang['sr_RS']['CMSMain_right.ss']['LOADING'] = 'учитавам...';
@@ -216,15 +208,20 @@ $lang['sr_RS']['ImageEditor.ss']['UNDO'] = 'опозови';
 $lang['sr_RS']['ImageEditor.ss']['UNTITLED'] = 'Ненасловљени документ';
 $lang['sr_RS']['ImageEditor.ss']['WIDTH'] = 'ширина';
 $lang['sr_RS']['LeftAndMain']['CHANGEDURL'] = 'URL промењен на \'%s\'';
+$lang['sr_RS']['LeftAndMain']['COMMENTS'] = 'Komentari';
+$lang['sr_RS']['LeftAndMain']['FILESIMAGES'] = 'Fajlovi i slike';
 $lang['sr_RS']['LeftAndMain']['HELP'] = 'Помоћ';
 $lang['sr_RS']['LeftAndMain']['PAGETYPE'] = 'Тип стране:';
 $lang['sr_RS']['LeftAndMain']['PERMAGAIN'] = 'Одјављени сте са CMS-а. Уколико желите да се поново пријавите, унесите корисничко име и лозинку.';
 $lang['sr_RS']['LeftAndMain']['PERMALREADY'] = 'Не можете да приступите овом делу CMS-а. Ако желите да се пријавите као неко други, урадите то испод';
 $lang['sr_RS']['LeftAndMain']['PERMDEFAULT'] = 'Унесите своју имејл адресу и лозинку за приступ CMS-у.';
 $lang['sr_RS']['LeftAndMain']['PLEASESAVE'] = 'Сачувајте страну: ова страна не може да буде ажурирана јер још увек није сачувана.';
+$lang['sr_RS']['LeftAndMain']['REPORTS'] = 'Izvestaj';
 $lang['sr_RS']['LeftAndMain']['REQUESTERROR'] = 'Грешка у захтеву';
 $lang['sr_RS']['LeftAndMain']['SAVED'] = 'сачувано';
 $lang['sr_RS']['LeftAndMain']['SAVEDUP'] = 'Сачувано';
+$lang['sr_RS']['LeftAndMain']['SECURITY'] = 'Bezbednost';
+$lang['sr_RS']['LeftAndMain']['SITECONTENT'] = 'Sadrzaj sajta';
 $lang['sr_RS']['LeftAndMain']['SITECONTENTLEFT'] = 'Садржај сајта';
 $lang['sr_RS']['LeftAndMain.ss']['APPVERSIONTEXT1'] = 'Ово је';
 $lang['sr_RS']['LeftAndMain.ss']['APPVERSIONTEXT2'] = 'верзија коју тренутно имате је технички CVS грана';
@@ -242,17 +239,6 @@ $lang['sr_RS']['LeftAndMain.ss']['SSWEB'] = 'Silverstripe сајт';
 $lang['sr_RS']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Преглед стране:';
 $lang['sr_RS']['LeftAndMain']['STATUSTO'] = 'Статус промењен на \'%s\'';
 $lang['sr_RS']['LeftAndMain']['TREESITECONTENT'] = 'Садржај сајта';
-$lang['sr_RS']['MemberList']['ADD'] = 'Додај';
-$lang['sr_RS']['MemberList']['ANYGROUP'] = 'Било која група';
-$lang['sr_RS']['MemberList']['ASC'] = 'Растући редослед';
-$lang['sr_RS']['MemberList']['DESC'] = 'Опадајући редослед';
-$lang['sr_RS']['MemberList']['EMAIL'] = 'Е-пошта';
-$lang['sr_RS']['MemberList']['FILTERBYG'] = 'Филтрирај по групи';
-$lang['sr_RS']['MemberList']['FN'] = 'Име';
-$lang['sr_RS']['MemberList']['ORDERBY'] = 'Сортирај по';
-$lang['sr_RS']['MemberList']['PASSWD'] = 'Лозинка';
-$lang['sr_RS']['MemberList']['SEARCH'] = 'Претрага';
-$lang['sr_RS']['MemberList']['SN'] = 'Презиме';
 $lang['sr_RS']['MemberList.ss']['FILTER'] = 'Филтер';
 $lang['sr_RS']['MemberList_PageControls.ss']['DISPLAYING'] = 'Приказујем';
 $lang['sr_RS']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'чланова';
@@ -285,7 +271,6 @@ $lang['sr_RS']['MemberTableField.ss']['DELETEMEMBER'] = 'Избриши овог
 $lang['sr_RS']['MemberTableField.ss']['EDITMEMBER'] = 'Измени овог члана';
 $lang['sr_RS']['MemberTableField.ss']['SHOWMEMBER'] = 'Прикажи овог члана';
 $lang['sr_RS']['MemberTableField']['SURNAME'] = 'Презиме';
-$lang['sr_RS']['ModelAdmin']['CLASSTYPE'] = 'Тип';
 $lang['sr_RS']['PageComment']['COMMENTBY'] = 'Коментарисао \'%s\' у %s';
 $lang['sr_RS']['PageComment']['PLURALNAME'] = 'Komentari Stranice';
 $lang['sr_RS']['PageComment']['SINGULARNAME'] = 'Komentar Stranice';
@@ -335,10 +320,7 @@ $lang['sr_RS']['StaticExporter']['BASEURL'] = 'Основни URL';
 $lang['sr_RS']['StaticExporter']['EXPORTTO'] = 'Извези у ову фасциклу';
 $lang['sr_RS']['StaticExporter']['FOLDEREXPORT'] = 'Фасцикла за извожење';
 $lang['sr_RS']['StaticExporter']['NAME'] = 'Извези статичне садржаје';
-$lang['sr_RS']['StaticExporter']['ONETHATEXISTS'] = 'Прецизирајте фасциклу која већ постоји';
-$lang['sr_RS']['TaskList.ss']['BY'] = 'написао';
 $lang['sr_RS']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Нема пронађених слика у';
-$lang['sr_RS']['ThumbnailStripField']['NOTAFOLDER'] = 'Ово није фасцикла';
 $lang['sr_RS']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(изаберите фасциклу)';
 $lang['sr_RS']['ViewArchivedEmail.ss']['CANACCESS'] = 'Можете да приступите архивираном садржају на овом линку:';
 $lang['sr_RS']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Замољени сте да погледате садржај овог сајта';
diff --git a/lang/sv_SE.php b/lang/sv_SE.php
index b928a323..2989a736 100644
--- a/lang/sv_SE.php
+++ b/lang/sv_SE.php
@@ -17,8 +17,6 @@ if(array_key_exists('sv_SE', $lang) && is_array($lang['sv_SE'])) {
 }
 
 $lang['sv_SE']['AssetAdmin']['CHOOSEFILE'] = 'Välj fil';
-$lang['sv_SE']['AssetAdmin']['CONTENTMODBY'] = 'Följande kan redigera innehållet';
-$lang['sv_SE']['AssetAdmin']['CONTENTUSABLEBY'] = 'Följande kan använda innehållet';
 $lang['sv_SE']['AssetAdmin']['DELETEDX'] = 'Raderade %s filer. %s';
 $lang['sv_SE']['AssetAdmin']['FILESREADY'] = 'Filer klara för uppladdning:';
 $lang['sv_SE']['AssetAdmin']['FOLDERDELETED'] = 'mappen raderad.';
@@ -31,16 +29,17 @@ $lang['sv_SE']['AssetAdmin']['NOTEMP'] = 'Det finns ingen temporär mapp för up
 $lang['sv_SE']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Det fanns inget att ladda upp';
 $lang['sv_SE']['AssetAdmin']['NOWBROKEN'] = 'De här sidorna har nu brutna länkar:';
 $lang['sv_SE']['AssetAdmin']['NOWBROKEN2'] = 'Deras ägare har blivit meddelade och de kommer att fixa sidorna.';
-$lang['sv_SE']['AssetAdmin']['OWNER'] = 'Ägare';
 $lang['sv_SE']['AssetAdmin']['SAVEDFILE'] = 'Sparade fil %s';
 $lang['sv_SE']['AssetAdmin']['SAVEFOLDERNAME'] = 'Spara mappnamn';
-$lang['sv_SE']['AssetAdmin']['THUMBSDELETED'] = 'Alla oanvända tumnaglar har raderats';
+$lang['sv_SE']['AssetAdmin']['THUMBSDELETED'] = '%s oanvända tumnaglar har raderats';
 $lang['sv_SE']['AssetAdmin']['UPLOAD'] = 'Ladda upp filerna nedan';
 $lang['sv_SE']['AssetAdmin']['UPLOADEDX'] = 'Laddade upp %s filer';
 $lang['sv_SE']['AssetAdmin_left.ss']['CREATE'] = 'Skapa';
 $lang['sv_SE']['AssetAdmin_left.ss']['DELETE'] = 'Radera';
 $lang['sv_SE']['AssetAdmin_left.ss']['DELFOLDERS'] = 'Radera markerade mappar';
 $lang['sv_SE']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Tillåt sortering genom att dra och släppa.';
+$lang['sv_SE']['AssetAdmin_left.ss']['FILESYSTEMSYNC'] = 'Leta efter nya filer';
+$lang['sv_SE']['AssetAdmin_left.ss']['FILESYSTEMSYNC_DESC'] = 'SilverStripe har sin egen databas av filer och bilder som finns lagrade i din assets/ folder. Klicka på denna knapp för att uppdatera databasen, om filer som läggs till assets/ folder utifrån SilverStripe, till exempel om du har laddat upp filer via FTP.';
 $lang['sv_SE']['AssetAdmin_left.ss']['FOLDERS'] = 'Mappar';
 $lang['sv_SE']['AssetAdmin_left.ss']['GO'] = 'Kör';
 $lang['sv_SE']['AssetAdmin_left.ss']['SELECTTODEL'] = 'Markera de mappar du vill radera och klicka på knappen nedan';
@@ -48,6 +47,7 @@ $lang['sv_SE']['AssetAdmin_left.ss']['TOREORG'] = 'Du organiserar om dina mappar
 $lang['sv_SE']['AssetAdmin_right.ss']['CHOOSEPAGE'] = 'Var god välj en sida till vänster.';
 $lang['sv_SE']['AssetAdmin_right.ss']['WELCOME'] = 'Välkommen till';
 $lang['sv_SE']['AssetAdmin_uploadiframe.ss']['PERMFAILED'] = 'Du har inte tillåtelse att ladda upp filer till den mappen.';
+$lang['sv_SE']['AssetAdmin_uploadiframe.ss']['TITLE'] = 'Bild uppladdning Iframe';
 $lang['sv_SE']['AssetTableField']['CAPTION'] = 'Rubrik';
 $lang['sv_SE']['AssetTableField']['CREATED'] = 'Först uppladdad';
 $lang['sv_SE']['AssetTableField']['DIM'] = 'Dimensioner';
@@ -73,6 +73,15 @@ $lang['sv_SE']['AssetTableField']['SWFFILEOPTIONS'] = 'SWF-filsinställningar';
 $lang['sv_SE']['AssetTableField']['TITLE'] = 'Titel';
 $lang['sv_SE']['AssetTableField']['TYPE'] = 'Typ';
 $lang['sv_SE']['AssetTableField']['URL'] = 'URL';
+$lang['sv_SE']['CMSBatchActions']['DELETED_PAGES'] = 'Raderade  %d sidan från den publicerade siten';
+$lang['sv_SE']['CMSBatchActions']['DELETE_PAGES'] = 'radera från publicerad site';
+$lang['sv_SE']['CMSBatchActions']['DELETING_PAGES'] = 'Radera markerade sifor från publicerad site';
+$lang['sv_SE']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Publicerat %d sidor';
+$lang['sv_SE']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Publicerar sidor';
+$lang['sv_SE']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publicera';
+$lang['sv_SE']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'Un-publicerade % d sidor';
+$lang['sv_SE']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'Dölj publicerade sidor';
+$lang['sv_SE']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'Dölj publicerad';
 $lang['sv_SE']['CMSLeft.ss']['DELPAGE'] = 'Radera sidor...';
 $lang['sv_SE']['CMSLeft.ss']['DELPAGES'] = 'Radera markerade sidor';
 $lang['sv_SE']['CMSLeft.ss']['GO'] = 'Kör';
@@ -86,7 +95,6 @@ $lang['sv_SE']['CMSMain']['CHOOSEREPORT'] = '(Välj en rapport)';
 $lang['sv_SE']['CMSMain']['COMPARINGV'] = 'Du jämför versionerna %s och %s';
 $lang['sv_SE']['CMSMain']['COPYPUBTOSTAGE'] = 'Vill du verkligen kopiera det publicerade innehållet till \'stage-sajten\'?';
 $lang['sv_SE']['CMSMain']['DELETE'] = 'Radera från utkast-sajten';
-$lang['sv_SE']['CMSMain']['DELETEFP'] = 'Radera från den publicerade sajten';
 $lang['sv_SE']['CMSMain']['DESCREMOVED'] = 'och %s ättlingar';
 $lang['sv_SE']['CMSMain']['EMAIL'] = 'E-post';
 $lang['sv_SE']['CMSMain']['GO'] = 'Kör';
@@ -117,7 +125,6 @@ $lang['sv_SE']['CMSMain']['REMOVEDFD'] = 'Bortagen från utkast-sajten';
 $lang['sv_SE']['CMSMain']['REMOVEDPAGE'] = 'Tog bort \'%s\' ';
 $lang['sv_SE']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Raderade \'%s\' från utkast-sajten';
 $lang['sv_SE']['CMSMain']['REPORT'] = 'Rapport';
-$lang['sv_SE']['CMSMain']['RESTORE'] = 'Återskapa';
 $lang['sv_SE']['CMSMain']['RESTORED'] = 'Återställningen av \'%s\' lyckades';
 $lang['sv_SE']['CMSMain']['ROLLBACK'] = 'Återställ den här versionen';
 $lang['sv_SE']['CMSMain']['ROLLEDBACKPUB'] = 'Återskapade den publicerade versionen. Nytt versionsnummer är #%d';
@@ -125,6 +132,7 @@ $lang['sv_SE']['CMSMain']['ROLLEDBACKVERSION'] = 'Återskapade version #%d. Nytt
 $lang['sv_SE']['CMSMain']['SAVE'] = 'Spara';
 $lang['sv_SE']['CMSMain']['SENTTO'] = 'Skickat till %s %s för godkännande';
 $lang['sv_SE']['CMSMain']['STATUSOPT'] = 'Status';
+$lang['sv_SE']['CMSMain']['TITLEOPT'] = 'Titel';
 $lang['sv_SE']['CMSMain']['TOTALPAGES'] = 'Totalt antal sidor';
 $lang['sv_SE']['CMSMain']['VERSIONSNOPAGE'] = 'Kan inte hitta sida #%d';
 $lang['sv_SE']['CMSMain']['VIEWING'] = 'Du tittar på version #%s, skapad %s av %s';
@@ -137,8 +145,8 @@ $lang['sv_SE']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'Tillagd till utkast-sajten o
 $lang['sv_SE']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Lägg till kritierie..';
 $lang['sv_SE']['CMSMain_left.ss']['BATCHACTIONS'] = 'Ändra flera';
 $lang['sv_SE']['CMSMain_left.ss']['CHANGED'] = 'ändrad';
+$lang['sv_SE']['CMSMain_left.ss']['CLEARTITLE'] = 'Rensa sökningen och visa alla objekt';
 $lang['sv_SE']['CMSMain_left.ss']['CLOSEBOX'] = 'klicka för att stänga den här boxen';
-$lang['sv_SE']['CMSMain_left.ss']['COMMENTS'] = 'Kommentarer';
 $lang['sv_SE']['CMSMain_left.ss']['COMPAREMODE'] = 'Jämför (klicka på 2 nedan)';
 $lang['sv_SE']['CMSMain_left.ss']['CREATE'] = 'Skapa';
 $lang['sv_SE']['CMSMain_left.ss']['DEL'] = 'raderad';
@@ -148,8 +156,10 @@ $lang['sv_SE']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Redigerad på utkast-sajten
 $lang['sv_SE']['CMSMain_left.ss']['EDITEDSINCE'] = 'Ändrade sedean';
 $lang['sv_SE']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Tillåt dra &amp; släpp-organisering';
 $lang['sv_SE']['CMSMain_left.ss']['GO'] = 'Kör';
+$lang['sv_SE']['CMSMain_left.ss']['HIDDEN'] = 'dold';
 $lang['sv_SE']['CMSMain_left.ss']['KEY'] = 'Nyckel';
 $lang['sv_SE']['CMSMain_left.ss']['NEW'] = 'ny';
+$lang['sv_SE']['CMSMain_left.ss']['NOTINMENU'] = 'Undantas från navigeringsmenyerna';
 $lang['sv_SE']['CMSMain_left.ss']['OPENBOX'] = 'klicka för att öppna den här boxen';
 $lang['sv_SE']['CMSMain_left.ss']['PAGEVERSIONH'] = 'Sidversionshistorik';
 $lang['sv_SE']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publicera de markerade sidorna';
@@ -161,8 +171,6 @@ $lang['sv_SE']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Visa bara ändrade sidor
 $lang['sv_SE']['CMSMain_left.ss']['SHOWUNPUB'] = 'Visa opublicerade versioner';
 $lang['sv_SE']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Sajt-innehåll och struktur';
 $lang['sv_SE']['CMSMain_left.ss']['SITEREPORTS'] = 'Sajt-rapporter';
-$lang['sv_SE']['CMSMain_left.ss']['TASKLIST'] = 'Uppgiftslista';
-$lang['sv_SE']['CMSMain_left.ss']['WAITINGON'] = 'Väntar på';
 $lang['sv_SE']['CMSMain_right.ss']['ANYMESSAGE'] = 'Har du något meddelande till din redaktör?';
 $lang['sv_SE']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Var god välj en sida till vänster.';
 $lang['sv_SE']['CMSMain_right.ss']['LOADING'] = 'laddar...';
@@ -184,6 +192,7 @@ $lang['sv_SE']['CommentAdmin']['APPROVED'] = 'Accepterade %s kommentarer.';
 $lang['sv_SE']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Godkända kommentarer';
 $lang['sv_SE']['CommentAdmin']['AUTHOR'] = 'Författare';
 $lang['sv_SE']['CommentAdmin']['COMMENT'] = 'Kommentar';
+$lang['sv_SE']['CommentAdmin']['COMMENTERURL'] = 'URL';
 $lang['sv_SE']['CommentAdmin']['COMMENTS'] = 'Kommentarer';
 $lang['sv_SE']['CommentAdmin']['COMMENTSAWAITINGMODERATION'] = 'Kommentarer som väntar på att modereras';
 $lang['sv_SE']['CommentAdmin']['DATEPOSTED'] = 'Skrivet den';
@@ -244,6 +253,7 @@ $lang['sv_SE']['ImageEditor.ss']['SEPIA'] = 'sepia';
 $lang['sv_SE']['ImageEditor.ss']['UNDO'] = 'ångra';
 $lang['sv_SE']['ImageEditor.ss']['UNTITLED'] = 'Obetitlat dokument';
 $lang['sv_SE']['ImageEditor.ss']['WIDTH'] = 'bredd';
+$lang['sv_SE']['LeftAndMain']['CANT_REORGANISE'] = 'Du har inte behörighet att rearange site tree. Ditt förändring sparades inte.';
 $lang['sv_SE']['LeftAndMain']['CHANGEDURL'] = 'URL ändrad till \'%s\'';
 $lang['sv_SE']['LeftAndMain']['COMMENTS'] = 'Kommentarer';
 $lang['sv_SE']['LeftAndMain']['FILESIMAGES'] = 'Filer & bilder';
@@ -279,17 +289,6 @@ $lang['sv_SE']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Sidvy:';
 $lang['sv_SE']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = 'Publiceringen av \'%s\' lyckades';
 $lang['sv_SE']['LeftAndMain']['STATUSTO'] = 'Status ändrad till \'%s\'';
 $lang['sv_SE']['LeftAndMain']['TREESITECONTENT'] = 'Sajt-innehåll';
-$lang['sv_SE']['MemberList']['ADD'] = 'Lägg till';
-$lang['sv_SE']['MemberList']['ANYGROUP'] = 'Alla grupper';
-$lang['sv_SE']['MemberList']['ASC'] = 'Stigande';
-$lang['sv_SE']['MemberList']['DESC'] = 'Fallande';
-$lang['sv_SE']['MemberList']['EMAIL'] = 'E-post';
-$lang['sv_SE']['MemberList']['FILTERBYG'] = 'Filtrera per grupp';
-$lang['sv_SE']['MemberList']['FN'] = 'Förnamn';
-$lang['sv_SE']['MemberList']['ORDERBY'] = 'Ordna efter';
-$lang['sv_SE']['MemberList']['PASSWD'] = 'Lösenord';
-$lang['sv_SE']['MemberList']['SEARCH'] = 'Sök';
-$lang['sv_SE']['MemberList']['SN'] = 'Efternamn';
 $lang['sv_SE']['MemberList.ss']['FILTER'] = 'Filter';
 $lang['sv_SE']['MemberList_PageControls.ss']['DISPLAYING'] = 'Visar';
 $lang['sv_SE']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'medlemmar';
@@ -313,6 +312,7 @@ $lang['sv_SE']['MemberTableField']['ANYGROUP'] = 'Alla grupper';
 $lang['sv_SE']['MemberTableField']['ASC'] = 'Stigande';
 $lang['sv_SE']['MemberTableField']['DESC'] = 'Fallande';
 $lang['sv_SE']['MemberTableField']['EMAIL'] = 'E-post';
+$lang['sv_SE']['MemberTableField']['ERRORADDINGUSER'] = 'Det var ett uppstod ett fel när du la till användare till gruppen:% s';
 $lang['sv_SE']['MemberTableField']['FILTER'] = 'Filtrera';
 $lang['sv_SE']['MemberTableField']['FILTERBYGROUP'] = 'Filtrera per grupp';
 $lang['sv_SE']['MemberTableField']['FIRSTNAME'] = 'Förnamn';
@@ -321,12 +321,12 @@ $lang['sv_SE']['MemberTableField']['SEARCH'] = 'Sök';
 $lang['sv_SE']['MemberTableField.ss']['ADDNEW'] = 'Ny';
 $lang['sv_SE']['MemberTableField.ss']['DELETEMEMBER'] = 'Radera medlem';
 $lang['sv_SE']['MemberTableField.ss']['EDITMEMBER'] = 'Redigera medlem';
+$lang['sv_SE']['MemberTableField.ss']['NOITEMSFOUND'] = 'Inga objekt hittades';
 $lang['sv_SE']['MemberTableField.ss']['SHOWMEMBER'] = 'Visa medlem';
 $lang['sv_SE']['MemberTableField']['SURNAME'] = 'Efternamn';
 $lang['sv_SE']['ModelAdmin']['ADDBUTTON'] = 'Lägg till';
 $lang['sv_SE']['ModelAdmin']['ADDFORM'] = 'Fyll i det här formuläret för att lägga till ett %s i databasen.';
 $lang['sv_SE']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Välj resultatkolumner';
-$lang['sv_SE']['ModelAdmin']['CLASSTYPE'] = 'Typ';
 $lang['sv_SE']['ModelAdmin']['CLEAR_SEARCH'] = 'Rensa sökning';
 $lang['sv_SE']['ModelAdmin']['CREATEBUTTON'] = 'Skapa \'%s\'';
 $lang['sv_SE']['ModelAdmin']['DELETE'] = 'Ta bort';
@@ -335,13 +335,14 @@ $lang['sv_SE']['ModelAdmin']['FOUNDRESULTS'] = 'Din sökning gav %s matchande tr
 $lang['sv_SE']['ModelAdmin']['GOBACK'] = 'Tillbaka';
 $lang['sv_SE']['ModelAdmin']['GOFORWARD'] = 'Framåt';
 $lang['sv_SE']['ModelAdmin']['IMPORT'] = 'Importera från CSV';
-$lang['sv_SE']['ModelAdmin']['IMPORTEDRECORDS'] = 'Importerade %s %s.';
+$lang['sv_SE']['ModelAdmin']['IMPORTEDRECORDS'] = 'Importerade %s poster.';
 $lang['sv_SE']['ModelAdmin']['ITEMNOTFOUND'] = 'Jag kan inte hitta den saken';
 $lang['sv_SE']['ModelAdmin']['LOADEDFOREDITING'] = 'Tog fram \'%s\' för redigering.';
 $lang['sv_SE']['ModelAdmin']['NOCSVFILE'] = 'Var god och bläddra efter en CSV-fil för import';
 $lang['sv_SE']['ModelAdmin']['NOIMPORT'] = 'Inget att importera';
 $lang['sv_SE']['ModelAdmin']['NORESULTS'] = 'Inget resultat';
 $lang['sv_SE']['ModelAdmin']['SAVE'] = 'Spara';
+$lang['sv_SE']['ModelAdmin']['SEARCHFOR'] = 'Sök efter:';
 $lang['sv_SE']['ModelAdmin']['SEARCHRESULTS'] = 'Sökresultat';
 $lang['sv_SE']['ModelAdmin']['SELECTALL'] = 'välj alla';
 $lang['sv_SE']['ModelAdmin']['SELECTNONE'] = 'välj ingen';
@@ -351,10 +352,12 @@ $lang['sv_SE']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Visa specifikati
 $lang['sv_SE']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Relationer';
 $lang['sv_SE']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Specifikationer för %s';
 $lang['sv_SE']['ModelAdmin_left.ss']['ADDLISTING'] = 'Lägg till';
-$lang['sv_SE']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Lägg till';
 $lang['sv_SE']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Importera';
 $lang['sv_SE']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Sök';
 $lang['sv_SE']['ModelAdmin_right.ss']['WELCOME1'] = 'Välkommen till %s. Var god och välj ett av inläggen till vänster.';
+$lang['sv_SE']['ModelSidebar.ss']['ADDLISTING'] = 'Lägg till';
+$lang['sv_SE']['ModelSidebar.ss']['IMPORT_TAB_HEADER'] = 'Importera';
+$lang['sv_SE']['ModelSidebar.ss']['SEARCHLISTINGS'] = 'Sök';
 $lang['sv_SE']['PageComment']['Comment'] = 'Kommentar';
 $lang['sv_SE']['PageComment']['COMMENTBY'] = 'Kommenterad av \'%s\' på %s';
 $lang['sv_SE']['PageComment']['IsSpam'] = 'Skräp?';
@@ -365,10 +368,14 @@ $lang['sv_SE']['PageComment']['SINGULARNAME'] = 'Sidkommentar';
 $lang['sv_SE']['PageCommentInterface']['COMMENTERURL'] = 'Din sajts URL';
 $lang['sv_SE']['PageCommentInterface']['POST'] = 'Skicka';
 $lang['sv_SE']['PageCommentInterface']['SPAMQUESTION'] = 'Spam-skyddsfråga: %s';
+$lang['sv_SE']['PageCommentInterface.ss']['COMMENTLOGINERROR'] = 'Du kan inte kommentera förrän du har loggat in';
+$lang['sv_SE']['PageCommentInterface.ss']['COMMENTPERMISSIONERROR'] = 'och att du har en lämplig behörighetsnivå';
+$lang['sv_SE']['PageCommentInterface.ss']['COMMENTPOSTLOGIN'] = 'Logga in här';
 $lang['sv_SE']['PageCommentInterface.ss']['COMMENTS'] = 'Kommentarer';
+$lang['sv_SE']['PageCommentInterface.ss']['COMMENTSDISABLED'] = 'Skriva kommentarer har avaktiverats';
 $lang['sv_SE']['PageCommentInterface.ss']['NEXT'] = 'nästa';
 $lang['sv_SE']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'Ingen har kommenterat ännu';
-$lang['sv_SE']['PageCommentInterface.ss']['POSTCOM'] = 'Skicka din kommentar';
+$lang['sv_SE']['PageCommentInterface.ss']['POSTCOM'] = 'Skriv en kommentar';
 $lang['sv_SE']['PageCommentInterface.ss']['PREV'] = 'föregående';
 $lang['sv_SE']['PageCommentInterface.ss']['RSSFEEDALLCOMMENTS'] = 'RSS-ström för alla kommentarer';
 $lang['sv_SE']['PageCommentInterface.ss']['RSSFEEDCOMMENTS'] = 'RSS-ström för kommentaren på den här sidan';
@@ -414,7 +421,6 @@ $lang['sv_SE']['StaticExporter']['BASEURL'] = 'Bas-URL';
 $lang['sv_SE']['StaticExporter']['EXPORTTO'] = 'Exportera till den mappen';
 $lang['sv_SE']['StaticExporter']['FOLDEREXPORT'] = 'Mapp att exportera till';
 $lang['sv_SE']['StaticExporter']['NAME'] = 'Statisk exportör';
-$lang['sv_SE']['StaticExporter']['ONETHATEXISTS'] = 'Var god och ange ett mappnamn som existerar';
 $lang['sv_SE']['TableListField_PageControls.ss']['DISPLAYING'] = 'Visar';
 $lang['sv_SE']['TableListField_PageControls.ss']['OF'] = 'av';
 $lang['sv_SE']['TableListField_PageControls.ss']['TO'] = 'till';
@@ -422,12 +428,10 @@ $lang['sv_SE']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Visa första';
 $lang['sv_SE']['TableListField_PageControls.ss']['VIEWLAST'] = 'Visa sista';
 $lang['sv_SE']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Visa nästa';
 $lang['sv_SE']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Visa föregående';
-$lang['sv_SE']['TaskList.ss']['BY'] = 'av';
 $lang['sv_SE']['ThumbnailStripField']['NOFLASHFOUND'] = 'Inga flash-filer hittades';
 $lang['sv_SE']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'Inga flash-filer hittades i';
 $lang['sv_SE']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'Inga bilder hittades i';
 $lang['sv_SE']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Inga bilder hittades';
-$lang['sv_SE']['ThumbnailStripField']['NOTAFOLDER'] = 'Det är ingen mapp';
 $lang['sv_SE']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Välj en mapp eller sök ovan)';
 $lang['sv_SE']['ViewArchivedEmail.ss']['CANACCESS'] = 'Du kan komma åt den arkiverade sajten på den här länken:';
 $lang['sv_SE']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Du har frågat efter att få se innehållet på vår sajt från';
diff --git a/lang/tr_TR.php b/lang/tr_TR.php
index ac5215b6..a773657a 100644
--- a/lang/tr_TR.php
+++ b/lang/tr_TR.php
@@ -17,8 +17,6 @@ if(array_key_exists('tr_TR', $lang) && is_array($lang['tr_TR'])) {
 }
 
 $lang['tr_TR']['AssetAdmin']['CHOOSEFILE'] = 'Dosya seç';
-$lang['tr_TR']['AssetAdmin']['CONTENTMODBY'] = 'İçeriği değiştirebilenler:';
-$lang['tr_TR']['AssetAdmin']['CONTENTUSABLEBY'] = 'İçeriği kullanabilenler:';
 $lang['tr_TR']['AssetAdmin']['DELETEDX'] = '%s adet dosya silindi.%s';
 $lang['tr_TR']['AssetAdmin']['FILESREADY'] = 'Sunucuya yüklenmeye hazır dosyalar:';
 $lang['tr_TR']['AssetAdmin']['FOLDERDELETED'] = 'klasör silindi.';
@@ -31,7 +29,6 @@ $lang['tr_TR']['AssetAdmin']['NOTEMP'] = 'Yüklemeler için belirlenen bir geçi
 $lang['tr_TR']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Yüklenecek dosya bulunamadı';
 $lang['tr_TR']['AssetAdmin']['NOWBROKEN'] = 'Aşağıdaki sayfalar kırık bağlantılar içeriyor:';
 $lang['tr_TR']['AssetAdmin']['NOWBROKEN2'] = 'Sahiplerine e-posta gönderildi, o sayfalari düzeltecekler.';
-$lang['tr_TR']['AssetAdmin']['OWNER'] = 'Sahibi';
 $lang['tr_TR']['AssetAdmin']['SAVEDFILE'] = '%s dosyası kaydedildi';
 $lang['tr_TR']['AssetAdmin']['SAVEFOLDERNAME'] = 'Klasör adını kaydet';
 $lang['tr_TR']['AssetAdmin']['THUMBSDELETED'] = 'Tüm gereksiz pul imgeler silindi.';
@@ -86,7 +83,6 @@ $lang['tr_TR']['CMSMain']['CHOOSEREPORT'] = '(Bir rapor seçin)';
 $lang['tr_TR']['CMSMain']['COMPARINGV'] = '#%s ve #%s sürümlerini karşılaştırıyorsunuz';
 $lang['tr_TR']['CMSMain']['COPYPUBTOSTAGE'] = 'Yayındaki içeriği taslak siteye kopyalamak istediğinize emin misiniz?';
 $lang['tr_TR']['CMSMain']['DELETE'] = 'Taslak siteden sil';
-$lang['tr_TR']['CMSMain']['DELETEFP'] = 'Yayındaki siteden sil';
 $lang['tr_TR']['CMSMain']['DESCREMOVED'] = 've %s adet türetilen';
 $lang['tr_TR']['CMSMain']['EMAIL'] = 'Eposta';
 $lang['tr_TR']['CMSMain']['GO'] = 'Git';
@@ -117,7 +113,6 @@ $lang['tr_TR']['CMSMain']['REMOVEDFD'] = 'Taslak siteden kaldırıldı';
 $lang['tr_TR']['CMSMain']['REMOVEDPAGE'] = '\'%s\' yayındaki siteden kaldırıldı';
 $lang['tr_TR']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = '\'%s\' taslak siteden silindi';
 $lang['tr_TR']['CMSMain']['REPORT'] = 'Rapor';
-$lang['tr_TR']['CMSMain']['RESTORE'] = 'Geri Yükle';
 $lang['tr_TR']['CMSMain']['RESTORED'] = '\'%s\' başarılı bir şekilde geri yüklendi';
 $lang['tr_TR']['CMSMain']['ROLLBACK'] = 'Bu sürüme geri dön';
 $lang['tr_TR']['CMSMain']['ROLLEDBACKPUB'] = 'Yayınlanmış sürüme geri alındı. Yeni sürüm numarası: #%d';
@@ -138,7 +133,6 @@ $lang['tr_TR']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Arama Kriteri Ekle...'
 $lang['tr_TR']['CMSMain_left.ss']['BATCHACTIONS'] = 'Toplu İşlemler';
 $lang['tr_TR']['CMSMain_left.ss']['CHANGED'] = 'değiştirildi';
 $lang['tr_TR']['CMSMain_left.ss']['CLOSEBOX'] = 'bu kutuyu kapatmak için tıklayın';
-$lang['tr_TR']['CMSMain_left.ss']['COMMENTS'] = 'Yorumlar';
 $lang['tr_TR']['CMSMain_left.ss']['COMPAREMODE'] = 'Karşılaştırma modu (2 tanesini seçin)';
 $lang['tr_TR']['CMSMain_left.ss']['CREATE'] = 'Yarat';
 $lang['tr_TR']['CMSMain_left.ss']['DEL'] = 'silindi';
@@ -161,8 +155,6 @@ $lang['tr_TR']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Sadece değiştirilmiş
 $lang['tr_TR']['CMSMain_left.ss']['SHOWUNPUB'] = 'Yayınlanmamış sürümleri göster';
 $lang['tr_TR']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Site İçerik ve Yapısı';
 $lang['tr_TR']['CMSMain_left.ss']['SITEREPORTS'] = 'Site Raporları';
-$lang['tr_TR']['CMSMain_left.ss']['TASKLIST'] = 'Görev Listesi';
-$lang['tr_TR']['CMSMain_left.ss']['WAITINGON'] = 'Bekleniyor:';
 $lang['tr_TR']['CMSMain_right.ss']['ANYMESSAGE'] = 'Editörünüz için bir mesajınız var mı?';
 $lang['tr_TR']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Lütfen sol taraftan bir sayfa seçiniz';
 $lang['tr_TR']['CMSMain_right.ss']['LOADING'] = 'yükleniyor...';
@@ -279,17 +271,6 @@ $lang['tr_TR']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Sayfa görünümü:';
 $lang['tr_TR']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' başarıyla yayınlandı';
 $lang['tr_TR']['LeftAndMain']['STATUSTO'] = 'Durum \'%s\' olarak değiştirildi';
 $lang['tr_TR']['LeftAndMain']['TREESITECONTENT'] = 'Site İçeriği';
-$lang['tr_TR']['MemberList']['ADD'] = 'Ekle';
-$lang['tr_TR']['MemberList']['ANYGROUP'] = 'Herhangi bir grup';
-$lang['tr_TR']['MemberList']['ASC'] = 'Artan';
-$lang['tr_TR']['MemberList']['DESC'] = 'Azalan';
-$lang['tr_TR']['MemberList']['EMAIL'] = 'Eposta';
-$lang['tr_TR']['MemberList']['FILTERBYG'] = 'Gruba göre filtrele';
-$lang['tr_TR']['MemberList']['FN'] = 'Ad';
-$lang['tr_TR']['MemberList']['ORDERBY'] = '\'a göre sırala';
-$lang['tr_TR']['MemberList']['PASSWD'] = 'Parola';
-$lang['tr_TR']['MemberList']['SEARCH'] = 'Ara';
-$lang['tr_TR']['MemberList']['SN'] = 'Soyad';
 $lang['tr_TR']['MemberList.ss']['FILTER'] = 'Filtre';
 $lang['tr_TR']['MemberList_PageControls.ss']['DISPLAYING'] = 'Görüntüleniyor';
 $lang['tr_TR']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'üyeler';
@@ -326,7 +307,6 @@ $lang['tr_TR']['MemberTableField']['SURNAME'] = 'Soyadı';
 $lang['tr_TR']['ModelAdmin']['ADDBUTTON'] = 'Ekle';
 $lang['tr_TR']['ModelAdmin']['ADDFORM'] = 'Yeni bir %s eklemek için bu formu doldurun.';
 $lang['tr_TR']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Sonuç kolonlarını seçiniz...';
-$lang['tr_TR']['ModelAdmin']['CLASSTYPE'] = 'Tip';
 $lang['tr_TR']['ModelAdmin']['CLEAR_SEARCH'] = 'Aramayı Temizle';
 $lang['tr_TR']['ModelAdmin']['CREATEBUTTON'] = '\'%s\' yarat';
 $lang['tr_TR']['ModelAdmin']['DELETE'] = 'Sil';
@@ -351,7 +331,6 @@ $lang['tr_TR']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = '%s için detayla
 $lang['tr_TR']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'İlişkiler';
 $lang['tr_TR']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = '%s detayları';
 $lang['tr_TR']['ModelAdmin_left.ss']['ADDLISTING'] = 'Ekle';
-$lang['tr_TR']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Ekle';
 $lang['tr_TR']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'İçe Aktar';
 $lang['tr_TR']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Ara';
 $lang['tr_TR']['ModelAdmin_right.ss']['WELCOME1'] = '%s alanına hoşgeldiniz. Lütfen sol bölümden bir seçim yapın.';
@@ -414,7 +393,6 @@ $lang['tr_TR']['StaticExporter']['BASEURL'] = 'Ana URL';
 $lang['tr_TR']['StaticExporter']['EXPORTTO'] = 'Bu dosyaya dışa aktar';
 $lang['tr_TR']['StaticExporter']['FOLDEREXPORT'] = 'Kaydedilecek klasör';
 $lang['tr_TR']['StaticExporter']['NAME'] = 'Statik Aktarıcı';
-$lang['tr_TR']['StaticExporter']['ONETHATEXISTS'] = 'Lütfen geçerli bir klasör belirtiniz';
 $lang['tr_TR']['TableListField_PageControls.ss']['DISPLAYING'] = 'Görüntüleniyor';
 $lang['tr_TR']['TableListField_PageControls.ss']['OF'] = '/';
 $lang['tr_TR']['TableListField_PageControls.ss']['TO'] = '->';
@@ -422,12 +400,10 @@ $lang['tr_TR']['TableListField_PageControls.ss']['VIEWFIRST'] = 'İlkini görün
 $lang['tr_TR']['TableListField_PageControls.ss']['VIEWLAST'] = 'Sonuncuyu görüntüle';
 $lang['tr_TR']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Sonrakini görüntüle';
 $lang['tr_TR']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Öncekini görüntüle';
-$lang['tr_TR']['TaskList.ss']['BY'] = 'tarafından';
 $lang['tr_TR']['ThumbnailStripField']['NOFLASHFOUND'] = 'Flash dosyası bulunamadı';
 $lang['tr_TR']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'Flash dosyası bulunamadı:';
 $lang['tr_TR']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'İmaj dosyası bulunamadı:';
 $lang['tr_TR']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Resim bulunamadı';
-$lang['tr_TR']['ThumbnailStripField']['NOTAFOLDER'] = 'Bu klasör geçerli değil';
 $lang['tr_TR']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Bir klasör seçin veya yukarıdaki bölümden arayın)';
 $lang['tr_TR']['ViewArchivedEmail.ss']['CANACCESS'] = 'Arşivdeki siteye şu bağlantıdan erişebilirsiniz:';
 $lang['tr_TR']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Şu tarihe kadar olan site içeriğini görüntülemek istediniz:';
diff --git a/lang/zh_CN.php b/lang/zh_CN.php
index ec3541a9..5865609e 100644
--- a/lang/zh_CN.php
+++ b/lang/zh_CN.php
@@ -17,20 +17,18 @@ if(array_key_exists('zh_CN', $lang) && is_array($lang['zh_CN'])) {
 }
 
 $lang['zh_CN']['AssetAdmin']['CHOOSEFILE'] = '选择文件';
-$lang['zh_CN']['AssetAdmin']['CONTENTMODBY'] = '内容可被修改';
-$lang['zh_CN']['AssetAdmin']['CONTENTUSABLEBY'] = '内容可被使用';
 $lang['zh_CN']['AssetAdmin']['DELETEDX'] = '删除%s个文件。';
 $lang['zh_CN']['AssetAdmin']['FILESREADY'] = '已经可以上传的文件：';
 $lang['zh_CN']['AssetAdmin']['FOLDERDELETED'] = '选中文件夹已删除。';
 $lang['zh_CN']['AssetAdmin']['FOLDERSDELETED'] = '所有选中文件夹已删除。';
 $lang['zh_CN']['AssetAdmin']['MENUTITLE'] = '文件与图像管理';
+$lang['zh_CN']['AssetAdmin']['MENUTITLE'] = '文件和图片';
 $lang['zh_CN']['AssetAdmin']['MOVEDX'] = '移动%s个文件';
 $lang['zh_CN']['AssetAdmin']['NEWFOLDER'] = '新建文件夹';
 $lang['zh_CN']['AssetAdmin']['NOTEMP'] = '没有临时文件夹提供上传文件的保存。请在 php.ini 里设置 upload_tmp_dir。';
 $lang['zh_CN']['AssetAdmin']['NOTHINGTOUPLOAD'] = '没有文件可以上传';
 $lang['zh_CN']['AssetAdmin']['NOWBROKEN'] = '这些网页有失效的链接：';
 $lang['zh_CN']['AssetAdmin']['NOWBROKEN2'] = '已 Email 通知管理者，他们会修正这些页面。';
-$lang['zh_CN']['AssetAdmin']['OWNER'] = '拥有者';
 $lang['zh_CN']['AssetAdmin']['SAVEDFILE'] = '文件%s已保存';
 $lang['zh_CN']['AssetAdmin']['SAVEFOLDERNAME'] = '保存文件夹名称';
 $lang['zh_CN']['AssetAdmin']['THUMBSDELETED'] = '所有未使用的缩略图已经删除。';
@@ -82,11 +80,11 @@ $lang['zh_CN']['CMSMain']['CHOOSEREPORT'] = '（请选择一个报告）';
 $lang['zh_CN']['CMSMain']['COMPARINGV'] = '您正在比较#%d版本和#%d版本';
 $lang['zh_CN']['CMSMain']['COPYPUBTOSTAGE'] = '您确定将已发布的内容复制到预备发布站吗？';
 $lang['zh_CN']['CMSMain']['DELETE'] = '从测试网站中删除';
-$lang['zh_CN']['CMSMain']['DELETEFP'] = '从正式发布站上删除';
 $lang['zh_CN']['CMSMain']['DESCREMOVED'] = '连同 %s 子项';
 $lang['zh_CN']['CMSMain']['EMAIL'] = '电子邮件';
 $lang['zh_CN']['CMSMain']['GO'] = '执行';
 $lang['zh_CN']['CMSMain']['MENUTITLE'] = '网站内容管理';
+$lang['zh_CN']['CMSMain']['MENUTITLE'] = '网站内容';
 $lang['zh_CN']['CMSMain']['METADESCOPT'] = '网页描述标签';
 $lang['zh_CN']['CMSMain']['METAKEYWORDSOPT'] = '网页关键词标签';
 $lang['zh_CN']['CMSMain']['NEW'] = '新建的';
@@ -112,7 +110,6 @@ $lang['zh_CN']['CMSMain']['REMOVEDFD'] = '从预备发布站删除';
 $lang['zh_CN']['CMSMain']['REMOVEDPAGE'] = '从正式发布站删除网页“%s"';
 $lang['zh_CN']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = '已从测试站点删除 \'%s\'';
 $lang['zh_CN']['CMSMain']['REPORT'] = '报告';
-$lang['zh_CN']['CMSMain']['RESTORE'] = '恢复';
 $lang['zh_CN']['CMSMain']['RESTORED'] = '“%s“恢复成功';
 $lang['zh_CN']['CMSMain']['ROLLBACK'] = '恢复到这一版本';
 $lang['zh_CN']['CMSMain']['ROLLEDBACKPUB'] = '回复到已正式发布的版本。新的版本号为#%d';
@@ -131,7 +128,6 @@ $lang['zh_CN']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = '加入下列一个搜
 $lang['zh_CN']['CMSMain_left.ss']['BATCHACTIONS'] = '批量处理';
 $lang['zh_CN']['CMSMain_left.ss']['CHANGED'] = '已更改';
 $lang['zh_CN']['CMSMain_left.ss']['CLOSEBOX'] = '点击以关闭该区块';
-$lang['zh_CN']['CMSMain_left.ss']['COMMENTS'] = '评论';
 $lang['zh_CN']['CMSMain_left.ss']['COMPAREMODE'] = '比较状态（点击下面的两个）';
 $lang['zh_CN']['CMSMain_left.ss']['CREATE'] = '创建';
 $lang['zh_CN']['CMSMain_left.ss']['DEL'] = '已删除';
@@ -154,8 +150,6 @@ $lang['zh_CN']['CMSMain_left.ss']['SHOWONLYCHANGED'] = '只显示更改的网页
 $lang['zh_CN']['CMSMain_left.ss']['SHOWUNPUB'] = '显示未发布的版本';
 $lang['zh_CN']['CMSMain_left.ss']['SITECONTENT TITLE'] = '网站内容与结构';
 $lang['zh_CN']['CMSMain_left.ss']['SITEREPORTS'] = '网站报告';
-$lang['zh_CN']['CMSMain_left.ss']['TASKLIST'] = '任务清单';
-$lang['zh_CN']['CMSMain_left.ss']['WAITINGON'] = '等待处理';
 $lang['zh_CN']['CMSMain_right.ss']['ANYMESSAGE'] = '对您的编辑器您有什么信息吗？';
 $lang['zh_CN']['CMSMain_right.ss']['CHOOSEPAGE'] = '请选择左边的某一网页';
 $lang['zh_CN']['CMSMain_right.ss']['LOADING'] = '加载中...';
@@ -187,6 +181,7 @@ $lang['zh_CN']['CommentAdmin']['MARKASNOTSPAM'] = '这不是垃圾信息';
 $lang['zh_CN']['CommentAdmin']['MARKEDNOTSPAM'] = '标记 %s 评论为非垃圾信息。';
 $lang['zh_CN']['CommentAdmin']['MARKEDSPAM'] = '标记 %s 评论为垃圾信息。';
 $lang['zh_CN']['CommentAdmin']['MENUTITLE'] = '网页评论管理';
+$lang['zh_CN']['CommentAdmin']['MENUTITLE'] = '评论';
 $lang['zh_CN']['CommentAdmin']['NAME'] = '名字';
 $lang['zh_CN']['CommentAdmin']['PAGE'] = '页面';
 $lang['zh_CN']['CommentAdmin']['SPAM'] = '垃圾信息';
@@ -205,15 +200,20 @@ $lang['zh_CN']['ImageEditor.ss']['UNDO'] = '恢复';
 $lang['zh_CN']['ImageEditor.ss']['UNTITLED'] = '未命名文档';
 $lang['zh_CN']['ImageEditor.ss']['WIDTH'] = '宽';
 $lang['zh_CN']['LeftAndMain']['CHANGEDURL'] = '路径（URL）已改为”%s“';
+$lang['zh_CN']['LeftAndMain']['COMMENTS'] = '评论';
+$lang['zh_CN']['LeftAndMain']['FILESIMAGES'] = '文件和图片';
 $lang['zh_CN']['LeftAndMain']['HELP'] = '帮助';
 $lang['zh_CN']['LeftAndMain']['PAGETYPE'] = '网页类型';
 $lang['zh_CN']['LeftAndMain']['PERMAGAIN'] = '您于CMS的登录已被注销，请在下面输入用户名和密码重新登录。';
 $lang['zh_CN']['LeftAndMain']['PERMALREADY'] = '对不起，您无权登录CMS的这一部分。如果您要用另外的帐号，请在下面登录。';
 $lang['zh_CN']['LeftAndMain']['PERMDEFAULT'] = '请先选择一种验证方法并输入您的权限信息，以登录CMS。';
 $lang['zh_CN']['LeftAndMain']['PLEASESAVE'] = '请先保存：因为该网页还未保存，所以该页无法更新。';
+$lang['zh_CN']['LeftAndMain']['REPORTS'] = '报表';
 $lang['zh_CN']['LeftAndMain']['REQUESTERROR'] = '请求出错。';
 $lang['zh_CN']['LeftAndMain']['SAVED'] = '已保存';
 $lang['zh_CN']['LeftAndMain']['SAVEDUP'] = '已保存';
+$lang['zh_CN']['LeftAndMain']['SECURITY'] = '安全';
+$lang['zh_CN']['LeftAndMain']['SITECONTENT'] = '网站内容';
 $lang['zh_CN']['LeftAndMain']['SITECONTENTLEFT'] = '网站内容';
 $lang['zh_CN']['LeftAndMain.ss']['APPVERSIONTEXT1'] = '您当前所运行的';
 $lang['zh_CN']['LeftAndMain.ss']['APPVERSIONTEXT2'] = '版本，技术上讲，是CVS的目录分支。';
@@ -230,13 +230,6 @@ $lang['zh_CN']['LeftAndMain.ss']['SSWEB'] = 'SilverStripe网站';
 $lang['zh_CN']['LeftAndMain.ss']['VIEWPAGEIN'] = '展示站：';
 $lang['zh_CN']['LeftAndMain']['STATUSTO'] = '状态已改为”%s“';
 $lang['zh_CN']['LeftAndMain']['TREESITECONTENT'] = '网站内容';
-$lang['zh_CN']['MemberList']['ADD'] = '新加';
-$lang['zh_CN']['MemberList']['EMAIL'] = '电邮';
-$lang['zh_CN']['MemberList']['FILTERBYG'] = '由会员组筛选';
-$lang['zh_CN']['MemberList']['FN'] = '名';
-$lang['zh_CN']['MemberList']['PASSWD'] = '密码';
-$lang['zh_CN']['MemberList']['SEARCH'] = '搜索';
-$lang['zh_CN']['MemberList']['SN'] = '姓';
 $lang['zh_CN']['MemberList.ss']['FILTER'] = '筛选';
 $lang['zh_CN']['MemberList_Table.ss']['EMAIL'] = '电邮地址';
 $lang['zh_CN']['MemberList_Table.ss']['FN'] = '名';
@@ -249,13 +242,15 @@ $lang['zh_CN']['MemberTableField.ss']['DELETEMEMBER'] = '删除该会员';
 $lang['zh_CN']['MemberTableField.ss']['EDITMEMBER'] = '编辑该会员';
 $lang['zh_CN']['MemberTableField.ss']['SHOWMEMBER'] = '显示该会员';
 $lang['zh_CN']['ModelAdmin']['ADDBUTTON'] = '添加';
-$lang['zh_CN']['ModelAdmin']['CLASSTYPE'] = '类型';
+$lang['zh_CN']['ModelAdmin']['CREATEBUTTON'] = '创建\'%s\'';
 $lang['zh_CN']['ModelAdmin']['DELETE'] = '删除';
 $lang['zh_CN']['ModelAdmin']['GOBACK'] = '返回';
 $lang['zh_CN']['ModelAdmin']['ITEMNOTFOUND'] = '无法找到该内容';
 $lang['zh_CN']['ModelAdmin']['LOADEDFOREDITING'] = '正在打开\'%s\'的编辑试图';
 $lang['zh_CN']['ModelAdmin']['SAVE'] = '保存';
 $lang['zh_CN']['PageComment']['COMMENTBY'] = '由\'%s\'对\'%s\'评论';
+$lang['zh_CN']['PageComment']['PLURALNAME'] = '网页评论';
+$lang['zh_CN']['PageComment']['SINGULARNAME'] = '网页评论';
 $lang['zh_CN']['PageCommentInterface.ss']['COMMENTS'] = '评论';
 $lang['zh_CN']['PageCommentInterface.ss']['NEXT'] = '下一个';
 $lang['zh_CN']['PageCommentInterface.ss']['NOCOMMENTSYET'] = '该网页还未有评论。';
@@ -265,12 +260,14 @@ $lang['zh_CN']['PageCommentInterface_singlecomment.ss']['ISNTSPAM'] = '该评论
 $lang['zh_CN']['PageCommentInterface_singlecomment.ss']['ISSPAM'] = '该评论是网络垃圾';
 $lang['zh_CN']['PageCommentInterface_singlecomment.ss']['PBY'] = '提交人：';
 $lang['zh_CN']['PageCommentInterface_singlecomment.ss']['REMCOM'] = '移除该评论';
+$lang['zh_CN']['ReportAdmin']['MENUTITLE'] = '报表';
 $lang['zh_CN']['ReportAdmin_left.ss']['REPORTS'] = '报告';
 $lang['zh_CN']['ReportAdmin_right.ss']['WELCOME1'] = '欢迎来到';
 $lang['zh_CN']['ReportAdmin_right.ss']['WELCOME2'] = '报告系统。请从左边选择一个报告项';
 $lang['zh_CN']['ReportAdmin_SiteTree.ss']['REPORTS'] = '报告';
 $lang['zh_CN']['SecurityAdmin']['ADDMEMBER'] = '新加会员';
 $lang['zh_CN']['SecurityAdmin']['MENUTITLE'] = '用户安全权限管理';
+$lang['zh_CN']['SecurityAdmin']['MENUTITLE'] = '安全';
 $lang['zh_CN']['SecurityAdmin']['NEWGROUP'] = '新建会员组';
 $lang['zh_CN']['SecurityAdmin']['SAVE'] = '保存';
 $lang['zh_CN']['SecurityAdmin']['SGROUPS'] = '各个不同权限的会员组';
@@ -291,9 +288,6 @@ $lang['zh_CN']['StaticExporter']['BASEURL'] = '基本URL';
 $lang['zh_CN']['StaticExporter']['EXPORTTO'] = '导出到该文件夹';
 $lang['zh_CN']['StaticExporter']['FOLDEREXPORT'] = '导出文件夹';
 $lang['zh_CN']['StaticExporter']['NAME'] = '网站静态拷贝导出器';
-$lang['zh_CN']['StaticExporter']['ONETHATEXISTS'] = '请指定一已存在的文件夹';
-$lang['zh_CN']['TaskList.ss']['BY'] = '作者：';
-$lang['zh_CN']['ThumbnailStripField']['NOTAFOLDER'] = '这并非一个文件夹';
 $lang['zh_CN']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '（选择上面的一个文件夹）';
 $lang['zh_CN']['ViewArchivedEmail.ss']['CANACCESS'] = '您可通过这个链接进入已归挡的网页：';
 $lang['zh_CN']['ViewArchivedEmail.ss']['HAVEASKED'] = '在%s,您要求浏览我们网站';
diff --git a/lang/zh_TW.php b/lang/zh_TW.php
index 9df7087e..e26dbac1 100644
--- a/lang/zh_TW.php
+++ b/lang/zh_TW.php
@@ -17,8 +17,6 @@ if(array_key_exists('zh_TW', $lang) && is_array($lang['zh_TW'])) {
 }
 
 $lang['zh_TW']['AssetAdmin']['CHOOSEFILE'] = '選擇檔案';
-$lang['zh_TW']['AssetAdmin']['CONTENTMODBY'] = '可以更改內容的人：';
-$lang['zh_TW']['AssetAdmin']['CONTENTUSABLEBY'] = '可以使用內容的人：';
 $lang['zh_TW']['AssetAdmin']['DELETEDX'] = '刪除 %s 檔案. %s';
 $lang['zh_TW']['AssetAdmin']['FILESREADY'] = '可以上傳的檔案：';
 $lang['zh_TW']['AssetAdmin']['MENUTITLE'] = '檔案和圖片';
@@ -27,7 +25,6 @@ $lang['zh_TW']['AssetAdmin']['NEWFOLDER'] = '新資料夾';
 $lang['zh_TW']['AssetAdmin']['NOTEMP'] = '找不到檔案上傳的暫存資料夾。請在 php.ini 設定 upload_tmp_dir';
 $lang['zh_TW']['AssetAdmin']['NOTHINGTOUPLOAD'] = '沒有檔案可以上傳';
 $lang['zh_TW']['AssetAdmin']['NOWBROKEN'] = '下列的網頁含有失效的連結：';
-$lang['zh_TW']['AssetAdmin']['OWNER'] = '擁有者';
 $lang['zh_TW']['AssetAdmin']['SAVEDFILE'] = '儲存檔案 %s';
 $lang['zh_TW']['AssetAdmin']['SAVEFOLDERNAME'] = '儲存資料夾名稱';
 $lang['zh_TW']['AssetAdmin']['UPLOAD'] = '上傳下列檔案';
@@ -64,7 +61,6 @@ $lang['zh_TW']['CMSMain']['CANCEL'] = '取消';
 $lang['zh_TW']['CMSMain']['CHOOSEREPORT'] = '(選擇報告)';
 $lang['zh_TW']['CMSMain']['COMPARINGV'] = '您正在比較第%d版與第%d版';
 $lang['zh_TW']['CMSMain']['COPYPUBTOSTAGE'] = '您真的要將已發布的內容複製到預備發布站嗎？';
-$lang['zh_TW']['CMSMain']['DELETEFP'] = '成功的從正式發布站移除';
 $lang['zh_TW']['CMSMain']['EMAIL'] = '電子郵件';
 $lang['zh_TW']['CMSMain']['GO'] = '執行';
 $lang['zh_TW']['CMSMain']['MENUTITLE'] = '網站內容';
@@ -90,7 +86,6 @@ $lang['zh_TW']['CMSMain']['PUBALLFUN2'] = '按下這個按鈕就是如同到每
 $lang['zh_TW']['CMSMain']['PUBPAGES'] = '完成：共發布了%頁';
 $lang['zh_TW']['CMSMain']['REMOVEDFD'] = '成功的從預備發布站移除';
 $lang['zh_TW']['CMSMain']['REMOVEDPAGE'] = '成功的從正式發布站移除 「%s」';
-$lang['zh_TW']['CMSMain']['RESTORE'] = '復原';
 $lang['zh_TW']['CMSMain']['RESTORED'] = '復原 \'%s\'  成功';
 $lang['zh_TW']['CMSMain']['ROLLBACK'] = '回複到這個的版本';
 $lang['zh_TW']['CMSMain']['ROLLEDBACKPUB'] = '成功的回複到正式發布的版本。新的版本號是%d。';
@@ -109,7 +104,6 @@ $lang['zh_TW']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = '新增搜尋範圍';
 $lang['zh_TW']['CMSMain_left.ss']['BATCHACTIONS'] = '整批處理';
 $lang['zh_TW']['CMSMain_left.ss']['CHANGED'] = '已變更';
 $lang['zh_TW']['CMSMain_left.ss']['CLOSEBOX'] = '點擊以關閉這個區塊';
-$lang['zh_TW']['CMSMain_left.ss']['COMMENTS'] = '留言';
 $lang['zh_TW']['CMSMain_left.ss']['COMPAREMODE'] = '比較模式(點選兩個)';
 $lang['zh_TW']['CMSMain_left.ss']['CREATE'] = '建立';
 $lang['zh_TW']['CMSMain_left.ss']['DEL'] = '已刪除';
@@ -132,8 +126,6 @@ $lang['zh_TW']['CMSMain_left.ss']['SHOWONLYCHANGED'] = '只顯示被變更的網
 $lang['zh_TW']['CMSMain_left.ss']['SHOWUNPUB'] = '顯示尚未發布的版本';
 $lang['zh_TW']['CMSMain_left.ss']['SITECONTENT TITLE'] = '網站內容及架構';
 $lang['zh_TW']['CMSMain_left.ss']['SITEREPORTS'] = '網站報告';
-$lang['zh_TW']['CMSMain_left.ss']['TASKLIST'] = '任務清單';
-$lang['zh_TW']['CMSMain_left.ss']['WAITINGON'] = '等待處理';
 $lang['zh_TW']['CMSMain_right.ss']['ANYMESSAGE'] = '對您的編輯有什麼話嗎？';
 $lang['zh_TW']['CMSMain_right.ss']['CHOOSEPAGE'] = '請從左邊選擇一個網頁。';
 $lang['zh_TW']['CMSMain_right.ss']['LOADING'] = '載入中...';
@@ -187,13 +179,6 @@ $lang['zh_TW']['LeftAndMain.ss']['SSWEB'] = 'Silverstripe網站';
 $lang['zh_TW']['LeftAndMain.ss']['VIEWPAGEIN'] = '網頁瀏覽：';
 $lang['zh_TW']['LeftAndMain']['STATUSTO'] = '狀態改變為「%s」';
 $lang['zh_TW']['LeftAndMain']['TREESITECONTENT'] = '網站內容';
-$lang['zh_TW']['MemberList']['ADD'] = '新增';
-$lang['zh_TW']['MemberList']['EMAIL'] = '電子郵件';
-$lang['zh_TW']['MemberList']['FILTERBYG'] = '由會員組篩選';
-$lang['zh_TW']['MemberList']['FN'] = '名';
-$lang['zh_TW']['MemberList']['PASSWD'] = '密碼';
-$lang['zh_TW']['MemberList']['SEARCH'] = '搜尋';
-$lang['zh_TW']['MemberList']['SN'] = '姓';
 $lang['zh_TW']['MemberList.ss']['FILTER'] = '篩選';
 $lang['zh_TW']['MemberList_Table.ss']['EMAIL'] = '電子郵件';
 $lang['zh_TW']['MemberList_Table.ss']['FN'] = '名';
@@ -240,9 +225,6 @@ $lang['zh_TW']['StaticExporter']['BASEURL'] = '基本網址';
 $lang['zh_TW']['StaticExporter']['EXPORTTO'] = '匯出至那個資料夾';
 $lang['zh_TW']['StaticExporter']['FOLDEREXPORT'] = '資料夾匯出至';
 $lang['zh_TW']['StaticExporter']['NAME'] = '網站靜態匯出';
-$lang['zh_TW']['StaticExporter']['ONETHATEXISTS'] = '請選擇存在的資料夾';
-$lang['zh_TW']['TaskList.ss']['BY'] = '由';
-$lang['zh_TW']['ThumbnailStripField']['NOTAFOLDER'] = '這不是一個資料夾';
 $lang['zh_TW']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(請選擇上面的一個資料夾)';
 $lang['zh_TW']['ViewArchivedEmail.ss']['CANACCESS'] = '您可以利用哲格連結到已歸檔站：';
 $lang['zh_TW']['ViewArchivedEmail.ss']['HAVEASKED'] = '您要瀏覽這一天的網站內容：';

From 3ed6e4df05346852df1d7707393fd88831637176 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 12 Mar 2010 03:17:44 +0000
Subject: [PATCH 311/483] MINOR Adjusted CMSMain->getRootForm() to SiteConfig
 API changes

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100974 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index d288f7ef..55add3e5 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -491,11 +491,11 @@ JS;
 	 */
 	function RootForm() {
 		$siteConfig = SiteConfig::current_site_config();
-		$fields = $siteConfig->getFormFields(); 
+		$fields = $siteConfig->getCMSFields(); 
 		if(Object::has_extension('SiteConfig',"Translatable")){ 
 			$fields->push(new HiddenField('Locale','', $siteConfig->Locale ));       
 		} 
-		$form = new Form($this, "EditForm", $fields, $siteConfig->getFormActions());
+		$form = new Form($this, "EditForm", $fields, $siteConfig->getCMSActions());
 		$form->loadDataFrom($siteConfig);
 		
 		$this->extend('updateEditForm', $form);

From 3e9424ac27e2aaa42257e32a5be97829b0f73bf8 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 15 Mar 2010 20:50:12 +0000
Subject: [PATCH 312/483] MINOR Fixed permission language code regression

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101062 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 2 +-
 lang/en_US.php   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 55add3e5..3862c655 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -1361,7 +1361,7 @@ JS;
 		$perms["CMS_ACCESS_LeftAndMain"] = array(
 			'name' => _t('CMSMain.ACCESSALLINTERFACES', 'Access to all CMS sections'),
 			'category' => _t('Permission.CMS_ACCESS_CATEGORY', 'CMS Access'),
-			'help' => _t('CMSMain.ACCESSALLINTERFACES', 'Overrules more specific access settings.'),
+			'help' => _t('CMSMain.ACCESSALLINTERFACESHELP', 'Overrules more specific access settings.'),
 			'sort' => -100
 		);
 		$perms['CMS_ACCESS_CMSMain']['help'] = _t(
diff --git a/lang/en_US.php b/lang/en_US.php
index 0dc37c1f..86f803a6 100755
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -90,7 +90,8 @@ $lang['en_US']['CMSMain']['ACCESS'] = array(
 	PR_MEDIUM,
 	'Item in permission selection identifying the admin section. Example: Access to \'Files & Images\''
 );
-$lang['en_US']['CMSMain']['ACCESSALLINTERFACES'] = 'Overrules more specific access settings.';
+$lang['en_US']['CMSMain']['ACCESSALLINTERFACES'] = 'Access to all CMS sections';
+$lang['en_US']['CMSMain']['ACCESSALLINTERFACESHELP'] = 'Overrules more specific access settings.';
 $lang['en_US']['CMSMain']['ACCESS_HELP'] = 'Allow viewing of the section containing page tree and content. View and edit permissions can be handled through page specific dropdowns, as well as the separate "Content permissions".';
 $lang['en_US']['CMSMain']['CANCEL'] = 'Cancel';
 $lang['en_US']['CMSMain']['CHOOSEREPORT'] = '(Choose a report)';

From 4e8aa378b9e3c7f7c3de79a10dca407f3681b382 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 15 Mar 2010 22:08:48 +0000
Subject: [PATCH 313/483] MINOR Fixed merge error from r99117

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101076 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 thirdparty/multifile/multifile.js | 38 ++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/thirdparty/multifile/multifile.js b/thirdparty/multifile/multifile.js
index 99a68a81..e6c9ba2e 100755
--- a/thirdparty/multifile/multifile.js
+++ b/thirdparty/multifile/multifile.js
@@ -43,6 +43,26 @@
  
 // Modified by: Silverstripe Ltd. (changed naming of file-input-elements) 
 
+function ObservableObject() {
+    this.functions = [];
+}
+ObservableObject.prototype = {
+    subscribe : function(evt, fn) {
+        this.functions.push([evt, fn]);
+    },
+    unsubscribe : function(evt, fn) {
+        this.functions = this.fns.filter(function(el) {if (el !== [evt, fn]) return el;});
+    },
+    fire : function(evt, data, scope) {
+		scope = scope || window
+        this.functions.forEach(function(el) {
+			if (el[0] == evt) el[1].call(scope, data);
+		});
+    }
+};
+
+var MultiSelectorObserver = new ObservableObject();
+
 function MultiSelector( list_target, max, upload_button ){
 	
 	this.upload_button = upload_button;
@@ -130,6 +150,7 @@ function MultiSelector( list_target, max, upload_button ){
 	 * Add a new row to the list of files
 	 */
 	this.addListRow = function( element ){
+		var fileId = this.id -1; 
 
 		// Modified 2006-11-06 by Silverstripe Ltd.
 		var filenameMatches = element.value.match(/([^\/\\]+)$/);
@@ -137,6 +158,7 @@ function MultiSelector( list_target, max, upload_button ){
 		
 		// Row div
 		var new_row = document.createElement('div');
+		new_row.className = 'fileBox'; 
 
 		// Delete button
 		var new_row_button = document.createElement('input');
@@ -174,6 +196,8 @@ function MultiSelector( list_target, max, upload_button ){
 		// Set row value
 		// Modified 2006-11-06 by Silverstripe Ltd.
 		new_row.innerHTML = filename;
+		
+		MultiSelectorObserver.fire('onBeforeCreateRow', [fileId, new_row], this); 
 
 		// Add button
 		new_row.appendChild( new_row_button );
@@ -181,9 +205,21 @@ function MultiSelector( list_target, max, upload_button ){
 		// Add it to the list
 		this.list_target.appendChild( new_row );
 		
+		MultiSelectorObserver.fire('onAfterCreateRow', [fileId, new_row], this); 
+		
 		// Modified 2006-11-06 by Silverstripe Ltd.
 		window.ontabschanged();
 		
 	};
 
-};
\ No newline at end of file
+};
+
+MultiSelectorObserver.subscribe('onBeforeCreateRow', function(data) {
+	if (jQuery('#metadataFormTemplate')) {
+		var parameters = jQuery('#metadataFormTemplate').clone(true);
+		parameters.get(0).id = '';
+		parameters.find(":input[name!='']").each(function(i) { this.name = this.name.replace(/__X__/g, data[0]); });
+		parameters.find(":input[id!='']").each(function(i) { this.id = this.id.replace(/__X__/g, data[0]); });
+		data[1].innerHTML = data[1].innerHTML + '<div id="MetadataFor-'+data[0]+'">'+parameters.html()+'</div>';
+	}
+});
\ No newline at end of file

From fd42eae95b328332c140857716942270272e6eb4 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 16 Mar 2010 00:28:40 +0000
Subject: [PATCH 314/483] MINOR: Use castingHelper() rather than
 castingHelperPair() to look for a field presence.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101091 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 3862c655..35d8cd03 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -562,7 +562,7 @@ JS;
 
 		// DataObject::fieldExists only checks the current class, not the hierarchy
 		// This allows the CMS to set the correct sort value
-		if($newItem->castingHelperPair('Sort')) {
+		if($newItem->castingHelper('Sort')) {
 			$newItem->Sort = DB::query("SELECT MAX(\"Sort\") FROM \"SiteTree\" WHERE \"ParentID\" = '" . Convert::raw2sql($parentID) . "'")->value() + 1;
 		}
 

From 67e55a7f992e2e309cb2179c981cd8777a1c6c14 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Mar 2010 02:28:29 +0000
Subject: [PATCH 315/483] MINOR Disabled metadata upload in AssetAdmin by
 default, configurable through AssetAdmin::$metadata_upload_enabled. Feature
 needs UI review.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101106 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php                  | 15 ++++++++++++++-
 templates/AssetAdmin_uploadiframe.ss |  8 +++++---
 thirdparty/multifile/multifile.css   |  4 ++--
 thirdparty/multifile/multifile.js    |  2 +-
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 5228b36d..c5cb2ab7 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -41,6 +41,15 @@ class AssetAdmin extends LeftAndMain {
 		'deleteUnusedThumbnails' => 'ADMIN'
 	);
 	
+	/**
+	 * @var boolean Enables upload of additional textual information
+	 * alongside each file (through multifile.js), which makes
+	 * batch changes easier.
+	 * 
+	 * CAUTION: This is an unstable API which might change.
+	 */
+	public static $metadata_upload_enabled = true;
+	
 	/**
 	 * Return fake-ID "root" if no ID is found (needed to upload files into the root-folder)
 	 */
@@ -117,9 +126,13 @@ JS
 	}
 	
 	/**
+	 * Needs to be enabled through {@link AssetAdmin::$metadata_upload_enabled}
+	 * 
 	 * @return String
 	 */
 	function UploadMetadataHtml() {
+		if(!self::$metadata_upload_enabled) return;
+		
 		$fields = singleton('File')->uploadMetadataFields();
 
 		// Return HTML with markers for easy replacement
@@ -240,7 +253,7 @@ JS
 				if($valid) {
 					$newFile = $folder->addUploadToFolder($tmpFile);
 					
-					if (isset($processedData[$filePostId])) {
+					if(self::$metadata_upload_enabled && isset($processedData[$filePostId])) {
 						$fileObject = DataObject::get_by_id('File', $newFile);
 						$metadataForm = new Form($this, 'MetadataForm', $fileObject->uploadMetadataFields(), new FieldSet());
 						$metadataForm->loadDataFrom($processedData[$filePostId]);
diff --git a/templates/AssetAdmin_uploadiframe.ss b/templates/AssetAdmin_uploadiframe.ss
index 0d13bead..75035213 100755
--- a/templates/AssetAdmin_uploadiframe.ss
+++ b/templates/AssetAdmin_uploadiframe.ss
@@ -21,9 +21,11 @@
 	<body>
 	<% if CanUpload %>
 		$UploadForm
-		<div id="metadataFormTemplate" style="display:none">
-			$UploadMetadataHtml
-		</div>
+		<% if UploadMetadataHtml %>
+			<div id="metadataFormTemplate" style="display:none">
+				$UploadMetadataHtml
+			</div>
+		<% end_if %>
 	<% else %>
 		<% _t('PERMFAILED','You do not have permission to upload files into this folder.') %>
 	<% end_if %>
diff --git a/thirdparty/multifile/multifile.css b/thirdparty/multifile/multifile.css
index 03536d07..898c01f8 100755
--- a/thirdparty/multifile/multifile.css
+++ b/thirdparty/multifile/multifile.css
@@ -69,14 +69,14 @@
 	margin-top: 5px;
 }
 
-#Form_UploadForm_FilesList div {
+#Form_UploadForm_FilesList .fileBox {
 	width: auto;
 	border: 1px solid #F1EFE2;
 	padding: 5px;
 	margin-bottom: 5px;
 }
 
-#Form_UploadForm_FilesList div .delete:hover {
+#Form_UploadForm_FilesList .fileBox .delete:hover {
 	background: red;
 	font-weight: bold;
 }
diff --git a/thirdparty/multifile/multifile.js b/thirdparty/multifile/multifile.js
index e6c9ba2e..fc42ab0e 100755
--- a/thirdparty/multifile/multifile.js
+++ b/thirdparty/multifile/multifile.js
@@ -215,7 +215,7 @@ function MultiSelector( list_target, max, upload_button ){
 };
 
 MultiSelectorObserver.subscribe('onBeforeCreateRow', function(data) {
-	if (jQuery('#metadataFormTemplate')) {
+	if (jQuery('#metadataFormTemplate').length) {
 		var parameters = jQuery('#metadataFormTemplate').clone(true);
 		parameters.get(0).id = '';
 		parameters.find(":input[name!='']").each(function(i) { this.name = this.name.replace(/__X__/g, data[0]); });

From 5271e54972a36da81a59a5a860137fefa67e4ac3 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Mar 2010 02:32:49 +0000
Subject: [PATCH 316/483] MINOR Fixed wrong default value for AssetAdmin (see
 r101106)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101111 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index c5cb2ab7..f81cef5c 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -48,7 +48,7 @@ class AssetAdmin extends LeftAndMain {
 	 * 
 	 * CAUTION: This is an unstable API which might change.
 	 */
-	public static $metadata_upload_enabled = true;
+	public static $metadata_upload_enabled = false;
 	
 	/**
 	 * Return fake-ID "root" if no ID is found (needed to upload files into the root-folder)

From 9ac87ea4fc2425697a46ca51936d55bc408864e4 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 16 Mar 2010 03:18:15 +0000
Subject: [PATCH 317/483] MINOR: Fixed test that was relying on bug fixed in
 r101116

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101117 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/CommentAdminTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/CommentAdminTest.php b/tests/CommentAdminTest.php
index 5eebdc4a..2fbdb49b 100644
--- a/tests/CommentAdminTest.php
+++ b/tests/CommentAdminTest.php
@@ -32,7 +32,7 @@ class CommentAdminTest extends FunctionalTest {
 		$result = $this->get("admin/comments/EditForm/field/Comments/item/$id/delete");
 		$checkComm = DataObject::get_by_id('PageComment',$id);
 
-		$this->assertEquals(0, $checkComm->ID);
+		$this->assertNull($checkComm);
 	}
 	
 }

From e3dd9c9af33d82f83e7437a43791b58aa57c2285 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 16 Mar 2010 03:58:50 +0000
Subject: [PATCH 318/483] MINOR: Fixed test that was relying on bug fixed in
 r101116

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101132 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/CommentAdminTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/CommentAdminTest.php b/tests/CommentAdminTest.php
index 2fbdb49b..9a3cfa92 100644
--- a/tests/CommentAdminTest.php
+++ b/tests/CommentAdminTest.php
@@ -32,7 +32,7 @@ class CommentAdminTest extends FunctionalTest {
 		$result = $this->get("admin/comments/EditForm/field/Comments/item/$id/delete");
 		$checkComm = DataObject::get_by_id('PageComment',$id);
 
-		$this->assertNull($checkComm);
+		$this->assertFalse($checkComm);
 	}
 	
 }

From f8ff13ad9e75159557f6d92aa45c452d42d89a49 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 16 Mar 2010 04:15:05 +0000
Subject: [PATCH 319/483] MINOR Fixed multifile.js non-standard forEach()
 reference, using jQuery.each() instead

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101135 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 thirdparty/multifile/multifile.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/thirdparty/multifile/multifile.js b/thirdparty/multifile/multifile.js
index fc42ab0e..4cd65ad9 100755
--- a/thirdparty/multifile/multifile.js
+++ b/thirdparty/multifile/multifile.js
@@ -53,12 +53,12 @@ ObservableObject.prototype = {
     unsubscribe : function(evt, fn) {
         this.functions = this.fns.filter(function(el) {if (el !== [evt, fn]) return el;});
     },
-    fire : function(evt, data, scope) {
-		scope = scope || window
-        this.functions.forEach(function(el) {
-			if (el[0] == evt) el[1].call(scope, data);
-		});
-    }
+		fire : function(evt, data, scope) {
+			scope = scope || window
+			jQuery(this.functions).each(function(el) {
+				if (el[0] == evt) el[1].call(scope, data);
+			});
+		}
 };
 
 var MultiSelectorObserver = new ObservableObject();

From 11392e5bb21cc0adb07278fef75507a30e6f694e Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 17 Mar 2010 02:30:05 +0000
Subject: [PATCH 320/483] BUGFIX: Make SS_ReportWrapper::sourceRecords()'
 arguments optional

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101189 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/Report.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/Report.php b/code/Report.php
index 14af6e7f..2adc8ef7 100644
--- a/code/Report.php
+++ b/code/Report.php
@@ -482,7 +482,7 @@ abstract class SS_ReportWrapper extends SS_Report {
 
 	}
 
-	function sourceRecords($params, $sort, $limit) {
+	function sourceRecords($params = array(), $sort = null, $limit = null) {
 		$this->beforeQuery($params);
 		$records = $this->baseReport->sourceRecords($params, $sort, $limit);
 		$this->afterQuery();

From c8945d981928aa5bf32194bab0dd9a1a939a0b39 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Fri, 19 Mar 2010 01:57:25 +0000
Subject: [PATCH 321/483] BUGFIX Fixed closing </div> which should have been a
 </td> for dragfile in AssetTableField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101375 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 templates/Includes/AssetTableField.ss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/Includes/AssetTableField.ss b/templates/Includes/AssetTableField.ss
index 036760ef..75e4b2bd 100755
--- a/templates/Includes/AssetTableField.ss
+++ b/templates/Includes/AssetTableField.ss
@@ -22,7 +22,7 @@
 						<td class="dragfile" id="drag-$Parent.Name-$ID">
 							<img id="drag-img-$Parent.Name-$ID" alt="Drag" title="<% _t('DRAGTOFOLDER','Drag to folder on left to move file') %>" src="sapphire/images/drag.gif" />
 							<span class="linkCount" style="display: none;">$BackLinkTrackingCount</span>
-						</div>
+						</td>
 						<% if Markable %><td class="markingcheckbox">$MarkingCheckbox</td><% end_if %>
 						<% control Fields %>
 						<td>$Value</td>

From ba3fbe101bdfc17bf3eafda8427835bb35451cde Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Wed, 24 Mar 2010 04:01:25 +0000
Subject: [PATCH 322/483] BUGFIX: IE does not accept TD element without a
 table, repacking into DIV (open #5228)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101602 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/AssetAdmin.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/javascript/AssetAdmin.js b/javascript/AssetAdmin.js
index 4f8a4de0..5b910d9d 100755
--- a/javascript/AssetAdmin.js
+++ b/javascript/AssetAdmin.js
@@ -217,13 +217,13 @@ Object.extend( SubsDraggable.prototype , {
 		}
 	}
 });
-// gets element that should be dragged instead of original element
-// returned element should be added to DOM tree, and will be deleted by dragdrop library
+// Creates drag element by copying the content into DIV wrapper (IE does not like TD outside of tables)
+// The drag element will be deleted by dragdrop library.
 function getDragElement(element){
-	var el = element.cloneNode(true);
-	el.id = '';
-	document.body.appendChild(el);
-	return el;
+	wrap = document.createElement('div');
+	wrap.innerHTML = element.innerHTML;
+	document.body.appendChild(wrap);
+	return wrap;
 }
 
 // Set up DRAG handle

From 0449a6bc7d0cdc3504e0692c92a9a76849b40596 Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Wed, 24 Mar 2010 04:05:53 +0000
Subject: [PATCH 323/483] BUGFIX: remove the unnecessary DOM manipulation, this
 is legacy code due to SilverStripeNavigator changes (open #5250)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101604 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/SideTabs.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/javascript/SideTabs.js b/javascript/SideTabs.js
index d853c008..2e706b56 100755
--- a/javascript/SideTabs.js
+++ b/javascript/SideTabs.js
@@ -309,12 +309,7 @@ VersionList.prototype = {
 			var url = 'admin/getversion/' + pageID + '/' + versionID;
 			if($('Form_EditForm_Locale')) url += "?locale=" + $('Form_EditForm_Locale').value;
 			$('Form_EditForm').loadURLFromServer(url);
-			$('viewArchivedSite').style.display = '';
-			$('viewArchivedSite').getVars = '?archiveDate=' + sourceEl.getElementsByTagName('td')[1].className;
-			
 		} else {
-			$('viewArchivedSite').style.display = 'none';
-
 			if(this.otherVersionID) {
 				sourceEl.select();
 				this.otherSourceEl.select(true);
@@ -342,7 +337,6 @@ VersionList.prototype = {
 		if(this.idLoaded) {
 			$('Form_EditForm').getPageFromServer(this.idLoaded);
 		}
-		$('viewArchivedSite').style.display = 'none';
 	}
 }
 

From fb16cc63f61e31dc9a9ee32721162138edb8a70d Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Wed, 24 Mar 2010 20:33:27 +0000
Subject: [PATCH 324/483] BUGFIX: put back into the SSNavigator the archived
 site link (#5251)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101623 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 35d8cd03..b006956e 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -118,8 +118,16 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		return true;
 	}
 	
-	function SwitchView() {
-		if($page = $this->currentPage()) {
+	/**
+	 * Overloads the LeftAndMain::ShowView. Allows to pass a page as a parameter, so we are able
+	 * to switch view also for archived versions.
+	 */
+	function SwitchView($page = null) {
+		if(!$page) {
+			$page = $this->currentPage();
+		}
+		
+		if($page) {
 			$nav = SilverStripeNavigator::get_for_record($page);
 			Requirements::customScript("window.name = windowName('cms');");
 			return $nav['items'];
@@ -916,12 +924,14 @@ JS;
 			if(Director::is_ajax()) {
 				$result = $templateData->renderWith($this->class . '_right');
 				$parts = split('</?form[^>]*>', $result);
-				return $parts[sizeof($parts)-2];
+				$content = $parts[sizeof($parts)-2];
+				if($this->ShowSwitchView()) {
+					$content .= '<div id="AjaxSwitchView">' . $this->SwitchView($record) . '</div>';
+				}
+				return $content;
 			} else {
 				return $templateData->renderWith('LeftAndMain');
 			}
-			
-			
 		}
 	}
 

From e507f9488bc928a0dc69a7df237e5998a968172f Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 25 Mar 2010 22:44:33 +0000
Subject: [PATCH 325/483] BUGFIX Only show "Roles" tab in admin/security if
 user has APPLY_ROLES permissions (fixes #5258)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101719 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SecurityAdmin.php | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index bdbfbe4b..033eb594 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -81,20 +81,21 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 						)
 					)
 				);
-				
-				$fields->addFieldToTab(
-					'Root.Roles',
-					new LiteralField(
-						'RolesAddEditLink', 
-						sprintf(
-							'<p class="add-role"><a href="%s">%s</a></p>',
-							$this->Link('show/root'),
-							// TODO This should include #Root_Roles to switch directly to the tab,
-							// but tabstrip.js doesn't display tabs when directly adressed through a URL pragma
-							_t('Group.RolesAddEditLink', 'Add/edit roles')
+				if(Permission::check('APPLY_ROLES')) { 
+					$fields->addFieldToTab(
+						'Root.Roles',
+						new LiteralField(
+							'RolesAddEditLink', 
+							sprintf(
+								'<p class="add-role"><a href="%s">%s</a></p>',
+								$this->Link('show/root'),
+								// TODO This should include #Root_Roles to switch directly to the tab,
+								// but tabstrip.js doesn't display tabs when directly adressed through a URL pragma
+								_t('Group.RolesAddEditLink', 'Add/edit roles')
+							)
 						)
-					)
-				);
+					);
+				}
 			}
 		
 			$actions = new FieldSet(

From 0e2c39593f2c20b99f3e49f9288671afa5c30524 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 25 Mar 2010 22:52:10 +0000
Subject: [PATCH 326/483] MINOR Fixed getElementsByClassName() usage in
 AssetTableField.js (fixes #5256)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101723 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/AssetTableField.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/AssetTableField.js b/javascript/AssetTableField.js
index 3040742b..c1f4847f 100644
--- a/javascript/AssetTableField.js
+++ b/javascript/AssetTableField.js
@@ -49,7 +49,7 @@ AssetTableField.prototype = {
 		var link = Event.findElement(e,"a");
 		var row = Event.findElement(e,"tr");
 		
-		var linkCount = row.getElementsByClassName('linkCount')[0];
+		var linkCount = document.getElementsByClassName('linkCount', row)[0];
 		if(linkCount) linkCount = linkCount.innerHTML;
 		
 		var confirmMessage = ss.i18n._t('TABLEFIELD.DELETECONFIRMMESSAGE', 'Are you sure you want to delete this record?');

From 4469b0028a6cfb9941163d7862aa23d63cacacc9 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Fri, 26 Mar 2010 02:33:59 +0000
Subject: [PATCH 327/483] BUGFIX RedirectorPage types shouldn't appear in
 "Pages with no content" side report in the CMS Pages tab

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101737 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SideReport.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/SideReport.php b/code/SideReport.php
index 5dc8ae3a..ef0737bb 100755
--- a/code/SideReport.php
+++ b/code/SideReport.php
@@ -134,7 +134,7 @@ class SideReport_EmptyPages extends SS_Report {
 		return 100;
 	}
 	function sourceRecords($params = null) {
-		return DataObject::get("SiteTree", "\"Content\" = '' OR \"Content\" IS NULL OR \"Content\" LIKE '<p></p>' OR \"Content\" LIKE '<p>&nbsp;</p>'", '"Title"');
+		return DataObject::get("SiteTree", "\"ClassName\" != 'RedirectorPage' AND (\"Content\" = '' OR \"Content\" IS NULL OR \"Content\" LIKE '<p></p>' OR \"Content\" LIKE '<p>&nbsp;</p>')", '"Title"');
 	}
 	function columns() {
 		return array(

From 97a0abb2cc99d360696768ca9279d421570bc046 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 28 Mar 2010 19:51:47 +0000
Subject: [PATCH 328/483] MINOR Removed unnecessary "show" icons in "Roles" and
 "Member" ComplexTableFields

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101752 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SecurityAdmin.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 033eb594..0318c232 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -132,7 +132,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 			"Members"
 		);
 		// unset 'inlineadd' permission, we don't want inline addition
-		$memberList->setPermissions(array('show', 'edit', 'delete', 'add'));
+		$memberList->setPermissions(array('edit', 'delete', 'add'));
 		$memberList->setRelationAutoSetting(false);
 		
 		$fields = new FieldSet(
@@ -170,6 +170,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 				'Roles',
 				'PermissionRole'
 			);
+			$rolesCTF->setPermissions(array('edit', 'delete'));
 
 			$rolesTab = $fields->findOrMakeTab('Root.Roles', _t('SecurityAdmin.TABROLES', 'Roles'));
 			$rolesTab->push(new LiteralField(

From a59fcdd4302c527915f650dd48ff76e0eec7c932 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 28 Mar 2010 20:06:45 +0000
Subject: [PATCH 329/483] MINOR Removed unnecessary console.*() from cms
 javascript files

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101754 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/LeftAndMain.js      | 3 ---
 javascript/WidgetAreaEditor.js | 5 -----
 2 files changed, 8 deletions(-)

diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index 536a9fde..674a2012 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -606,9 +606,6 @@ ChangeTracker.prototype = {
 		    
 			if(!element.isChanged) element.isChanged = this.field_changed;
 			if(!this.changeDetection_fieldsToIgnore[element.name] && element.isChanged()) {
-				//console.log('Changed:'+ element.id + '(' + this.originalSerialized +')->('+Form.Element.serialize(element)+')' );
-				//console.log(element)
-
 				return true;
 			}
 		}
diff --git a/javascript/WidgetAreaEditor.js b/javascript/WidgetAreaEditor.js
index 51f5c573..14de3b12 100644
--- a/javascript/WidgetAreaEditor.js
+++ b/javascript/WidgetAreaEditor.js
@@ -63,19 +63,14 @@ WidgetAreaEditorClass.prototype = {
 				if (!widget.getAttribute('rewritten') && (widget.id || widget.name)) {
 					if (widget.id && widget.id.indexOf('Widget[') === 0) {
 						var newValue = widget.id.replace(/Widget\[/, 'Widget['+name+'][');
-						//console.log('Renaming '+widget.tagName+' ID '+widget.id+' to '+newValue);
 						widget.id = newValue;
 					}
 					if (widget.name && widget.name.indexOf('Widget[') === 0) {
 						var newValue = widget.name.replace(/Widget\[/, 'Widget['+name+'][');
-						//console.log('Renaming '+widget.tagName+' Name '+widget.name+' to '+newValue);
 						widget.name = newValue;
 					}
 					widget.setAttribute('rewritten', 'yes');
 				}
-				else {
-					//console.log('Skipping '+(widget.id ? widget.id : (widget.name ? widget.name : 'unknown '+widget.tagName)));
-				}
 			}
 		}
 		

From b9b4acabaf994450de616e886952e609b3b47e06 Mon Sep 17 00:00:00 2001
From: Andreas Piening <andreas@silverstripe.com>
Date: Mon, 29 Mar 2010 03:33:22 +0000
Subject: [PATCH 330/483] BUGFIX: keep ModelAdmin from importing data twice

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101795 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ModelAdmin.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index 58f8156f..8b1d24f1 100755
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -515,13 +515,11 @@ class ModelAdmin_CollectionController extends Controller {
 			Director::redirectBack();
 			return false;
 		}
-		
-		$results = $loader->load($_FILES['_CsvFile']['tmp_name']);
+
 		if (!empty($data['EmptyBeforeImport']) && $data['EmptyBeforeImport']) { //clear database before import 
-			$results = $loader->load($_FILES['_CsvFile']['tmp_name'], '512M', true);                 
-		} else {        //normal import without clearing 
-			$results = $loader->load($_FILES['_CsvFile']['tmp_name']); 
+			$loader->deleteExistingRecords = true;
 		}
+		$results = $loader->load($_FILES['_CsvFile']['tmp_name']);
 		
 		$message = '';
 		if($results->CreatedCount()) $message .= sprintf(

From b6a41ebc19f59579d4f99db74fe13065a249a018 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Mon, 29 Mar 2010 21:58:57 +0000
Subject: [PATCH 331/483] BUGFIX #5295: Update CMS site name in LHS via Ajax
 after siteconfig save.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101810 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index b006956e..850f1348 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -380,6 +380,10 @@ JS;
 		$siteConfig->write();
 		FormResponse::status_message('Saved site configuration', "good");
 		FormResponse::add("$('Form_EditForm').resetElements();");
+
+		$title = Convert::raw2js($siteConfig->Title);
+		FormResponse::add("$('sitetree').setNodeTitle(0, \"$title\");");
+
 		return FormResponse::respond();
 	}
 	/**

From a32b6237ed465f7fc9d339d96c4fb76150541c27 Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Tue, 30 Mar 2010 05:37:07 +0000
Subject: [PATCH 332/483] BUGFIX: Update Salad tests to match behaviour

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101869 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/cuke/login.feature | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/cuke/login.feature b/tests/cuke/login.feature
index b9408434..81a2101a 100644
--- a/tests/cuke/login.feature
+++ b/tests/cuke/login.feature
@@ -12,10 +12,10 @@ Feature: Log in
 
 	Scenario: valid login
 		When I fill out the log in form with user "admin" and password "password"
-		Then I see "Your are logged in as"
+		Then I see "You're logged in as"
 
 	Scenario: no password login
-		When I fill out the log in form with user "admin" and password "password"
+		When I fill out the log in form with user "admin" and password ""
 		Then I see "That doesn't seem to be the right e-mail address or password."
 
 	Scenario: no user login

From 1d50542d6f13a282d73eaeb8b7bf6f09e9662cff Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Tue, 30 Mar 2010 05:37:08 +0000
Subject: [PATCH 333/483] MINOR: Make Salad accept "login" or "log in"

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101870 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/cuke/step_definitions/log-in.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/cuke/step_definitions/log-in.rb b/tests/cuke/step_definitions/log-in.rb
index c94f45e4..7aadcab6 100644
--- a/tests/cuke/step_definitions/log-in.rb
+++ b/tests/cuke/step_definitions/log-in.rb
@@ -15,7 +15,7 @@ Given /log out$/ do
   Given "I visit Security/logout"
 end
 
-Given /fill out the log in form with user "(.*)" and password "(.*)"/ do |user, password|
+Given /fill out the log(?:\s*)in form with user "(.*)" and password "(.*)"/ do |user, password|
 	Given 'I visit Security/logout'
 	And 'I visit Security/login?BackURL=Security/login'
 	And "I put \"#{user}\" in the \"Email\" field"

From 5ba4e2d09c79c7de27a0fb2ce37de2c883407d87 Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Tue, 30 Mar 2010 05:37:08 +0000
Subject: [PATCH 334/483] ENHANCEMENT: Updated automatic regression tests
 (Salad)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101871 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/cuke/login.feature               |  5 ++++-
 tests/cuke/logout.feature              | 12 ++++++------
 tests/cuke/step_definitions/content.rb |  2 +-
 tests/cuke/step_definitions/log-in.rb  |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/tests/cuke/login.feature b/tests/cuke/login.feature
index 81a2101a..3c7707da 100644
--- a/tests/cuke/login.feature
+++ b/tests/cuke/login.feature
@@ -11,7 +11,7 @@ Feature: Log in
 		Then I am sent to Security/login
 
 	Scenario: valid login
-		When I fill out the log in form with user "admin" and password "password"
+		When I fill out the login form with user "admin" and password "password"
 		Then I see "You're logged in as"
 
 	Scenario: no password login
@@ -34,3 +34,6 @@ Feature: Log in
 		And I click the "Log in" button
 		Then I am sent to admin
 
+	Scenario: Re-login
+		Given I visit Security/logout
+		Then I log into the CMS as admin
diff --git a/tests/cuke/logout.feature b/tests/cuke/logout.feature
index 97761fef..04ab5c6f 100644
--- a/tests/cuke/logout.feature
+++ b/tests/cuke/logout.feature
@@ -7,14 +7,14 @@ Feature: Log out
 		Given I log into the CMS as admin
 		And I click the "Log out" link
 		When I visit admin/
-		Then I see "Enter your username and password to access the CMS."
+		Then I see "Please choose an authentication method and enter your credentials to access the CMS."
 		When I visit admin/assets/
-		Then I see "Enter your username and password to access the CMS."
+		Then I see "Please choose an authentication method and enter your credentials to access the CMS."
 		When I visit admin/comments/
-		Then I see "Enter your username and password to access the CMS."
+		Then I see "Please choose an authentication method and enter your credentials to access the CMS."
 		When I visit admin/reports/
-		Then I see "Enter your username and password to access the CMS."
+		Then I see "Please choose an authentication method and enter your credentials to access the CMS."
 		When I visit admin/security/
-		Then I see "Enter your username and password to access the CMS."
+		Then I see "Please choose an authentication method and enter your credentials to access the CMS."
 		When I visit admin/subsites/
-		Then I see "Enter your username and password to access the CMS."
\ No newline at end of file
+		Then I see "Please choose an authentication method and enter your credentials to access the CMS."
\ No newline at end of file
diff --git a/tests/cuke/step_definitions/content.rb b/tests/cuke/step_definitions/content.rb
index 379671dd..157bfa63 100644
--- a/tests/cuke/step_definitions/content.rb
+++ b/tests/cuke/step_definitions/content.rb
@@ -36,7 +36,7 @@ Given /I load the "(.*)" root-level page/ do |nav|
 end
 
 Given /I load the root node/ do
-  Given 'I click the "admin/0" link'
+  Given 'I click the "admin/show/root" link'
 end
 
 Given /create a new page$/i do
diff --git a/tests/cuke/step_definitions/log-in.rb b/tests/cuke/step_definitions/log-in.rb
index 7aadcab6..04fc610e 100644
--- a/tests/cuke/step_definitions/log-in.rb
+++ b/tests/cuke/step_definitions/log-in.rb
@@ -2,7 +2,7 @@
 # Log in
 Given /log in as (.*)$/ do |user|
 	Given "I fill out the log in form with user \"#{user}\" and password \"password\""
-	And 'I see "Your are logged in as"'
+	And 'I see "You\'re logged in as"'
 end
 
 Given /log into the CMS as (.*)/ do |user|

From 1a3a8d0a0cd4ca7488f16fce1a7fc28d3123685b Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Tue, 30 Mar 2010 20:57:48 +0000
Subject: [PATCH 335/483] MINOR: removed duplication of variable and
 conditional that would never pass

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101889 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index f81cef5c..ac6d687b 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -626,11 +626,10 @@ JS;
 	 * Delete a folder
 	 */
 	public function deletefolder() {
-		$script = '';
 		$ids = split(' *, *', $_REQUEST['csvIDs']);
-		$script = '';
 		
 		if(!$ids) return false;
+		$script = '';
 		
 		foreach($ids as $id) {
 			if(is_numeric($id)) {
@@ -649,12 +648,7 @@ JS;
 		} else {
 		  $message = $size.' '._t('AssetAdmin.FOLDERDELETED', 'folder deleted.');
 		}
-
-		if(isset($brokenPageList)) {
-		  $message .= '  '._t('AssetAdmin.NOWBROKEN', 'The following pages now have broken links:').'<ul>'.addslashes($brokenPageList).'</ul>'.
-		    _t('AssetAdmin.NOWBROKEN2', 'Their owners have been emailed and they will fix up those pages.');			
-		}
-
+		
 		$script .= "statusMessage('$message');";
 		echo $script;
 	}

From b055154586f30267fa05b2a00b10927add036131 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 31 Mar 2010 03:28:43 +0000
Subject: [PATCH 336/483] BUGFIX Fixed "object not found" javascript error  in
 SecurityAdmin_right.js when changing group nodes (fixes #5179)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101956 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/SecurityAdmin_right.js | 34 +++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/javascript/SecurityAdmin_right.js b/javascript/SecurityAdmin_right.js
index e9e8e163..e3b1cfa0 100755
--- a/javascript/SecurityAdmin_right.js
+++ b/javascript/SecurityAdmin_right.js
@@ -9,28 +9,28 @@ function action_addmember_right() {
 }
 
 (function($) {
-	$(document).ready(function() {
-		var refreshAfterImport = function(e) {
-			// Check for a message <div>, an indication that the form has been submitted.
-			var existingFormMessage = $($(this).contents()).find('.message');
-			if(existingFormMessage && existingFormMessage.html()) {
-				// Refresh member listing
-				var memberTableField = $(window.parent.document).find('#Form_EditForm_Members').get(0);
-				if(memberTableField) memberTableField.refresh();
-
-				// Refresh tree
-				var tree = $(window.parent.document).find('#sitetree').get(0);
-				if(tree) tree.reload();
-			}
-		};
-
 		/**
 		 * Refresh the member listing every time the import iframe is loaded,
 		 * which is most likely a form submission.
 		 */
 		$('#MemberImportFormIframe,#GroupImportFormIframe').livequery(
 			'load',
-			refreshAfterImport
+			function(e) {
+				// Get iframe content
+				var doc = this.document || this.contentDocument || this.contentWindow && this.contentWindow.document || null;
+				if(!doc) return;
+				
+				// Check for a message <div>, an indication that the form has been submitted.
+				var existingFormMessage = $(doc.body).find('.message');
+				if(existingFormMessage && existingFormMessage.html()) {
+					// Refresh member listing
+					var memberTableField = $(window.parent.document).find('#Form_EditForm_Members').get(0);
+					if(memberTableField) memberTableField.refresh();
+				
+					// Refresh tree
+					var tree = $(window.parent.document).find('#sitetree').get(0);
+					if(tree) tree.reload();
+				}
+			}
 		);
-	})
 })(jQuery);
\ No newline at end of file

From f5be047b97b108641feaa32cfca20dc72866f8dc Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 31 Mar 2010 05:00:02 +0000
Subject: [PATCH 337/483] BUGFIX Stop IE6/IE7 from redirecting in admin/assets
 after deleting multiple folders (fixes #5208)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101969 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php      | 5 +++--
 javascript/AssetAdmin.js | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index ac6d687b..eb8bcee2 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -650,7 +650,8 @@ JS;
 		}
 		
 		$script .= "statusMessage('$message');";
-		echo $script;
+
+		return $script;
 	}
 	
 	public function removefile(){
@@ -662,7 +663,7 @@ JS;
 			}
 			$file->delete();
 			$file->destroy();
-			
+
 			if(Director::is_ajax()) {
 				echo <<<JS
 				$('Form_EditForm_Files').removeFile($fileID);
diff --git a/javascript/AssetAdmin.js b/javascript/AssetAdmin.js
index 5b910d9d..4aecd46a 100755
--- a/javascript/AssetAdmin.js
+++ b/javascript/AssetAdmin.js
@@ -432,7 +432,7 @@ var deletefolder = {
 					errorMessage('Error deleting pages', response);
 				}
 			});
-
+			
 			$('deletepage').getElementsByTagName('button')[0].onclick();
 			
 		} else {
@@ -506,7 +506,8 @@ appendLoader(function () {
 				onsubmit: function(event) {
 					deletefolder.form_submit();
 					Event.stop(event);
-					}
+					return false;
+				}
 				}
 			});
 		Element.hide('Form_DeleteItemsForm');

From 77718a05f018012eea33c1fa5cb41dcd4bfbc14c Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 31 Mar 2010 05:35:03 +0000
Subject: [PATCH 338/483] MINOR Fixed indentation

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101971 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 .../tinymce_ssbuttons/editor_plugin_src.js    | 107 +++++++++---------
 1 file changed, 53 insertions(+), 54 deletions(-)

diff --git a/javascript/tinymce_ssbuttons/editor_plugin_src.js b/javascript/tinymce_ssbuttons/editor_plugin_src.js
index 7f92b498..26bd9188 100644
--- a/javascript/tinymce_ssbuttons/editor_plugin_src.js
+++ b/javascript/tinymce_ssbuttons/editor_plugin_src.js
@@ -20,74 +20,73 @@
 			};
 		},
 
-
 		init : function(ed, url) {
-	    	/**
-	    	 * These map the action buttons to the IDs of the forms that they open/close
-	    	 */
-	    	forms = {
-	    	    'sslink' : 'Form_EditorToolbarLinkForm',
-	    	    'ssimage' : 'Form_EditorToolbarImageForm',
-	    	    'ssflash' : 'Form_EditorToolbarFlashForm'
-	    	};
+			/**
+			 * These map the action buttons to the IDs of the forms that they open/close
+			 */
+			forms = {
+				'sslink' : 'Form_EditorToolbarLinkForm',
+				'ssimage' : 'Form_EditorToolbarImageForm',
+				'ssflash' : 'Form_EditorToolbarFlashForm'
+			};
 
-	        ed.addButton('sslink', {title : ed.getLang('tinymce_ssbuttons.insertlink'), cmd : 'sslink', 'class' : 'mce_link'}); 
-	        ed.addButton('ssimage', {title : ed.getLang('tinymce_ssbuttons.insertimage'), cmd : 'ssimage', 'class' : 'mce_image'}); 
-	        ed.addButton('ssflash', {title : ed.getLang('tinymce_ssbuttons.insertflash'), cmd : 'ssflash', 'class' : 'mce_flash', 'image': url + '/img/flash.gif'}); 
+			ed.addButton('sslink', {title : ed.getLang('tinymce_ssbuttons.insertlink'), cmd : 'sslink', 'class' : 'mce_link'}); 
+			ed.addButton('ssimage', {title : ed.getLang('tinymce_ssbuttons.insertimage'), cmd : 'ssimage', 'class' : 'mce_image'}); 
+			ed.addButton('ssflash', {title : ed.getLang('tinymce_ssbuttons.insertflash'), cmd : 'ssflash', 'class' : 'mce_flash', 'image': url + '/img/flash.gif'}); 
 
-            /**
-             * Show a side panel, hiding others
-             * If showCommand isn't set, then this will simply hide panels
-             */
-	    	function showSidePanel(showCommand, hideCommands) {
-	    	    hideCommands.each(function(command) { 
-	    	        ed.controlManager.setActive(command,false);
-	    	        Element.hide(forms[command]); 
-	    	    });
+			/**
+			 * Show a side panel, hiding others
+			 * If showCommand isn't set, then this will simply hide panels
+			 */
+			function showSidePanel(showCommand, hideCommands) {
+				hideCommands.each(function(command) { 
+					ed.controlManager.setActive(command,false);
+					Element.hide(forms[command]); 
+				});
 
-                var showForm = null;
-                if(forms[showCommand]) {
-                    showForm = $(forms[showCommand]);
-                    showForm.toggle(ed);
-                }
+				var showForm = null;
+				if(forms[showCommand]) {
+					showForm = $(forms[showCommand]);
+					showForm.toggle(ed);
+				}
 
-                if(!showForm || showForm.style.display == "none") {
-	        		ed.controlManager.setActive(showCommand, false);
-	        		// Can't use $('contentPanel'), as its in a different window
-	        		window.parent.document.getElementById('contentPanel').style.display = "none";
-	    		} else {
-	        		ed.controlManager.setActive(showCommand, true);
-	        		window.parent.document.getElementById('contentPanel').style.display = "block";
-	    		}
-	    		window.onresize();
-	    	}
+				if(!showForm || showForm.style.display == "none") {
+					ed.controlManager.setActive(showCommand, false);
+					// Can't use $('contentPanel'), as its in a different window
+					window.parent.document.getElementById('contentPanel').style.display = "none";
+				} else {
+					ed.controlManager.setActive(showCommand, true);
+					window.parent.document.getElementById('contentPanel').style.display = "block";
+				}
+				window.onresize();
+			}
 
-            ed.addCommand("ssclosesidepanel", function(ed) {
-                showSidePanel('', [ 'sslink', 'ssimage', 'ssflash' ]);
-            });
+			ed.addCommand("ssclosesidepanel", function(ed) {
+				showSidePanel('', [ 'sslink', 'ssimage', 'ssflash' ]);
+			});
 
-		    ed.addCommand("sslink", function(ed) {
-		        showSidePanel('sslink', [ 'ssimage', 'ssflash' ]);
+			ed.addCommand("sslink", function(ed) {
+				showSidePanel('sslink', [ 'ssimage', 'ssflash' ]);
 			});
 
 			ed.addCommand("ssimage", function(ed) {
-		        showSidePanel('ssimage', [ 'sslink', 'ssflash' ]);
+				showSidePanel('ssimage', [ 'sslink', 'ssflash' ]);
 			});
 
 			ed.addCommand("ssflash", function(ed) {
-		        showSidePanel('ssflash', [ 'ssimage', 'sslink' ]);
+				showSidePanel('ssflash', [ 'ssimage', 'sslink' ]);
 			});
 
 			ed.onNodeChange.add(function(ed, o) {
-	    	    if ($('Form_EditorToolbarLinkForm').updateSelection) {
-			    $('Form_EditorToolbarLinkForm').updateSelection(ed);
-			    $('Form_EditorToolbarLinkForm').respondToNodeChange(ed);
-		    }
-		    $('Form_EditorToolbarImageForm').respondToNodeChange(ed);
-	        });
-	        ed.onKeyUp.add(function(ed, o) {
-	    	    $('Form_EditorToolbarLinkForm').updateSelection(ed);
-		    });
+				if ($('Form_EditorToolbarLinkForm').updateSelection) {
+					$('Form_EditorToolbarLinkForm').updateSelection(ed);
+					$('Form_EditorToolbarLinkForm').respondToNodeChange(ed);
+				}
+				$('Form_EditorToolbarImageForm').respondToNodeChange(ed);
+			});
+			ed.onKeyUp.add(function(ed, o) {
+				$('Form_EditorToolbarLinkForm').updateSelection(ed);
+			});
 		
 			// resize image containers when the image is resized.
 			if(!tinymce.isOpera && !tinymce.isWebKit) ed.onMouseUp.add(function(ed, o) {
@@ -96,8 +95,8 @@
 					// we have to delay the resize check here, as this event handler is called before the actual image
 					// resizing is done.
 					setTimeout(function() {
-						var ed        = tinyMCE.activeEditor, // we need to redeclare these for IE.
-							node      = ed.selection.getNode(),
+						var ed		= tinyMCE.activeEditor, // we need to redeclare these for IE.
+							node	  = ed.selection.getNode(),
 							container = ed.dom.getParent(node, 'div');
 
 						if(node.width && node.width != parseInt(ed.dom.getStyle(container, 'width'))) {

From f3f129f44bc6320c21c77690c5e17c1f8da59bb0 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 31 Mar 2010 06:35:25 +0000
Subject: [PATCH 339/483] MINOR Saving TinyMCE editor focus in
 tinymce_ssbuttons plugin when sidepanel is opened (see #5263)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101974 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/tinymce_ssbuttons/editor_plugin_src.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/javascript/tinymce_ssbuttons/editor_plugin_src.js b/javascript/tinymce_ssbuttons/editor_plugin_src.js
index 26bd9188..781e6fd5 100644
--- a/javascript/tinymce_ssbuttons/editor_plugin_src.js
+++ b/javascript/tinymce_ssbuttons/editor_plugin_src.js
@@ -39,6 +39,7 @@
 			 * If showCommand isn't set, then this will simply hide panels
 			 */
 			function showSidePanel(showCommand, hideCommands) {
+				ed.ss_focus_bookmark = ed.selection.getBookmark();
 				hideCommands.each(function(command) { 
 					ed.controlManager.setActive(command,false);
 					Element.hide(forms[command]); 
@@ -112,4 +113,4 @@
 
 	// Adds the plugin class to the list of available TinyMCE plugins
 	tinymce.PluginManager.add("ssbuttons", tinymce.plugins.SSButtons);
-})();
+})();
\ No newline at end of file

From 1d259855c348114cf396af20b86c7d26000d26e5 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 31 Mar 2010 23:17:46 +0000
Subject: [PATCH 340/483] MINOR Fixed regression from r101752 (adding
 permission roles button was missing)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102010 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SecurityAdmin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 0318c232..6756a50e 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -170,7 +170,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 				'Roles',
 				'PermissionRole'
 			);
-			$rolesCTF->setPermissions(array('edit', 'delete'));
+			$rolesCTF->setPermissions(array('add', 'edit', 'delete'));
 
 			$rolesTab = $fields->findOrMakeTab('Root.Roles', _t('SecurityAdmin.TABROLES', 'Roles'));
 			$rolesTab->push(new LiteralField(

From 963fd45c913f88ac58149c5f4445425ea684c9ed Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Thu, 1 Apr 2010 02:53:05 +0000
Subject: [PATCH 341/483] BUGFIX #5255 LeftAndMain should include the correct
 editor.css file so typography from user selected theme in SiteConfig is shown
 in TinyMCE

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102038 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index b06cd73e..c003f196 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -162,7 +162,17 @@ class LeftAndMain extends Controller {
 		$htmlEditorConfig = HtmlEditorConfig::get_active();
 		if(!$htmlEditorConfig->getOption('content_css')) {
 			$cssFiles = 'cms/css/editor.css';
-			if(SSViewer::current_theme()) $cssFiles .= ', ' . THEMES_DIR . "/" . SSViewer::current_theme() . '/css/editor.css';
+			
+			// Use theme from the site config
+			if(($config = SiteConfig::current_site_config()) && $config->Theme) {
+				$theme = $config->Theme;
+			} elseif(SSViewer::current_theme()) {
+				$theme = SSViewer::current_theme();
+			} else {
+				$theme = false;
+			}
+			
+			if($theme) $cssFiles .= ', ' . THEMES_DIR . "/{$theme}/css/editor.css";
 			else if(project()) $cssFiles .= ', ' . project() . '/css/editor.css';
 
 			$htmlEditorConfig->setOption('content_css', $cssFiles);
@@ -222,7 +232,7 @@ class LeftAndMain extends Controller {
 		// navigator
 		Requirements::css(SAPPHIRE_DIR . '/css/SilverStripeNavigator.css');
 		Requirements::javascript(SAPPHIRE_DIR . '/javascript/SilverStripeNavigator.js');
-		
+
 		Requirements::themedCSS('typography');
 
 		foreach (self::$extra_requirements['javascript'] as $file) {

From 07ab02b29d9ef4dd7df6fa92b2e64a21b2ee3b28 Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Wed, 7 Apr 2010 04:10:32 +0000
Subject: [PATCH 342/483] BUGFIX allow HTMLEditorFields to save in SiteConfig,
 fixes #5246

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102160 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/LeftAndMain_right.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/javascript/LeftAndMain_right.js b/javascript/LeftAndMain_right.js
index bdce0c4e..f2383e07 100755
--- a/javascript/LeftAndMain_right.js
+++ b/javascript/LeftAndMain_right.js
@@ -340,6 +340,20 @@ function action_save_right() {
 	$('Form_EditForm').save(false);
 }
 
+function action_save_siteconfig_right() {
+	_AJAX_LOADING = true;
+	if(typeof tinyMCE != 'undefined') tinyMCE.triggerSave();
+	$('Form_EditForm_action_save_siteconfig').value = ss.i18n._t('CMSMAIN.SAVING');
+	$('Form_EditForm_action_save_siteconfig').className = 'action loading';
+
+	$('Form_EditForm').save(null, function() {
+		if($('Form_EditForm_action_save_siteconfig') && $('Form_EditForm_action_save_siteconfig').className.indexOf('loading') != -1) {
+			$('Form_EditForm_action_save_siteconfig').value = 'Save';
+			Element.removeClassName($('Form_EditForm_action_save_siteconfig'), 'loading');
+		}
+	}, 'save_siteconfig');
+}
+
 /**
  * Handle auto-saving.  Detects if changes have been made, and if so save everything on the page.
  * If confirmation is true it will ask for confirmation.

From 30e6e91a810adb9ff164fd2ea4b60997a3534714 Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Fri, 9 Apr 2010 04:00:09 +0000
Subject: [PATCH 343/483] BUGFIX: Fix Salad tests

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102265 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/cuke/delete-page.feature         | 43 +++++++++++++++-----------
 tests/cuke/step_definitions/content.rb | 16 +++++++---
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/tests/cuke/delete-page.feature b/tests/cuke/delete-page.feature
index d80aa2a0..c4153e3a 100644
--- a/tests/cuke/delete-page.feature
+++ b/tests/cuke/delete-page.feature
@@ -2,39 +2,46 @@ Feature: Page deletion in the CMS
 	As a content author
 	I want to delete pages in the CMS
 	So that out of date content can be removed
-	
+			
 	Scenario: User can delete a page without making any changes
 		Given I log into the CMS as admin
-		And I create a new page
-		And I save the page
+		And there are 0 root pages with navigation label "delete-page.scenario1"
+		And I create a new page called "delete-page.scenario1"
+		And there are 1 root pages with navigation label "delete-page.scenario1"
 		When I delete the current page
-		Then there are 0 root pages with navigation label "New Page"
-		
+		Then there are 0 root pages with navigation label "delete-page.scenario1"
+
 	Scenario: A deleted page can't be viewed
-		Given I create a new page
-		And I save the page
+		And there are 0 root pages with navigation label "delete-page.scenario2"
+		Given I create a new page called "delete-page.scenario2"
+		And there is 1 root page with navigation label "delete-page.scenario2"
 		When I delete the current page
+		And there are 0 root pages with navigation label "delete-page.scenario2"
 		And I log out
-		Then url new-page does not exist
-		
+		Then url delete-page-scenario2 does not exist
+
 	Scenario: A deleted URL can be re-used
 		Given I log into the CMS as admin
-		And I create a new page
+		And there are 0 root pages with navigation label "delete-page.scenario3"
+		And I create a new page called "delete-page.scenario3"
+		And there are 1 root pages with navigation label "delete-page.scenario3"
 		And I click on the "Metadata" tab
-		And the "URLSegment" field is "new-page"
-		And I save the page
+		And the "URLSegment" field is "delete-page-scenario3"
 		And I delete the current page
-		When I create a new page
+		And there are 0 root pages with navigation label "delete-page.scenario3"
+		When I create a new page called "delete-page.scenario3"
 		And I click on the "Metadata" tab
-		Then the "URLSegment" field is "new-page"
-		
+		Then the "URLSegment" field is "delete-page-scenario3"
 		Then delete the current page
 		
 	Scenario: A deleted page doesn't appear after re-login
-		Given I create a new page
+		Given there are 0 root pages with navigation label "delete-page.scenario4"
+		And I create a new page called "delete-page.scenario4"
+		And there is 1 root page with navigation label "delete-page.scenario4"
 		And I save the page
 		And I delete the current page
+		And there are 0 root pages with navigation label "delete-page.scenario4"
 		When I log out
 		And I log into the CMS as admin
-		Then there are 0 root pages with navigation label "New Page"
-	
\ No newline at end of file
+		Then there are 0 root pages with navigation label "delete-page.scenario4"
+	
diff --git a/tests/cuke/step_definitions/content.rb b/tests/cuke/step_definitions/content.rb
index 157bfa63..721601e7 100644
--- a/tests/cuke/step_definitions/content.rb
+++ b/tests/cuke/step_definitions/content.rb
@@ -10,6 +10,7 @@ end
 
 Given /a "(.*)" page called "(.*)" as a child of "(.*)"/i do |type, title, parent|
     Given "I click the \"#{parent}\" link"
+    And 'I wait 2s'
     And 'I click the "Create" button'
     And "I select \"#{type}\" from \"PageType\""
     And 'I click the "Go" button'
@@ -20,7 +21,8 @@ end
 
 Given /^a top\-level "(.*)" page called "(.*)"$/i do |type,title|
   Given "I click the \"Site Content\" link"
-  And "I create a page "
+  And "I create a new page "
+  And "I click on the \"Main\" tab"
   And "I put \"#{title}\" in the \"Title\" field"
   And "I click \"Save\""
 end
@@ -43,13 +45,17 @@ Given /create a new page$/i do
   Given "I create a new page using template \"Page\""
 end
 
+Given /create a new page called "(.*)"$/i do |title|
+  Given "I create a new page using template \"Page\""
+  And "I click on the \"Main\" tab"
+  And "I put \"#{title}\" in the \"Page name\" field"
+  And "I click the \"Save\" button"
+end
+
 Given /create a new page using template \"(.*)\"/i do |type|
   Given 'I load the root node (ajax)'
-  puts "Clicking the create button"
   And 'I click the "Create" button'
-  puts "Selecting #{type} from PageType"
   And "I select \"#{type}\" from \"PageType\""
-  puts "done selecting"
   And 'I click the "Go" button (ajax)'
   And 'I click the "Create" button'
 end
@@ -65,7 +71,7 @@ end
 
 ## ASSERTIONS
 
-Given /There are ([0-9]+) root pages with navigation label "(.*)"/i do |count, nav|
+Given /There (?:are|is) ([0-9]+) root pages? with navigation label "(.*)"/i do |count, nav|
   @browser.elements_by_xpath("//ul[@id='sitetree']/li/ul/li//a[.='#{nav}']").count.should == count.to_i
 end
 

From a3e8e4e60db4ac21a778673dc4e66c3a9b3cdd66 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Mon, 12 Apr 2010 00:35:52 +0000
Subject: [PATCH 344/483] BUGFIX: fixed invalid HTML output from page comments
 template

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102320 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 .../PageCommentInterface_singlecomment.ss     | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/templates/PageCommentInterface_singlecomment.ss b/templates/PageCommentInterface_singlecomment.ss
index 2084730b..97dc880c 100755
--- a/templates/PageCommentInterface_singlecomment.ss
+++ b/templates/PageCommentInterface_singlecomment.ss
@@ -7,24 +7,23 @@
 </p>
 <p class="info">
 	<% if CommenterURL %>
-		<span><% _t('PBY','Posted by') %> <a href="$CommenterURL.ATT">$Name.XML</a>, $Created.Nice ($Created.Ago)</span>
+		<% _t('PBY','Posted by') %> <a href="$CommenterURL.ATT">$Name.XML</a>, $Created.Nice ($Created.Ago)
 	<% else %>
-		<span><% _t('PBY','Posted by') %> $Name.XML, $Created.Nice ($Created.Ago)</span>
+		<% _t('PBY','Posted by') %> $Name.XML, $Created.Nice ($Created.Ago)
 	<% end_if %>
-
-	<br />
-	<ul class="actionLinks">
-		<% if ApproveLink %>
-			<li><a href="$ApproveLink" class="approvelink"><% _t('APPROVE', 'approve this comment') %></a></li>
-		<% end_if %>
-		<% if SpamLink %>
-			<li><a href="$SpamLink" class="spamlink"><% _t('ISSPAM','this comment is spam') %></a></li>
-		<% end_if %>
-		<% if HamLink %>
-			<li><a href="$HamLink" class="hamlink"><% _t('ISNTSPAM','this comment is not spam') %></a></li>
-		<% end_if %>
-		<% if DeleteLink %>
-			<li class="last"><a href="$DeleteLink" class="deletelink"><% _t('REMCOM','remove this comment') %></a></li>
-		<% end_if %>
-	</ul>
 </p>
+
+<ul class="actionLinks">
+	<% if ApproveLink %>
+		<li><a href="$ApproveLink" class="approvelink"><% _t('APPROVE', 'approve this comment') %></a></li>
+	<% end_if %>
+	<% if SpamLink %>
+		<li><a href="$SpamLink" class="spamlink"><% _t('ISSPAM','this comment is spam') %></a></li>
+	<% end_if %>
+	<% if HamLink %>
+		<li><a href="$HamLink" class="hamlink"><% _t('ISNTSPAM','this comment is not spam') %></a></li>
+	<% end_if %>
+	<% if DeleteLink %>
+		<li class="last"><a href="$DeleteLink" class="deletelink"><% _t('REMCOM','remove this comment') %></a></li>
+	<% end_if %>
+</ul>

From b7a9287844822b17ff8e6b0c74ab103fb2f6b677 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Mon, 12 Apr 2010 03:02:05 +0000
Subject: [PATCH 345/483] BUGFIX: delete from published site never calls
 canDeleteFromLive(). (via marcus #5364)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102386 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 850f1348..53144431 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -595,7 +595,7 @@ JS;
 		$id = $_REQUEST['ID'];
 		Versioned::reading_stage('Live');
 		$record = DataObject::get_by_id("SiteTree", $id);
-		if($record && !$record->canDelete()) return Security::permissionFailure($this);
+		if($record && !($record->canDelete() && $record->canDeleteFromLive())) return Security::permissionFailure($this);
 		
 		$descRemoved = '';
 		$descendantsRemoved = 0;

From 5e9d3a3f3883e1002e7c5e21887c2e39c5445869 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 13 Apr 2010 20:12:31 +0000
Subject: [PATCH 346/483] BUGFIX Fixed CTF sorting in ModelAdmin results (was
 failing because of missing 'ResultAssembly' GET parameters

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102712 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ModelAdmin.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index 8b1d24f1..839a01ba 100755
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -669,9 +669,8 @@ class ModelAdmin_CollectionController extends Controller {
 
 		$summaryFields = $this->columnsAvailable();
 		
-		$resultAssembly = $searchCriteria['ResultAssembly'];
-		if($selectedOnly && $resultAssembly) {
-			
+		if($selectedOnly && isset($searchCriteria['ResultAssembly'])) {
+			$resultAssembly = $searchCriteria['ResultAssembly'];
 			if(!is_array($resultAssembly)) {
 				$explodedAssembly = split(' *, *', $resultAssembly);
 				$resultAssembly = array();

From ebea43ebd83ec00b5eb99df0a4167a5c3d9fd5f2 Mon Sep 17 00:00:00 2001
From: Carlos Barberis <carlos@silverstripe.com>
Date: Wed, 14 Apr 2010 22:04:06 +0000
Subject: [PATCH 347/483] ENHANCEMENT: added language (Ticket #5390)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102899 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php                   |  4 ++--
 code/CMSSiteTreeFilter.php         |  6 +++---
 lang/en_US.php                     |  5 +++++
 lang/pl_PL.php                     | 27 +++++++++++++++++++++------
 templates/Includes/CMSMain_left.ss |  2 +-
 5 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 53144431..dfdbe164 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -193,7 +193,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		$doSet = new DataObjectSet();
 		$doSet->push(new ArrayData(array(
 			'ClassName' => 'all',
-			'Title' => 'All items'
+			'Title' => _t('CMSSiteTreeFilter.ALL', 'All items')
 		)));
 		foreach($filters as $filter) {
 			if (call_user_func(array($filter, 'showInList'))) {
@@ -595,7 +595,7 @@ JS;
 		$id = $_REQUEST['ID'];
 		Versioned::reading_stage('Live');
 		$record = DataObject::get_by_id("SiteTree", $id);
-		if($record && !($record->canDelete() && $record->canDeleteFromLive())) return Security::permissionFailure($this);
+		if($record && !$record->canDelete()) return Security::permissionFailure($this);
 		
 		$descRemoved = '';
 		$descendantsRemoved = 0;
diff --git a/code/CMSSiteTreeFilter.php b/code/CMSSiteTreeFilter.php
index e4d58360..d6a06609 100644
--- a/code/CMSSiteTreeFilter.php
+++ b/code/CMSSiteTreeFilter.php
@@ -75,7 +75,7 @@ abstract class CMSSiteTreeFilter extends Object {
 
 class CMSSiteTreeFilter_DeletedPages extends CMSSiteTreeFilter {
 	static function title() {
-		return "All pages, including deleted";
+		return _t('CMSSiteTreeFilter.DELETEDPAGES', "All pages, including deleted");
 	}
 	
 	function getTree() {
@@ -92,7 +92,7 @@ class CMSSiteTreeFilter_DeletedPages extends CMSSiteTreeFilter {
 
 class CMSSiteTreeFilter_ChangedPages extends CMSSiteTreeFilter {
 	static function title() {
-		return "Changed pages";
+		return _t('CMSSiteTreeFilter.CHANGEDPAGES', "Changed pages");
 	}
 	
 	function pagesIncluded() {
@@ -111,7 +111,7 @@ class CMSSiteTreeFilter_Search extends CMSSiteTreeFilter {
 	static function showInList() { return false; }
 	
 	static function title() {
-		return "Search";
+		return _t('CMSSiteTreeFilter.SEARCH', 'Search');
 	}
 	
 	/**
diff --git a/lang/en_US.php b/lang/en_US.php
index 86f803a6..cc657347 100755
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -173,6 +173,7 @@ $lang['en_US']['CMSMain_left.ss']['DELETECONFIRM'] = 'Delete the selected pages'
 $lang['en_US']['CMSMain_left.ss']['DELETEDSTILLLIVE'] = 'Deleted from the draft site but still on the live site';
 $lang['en_US']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Edited on the draft site and not published yet';
 $lang['en_US']['CMSMain_left.ss']['EDITEDSINCE'] = 'Edited Since';
+$lang['en_US']['CMSMain_left.ss']['SHOWITEMS'] = 'Show:';
 $lang['en_US']['CMSMain_left.ss']['ENABLEDRAGGING'] = array(
 	'Allow drag &amp; drop reordering',
 	PR_HIGH
@@ -202,6 +203,10 @@ $lang['en_US']['CMSMain_versions.ss']['NOTPUB'] = 'Not published';
 $lang['en_US']['CMSMain_versions.ss']['PUBR'] = 'Publisher';
 $lang['en_US']['CMSMain_versions.ss']['UNKNOWN'] = 'Unknown';
 $lang['en_US']['CMSMain_versions.ss']['WHEN'] = 'When';
+$lang['en_US']['CMSSiteTreeFilter']['ALL'] = 'All items';
+$lang['en_US']['CMSSiteTreeFilter']['DELETEDPAGES'] = 'All pages, including deleted';
+$lang['en_US']['CMSSiteTreeFilter']['CHANGEDPAGES'] = "Changed pages";
+$lang['en_US']['CMSSiteTreeFilter']['SEARCH'] = "Search";
 $lang['en_US']['CommentAdmin']['ACCEPT'] = 'Accept';
 $lang['en_US']['CommentAdmin']['APPROVED'] = 'Accepted %s comments.';
 $lang['en_US']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Approved Comments';
diff --git a/lang/pl_PL.php b/lang/pl_PL.php
index 409b17c6..6a471473 100644
--- a/lang/pl_PL.php
+++ b/lang/pl_PL.php
@@ -39,7 +39,9 @@ $lang['pl_PL']['AssetAdmin_left.ss']['DELETE'] = 'Usuń ...';
 $lang['pl_PL']['AssetAdmin_left.ss']['DELFOLDERS'] = 'Usuń zaznaczone foldery';
 $lang['pl_PL']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Zezwól na przeciąganie elementów';
 $lang['pl_PL']['AssetAdmin_left.ss']['FOLDERS'] = 'Foldery';
-$lang['pl_PL']['AssetAdmin_left.ss']['GO'] = 'Idź';
+$lang['pl_PL']['AssetAdmin_left.ss']['FILESYSTEMSYNC'] = 'Rozejrzyj się za nowymi plikami';
+$lang['pl_PL']['AssetAdmin_left.ss']['FILESYSTEMSYNC_DESC'] = 'SilverStripe utrzymuje własną baze danych plików przechowywanych w katalogu assets/ . Kliknij na ten przycisk aby dodać do tej bazy danych informację o plikach dodanych do katalogu assets/ przez inne programy, jak np. FTP';
+$lang['pl_PL']['AssetAdmin_left.ss']['GO'] = 'Ok';
 $lang['pl_PL']['AssetAdmin_left.ss']['SELECTTODEL'] = 'Wybierz foldery, które chcesz usunąć i kliknij przycisk poniżej';
 $lang['pl_PL']['AssetAdmin_left.ss']['TOREORG'] = 'Aby zreorganizować twoje foldery, przenieś je w wybrane miejsca';
 $lang['pl_PL']['AssetAdmin_right.ss']['CHOOSEPAGE'] = 'Proszę wybrać stronę po lewej';
@@ -70,6 +72,14 @@ $lang['pl_PL']['AssetTableField']['SWFFILEOPTIONS'] = 'Opcje Pliku SWF';
 $lang['pl_PL']['AssetTableField']['TITLE'] = 'Tytuł';
 $lang['pl_PL']['AssetTableField']['TYPE'] = 'Rodzaj';
 $lang['pl_PL']['AssetTableField']['URL'] = 'URL';
+$lang['pl_PL']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = 'Usunięto %d stron z wersji roboczej serwisu, %d nieudanych usunięć';
+$lang['pl_PL']['CMSBatchActions']['DELETED_PAGES'] = 'Usunięto %d stron z opublikowanej wersji serwisu, %d nieudanych usunięć';
+$lang['pl_PL']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Usuń z wersji roboczej serwisu';
+$lang['pl_PL']['CMSBatchActions']['DELETE_PAGES'] = 'Usuń z wersji opublikowanej serwisu';
+$lang['pl_PL']['CMSBatchActions']['DELETING_DRAFT_PAGES'] = 'Usuwanie wybranych stron z wersji roboczej serwisu';
+$lang['pl_PL']['CMSBatchActions']['DELETING_PAGES'] = 'Usuwanie wybranych stron z wersji opublikowanej serwisu';
+$lang['pl_PL']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Opublikowano %d stron, %d nieudanych publikacji';
+$lang['pl_PL']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Publikowanie stron';
 $lang['pl_PL']['CMSBatchActions']['PUBLISH_PAGES'] = 'Opublikuj';
 $lang['pl_PL']['CMSLeft.ss']['DELPAGE'] = 'Usuń strony ...';
 $lang['pl_PL']['CMSLeft.ss']['DELPAGES'] = 'Usuń zaznaczone strony';
@@ -85,7 +95,7 @@ $lang['pl_PL']['CMSMain']['COPYPUBTOSTAGE'] = 'Naprawdę chcesz skopiować publi
 $lang['pl_PL']['CMSMain']['DELETE'] = 'Usuń ze strony roboczej';
 $lang['pl_PL']['CMSMain']['DESCREMOVED'] = 'i %s potomków';
 $lang['pl_PL']['CMSMain']['EMAIL'] = 'E-mail';
-$lang['pl_PL']['CMSMain']['GO'] = 'Idź';
+$lang['pl_PL']['CMSMain']['GO'] = 'Ok';
 $lang['pl_PL']['CMSMain']['MENUTITLE'] = 'Zawartość strony';
 $lang['pl_PL']['CMSMain']['MENUTITLE'] = 'Zawartość Strony';
 $lang['pl_PL']['CMSMain']['METADESCOPT'] = 'Opis';
@@ -131,7 +141,7 @@ $lang['pl_PL']['CMSMain_dialog.ss']['BUTTONNOTFOUND'] = 'Nie znaleziono nazwy pr
 $lang['pl_PL']['CMSMain_dialog.ss']['NOLINKED'] = 'Nie odnaleziono window.linkedObject aby wysłać sygnał przyciśnięcia przycisku z powrotem do głównego okna';
 $lang['pl_PL']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'Dodałeś do oczekujących i jeszcze nie opublikowanych stron';
 $lang['pl_PL']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Dodaj kryterium ...';
-$lang['pl_PL']['CMSMain_left.ss']['BATCHACTIONS'] = 'Akcja pliku';
+$lang['pl_PL']['CMSMain_left.ss']['BATCHACTIONS'] = 'Wykonaj na wielu';
 $lang['pl_PL']['CMSMain_left.ss']['CHANGED'] = 'zmienione';
 $lang['pl_PL']['CMSMain_left.ss']['CLOSEBOX'] = 'kliknij aby zamknąć';
 $lang['pl_PL']['CMSMain_left.ss']['COMPAREMODE'] = 'Tryb porównania (wybierz 2 poniżej)';
@@ -141,8 +151,9 @@ $lang['pl_PL']['CMSMain_left.ss']['DELETECONFIRM'] = 'Usuń zaznaczone strony';
 $lang['pl_PL']['CMSMain_left.ss']['DELETEDSTILLLIVE'] = 'Usunąłeś z oczekujących stron ale ciągle jest aktywna';
 $lang['pl_PL']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Zmieniłeś oczekującą stronę ale jeszcze nie opublikowałeś ';
 $lang['pl_PL']['CMSMain_left.ss']['EDITEDSINCE'] = 'Edytowane od';
+$lang['pl_PL']['CMSMain_left.ss']['SHOWITEMS'] = 'Pokaż:';
 $lang['pl_PL']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Zezwól na zmianę przenieś i puść ';
-$lang['pl_PL']['CMSMain_left.ss']['GO'] = 'idź';
+$lang['pl_PL']['CMSMain_left.ss']['GO'] = 'Ok';
 $lang['pl_PL']['CMSMain_left.ss']['HIDDEN'] = 'ukryte';
 $lang['pl_PL']['CMSMain_left.ss']['KEY'] = 'Klucz:';
 $lang['pl_PL']['CMSMain_left.ss']['NEW'] = 'nowy';
@@ -171,6 +182,10 @@ $lang['pl_PL']['CMSMain_versions.ss']['NOTPUB'] = 'Nie opublikowany';
 $lang['pl_PL']['CMSMain_versions.ss']['PUBR'] = 'Publikujący';
 $lang['pl_PL']['CMSMain_versions.ss']['UNKNOWN'] = 'Nieznany';
 $lang['pl_PL']['CMSMain_versions.ss']['WHEN'] = 'Kiedy';
+$lang['pl_PL']['CMSSiteTreeFilter']['ALL'] = 'Wszystko';
+$lang['pl_PL']['CMSSiteTreeFilter']['DELETEDPAGES'] = 'Wszystkie strony, także te usunięte';
+$lang['pl_PL']['CMSSiteTreeFilter']['CHANGEDPAGES'] = "Strony, które uległy zmianie";
+$lang['pl_PL']['CMSSiteTreeFilter']['SEARCH'] = "Szukaj";
 $lang['pl_PL']['CMSRight.ss']['CHOOSEPAGE'] = 'Proszę wybrać stronę po lewej';
 $lang['pl_PL']['CMSRight.ss']['ECONTENT'] = 'Edytuj zawartość';
 $lang['pl_PL']['CMSRight.ss']['WELCOMETO'] = 'Witamy w';
@@ -346,7 +361,7 @@ $lang['pl_PL']['PageComment']['NeedsModeration'] = 'Wymaga Moderacji?';
 $lang['pl_PL']['PageComment']['PLURALNAME'] = 'Komentarze do strony';
 $lang['pl_PL']['PageComment']['SINGULARNAME'] = 'Komentarz do strony';
 $lang['pl_PL']['PageCommentInterface']['COMMENTERURL'] = 'Adres URL strony';
-$lang['pl_PL']['PageCommentInterface']['POST'] = 'Post';
+$lang['pl_PL']['PageCommentInterface']['POST'] = 'Wystaw';
 $lang['pl_PL']['PageCommentInterface']['SPAMQUESTION'] = 'Pytanie anty-spamowe: %s';
 $lang['pl_PL']['PageCommentInterface.ss']['COMMENTS'] = 'Komentarze';
 $lang['pl_PL']['PageCommentInterface.ss']['NEXT'] = 'następny';
@@ -383,7 +398,7 @@ $lang['pl_PL']['SecurityAdmin_left.ss']['CREATE'] = 'Stwórz';
 $lang['pl_PL']['SecurityAdmin_left.ss']['DEL'] = 'Usuń ...';
 $lang['pl_PL']['SecurityAdmin_left.ss']['DELGROUPS'] = 'Usuń zaznaczone grupy';
 $lang['pl_PL']['SecurityAdmin_left.ss']['ENABLEDRAGGING'] = 'Zezwól na przeciąganie elementów';
-$lang['pl_PL']['SecurityAdmin_left.ss']['GO'] = 'Idź';
+$lang['pl_PL']['SecurityAdmin_left.ss']['GO'] = 'Ok';
 $lang['pl_PL']['SecurityAdmin_left.ss']['SECGROUPS'] = 'Grupa bezpieczeństwa';
 $lang['pl_PL']['SecurityAdmin_left.ss']['SELECT'] = 'Zaznacz strony które chcesz usunąć i kliknij przycisk poniżej';
 $lang['pl_PL']['SecurityAdmin_left.ss']['TOREORG'] = 'Aby zmienić układ witryny, przeciągnij strony w odpowiadające Ci miejsca.';
diff --git a/templates/Includes/CMSMain_left.ss b/templates/Includes/CMSMain_left.ss
index 31845425..4dc93cff 100755
--- a/templates/Includes/CMSMain_left.ss
+++ b/templates/Includes/CMSMain_left.ss
@@ -84,7 +84,7 @@
 				</form>
 			</div>
 			<div class="checkboxAboveTree noBottomBorder">
-				Show: <select id="siteTreeFilterList">
+				<% _t('SHOWITEMS', 'Show:') %> <select id="siteTreeFilterList">
 					<% control SiteTreeFilters %>
 					<option value="$ClassName">$Title</option>
 					<% end_control %>

From 219e55ef559436d5c5a1501143038cab392e5607 Mon Sep 17 00:00:00 2001
From: Carlos Barberis <carlos@silverstripe.com>
Date: Wed, 14 Apr 2010 22:35:51 +0000
Subject: [PATCH 348/483] MINOR: reverted wrong change

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102901 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index dfdbe164..f748f49e 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -595,7 +595,7 @@ JS;
 		$id = $_REQUEST['ID'];
 		Versioned::reading_stage('Live');
 		$record = DataObject::get_by_id("SiteTree", $id);
-		if($record && !$record->canDelete()) return Security::permissionFailure($this);
+		if($record && !($record->canDelete() && $record->canDeleteFromLive())) return Security::permissionFailure($this);
 		
 		$descRemoved = '';
 		$descendantsRemoved = 0;

From 4ee4878dc17614d31a931a6c6d9083f0ef9a4d9a Mon Sep 17 00:00:00 2001
From: Saophalkun Ponlu <phalkunz@silverstripe.com>
Date: Sun, 18 Apr 2010 23:51:23 +0000
Subject: [PATCH 349/483] BUGFIX: correct mollom field mapping

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103037 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/PageCommentInterface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index b3dae5e0..23e51121 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -202,7 +202,7 @@ class PageCommentInterface extends RequestHandler {
 		
 		// Optional Spam Protection.
 		if(class_exists('SpamProtectorManager')) {
-			SpamProtectorManager::update_form($form, null, array('Name', 'CommenterURL', 'Comment'));
+			SpamProtectorManager::update_form($form, null, array('Name' => 'author_name', 'CommenterURL' => 'author_url', 'Comment' => 'post_body'));
 			self::set_use_ajax_commenting(false);
 		}
 		

From 0ba1e35ecef9daec027b5ebd1beffae8e4193cf6 Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Mon, 19 Apr 2010 21:17:47 +0000
Subject: [PATCH 350/483] BUGFIX: make the javascript-producing functions
 behave in the same way. Now they will return a javascript snippet and the
 caller is responsible for adding it to a FormResponse. Removes the
 duplication in AJAX response which happened when FormResponse::add has been
 used before the call to JS helper functions (#5359)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103083 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index c003f196..e3420e9d 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -618,7 +618,6 @@ JS;
 	 */
 	public function save($urlParams, $form) {
 		$className = $this->stat('tree_class');
-		$result = '';
 
 		$SQL_id = Convert::raw2sql($_REQUEST['ID']);
 		if(substr($SQL_id,0,3) != 'new') {
@@ -690,12 +689,12 @@ JS;
 
 			if($added = DataObjectLog::getAdded('SiteTree')) {
 				foreach($added as $page) {
-					if($page->ID != $record->ID) $result .= $this->addTreeNodeJS($page);
+					if($page->ID != $record->ID) FormResponse::add($this->addTreeNodeJS($page));
 				}
 			}
 			if($deleted = DataObjectLog::getDeleted('SiteTree')) {
 				foreach($deleted as $page) {
-					if($page->ID != $record->ID) $result .= $this->deleteTreeNodeJS($page);
+					if($page->ID != $record->ID) FormResponse::add($this->deleteTreeNodeJS($page));
 				}
 			}
 			if($changed = DataObjectLog::getChanged('SiteTree')) {
@@ -789,7 +788,7 @@ JS;
 				// BUGFIX: Changed icon only shows after Save button is clicked twice http://support.silverstripe.com/gsoc/ticket/76
 				$title = Convert::raw2js($record->TreeTitle());
 				FormResponse::add("$('sitetree').setNodeTitle(\"$record->ID\", \"$title\");");
-				$result .= $this->getActionUpdateJS($record);
+				FormResponse::add($this->getActionUpdateJS($record));
 				FormResponse::status_message($message, "good");
 				FormResponse::update_status($record->Status);
 
@@ -801,7 +800,9 @@ JS;
 	}
 
 	/**
-	 * Return a piece of javascript that will update the actions of the main form
+	 * Returns a javascript snippet that will update the actions of the main form
+	 * 
+	 * @return string
 	 */
 	public function getActionUpdateJS($record) {
 		// Get the new action buttons
@@ -812,13 +813,13 @@ JS;
 			$actionList .= $action->Field() . ' ';
 		}
 
-		FormResponse::add("$('Form_EditForm').loadActionsFromString('" . Convert::raw2js($actionList) . "');");
-
-		return FormResponse::respond();
+		return "$('Form_EditForm').loadActionsFromString('" . Convert::raw2js($actionList) . "');";
 	}
 
 	/**
-	 * Return JavaScript code to generate a tree node for the given page, if visible
+	 * Returns a javascript snippet to generate a tree node for the given page, if visible
+	 *
+	 * @return string
 	 */
 	public function addTreeNodeJS($page, $select = false) {
 		$parentID = (int)$page->ParentID;
@@ -829,11 +830,12 @@ var parentNode = $('sitetree').getTreeNodeByIdx($parentID);
 if(parentNode) parentNode.appendTreeNode(newNode);
 JS;
 		$response .= ($select ? "newNode.selectTreeNode();\n" : "") ;
-		FormResponse::add($response);
-		return FormResponse::respond();
+		return $response;
 	}
 	/**
-	 * Return JavaScript code to remove a tree node for the given page, if it exists.
+	 * Returns a javascript snippet to remove a tree node for the given page, if it exists.
+	 *
+	 * @return string
 	 */
 	public function deleteTreeNodeJS($page) {
 		$id = $page->ID ? $page->ID : $page->OldID;
@@ -842,14 +844,13 @@ var node = $('sitetree').getTreeNodeByIdx($id);
 if(node && node.parentTreeNode) node.parentTreeNode.removeTreeNode(node);
 $('Form_EditForm').closeIfSetTo($id);
 JS;
-		FormResponse::add($response);
 
 		// If we have that page selected currently, then clear that info from the session
 		if(Session::get("{$this->class}.currentPage") == $id) {
 			$this->setCurrentPageID(null);
 		}
 		
-		return FormResponse::respond();
+		return $response;
 	}
 
 	/**

From 051143465e6a6d2657ecd6c7121f86ad88208e84 Mon Sep 17 00:00:00 2001
From: Geoff Munn <geoff@silverstripe.com>
Date: Tue, 20 Apr 2010 02:15:59 +0000
Subject: [PATCH 351/483] BUGFIX: realtime publishing now enabled by default

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103127 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/staticpublisher/StaticPublisher.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/staticpublisher/StaticPublisher.php b/code/staticpublisher/StaticPublisher.php
index 087b72a5..6831d10e 100644
--- a/code/staticpublisher/StaticPublisher.php
+++ b/code/staticpublisher/StaticPublisher.php
@@ -15,8 +15,7 @@ abstract class StaticPublisher extends DataObjectDecorator {
 	 * Realtime static publishing... the second a page
     * is saved, it is written to the cache 
 	 */
-	// @todo this is currently disabled until template problems can be fixed
-	static $disable_realtime = true;
+	static $disable_realtime = false;
 	
 	abstract function publishPages($pages);
 	abstract function unpublishPages($pages);

From 9e0c8dd3848b446eafbef4712c9f89ec233c3cae Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Wed, 21 Apr 2010 00:26:49 +0000
Subject: [PATCH 352/483] BUGFIX: the decorator was not completely removed,
 which caused trouble for tests running later in the same batch

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103214 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/FilesystemPublisherTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/FilesystemPublisherTest.php b/tests/FilesystemPublisherTest.php
index 4e9afb93..11f2d137 100644
--- a/tests/FilesystemPublisherTest.php
+++ b/tests/FilesystemPublisherTest.php
@@ -17,7 +17,7 @@ class FilesystemPublisherTest extends SapphireTest {
 	}
 	
 	function tearDown() {
-		Object::remove_extension("SiteTree", "FilesystemPublisher");
+		Object::remove_extension("SiteTree", "FilesystemPublisher('../FilesystemPublisherTest-static-folder/')");
 		SiteTree::$write_homepage_map = true;
 		
 		parent::tearDown();

From 597b9cd2f00440dfa99e7c248c89491fa0c605dd Mon Sep 17 00:00:00 2001
From: Geoff Munn <geoff@silverstripe.com>
Date: Wed, 21 Apr 2010 05:13:02 +0000
Subject: [PATCH 353/483] BUGFIX: static publishing now uses the last non-null
 theme, OR the value defined in StaticPublisher::static_publisher_theme.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103255 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/staticpublisher/FilesystemPublisher.php | 10 +++++-
 code/staticpublisher/StaticPublisher.php     | 17 ++++++++++-
 tests/FilesystemPublisherTest.php            | 32 ++++++++++++++++++++
 3 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/code/staticpublisher/FilesystemPublisher.php b/code/staticpublisher/FilesystemPublisher.php
index a02a788d..8548be40 100644
--- a/code/staticpublisher/FilesystemPublisher.php
+++ b/code/staticpublisher/FilesystemPublisher.php
@@ -99,6 +99,14 @@ class FilesystemPublisher extends StaticPublisher {
 		increase_time_limit_to();
 		increase_memory_limit_to();
 		
+		// Set the appropriate theme for this publication batch.
+		// This may have been set explicitly via StaticPublisher::static_publisher_theme,
+		// or we can use the last non-null theme.
+		if(!StaticPublisher::static_publisher_theme())
+			SSViewer::set_theme(SSViewer::current_custom_theme());
+		else
+			SSViewer::set_theme(StaticPublisher::static_publisher_theme());
+			
 		$currentBaseURL = Director::baseURL();
 		if(self::$static_base_url) Director::setBaseURL(self::$static_base_url);
 		if($this->fileExtension == 'php') SSViewer::setOption('rewriteHashlinks', 'php'); 
@@ -255,4 +263,4 @@ class FilesystemPublisher extends StaticPublisher {
 	
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/code/staticpublisher/StaticPublisher.php b/code/staticpublisher/StaticPublisher.php
index 6831d10e..43309737 100644
--- a/code/staticpublisher/StaticPublisher.php
+++ b/code/staticpublisher/StaticPublisher.php
@@ -17,6 +17,13 @@ abstract class StaticPublisher extends DataObjectDecorator {
 	 */
 	static $disable_realtime = false;
 	
+	/*
+	 * This is the current static publishing theme, which can be set at any point
+	 * If it's not set, then the last non-null theme, set via SSViewer::set_theme() is used
+	 * The obvious place to set this is in _config.php
+	 */
+	static $static_publisher_theme=false;
+	
 	abstract function publishPages($pages);
 	abstract function unpublishPages($pages);
 	
@@ -133,6 +140,14 @@ abstract class StaticPublisher extends DataObjectDecorator {
 		
 		return $urls;		
 	}
+	
+	function set_static_publisher_theme($theme){
+		self::$static_publisher_theme=$theme;
+	}
+	
+	function static_publisher_theme(){
+		return self::$static_publisher_theme;
+	}
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/tests/FilesystemPublisherTest.php b/tests/FilesystemPublisherTest.php
index 11f2d137..49e9cf05 100644
--- a/tests/FilesystemPublisherTest.php
+++ b/tests/FilesystemPublisherTest.php
@@ -71,4 +71,36 @@ class FilesystemPublisherTest extends SapphireTest {
 		);
 	}
 	
+	/*
+	 * These are a few simple tests to check that we will be retrieving the correct theme when we need it
+	 * StaticPublishing needs to be able to retrieve a non-null theme at the time publishPages() is called.
+	 */
+	function testStaticPublisherTheme(){
+		
+		//This will be the name of the default theme of this particular project
+		$default_theme=SSViewer::current_theme();
+		
+		$p1 = new Page();
+		$p1->URLSegment = strtolower(__CLASS__).'-page-1';
+		$p1->HomepageForDomain = '';
+		$p1->write();
+		$p1->doPublish();
+		
+		$current_theme=SSViewer::current_custom_theme();
+		$this->assertEquals($current_theme, $default_theme, 'After a standard publication, the theme is correct');
+		
+		//The CMS sometimes sets the theme to null.  Check that the $current_custom_theme is still the default
+		SSViewer::set_theme(null);
+		$current_theme=SSViewer::current_custom_theme();
+		$this->assertEquals($current_theme, $default_theme, 'After a setting the theme to null, the default theme is correct');
+		
+		//We can set the static_publishing theme to something completely different:
+		//Static publishing will use this one instead of the current_custom_theme if it is not false
+		StaticPublisher::set_static_publisher_theme('otherTheme');
+		$current_theme=StaticPublisher::static_publisher_theme();
+		$this->assertNotEquals($current_theme, $default_theme, 'The static publisher theme overrides the custom theme');
+		
+		
+	}
+	
 }
\ No newline at end of file

From a6db618c126094e8c5847097eae88f25985fd2f5 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 22 Apr 2010 01:38:35 +0000
Subject: [PATCH 354/483] BUGFIX Using try/catch in
 MemberTableField->saveComplexTableField() similiar to parent implementation,
 which means trying to save a Member duplicate doesn't end up in a fatal error
 (fixes #5444)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103336 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberTableField.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index 0b6c6d17..7b6f08ce 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -350,8 +350,14 @@ class MemberTableField extends ComplexTableField {
 		// Needs to write before saveInto() to ensure the 'Groups' TreeMultiselectField saves
 		$childData->write();
 		
-		$form->saveInto($childData);
-		$childData->write();
+		try {
+			$form->saveInto($childData);
+			$childData->write();
+		} catch(ValidationException $e) {
+			var_dump($e->getResult());
+			$form->sessionMessage($e->getResult()->message(), 'bad');
+			return Director::redirectBack();
+		}
 		
 		$closeLink = sprintf(
 			'<small><a href="' . $_SERVER['HTTP_REFERER'] . '" onclick="javascript:window.top.GB_hide(); return false;">(%s)</a></small>',

From b19047a2998ac6a0728f7537a31ab09839c1f682 Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Thu, 22 Apr 2010 22:52:05 +0000
Subject: [PATCH 355/483] ENHNANCEMENT: Move cuke/ to salad/

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103375 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/{cuke => salad}/create-page.feature           | 0
 tests/{cuke => salad}/delete-page.feature           | 0
 tests/{cuke => salad}/login.feature                 | 0
 tests/{cuke => salad}/logout.feature                | 0
 tests/{cuke => salad}/step_definitions/content.rb   | 0
 tests/{cuke => salad}/step_definitions/front-end.rb | 0
 tests/{cuke => salad}/step_definitions/general.rb   | 0
 tests/{cuke => salad}/step_definitions/log-in.rb    | 0
 tests/{cuke => salad}/step_definitions/security.rb  | 0
 9 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/{cuke => salad}/create-page.feature (100%)
 rename tests/{cuke => salad}/delete-page.feature (100%)
 rename tests/{cuke => salad}/login.feature (100%)
 rename tests/{cuke => salad}/logout.feature (100%)
 rename tests/{cuke => salad}/step_definitions/content.rb (100%)
 rename tests/{cuke => salad}/step_definitions/front-end.rb (100%)
 rename tests/{cuke => salad}/step_definitions/general.rb (100%)
 rename tests/{cuke => salad}/step_definitions/log-in.rb (100%)
 rename tests/{cuke => salad}/step_definitions/security.rb (100%)

diff --git a/tests/cuke/create-page.feature b/tests/salad/create-page.feature
similarity index 100%
rename from tests/cuke/create-page.feature
rename to tests/salad/create-page.feature
diff --git a/tests/cuke/delete-page.feature b/tests/salad/delete-page.feature
similarity index 100%
rename from tests/cuke/delete-page.feature
rename to tests/salad/delete-page.feature
diff --git a/tests/cuke/login.feature b/tests/salad/login.feature
similarity index 100%
rename from tests/cuke/login.feature
rename to tests/salad/login.feature
diff --git a/tests/cuke/logout.feature b/tests/salad/logout.feature
similarity index 100%
rename from tests/cuke/logout.feature
rename to tests/salad/logout.feature
diff --git a/tests/cuke/step_definitions/content.rb b/tests/salad/step_definitions/content.rb
similarity index 100%
rename from tests/cuke/step_definitions/content.rb
rename to tests/salad/step_definitions/content.rb
diff --git a/tests/cuke/step_definitions/front-end.rb b/tests/salad/step_definitions/front-end.rb
similarity index 100%
rename from tests/cuke/step_definitions/front-end.rb
rename to tests/salad/step_definitions/front-end.rb
diff --git a/tests/cuke/step_definitions/general.rb b/tests/salad/step_definitions/general.rb
similarity index 100%
rename from tests/cuke/step_definitions/general.rb
rename to tests/salad/step_definitions/general.rb
diff --git a/tests/cuke/step_definitions/log-in.rb b/tests/salad/step_definitions/log-in.rb
similarity index 100%
rename from tests/cuke/step_definitions/log-in.rb
rename to tests/salad/step_definitions/log-in.rb
diff --git a/tests/cuke/step_definitions/security.rb b/tests/salad/step_definitions/security.rb
similarity index 100%
rename from tests/cuke/step_definitions/security.rb
rename to tests/salad/step_definitions/security.rb

From 6330e4ec4bc59cae9184f2626ddb126382507a41 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 23 Apr 2010 00:18:39 +0000
Subject: [PATCH 356/483] MINOR Fixed phpdoc documentation (from r103384)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103386 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php              |  2 +-
 code/MemberTableField.php         | 10 ++++++++++
 code/SideReport.php               | 12 ++++++++++++
 code/sitefeatures/PageComment.php |  5 +++++
 tasks/FilesystemSyncTask.php      |  4 ++++
 5 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index e3420e9d..96d6afc3 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -1290,4 +1290,4 @@ JS;
 	
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index 7b6f08ce..89b5bd88 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -13,6 +13,7 @@
  * - members of a provided group
  * - all members
  * - members based on a search-query
+ * 
  * @package cms
  * @subpackage security
  */
@@ -465,6 +466,10 @@ class MemberTableField_Popup extends ComplexTableField_Popup {
 
 }
 
+/**
+* @package cms
+* @subpackage security
+*/
 class MemberTableField_Item extends ComplexTableField_Item {
 
 	function Actions() {
@@ -492,6 +497,11 @@ class MemberTableField_Item extends ComplexTableField_Item {
 	}
 }
 
+/**
+* @package cms
+* @subpackage security
+*/
+
 class MemberTableField_ItemRequest extends ComplexTableField_ItemRequest {
 
 	/**
diff --git a/code/SideReport.php b/code/SideReport.php
index ef0737bb..01eea40c 100755
--- a/code/SideReport.php
+++ b/code/SideReport.php
@@ -3,6 +3,7 @@
 /**
  * Renderer for showing SideReports in CMSMain
  * 
+ * 
  * @package cms
  * @subpackage content
  */
@@ -148,6 +149,7 @@ class SideReport_EmptyPages extends SS_Report {
 
 /**
  * Content side-report listing recently editing pages.
+ * 
  * @package cms
  * @subpackage content
  */
@@ -208,6 +210,7 @@ class SideReport_ToDo extends SS_Report {
 
 /**
  * Content side-report listing pages with broken links
+ * 
  * @package cms
  * @subpackage content
  */
@@ -245,6 +248,7 @@ class SideReport_BrokenLinks extends SS_Report {
 /**
  * Content side-report listing pages with broken files
  * or asset links
+ * 
  * @package cms
  * @subpackage content
  */
@@ -281,6 +285,10 @@ class SideReport_BrokenFiles extends SS_Report {
 
 }
 
+/**
+ * @package cms
+ * @subpackage content
+ */
 class SideReport_BrokenVirtualPages extends SS_Report {
 	function title() {
 		return _t('SideReport.BROKENVIRTUALPAGES', 'VirtualPages pointing to deleted pages');
@@ -311,6 +319,10 @@ class SideReport_BrokenVirtualPages extends SS_Report {
 	}
 }
 
+/**
+ * @package cms
+ * @subpackage content
+ */
 class SideReport_BrokenRedirectorPages extends SS_Report {
 	function title() {
 		return _t('SideReport.BROKENREDIRECTORPAGES', 'RedirectorPages pointing to deleted pages');
diff --git a/code/sitefeatures/PageComment.php b/code/sitefeatures/PageComment.php
index cc909a56..15e800d8 100755
--- a/code/sitefeatures/PageComment.php
+++ b/code/sitefeatures/PageComment.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Represents a single comment on a page
+ * 
  * @package cms
  * @subpackage comments
  */
@@ -158,6 +159,10 @@ class PageComment extends DataObject {
 }
 
 
+/**
+ * @package cms
+ * @subpackage comments
+ */
 class PageComment_Controller extends Controller {
 	function rss() {
 		$parentcheck = isset($_REQUEST['pageid']) ? "\"ParentID\" = " . (int) $_REQUEST['pageid'] : "\"ParentID\" > 0";
diff --git a/tasks/FilesystemSyncTask.php b/tasks/FilesystemSyncTask.php
index aa5e5085..d050b0bb 100644
--- a/tasks/FilesystemSyncTask.php
+++ b/tasks/FilesystemSyncTask.php
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package cms
+ * @subpackage assets
+ */
 class FilesystemSyncTask extends BuildTask {
 	
 	protected $title = "Sync Files & Images assets";

From 99b5937f42eb32ca84a33d2a07c4ddf30b6cb152 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 23 Apr 2010 01:30:33 +0000
Subject: [PATCH 357/483] MINOR Fixed phpdoc documentation

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103397 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSBatchAction.php    |  1 -
 code/CMSMain.php           |  7 +++++--
 code/CMSSiteTreeFilter.php | 12 ++++++++++++
 code/HTMLCleaner.php       |  4 +++-
 code/Report.php            |  4 +++-
 code/SecurityAdmin.php     |  2 +-
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/code/CMSBatchAction.php b/code/CMSBatchAction.php
index 0facc18d..8bae8a79 100644
--- a/code/CMSBatchAction.php
+++ b/code/CMSBatchAction.php
@@ -36,7 +36,6 @@ abstract class CMSBatchAction extends Object {
 	 * @param $pages The DataObjectSet of SiteTree objects to perform this batch action
 	 * on.
 	 * @param $helperMethod The method to call on each of those objects.
-	 * @para
 	 */
 	public function batchaction(DataObjectSet $pages, $helperMethod, $successMessage, $arguments = array()) {
 		$failures = 0;
diff --git a/code/CMSMain.php b/code/CMSMain.php
index f748f49e..de021d28 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -4,8 +4,7 @@
  * This class creates a 2-frame layout - left-tree and right-form - to sit beneath the main
  * admin menu.
  * 
- * @package cms
- * @subpackage content
+ar
  * @todo Create some base classes to contain the generic functionality that will be replicated.
  */
 class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionProvider {
@@ -1429,6 +1428,10 @@ JS;
 	}
 }
 
+/**
+ * @package cms
+ * @subpackage content
+ */
 class CMSMainMarkingFilter {
 	
 	function __construct() {
diff --git a/code/CMSSiteTreeFilter.php b/code/CMSSiteTreeFilter.php
index d6a06609..ed60454e 100644
--- a/code/CMSSiteTreeFilter.php
+++ b/code/CMSSiteTreeFilter.php
@@ -73,6 +73,10 @@ abstract class CMSSiteTreeFilter extends Object {
 
 }
 
+/**
+ * @package cms
+ * @subpackage content
+ */
 class CMSSiteTreeFilter_DeletedPages extends CMSSiteTreeFilter {
 	static function title() {
 		return _t('CMSSiteTreeFilter.DELETEDPAGES', "All pages, including deleted");
@@ -90,6 +94,10 @@ class CMSSiteTreeFilter_DeletedPages extends CMSSiteTreeFilter {
 	}
 }
 
+/**
+ * @package cms
+ * @subpackage content
+ */
 class CMSSiteTreeFilter_ChangedPages extends CMSSiteTreeFilter {
 	static function title() {
 		return _t('CMSSiteTreeFilter.CHANGEDPAGES', "Changed pages");
@@ -100,6 +108,10 @@ class CMSSiteTreeFilter_ChangedPages extends CMSSiteTreeFilter {
 	}	
 }
 
+/**
+ * @package cms
+ * @subpackage content
+ */
 class CMSSiteTreeFilter_Search extends CMSSiteTreeFilter {
 	public $data;
 	
diff --git a/code/HTMLCleaner.php b/code/HTMLCleaner.php
index 9e85e10c..d6ce300b 100644
--- a/code/HTMLCleaner.php
+++ b/code/HTMLCleaner.php
@@ -1,7 +1,9 @@
 <?php
-
 /**
  * Base class for HTML cleaning classes.
+ * 
+ * @package sapphire
+ * @subpackage misc
  */
 abstract class HTMLCleaner  extends Object {
 	/**
diff --git a/code/Report.php b/code/Report.php
index 2adc8ef7..0b4488bf 100644
--- a/code/Report.php
+++ b/code/Report.php
@@ -421,8 +421,10 @@ class SS_Report_FakeQuery extends SQLQuery {
  * 
  * It also makes calls to 2 empty methods that you can override {@link beforeQuery()} and
  * {@link afterQuery()}
+ * 
+ * @package cms
+ * @subpackage reports
  */
-
 abstract class SS_ReportWrapper extends SS_Report {
 	protected $baseReport;
 
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 6756a50e..d94e555b 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -398,7 +398,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 
 	/**
 	 * Return the entire site tree as a nested set of ULs.
-	 * @return string Unordered list <UL> HTML
+	 * @return string Unordered list HTML
 	 */
 	public function SiteTreeAsUL() {
 		$obj = singleton($this->stat('tree_class'));

From f19c5200d106fb62712ff3242752dfa7c4b5a241 Mon Sep 17 00:00:00 2001
From: Normann Lou <normann@silverstripe.com>
Date: Mon, 26 Apr 2010 02:56:44 +0000
Subject: [PATCH 358/483] ENHANCEMENT: to make the FileIFrameField and
 TreeSelectionField easy to use in CMS with Translatable on.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103465 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index de021d28..03e2d0b4 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -4,7 +4,8 @@
  * This class creates a 2-frame layout - left-tree and right-form - to sit beneath the main
  * admin menu.
  * 
-ar
+ * @package cms
+ * @subpackage content
  * @todo Create some base classes to contain the generic functionality that will be replicated.
  */
 class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionProvider {
@@ -411,9 +412,13 @@ JS;
 			}
 
 			// Don't open a page from a different locale
-			if($record && Object::has_extension('SiteTree', 'Translatable') && $record->Locale && $record->Locale != Translatable::get_current_locale()) {
+			/** The record's Locale is saved in database in 2.4, and not related with Session, we should check their locale matches the Translatable::get_current_locale,
+			 * 	as long as we all the HTTPRequest is init with right locale.
+			 *	This bit breaks the all FileIFrameField functions if the field is used in CMS and its relevent ajax calles, like loading the tree dropdown for TreeSelectorField. 
+			 */
+			/* if($record && Object::has_extension('SiteTree', 'Translatable') && $record->Locale && $record->Locale != Translatable::get_current_locale()) {
 				$record = null;
-			}
+			}*/
 
 			return $record;
 

From 53f53bd27f08e61348147aa826c9d059308219e6 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 26 Apr 2010 23:23:42 +0000
Subject: [PATCH 359/483] BUGFIX Fixed redirection in PageCommentInterface to
 use Link() instead of URLSegment (fixes 4200, thanks ktauber)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103518 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/PageCommentInterface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index 23e51121..a186b6dd 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -343,7 +343,7 @@ class PageCommentInterface_Form extends Form {
 				$page = DataObject::get_by_id("Page", $comment->ParentID);
 				if($page) {
 					// Redirect to the actual post on the page.
-					return Director::redirect(Director::baseURL(). $page->URLSegment.'#PageComment_'.$comment->ID);
+					return Director::redirect($page->Link() . '#PageComment_' . $comment->ID);
 				}
 			}
 

From d36bc64f3111f96fbc51c7e28253717558e06c4e Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Mon, 26 Apr 2010 23:27:42 +0000
Subject: [PATCH 360/483] BUGFIX: Prevent duplicate HTML IDs in ModelAdmin

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103519 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ModelAdmin.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index 839a01ba..efd9bccd 100755
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -423,17 +423,17 @@ class ModelAdmin_CollectionController extends Controller {
 		}
 		
 		$buttonLabel = sprintf(_t('ModelAdmin.CREATEBUTTON', "Create '%s'", PR_MEDIUM, "Create a new instance from a model class"), singleton($modelName)->i18n_singular_name());
-		
-		$actions = new FieldSet(
-			$createButton = new FormAction('add', $buttonLabel)
-		);
-		
+
+		$form = new Form($this, "CreateForm",
+						new FieldSet(),
+						$createButton = new FormAction('add', $buttonLabel),
+						$validator = new RequiredFields()
+				);
+	
 		$createButton->dontEscape = true;
-		
-		$validator = new RequiredFields();
 		$validator->setJavascriptValidationHandler('none');
-		
-		return new Form($this, "CreateForm", new FieldSet(), $actions, $validator);	
+		$form->setHTMLID("Form_CreateForm_" . $this->modelClass);
+		return $form;
 	}
 	
 	/**
@@ -488,6 +488,7 @@ class ModelAdmin_CollectionController extends Controller {
 			$actions,
 			$validator
 		);
+		$form->setHTMLID("Form_ImportForm_" . $this->modelClass);
 		return $form;
 	}
 	

From 5cbb94b43bda3b074694849bfe3e35e5ad01db7d Mon Sep 17 00:00:00 2001
From: Normann Lou <normann@silverstripe.com>
Date: Mon, 26 Apr 2010 23:29:57 +0000
Subject: [PATCH 361/483] MINOR: add more in-line documentation and fix the
 typo: should => should not

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103520 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 03e2d0b4..96e5c984 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -412,9 +412,11 @@ JS;
 			}
 
 			// Don't open a page from a different locale
-			/** The record's Locale is saved in database in 2.4, and not related with Session, we should check their locale matches the Translatable::get_current_locale,
-			 * 	as long as we all the HTTPRequest is init with right locale.
-			 *	This bit breaks the all FileIFrameField functions if the field is used in CMS and its relevent ajax calles, like loading the tree dropdown for TreeSelectorField. 
+			/** The record's Locale is saved in database in 2.4, and not related with Session,
+			 *  we should not check their locale matches the Translatable::get_current_locale,
+			 * 	here as long as we all the HTTPRequest is init with right locale.
+			 *	This bit breaks the all FileIFrameField functions if the field is used in CMS
+			 *  and its relevent ajax calles, like loading the tree dropdown for TreeSelectorField. 
 			 */
 			/* if($record && Object::has_extension('SiteTree', 'Translatable') && $record->Locale && $record->Locale != Translatable::get_current_locale()) {
 				$record = null;

From 3ab7de60513509df8d4b83abd8a5a50d5c1a3b60 Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Tue, 27 Apr 2010 00:40:38 +0000
Subject: [PATCH 362/483] MINOR: Fix to ModelAdmin, part of r103519

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103533 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ModelAdmin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index efd9bccd..b94293d1 100755
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -426,7 +426,7 @@ class ModelAdmin_CollectionController extends Controller {
 
 		$form = new Form($this, "CreateForm",
 						new FieldSet(),
-						$createButton = new FormAction('add', $buttonLabel),
+						new FieldSet($createButton = new FormAction('add', $buttonLabel)),
 						$validator = new RequiredFields()
 				);
 	

From 5b6bec63aab8f2963821f45daae74eabf1448195 Mon Sep 17 00:00:00 2001
From: Saophalkun Ponlu <phalkunz@silverstripe.com>
Date: Tue, 27 Apr 2010 02:17:26 +0000
Subject: [PATCH 363/483] MINOR: added moderation message for non-ajax mode

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103555 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/PageCommentInterface.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index a186b6dd..7d068139 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -330,13 +330,19 @@ class PageCommentInterface_Form extends Form {
 		$comment->write();
 		
 		Cookie::set("PageCommentInterface_Comment", '');
+		
+		$moderationMsg = _t('PageCommentInterface_Form.AWAITINGMODERATION', "Your comment has been submitted and is now awaiting moderation.");
+		
 		if(Director::is_ajax()) {
 			if($comment->NeedsModeration){
-				echo _t('PageCommentInterface_Form.AWAITINGMODERATION', "Your comment has been submitted and is now awaiting moderation.");
+				echo $moderationMsg;
 			} else{
 				echo $comment->renderWith('PageCommentInterface_singlecomment');
 			}
 		} else {		
+			if($comment->NeedsModeration){
+				$this->sessionMessage($moderationMsg, 'good');
+			}
 			// since it is not ajax redirect user down to their comment since it has been posted
 			// get the pages url off the comments parent ID.
 			if($comment->ParentID) {

From 07d182a19a6fc3ddb6287268e5704e65f73b7930 Mon Sep 17 00:00:00 2001
From: Saophalkun Ponlu <phalkunz@silverstripe.com>
Date: Tue, 27 Apr 2010 02:29:42 +0000
Subject: [PATCH 364/483] MINOR: sort page comment table by Created field -
 show newest entries first

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103558 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CommentAdmin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/CommentAdmin.php b/code/CommentAdmin.php
index 2e650eaa..fe0d0994 100644
--- a/code/CommentAdmin.php
+++ b/code/CommentAdmin.php
@@ -83,7 +83,7 @@ class CommentAdmin extends LeftAndMain {
 		);
 
 		$idField = new HiddenField('ID', '', $section);
-		$table = new CommentTableField($this, "Comments", "PageComment", $section, $tableFields, $popupFields, array($filter));
+		$table = new CommentTableField($this, "Comments", "PageComment", $section, $tableFields, $popupFields, array($filter), 'Created DESC');
 		$table->setParentClass(false);
 		$table->setFieldCasting(array(
 			'Created' => 'SSDatetime->Full'

From 19b27185199658b8c7271428c644a32da05f9887 Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Thu, 29 Apr 2010 00:44:56 +0000
Subject: [PATCH 365/483] BUGFIX: Use correct quoting for BrokenLinksReport
 (ticket #5474)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103706 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/reports/BrokenLinksReport.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
index 488b4a03..af20c5a6 100644
--- a/code/reports/BrokenLinksReport.php
+++ b/code/reports/BrokenLinksReport.php
@@ -29,9 +29,9 @@ class BrokenLinksReport extends SS_Report {
 				$sort = '';
 			}
 		}
-		
-		if (!isset($_REQUEST['CheckSite']) || $params['CheckSite'] == 'Published') $ret = Versioned::get_by_stage('SiteTree', 'Live', "(HasBrokenLink = 1 OR HasBrokenFile = 1)", $sort, $join, $limit);
-		else $ret = DataObject::get('SiteTree', "(HasBrokenFile = 1 OR HasBrokenLink = 1)", $sort, $join, $limit);
+		$q = DB::USE_ANSI_SQL ? '"' : '`';
+		if (!isset($_REQUEST['CheckSite']) || $params['CheckSite'] == 'Published') $ret = Versioned::get_by_stage('SiteTree', 'Live', "({$q}SiteTree{$q}.{$q}HasBrokenLink{$q} = 1 OR {$q}SiteTree{$q}.{$q}HasBrokenFile{$q} = 1)", $sort, $join, $limit);
+		else $ret = DataObject::get('SiteTree', "({$q}SiteTree{$q}.{$q}HasBrokenFile{$q} = 1 OR {$q}HasBrokenLink{$q} = 1)", $sort, $join, $limit);
 		
 		$returnSet = new DataObjectSet();
 		if ($ret) foreach($ret as $record) {

From 3fcbefb18b61fa7202f31dbcfec21aa0b806390e Mon Sep 17 00:00:00 2001
From: Saophalkun Ponlu <phalkunz@silverstripe.com>
Date: Thu, 29 Apr 2010 01:18:05 +0000
Subject: [PATCH 366/483] ENHANCEMENT: create cache directory when it does not
 exist before running the cache build test

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103708 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tasks/RebuildStaticCacheTask.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tasks/RebuildStaticCacheTask.php b/tasks/RebuildStaticCacheTask.php
index 11018544..486ac729 100644
--- a/tasks/RebuildStaticCacheTask.php
+++ b/tasks/RebuildStaticCacheTask.php
@@ -46,6 +46,10 @@ class RebuildStaticCacheTask extends Controller {
 		$page = singleton('Page');
 		$cacheBaseDir = $page->getDestDir();
 		
+		if(!file_exists($cacheBaseDir)) {
+			mkdir($cacheBaseDir);
+		}
+		
 		if (file_exists($cacheBaseDir.'/lock') && !isset($_REQUEST['force'])) die("There already appears to be a publishing queue running. You can skip warning this by adding ?/&force to the URL.");
 		
 		touch($cacheBaseDir.'/lock');

From 9a4f7be9a1b8b9e6a671fff4cf54d037b15f6a0c Mon Sep 17 00:00:00 2001
From: Saophalkun Ponlu <phalkunz@silverstripe.com>
Date: Thu, 29 Apr 2010 04:10:05 +0000
Subject: [PATCH 367/483] ENHANCEMENT: use FileSystem class to create cache
 directory to unsure the right permissions are set

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103730 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tasks/RebuildStaticCacheTask.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/RebuildStaticCacheTask.php b/tasks/RebuildStaticCacheTask.php
index 486ac729..99c044d0 100644
--- a/tasks/RebuildStaticCacheTask.php
+++ b/tasks/RebuildStaticCacheTask.php
@@ -47,7 +47,7 @@ class RebuildStaticCacheTask extends Controller {
 		$cacheBaseDir = $page->getDestDir();
 		
 		if(!file_exists($cacheBaseDir)) {
-			mkdir($cacheBaseDir);
+			Filesystem::makeFolder($cacheBaseDir);
 		}
 		
 		if (file_exists($cacheBaseDir.'/lock') && !isset($_REQUEST['force'])) die("There already appears to be a publishing queue running. You can skip warning this by adding ?/&force to the URL.");

From 9b593dcae50b4d3bddcf07697f998bfff28eb586 Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Thu, 29 Apr 2010 04:27:04 +0000
Subject: [PATCH 368/483] BUGFIX: Fix linkCount .js in AssetAdmin deleteRecord
 (ticket #5486)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103734 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/AssetTableField.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/AssetTableField.js b/javascript/AssetTableField.js
index c1f4847f..3040742b 100644
--- a/javascript/AssetTableField.js
+++ b/javascript/AssetTableField.js
@@ -49,7 +49,7 @@ AssetTableField.prototype = {
 		var link = Event.findElement(e,"a");
 		var row = Event.findElement(e,"tr");
 		
-		var linkCount = document.getElementsByClassName('linkCount', row)[0];
+		var linkCount = row.getElementsByClassName('linkCount')[0];
 		if(linkCount) linkCount = linkCount.innerHTML;
 		
 		var confirmMessage = ss.i18n._t('TABLEFIELD.DELETECONFIRMMESSAGE', 'Are you sure you want to delete this record?');

From 9c4c3eef2ee74c8b6944f1b01dd320ff5848e08f Mon Sep 17 00:00:00 2001
From: Saophalkun Ponlu <phalkunz@silverstripe.com>
Date: Thu, 29 Apr 2010 05:48:48 +0000
Subject: [PATCH 369/483] BUGFIX: static publisher for a site that resides in a
 subfolder of webroot

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103745 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/staticpublisher/FilesystemPublisher.php | 76 +++++++++++++++---
 tests/FilesystemPublisherTest.php            | 81 ++++++++++++++++++++
 2 files changed, 147 insertions(+), 10 deletions(-)

diff --git a/code/staticpublisher/FilesystemPublisher.php b/code/staticpublisher/FilesystemPublisher.php
index 8548be40..27ed61da 100644
--- a/code/staticpublisher/FilesystemPublisher.php
+++ b/code/staticpublisher/FilesystemPublisher.php
@@ -1,7 +1,11 @@
 <?php
 
 /**
- * Usage: Object::add_extension("SiteTree", "FilesystemPublisher('../static-folder/')")
+ * Usage: Object::add_extension("SiteTree", "FilesystemPublisher('static-folder', 'html')");
+ * 
+ * Usage: To work with Subsite module you need to:
+ * - Add FilesystemPublisher::$domain_based_caching = true; in mysite/_config.php
+ * - Added main site host mapping in subsites/host-map.php after everytime a new subsite is created or modified 
  *
  * You may also have a method $page->pagesAffectedByUnpublishing() to return other URLS
  * that should be de-cached if $page is unpublished.
@@ -12,14 +16,27 @@
  * @subpackage publishers
  */
 class FilesystemPublisher extends StaticPublisher {
-	protected $destFolder;
+
+	/**
+	 * @var String
+	 */
+	protected $destFolder = 'cache';
+	
+	/**
+	 * @var String
+	 */
 	protected $fileExtension = 'html';
 	
+	/**
+	 * @var String
+	 */
 	protected static $static_base_url = null;
 	
 	/**
-	 * Use domain based cacheing (put cache files into a domain subfolder)
-	 * This must be true if you are using this with subsites.
+	 * @var Boolean Use domain based cacheing (put cache files into a domain subfolder)
+	 * This must be true if you are using this with the "subsites" module.
+	 * Please note that this form of caching requires all URLs to be provided absolute
+	 * (not relative to the webroot) via {@link SiteTree->AbsoluteLink()}.
 	 */
 	public static $domain_based_caching = false;
 	
@@ -32,25 +49,57 @@ class FilesystemPublisher extends StaticPublisher {
 	}
 	
 	/**
-	 * @param $destFolder The folder to save the cached site into
-	 * @param $fileExtension  The file extension to use, for example, 'html'.  If omitted, then each page will be placed
-	 * in its own directory, with the filename 'index.html'.  If you set the extension to PHP, then a simple PHP script will
-	 * be generated that can do appropriate cache & redirect header negotation
+	 * @param $destFolder The folder to save the cached site into.
+	 *   This needs to be set in sapphire/static-main.php as well through the {@link $cacheBaseDir} variable.
+	 * @param $fileExtension  The file extension to use, e.g 'html'.  
+	 *   If omitted, then each page will be placed in its own directory, 
+	 *   with the filename 'index.html'.  If you set the extension to PHP, then a simple PHP script will
+	 *   be generated that can do appropriate cache & redirect header negotation.
 	 */
 	function __construct($destFolder, $fileExtension = null) {
+		// Remove trailing slash from folder
 		if(substr($destFolder, -1) == '/') $destFolder = substr($destFolder, 0, -1);
+		
 		$this->destFolder = $destFolder;
 		$this->fileExtension = $fileExtension;
+		
 		parent::__construct();
 	}
 	
+	/**
+	 * Transforms relative or absolute URLs to their static path equivalent.
+	 * This needs to be the same logic that's used to look up these paths through
+	 * sapphire/static-main.php. Does not include the {@link $destFolder} prefix.
+	 * Replaces various special characters in the resulting filename similar to {@link SiteTree::generateURLSegment()}.
+	 * 
+	 * Examples (without $domain_based_caching):
+	 *  - http://mysite.com/mywebroot/ => /index.html (assuming your webroot is in a subfolder)
+	 *  - http://mysite.com/about-us => /about-us.html
+	 *  - http://mysite.com/parent/child => /parent/child.html
+	 * 
+	 * Examples (with $domain_based_caching):
+	 *  - http://mysite.com/mywebroot/ => /mysite.com/index.html (assuming your webroot is in a subfolder)
+	 *  - http://mysite.com/about-us => /mysite.com/about-us.html
+	 *  - http://myothersite.com/about-us => /myothersite.com/about-us.html
+	 *  - http://subdomain.mysite.com/parent/child => /subdomain.mysite.com/parent/child.html
+	 * 
+	 * @param Array $urls Absolute or relative URLs
+	 * @return Array Map of original URLs to filesystem paths (relative to {@link $destFolder}).
+	 */
 	function urlsToPaths($urls) {
 		$mappedUrls = array();
 		foreach($urls as $url) {
 			$urlParts = @parse_url($url);
-			$urlParts['path'] = isset($urlParts['path']) ? $urlParts['path'] : '';
+			
+			// Remove base folders from the URL if webroot is hosted in a subfolder (same as static-main.php)
+			$path = isset($urlParts['path']) ? $urlParts['path'] : '';
+			if(substr(strtolower($path), 0, strlen(BASE_URL)) == strtolower(BASE_URL)) {
+				$urlSegment = substr($path, strlen(BASE_URL));
+			} else {
+				$urlSegment = $path;
+			}
+
 			// perform similar transformations to SiteTree::generateURLSegment()
-			$urlSegment = $urlParts['path'];
 			$urlSegment = str_replace('&amp;','-and-',$urlSegment);
 			$urlSegment = str_replace('&','-and-',$urlSegment);
 			$urlSegment = ereg_replace('[^A-Za-z0-9\/-]+','-',$urlSegment);
@@ -114,7 +163,9 @@ class FilesystemPublisher extends StaticPublisher {
 		$files = array();
 		$i = 0;
 		$totalURLs = sizeof($urls);
+
 		foreach($urls as $url => $path) {
+			
 			if(self::$static_base_url) Director::setBaseURL(self::$static_base_url);
 			$i++;
 
@@ -129,9 +180,14 @@ class FilesystemPublisher extends StaticPublisher {
 			}
 
 			Requirements::clear();
+			
+			if(Director::is_relative_url($url)) $url = Director::absoluteURL($url);
 			$response = Director::test(str_replace('+', ' ', $url));
+			
 			Requirements::clear();
 			
+			
+			
 			singleton('DataObject')->flushCache();
 
 			// Generate file content			
diff --git a/tests/FilesystemPublisherTest.php b/tests/FilesystemPublisherTest.php
index 49e9cf05..9504e031 100644
--- a/tests/FilesystemPublisherTest.php
+++ b/tests/FilesystemPublisherTest.php
@@ -9,20 +9,101 @@ class FilesystemPublisherTest extends SapphireTest {
 	
 	protected $usesDatabase = true;
 	
+	protected $orig = array();
+	
 	function setUp() {
 		parent::setUp();
 		
 		Object::add_extension("SiteTree", "FilesystemPublisher('../FilesystemPublisherTest-static-folder/')");
 		SiteTree::$write_homepage_map = false;
+		
+		$this->orig['domain_based_caching'] = FilesystemPublisher::$domain_based_caching;
+		FilesystemPublisher::$domain_based_caching = false;
 	}
 	
 	function tearDown() {
 		Object::remove_extension("SiteTree", "FilesystemPublisher('../FilesystemPublisherTest-static-folder/')");
 		SiteTree::$write_homepage_map = true;
 		
+		FilesystemPublisher::$domain_based_caching = $this->orig['domain_based_caching'];
+		
 		parent::tearDown();
 	}
 	
+	function testUrlsToPathsWithRelativeUrls() {
+		$fsp = new FilesystemPublisher('.', 'html');
+		
+		$this->assertEquals(
+			$fsp->urlsToPaths(array('/')),
+			array('/' => './index.html'),
+			'Root URL path mapping'
+		);
+		
+		$this->assertEquals(
+			$fsp->urlsToPaths(array('about-us')),
+			array('about-us' => './about-us.html'),
+			'URLsegment path mapping'
+		);
+		
+		$this->assertEquals(
+			$fsp->urlsToPaths(array('parent/child')),
+			array('parent/child' => 'parent/child.html'),
+			'Nested URLsegment path mapping'
+		);
+	}
+	
+	function testUrlsToPathsWithAbsoluteUrls() {
+		$fsp = new FilesystemPublisher('.', 'html');
+		
+		$url = Director::absoluteBaseUrl();
+		$this->assertEquals(
+			$fsp->urlsToPaths(array($url)),
+			array($url => './index.html'),
+			'Root URL path mapping'
+		);
+		
+		$url = Director::absoluteBaseUrl() . 'about-us';
+		$this->assertEquals(
+			$fsp->urlsToPaths(array($url)),
+			array($url => './about-us.html'),
+			'URLsegment path mapping'
+		);
+		
+		$url = Director::absoluteBaseUrl() . 'parent/child';
+		$this->assertEquals(
+			$fsp->urlsToPaths(array($url)),
+			array($url => 'parent/child.html'),
+			'Nested URLsegment path mapping'
+		);
+	}
+	
+	function testUrlsToPathsWithDomainBasedCaching() {
+		FilesystemPublisher::$domain_based_caching = true;
+		
+		$fsp = new FilesystemPublisher('.', 'html');
+		
+		$url = 'http://domain1.com/';
+		$this->assertEquals(
+			$fsp->urlsToPaths(array($url)),
+			array($url => 'domain1.com/index.html'),
+			'Root URL path mapping'
+		);
+		
+		$url = 'http://domain1.com/about-us';
+		$this->assertEquals(
+			$fsp->urlsToPaths(array($url)),
+			array($url => 'domain1.com/about-us.html'),
+			'URLsegment path mapping'
+		);
+		
+		$url = 'http://domain2.com/parent/child';
+		$this->assertEquals(
+			$fsp->urlsToPaths(array($url)),
+			array($url => 'domain2.com/parent/child.html'),
+			'Nested URLsegment path mapping'
+		);
+	}
+	
 	/**
 	 * Simple test to ensure that FileSystemPublisher::__construct()
 	 * has called parent::__construct() by checking the class property.

From c56a6090cefb8bbcf63f6852a00e8bed2a696946 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 29 Apr 2010 21:41:41 +0000
Subject: [PATCH 370/483] MINOR Unsetting state in FilesystemPublisherTest
 (regression from r103745)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103763 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/FilesystemPublisherTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/FilesystemPublisherTest.php b/tests/FilesystemPublisherTest.php
index 9504e031..001f3621 100644
--- a/tests/FilesystemPublisherTest.php
+++ b/tests/FilesystemPublisherTest.php
@@ -78,6 +78,7 @@ class FilesystemPublisherTest extends SapphireTest {
 	}
 	
 	function testUrlsToPathsWithDomainBasedCaching() {
+		$origDomainBasedCaching = FilesystemPublisher::$domain_based_caching;
 		FilesystemPublisher::$domain_based_caching = true;
 		
 		$fsp = new FilesystemPublisher('.', 'html');
@@ -102,6 +103,8 @@ class FilesystemPublisherTest extends SapphireTest {
 			array($url => 'domain2.com/parent/child.html'),
 			'Nested URLsegment path mapping'
 		);
+		
+		FilesystemPublisher::$domain_based_caching = $origDomainBasedCaching;
 	}
 	
 	/**

From 5a7a0128f3606da87a7246fb6188915b64e2580b Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 30 Apr 2010 03:46:50 +0000
Subject: [PATCH 371/483] MINOR Fixed CMSMainTest for postgres by not
 hardcoding fixture IDs

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103818 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/CMSMainTest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/CMSMainTest.yml b/tests/CMSMainTest.yml
index c3b577aa..1c4d9f64 100644
--- a/tests/CMSMainTest.yml
+++ b/tests/CMSMainTest.yml
@@ -60,7 +60,7 @@ SiteConfig:
       CanCreateTopLevelType: 'OnlyTheseUsers'
 SiteConfig_CreateTopLevelGroups:
    createtoplevelgroups1:
-      SiteConfigID:  1
+      SiteConfigID:  =>SiteConfig.siteconfig1
       GroupID: =>Group.rooteditusers
 PageComment:
     Comment1:

From 8de4ccbf0b18cfb140c74d2656fb48b42b250f36 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 30 Apr 2010 04:38:06 +0000
Subject: [PATCH 372/483] MINOR Updated cms translations

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103836 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 lang/ar_SA.php |  11 --
 lang/bg_BG.php |  11 --
 lang/ca_AD.php |  11 --
 lang/cs_CZ.php | 109 ++++++++++++++++----
 lang/da_DK.php |  37 +++++--
 lang/de_DE.php |  18 ++--
 lang/en_GB.php |  11 --
 lang/eo_XX.php |  11 --
 lang/es_AR.php |  11 --
 lang/es_ES.php |  11 --
 lang/es_MX.php |  11 --
 lang/et_EE.php |  11 --
 lang/fi_FI.php |  11 --
 lang/fr_FR.php |  11 --
 lang/he_IL.php |  12 ---
 lang/hr_HR.php |  10 --
 lang/hu_HU.php |  11 --
 lang/id_ID.php |  11 --
 lang/it_IT.php |  14 +--
 lang/ja_JP.php |  16 +--
 lang/lc_XX.php |  10 --
 lang/lt_LT.php |  11 --
 lang/ms_MY.php |  11 --
 lang/nb_NO.php |  11 --
 lang/ne_NP.php |  10 --
 lang/nl_NL.php |  15 +--
 lang/pl_PL.php |  38 ++-----
 lang/pt_BR.php |  11 --
 lang/pt_PT.php |  11 --
 lang/ru_RU.php |  13 +--
 lang/si_LK.php |  11 --
 lang/sk_SK.php | 269 +++++++++++++++++++++++++++++++++++++++++++++++--
 lang/sr_RS.php |  11 --
 lang/sv_SE.php |  11 --
 lang/tr_TR.php |  11 --
 lang/zh_CN.php |  11 --
 lang/zh_TW.php |  10 --
 37 files changed, 398 insertions(+), 436 deletions(-)

diff --git a/lang/ar_SA.php b/lang/ar_SA.php
index 72a74f85..c5bd73d0 100644
--- a/lang/ar_SA.php
+++ b/lang/ar_SA.php
@@ -52,7 +52,6 @@ $lang['ar_SA']['AssetTableField']['CAPTION'] = 'العنوان';
 $lang['ar_SA']['AssetTableField']['CREATED'] = 'أول المرفوعات';
 $lang['ar_SA']['AssetTableField']['DIM'] = 'الأبعاد';
 $lang['ar_SA']['AssetTableField']['DIMLIMT'] = 'أبعاد محدودة في النافذة المنبثقة';
-$lang['ar_SA']['AssetTableField']['EDITIMAGE'] = 'تعديل الصورة';
 $lang['ar_SA']['AssetTableField']['FILENAME'] = 'اسم الملف';
 $lang['ar_SA']['AssetTableField']['GALLERYOPTIONS'] = 'خيارات معرض الصور';
 $lang['ar_SA']['AssetTableField']['IMAGE'] = 'الصورة';
@@ -82,12 +81,6 @@ $lang['ar_SA']['CMSBatchActions']['PUBLISH_PAGES'] = 'النشر';
 $lang['ar_SA']['CMSBatchActions']['UNPUBLISHED_PAGES'] = '%d من الصفحات غير المنشورة';
 $lang['ar_SA']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'صفحات غير منشورة';
 $lang['ar_SA']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'غير منشور';
-$lang['ar_SA']['CMSLeft.ss']['DELPAGE'] = 'حذف صفحات ...';
-$lang['ar_SA']['CMSLeft.ss']['DELPAGES'] = 'احذف الصفحات المحددة';
-$lang['ar_SA']['CMSLeft.ss']['GO'] = 'اذهب';
-$lang['ar_SA']['CMSLeft.ss']['NEWPAGE'] = 'صفحة جديدة ...';
-$lang['ar_SA']['CMSLeft.ss']['SELECTPAGESDEL'] = 'اختر الملجدات التي تريد حذفها ثم اضغط على الزر بالأسفل';
-$lang['ar_SA']['CMSLeft.ss']['SITECONT'] = 'محتوى الموقع';
 $lang['ar_SA']['CMSMain']['ACCESS'] = 'الدخول إلى %s (%s)';
 $lang['ar_SA']['CMSMain']['ACCESSALLINTERFACES'] = 'الدخول إلى جميع واجهات إدارة المحتوى';
 $lang['ar_SA']['CMSMain']['CANCEL'] = 'إلغاء';
@@ -169,7 +162,6 @@ $lang['ar_SA']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'انشر الصفحات 
 $lang['ar_SA']['CMSMain_left.ss']['SEARCH'] = 'بحث';
 $lang['ar_SA']['CMSMain_left.ss']['SEARCHTITLE'] = 'ابحث في الروابط , العناوين ,عناوين القوائم , و المحتويات';
 $lang['ar_SA']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'اختر الصفحات التي ترغب بتغييرها &amp; ثم اختر التنفيذ';
-$lang['ar_SA']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'اختر الصفحة التي تريد تكرارها ومكان التكرار , متضمنة الصفحات الفرعية ';
 $lang['ar_SA']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'اعرض الصفحات المعدلة فقط';
 $lang['ar_SA']['CMSMain_left.ss']['SHOWUNPUB'] = 'إظهار الإصدارات الغير منشورة';
 $lang['ar_SA']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'محتوى و هيكلة الموقع';
@@ -187,9 +179,6 @@ $lang['ar_SA']['CMSMain_versions.ss']['NOTPUB'] = 'غير منشور';
 $lang['ar_SA']['CMSMain_versions.ss']['PUBR'] = 'الناشر';
 $lang['ar_SA']['CMSMain_versions.ss']['UNKNOWN'] = 'غير معروف';
 $lang['ar_SA']['CMSMain_versions.ss']['WHEN'] = 'عند';
-$lang['ar_SA']['CMSRight.ss']['CHOOSEPAGE'] = 'فضلاً اختر صفحة من القائمة';
-$lang['ar_SA']['CMSRight.ss']['ECONTENT'] = 'تعديل المحتوى';
-$lang['ar_SA']['CMSRight.ss']['WELCOMETO'] = 'أهلاً بك في ';
 $lang['ar_SA']['CommentAdmin']['ACCEPT'] = 'موافقة';
 $lang['ar_SA']['CommentAdmin']['APPROVED'] = 'التعليقات الموافق عليها %s';
 $lang['ar_SA']['CommentAdmin']['APPROVEDCOMMENTS'] = 'تعليقات تمت الموافقة عليها';
diff --git a/lang/bg_BG.php b/lang/bg_BG.php
index d53e9f58..5b707824 100644
--- a/lang/bg_BG.php
+++ b/lang/bg_BG.php
@@ -48,7 +48,6 @@ $lang['bg_BG']['AssetTableField']['CAPTION'] = 'Надпис';
 $lang['bg_BG']['AssetTableField']['CREATED'] = 'Първо качен';
 $lang['bg_BG']['AssetTableField']['DIM'] = 'Размери';
 $lang['bg_BG']['AssetTableField']['DIMLIMT'] = 'Ограничи размерите в Изкачащото Прозорче';
-$lang['bg_BG']['AssetTableField']['EDITIMAGE'] = 'Промени това изображение';
 $lang['bg_BG']['AssetTableField']['FILENAME'] = 'Име на файла';
 $lang['bg_BG']['AssetTableField']['GALLERYOPTIONS'] = 'Опций на галерията';
 $lang['bg_BG']['AssetTableField']['IMAGE'] = 'Изображение';
@@ -69,12 +68,6 @@ $lang['bg_BG']['AssetTableField']['SWFFILEOPTIONS'] = 'SWF Файл опций '
 $lang['bg_BG']['AssetTableField']['TITLE'] = 'Заглавие';
 $lang['bg_BG']['AssetTableField']['TYPE'] = 'Вид';
 $lang['bg_BG']['AssetTableField']['URL'] = 'URL';
-$lang['bg_BG']['CMSLeft.ss']['DELPAGE'] = 'Изтрий страници...';
-$lang['bg_BG']['CMSLeft.ss']['DELPAGES'] = 'Изтрий избраните страници';
-$lang['bg_BG']['CMSLeft.ss']['GO'] = 'Давай';
-$lang['bg_BG']['CMSLeft.ss']['NEWPAGE'] = 'Нова страница...';
-$lang['bg_BG']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Изберете страниците които искате да изтриете и натиснете бутона по-долу';
-$lang['bg_BG']['CMSLeft.ss']['SITECONT'] = 'Съдържание на сайта';
 $lang['bg_BG']['CMSMain']['ACCESS'] = 'Влез при %s в CMS';
 $lang['bg_BG']['CMSMain']['CANCEL'] = 'Отмени';
 $lang['bg_BG']['CMSMain']['CHOOSEREPORT'] = '(Изберете доклад)';
@@ -147,7 +140,6 @@ $lang['bg_BG']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Публикувай из
 $lang['bg_BG']['CMSMain_left.ss']['SEARCH'] = 'Търси';
 $lang['bg_BG']['CMSMain_left.ss']['SEARCHTITLE'] = 'Търси чрез URL, Заглавие, Заглавие на меню и Съдържание';
 $lang['bg_BG']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Изберете страниците които искате да промените и после изберете действие:';
-$lang['bg_BG']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Изберете страниците които искате да дублирате, дали подстраниците да бъдат включени и къде искате да запишете дубликатите';
 $lang['bg_BG']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Покажи само променени страници';
 $lang['bg_BG']['CMSMain_left.ss']['SHOWUNPUB'] = 'Покажи непубликуваните версии';
 $lang['bg_BG']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Съдържание и структура';
@@ -165,9 +157,6 @@ $lang['bg_BG']['CMSMain_versions.ss']['NOTPUB'] = 'Непубликуван';
 $lang['bg_BG']['CMSMain_versions.ss']['PUBR'] = 'Публикувал';
 $lang['bg_BG']['CMSMain_versions.ss']['UNKNOWN'] = 'Непознат';
 $lang['bg_BG']['CMSMain_versions.ss']['WHEN'] = 'Кога';
-$lang['bg_BG']['CMSRight.ss']['CHOOSEPAGE'] = 'Моля, изберете страница от ляво.';
-$lang['bg_BG']['CMSRight.ss']['ECONTENT'] = 'Промени Съдържание';
-$lang['bg_BG']['CMSRight.ss']['WELCOMETO'] = 'Добре дошли в';
 $lang['bg_BG']['CommentAdmin']['ACCEPT'] = 'Приеми';
 $lang['bg_BG']['CommentAdmin']['APPROVED'] = 'Приети %s коментара.';
 $lang['bg_BG']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Удобрени коментари';
diff --git a/lang/ca_AD.php b/lang/ca_AD.php
index bba798f6..15385a23 100644
--- a/lang/ca_AD.php
+++ b/lang/ca_AD.php
@@ -49,7 +49,6 @@ $lang['ca_AD']['AssetTableField']['CAPTION'] = 'Títol';
 $lang['ca_AD']['AssetTableField']['CREATED'] = 'Carregat per primer cop';
 $lang['ca_AD']['AssetTableField']['DIM'] = 'Dimensions';
 $lang['ca_AD']['AssetTableField']['DIMLIMT'] = 'Limita les dimensions de la finestra emergent';
-$lang['ca_AD']['AssetTableField']['EDITIMAGE'] = 'Edita aquesta imatge';
 $lang['ca_AD']['AssetTableField']['FILENAME'] = 'Nom del fitxer';
 $lang['ca_AD']['AssetTableField']['GALLERYOPTIONS'] = 'Opcions de la galeria';
 $lang['ca_AD']['AssetTableField']['IMAGE'] = 'Imatge';
@@ -70,12 +69,6 @@ $lang['ca_AD']['AssetTableField']['SWFFILEOPTIONS'] = 'Opcions del fitxer SWF';
 $lang['ca_AD']['AssetTableField']['TITLE'] = 'Títol';
 $lang['ca_AD']['AssetTableField']['TYPE'] = 'Tipus';
 $lang['ca_AD']['AssetTableField']['URL'] = 'URL';
-$lang['ca_AD']['CMSLeft.ss']['DELPAGE'] = 'Suprimeix pàgines...';
-$lang['ca_AD']['CMSLeft.ss']['DELPAGES'] = 'Suprimeix les pàgines seleccionades';
-$lang['ca_AD']['CMSLeft.ss']['GO'] = 'Vés';
-$lang['ca_AD']['CMSLeft.ss']['NEWPAGE'] = 'Nova pàgina...';
-$lang['ca_AD']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Seleccioneu les pàgines que voleu suprimir i després cliqueu el botó de sota';
-$lang['ca_AD']['CMSLeft.ss']['SITECONT'] = 'Contingut del lloc';
 $lang['ca_AD']['CMSMain']['ACCESS'] = 'Accés a %s al SGC';
 $lang['ca_AD']['CMSMain']['CANCEL'] = 'Cancel·la';
 $lang['ca_AD']['CMSMain']['CHOOSEREPORT'] = '(Trieu un informe)';
@@ -149,7 +142,6 @@ $lang['ca_AD']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publica les pàgines sele
 $lang['ca_AD']['CMSMain_left.ss']['SEARCH'] = 'Cerca';
 $lang['ca_AD']['CMSMain_left.ss']['SEARCHTITLE'] = 'Cerca a través de la URL, Títol, Títol de menú i Contingut';
 $lang['ca_AD']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Seleccioneu les pàgines que voleu canviar i després cliqueu una acció:';
-$lang['ca_AD']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Seleccioneu les pàgines que voleu duplicar, si els seus descendents s\'han d\'incloure, i on voleu posar els duplicats';
 $lang['ca_AD']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Mostra només pàgines canviades';
 $lang['ca_AD']['CMSMain_left.ss']['SHOWUNPUB'] = 'Mostra versions no publicades';
 $lang['ca_AD']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Contingut del lloc i estructura';
@@ -167,9 +159,6 @@ $lang['ca_AD']['CMSMain_versions.ss']['NOTPUB'] = 'No publicat';
 $lang['ca_AD']['CMSMain_versions.ss']['PUBR'] = 'Publicador';
 $lang['ca_AD']['CMSMain_versions.ss']['UNKNOWN'] = 'Desconegut';
 $lang['ca_AD']['CMSMain_versions.ss']['WHEN'] = 'Quan';
-$lang['ca_AD']['CMSRight.ss']['CHOOSEPAGE'] = 'Si us plau, trieu una pàgina de l\'esquerra.';
-$lang['ca_AD']['CMSRight.ss']['ECONTENT'] = 'Edita el contingut';
-$lang['ca_AD']['CMSRight.ss']['WELCOMETO'] = 'Benvingut a ';
 $lang['ca_AD']['CommentAdmin']['ACCEPT'] = 'Accepta';
 $lang['ca_AD']['CommentAdmin']['APPROVED'] = 'S\'han acceptat %s comentaris.';
 $lang['ca_AD']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Comentaris aprovats';
diff --git a/lang/cs_CZ.php b/lang/cs_CZ.php
index 18a8253b..975668cf 100644
--- a/lang/cs_CZ.php
+++ b/lang/cs_CZ.php
@@ -16,6 +16,7 @@ if(array_key_exists('cs_CZ', $lang) && is_array($lang['cs_CZ'])) {
 	$lang['cs_CZ'] = $lang['en_US'];
 }
 
+$lang['cs_CZ']['']['CHOOSEPAGE'] = 'Vyberte položku vlevo, prosím ';
 $lang['cs_CZ']['AssetAdmin']['CHOOSEFILE'] = 'Vybrat soubor';
 $lang['cs_CZ']['AssetAdmin']['DELETEDX'] = 'Smazáno %s souborů.%s';
 $lang['cs_CZ']['AssetAdmin']['FILESREADY'] = 'Soubory připravené k nahrání:';
@@ -52,7 +53,6 @@ $lang['cs_CZ']['AssetTableField']['CAPTION'] = 'Titulek';
 $lang['cs_CZ']['AssetTableField']['CREATED'] = 'Poprvé nahráno';
 $lang['cs_CZ']['AssetTableField']['DIM'] = 'Rozměry';
 $lang['cs_CZ']['AssetTableField']['DIMLIMT'] = 'Omezit velikost popup okna';
-$lang['cs_CZ']['AssetTableField']['EDITIMAGE'] = 'Upravit tento obrázek';
 $lang['cs_CZ']['AssetTableField']['FILENAME'] = 'Název souboru';
 $lang['cs_CZ']['AssetTableField']['GALLERYOPTIONS'] = 'Nastavení galerie';
 $lang['cs_CZ']['AssetTableField']['IMAGE'] = 'Obrazek';
@@ -73,8 +73,29 @@ $lang['cs_CZ']['AssetTableField']['SWFFILEOPTIONS'] = 'Nastavení SWF souboru';
 $lang['cs_CZ']['AssetTableField']['TITLE'] = 'Titulek';
 $lang['cs_CZ']['AssetTableField']['TYPE'] = 'Typ';
 $lang['cs_CZ']['AssetTableField']['URL'] = 'URL';
+$lang['cs_CZ']['BrokenLinksReport']['BROKENLINKS'] = 'Výkaz porušených odkazů';
+$lang['cs_CZ']['BrokenLinksReport']['CheckSiteDropdownDraft'] = 'Koncept webu';
+$lang['cs_CZ']['BrokenLinksReport']['CheckSiteDropdownPublished'] = 'Zveřejněný web';
+$lang['cs_CZ']['BrokenLinksReport']['ColumnDateLastModified'] = 'Datum poslední změny';
+$lang['cs_CZ']['BrokenLinksReport']['ColumnDateLastPublished'] = 'Datum posledního zveřejnění';
+$lang['cs_CZ']['BrokenLinksReport']['ColumnProblemType'] = 'Problém typu';
+$lang['cs_CZ']['BrokenLinksReport']['ColumnURL'] = 'URL';
+$lang['cs_CZ']['BrokenLinksReport']['HasBrokenFile'] = 'porušen soubor';
+$lang['cs_CZ']['BrokenLinksReport']['HasBrokenLink'] = 'porušen odkaz';
+$lang['cs_CZ']['BrokenLinksReport']['HasBrokenLinkAndFile'] = 'porušen odkaz a soubor';
+$lang['cs_CZ']['BrokenLinksReport']['HoverTitleEditPage'] = 'Editovat stránku';
+$lang['cs_CZ']['BrokenLinksReport']['ReasonDropdown'] = 'Problém ke kontrole';
+$lang['cs_CZ']['BrokenLinksReport']['ReasonDropdownBROKENFILE'] = 'Porušen soubor';
+$lang['cs_CZ']['BrokenLinksReport']['ReasonDropdownBROKENLINK'] = 'Porušen odkaz';
+$lang['cs_CZ']['BrokenLinksReport']['ReasonDropdownRPBROKENLINK'] = 'Stránka redirektoru ukazuje na neexistující stránku';
+$lang['cs_CZ']['BrokenLinksReport']['ReasonDropdownVPBROKENLINK'] = 'Virtuální stránka ukazuje na neexistující stránku';
+$lang['cs_CZ']['BrokenLinksReport']['RedirectorNonExistent'] = 'stránka redirektoru ukazuje na neexistující stránku';
+$lang['cs_CZ']['BrokenLinksReport']['VirtualPageNonExistent'] = 'virtuální stránka ukazuje na neexistující stránku';
+$lang['cs_CZ']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = 'Smazáno %d stránek z konceptu webu, %d selhání';
 $lang['cs_CZ']['CMSBatchActions']['DELETED_PAGES'] = 'Smazáno %d stránek ze zveřejněného webu';
+$lang['cs_CZ']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Smazáno z konceptu webu';
 $lang['cs_CZ']['CMSBatchActions']['DELETE_PAGES'] = 'Smazat ze zveřejněného webu';
+$lang['cs_CZ']['CMSBatchActions']['DELETING_DRAFT_PAGES'] = 'Mazání vybraných stránek z konceptu webu';
 $lang['cs_CZ']['CMSBatchActions']['DELETING_PAGES'] = 'Mazání vybraných stránek ze zveřejněného webu';
 $lang['cs_CZ']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Zveřejněných %d stránek';
 $lang['cs_CZ']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Zveřejňování stránek';
@@ -82,12 +103,6 @@ $lang['cs_CZ']['CMSBatchActions']['PUBLISH_PAGES'] = 'Zveřejnit';
 $lang['cs_CZ']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'Nezveřejněných %d stránek';
 $lang['cs_CZ']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'Nezveřejňování stránek';
 $lang['cs_CZ']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'Nezveřejnit';
-$lang['cs_CZ']['CMSLeft.ss']['DELPAGE'] = 'Smazat stránky...';
-$lang['cs_CZ']['CMSLeft.ss']['DELPAGES'] = 'Smazat vybrané stránky';
-$lang['cs_CZ']['CMSLeft.ss']['GO'] = 'Proveď';
-$lang['cs_CZ']['CMSLeft.ss']['NEWPAGE'] = 'Nová stránka...';
-$lang['cs_CZ']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Vyberte stránky, které chcete smazat. Pak klikněte na tlačítko níže';
-$lang['cs_CZ']['CMSLeft.ss']['SITECONT'] = 'Obsah webu';
 $lang['cs_CZ']['CMSMain']['ACCESS'] = 'Přístup do %s v CMS';
 $lang['cs_CZ']['CMSMain']['ACCESSALLINTERFACES'] = 'Přístup ke všem rozhraním CMS';
 $lang['cs_CZ']['CMSMain']['CANCEL'] = 'Zrušit';
@@ -124,8 +139,8 @@ $lang['cs_CZ']['CMSMain']['PUBPAGES'] = 'Hotovo: Zveřejněno %d stránek';
 $lang['cs_CZ']['CMSMain']['REMOVED'] = 'Smazán \'%s\'%s ze živé stránky';
 $lang['cs_CZ']['CMSMain']['REMOVEDFD'] = 'Smazáno z konceptů';
 $lang['cs_CZ']['CMSMain']['REMOVEDPAGE'] = '\'%s\' odstraněno ze zveřejněných';
-$lang['cs_CZ']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = '\'%s\' odebrano  z navrhu';
-$lang['cs_CZ']['CMSMain']['REPORT'] = 'Výpis';
+$lang['cs_CZ']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = '\'%s\' odebráno z konceptu';
+$lang['cs_CZ']['CMSMain']['REPORT'] = 'Výkaz';
 $lang['cs_CZ']['CMSMain']['RESTORED'] = '\'%s\' úspěšně obnoven';
 $lang['cs_CZ']['CMSMain']['ROLLBACK'] = 'Vrátit se zpět na tuto verzi';
 $lang['cs_CZ']['CMSMain']['ROLLEDBACKPUB'] = 'Vracím se zpět na zveřejněnou verzi. Číslo nové verze je #%d';
@@ -146,6 +161,7 @@ $lang['cs_CZ']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'Přidáno do konceptů, ale
 $lang['cs_CZ']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Přidat kritérium...';
 $lang['cs_CZ']['CMSMain_left.ss']['BATCHACTIONS'] = 'Skupinové akce';
 $lang['cs_CZ']['CMSMain_left.ss']['CHANGED'] = 'změněno';
+$lang['cs_CZ']['CMSMain_left.ss']['CLEAR'] = 'Vyčistit';
 $lang['cs_CZ']['CMSMain_left.ss']['CLEARTITLE'] = 'Vyčistit hledání a zobrazit všechny položky';
 $lang['cs_CZ']['CMSMain_left.ss']['CLOSEBOX'] = 'klikněte pro zavření pole';
 $lang['cs_CZ']['CMSMain_left.ss']['COMPAREMODE'] = 'Mód porovnávání (klikněte níže)';
@@ -155,7 +171,7 @@ $lang['cs_CZ']['CMSMain_left.ss']['DELETECONFIRM'] = 'Smazat vybrané stránky';
 $lang['cs_CZ']['CMSMain_left.ss']['DELETEDSTILLLIVE'] = 'Smazáno z konceptů, ale stále na stránkách';
 $lang['cs_CZ']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Upraveno v konceptech, ale ještě nezveřejněno';
 $lang['cs_CZ']['CMSMain_left.ss']['EDITEDSINCE'] = 'Naposledy upraveno';
-$lang['cs_CZ']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Povolit přesuny drag &amp; drop';
+$lang['cs_CZ']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Povolit přesuny drag a drop';
 $lang['cs_CZ']['CMSMain_left.ss']['GO'] = 'Proveď';
 $lang['cs_CZ']['CMSMain_left.ss']['HIDDEN'] = 'skrytý';
 $lang['cs_CZ']['CMSMain_left.ss']['KEY'] = 'Klíč:';
@@ -167,7 +183,7 @@ $lang['cs_CZ']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Zveřejnit vybrané strá
 $lang['cs_CZ']['CMSMain_left.ss']['SEARCH'] = 'Hledat';
 $lang['cs_CZ']['CMSMain_left.ss']['SEARCHTITLE'] = 'Prohledávat URL, Titulky, Titulky Menu, &amp; Obsah';
 $lang['cs_CZ']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Vyberte stránky, které chcete změnit &amp; pak klikněte na akci:';
-$lang['cs_CZ']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Vyberte stránky, které chcete duplikovat, zda chcete duplikovat i jejich podstránky, a kam chcete nové kopie umístit';
+$lang['cs_CZ']['CMSMain_left.ss']['SHOWITEMS'] = 'Ukázat:';
 $lang['cs_CZ']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Zobrazovat jen změněné stránky';
 $lang['cs_CZ']['CMSMain_left.ss']['SHOWUNPUB'] = 'Ukázat nezveřejněné verze';
 $lang['cs_CZ']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Obsah a struktura webu';
@@ -185,9 +201,8 @@ $lang['cs_CZ']['CMSMain_versions.ss']['NOTPUB'] = 'Nezveřejněno';
 $lang['cs_CZ']['CMSMain_versions.ss']['PUBR'] = 'Vydavatel';
 $lang['cs_CZ']['CMSMain_versions.ss']['UNKNOWN'] = 'Neznámý';
 $lang['cs_CZ']['CMSMain_versions.ss']['WHEN'] = 'Kdy';
-$lang['cs_CZ']['CMSRight.ss']['CHOOSEPAGE'] = 'Prosím vyberte stránku vlevo.';
-$lang['cs_CZ']['CMSRight.ss']['ECONTENT'] = 'Upravit obsah';
-$lang['cs_CZ']['CMSRight.ss']['WELCOMETO'] = 'Vítejte v';
+$lang['cs_CZ']['CMSSiteTreeFilter']['ALL'] = 'Všechny položky';
+$lang['cs_CZ']['CMSSiteTreeFilter']['DELETEDPAGES'] = 'Všechny stránky, včetně smazaných';
 $lang['cs_CZ']['CommentAdmin']['ACCEPT'] = 'Schválit';
 $lang['cs_CZ']['CommentAdmin']['APPROVED'] = 'Schváleno %s komentářů.';
 $lang['cs_CZ']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Schválené komentáře';
@@ -232,6 +247,11 @@ $lang['cs_CZ']['CommentTableField.ss']['NOITEMSFOUND'] = 'Nenalezeny žádné po
 $lang['cs_CZ']['CommentTableField.ss']['SPAM'] = 'spam';
 $lang['cs_CZ']['ComplexTableField']['CLOSEPOPUP'] = 'Zavřít';
 $lang['cs_CZ']['ComplexTableField']['SUCCESSADD'] = 'Přidáno %s %s %s';
+$lang['cs_CZ']['Group']['IMPORTTABTITLE'] = 'Import';
+$lang['cs_CZ']['Group']['RolesAddEditLink'] = 'Přidat/editovat role';
+$lang['cs_CZ']['GroupImportForm']['ResultCreated'] = 'Vytvořeno %d skupin';
+$lang['cs_CZ']['GroupImportForm']['ResultDeleted'] = 'Smazáno %d skupin';
+$lang['cs_CZ']['GroupImportForm']['ResultUpdated'] = 'Aktualizováno %d skupin';
 $lang['cs_CZ']['ImageEditor.ss']['ACTIONS'] = 'akce';
 $lang['cs_CZ']['ImageEditor.ss']['ADJUST'] = 'adjustace';
 $lang['cs_CZ']['ImageEditor.ss']['APPLY'] = 'použít';
@@ -264,17 +284,17 @@ $lang['cs_CZ']['LeftAndMain']['PERMAGAIN'] = 'Byli jste odhlášeni z CMS. Pokud
 $lang['cs_CZ']['LeftAndMain']['PERMALREADY'] = 'Je nám líto, ale nemůžete vstoupit do této části CMS. Pokud se chcete přihlásit jako někdo jiný, udělejte tak níže';
 $lang['cs_CZ']['LeftAndMain']['PERMDEFAULT'] = 'Pro přístup do CMS vložte Vaši e-mailovou adresu a heslo.';
 $lang['cs_CZ']['LeftAndMain']['PLEASESAVE'] = 'Prosím uložte stránku: Tato stránka nemohla být aktualizována, protože ještě nebyla uložena.';
-$lang['cs_CZ']['LeftAndMain']['REPORTS'] = 'Reporty';
+$lang['cs_CZ']['LeftAndMain']['REPORTS'] = 'Výkazy';
 $lang['cs_CZ']['LeftAndMain']['REQUESTERROR'] = 'Chyba v požadavku';
 $lang['cs_CZ']['LeftAndMain']['SAVED'] = 'uloženo';
 $lang['cs_CZ']['LeftAndMain']['SAVEDUP'] = 'Uloženo';
 $lang['cs_CZ']['LeftAndMain']['SECURITY'] = 'Bezpečnost';
-$lang['cs_CZ']['LeftAndMain']['SITECONTENT'] = 'Obsah stránky';
+$lang['cs_CZ']['LeftAndMain']['SITECONTENT'] = 'Obsah weby';
 $lang['cs_CZ']['LeftAndMain']['SITECONTENTLEFT'] = 'Obsah webu';
 $lang['cs_CZ']['LeftAndMain.ss']['APPVERSIONTEXT1'] = 'Toto je';
 $lang['cs_CZ']['LeftAndMain.ss']['APPVERSIONTEXT2'] = 'verze, kterou nyní používáte, je technicky CVS větev';
 $lang['cs_CZ']['LeftAndMain.ss']['ARCHS'] = 'Archiv';
-$lang['cs_CZ']['LeftAndMain.ss']['DRAFTS'] = 'Koncepty';
+$lang['cs_CZ']['LeftAndMain.ss']['DRAFTS'] = 'Koncepty webu';
 $lang['cs_CZ']['LeftAndMain.ss']['EDIT'] = 'Upravit';
 $lang['cs_CZ']['LeftAndMain.ss']['EDITINCMS'] = 'Editovat tuto stránku v CMS';
 $lang['cs_CZ']['LeftAndMain.ss']['EDITPROFILE'] = 'Profil';
@@ -284,12 +304,37 @@ $lang['cs_CZ']['LeftAndMain.ss']['LOGOUT'] = 'odhlásit';
 $lang['cs_CZ']['LeftAndMain.ss']['PUBLIS'] = 'Zveřejněné';
 $lang['cs_CZ']['LeftAndMain.ss']['REQUIREJS'] = 'SilverStripe vyžaduje zaplý Javascript.';
 $lang['cs_CZ']['LeftAndMain.ss']['SSWEB'] = 'Webová stránka SilverStripe';
-$lang['cs_CZ']['LeftAndMain.ss']['VIEWINDRAFT'] = 'Zobraz stránku v návrhu stránky';
+$lang['cs_CZ']['LeftAndMain.ss']['VIEWINDRAFT'] = 'Zobraz stránku v konceptu stránky';
 $lang['cs_CZ']['LeftAndMain.ss']['VIEWINPUBLISHED'] = 'Zobraz stránku v publikovaných stránkách';
 $lang['cs_CZ']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Zobrazení stránky:';
 $lang['cs_CZ']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' publikováno úspěšně';
 $lang['cs_CZ']['LeftAndMain']['STATUSTO'] = 'Stav změněn na \'%s\'';
 $lang['cs_CZ']['LeftAndMain']['TREESITECONTENT'] = 'Obsah webu';
+$lang['cs_CZ']['LeftAndMain_right.ss']['WELCOMETO'] = 'Vítejte v';
+$lang['cs_CZ']['MathSpamProtection']['EIGHT'] = 'osm';
+$lang['cs_CZ']['MathSpamProtection']['EIGHTEEN'] = 'osmnáct';
+$lang['cs_CZ']['MathSpamProtection']['ELEVEN'] = 'jedenáct';
+$lang['cs_CZ']['MathSpamProtection']['FIFTEEN'] = 'patnáct';
+$lang['cs_CZ']['MathSpamProtection']['FIVE'] = 'pět';
+$lang['cs_CZ']['MathSpamProtection']['FOUR'] = 'čtyři';
+$lang['cs_CZ']['MathSpamProtection']['FOURTEEN'] = 'čtrnáct';
+$lang['cs_CZ']['MathSpamProtection']['NINE'] = 'devět';
+$lang['cs_CZ']['MathSpamProtection']['ONE'] = 'jeden';
+$lang['cs_CZ']['MathSpamProtection']['SEVEN'] = 'sedm';
+$lang['cs_CZ']['MathSpamProtection']['SEVENTEEN'] = 'sedmnáct';
+$lang['cs_CZ']['MathSpamProtection']['SIX'] = 'šest';
+$lang['cs_CZ']['MathSpamProtection']['SIXTEEN'] = 'šestnáct';
+$lang['cs_CZ']['MathSpamProtection']['TEN'] = 'deset';
+$lang['cs_CZ']['MathSpamProtection']['THIRTEEN'] = 'třináct';
+$lang['cs_CZ']['MathSpamProtection']['THREE'] = 'tři';
+$lang['cs_CZ']['MathSpamProtection']['TWELVE'] = 'dvanáct';
+$lang['cs_CZ']['MathSpamProtection']['TWO'] = 'dvě';
+$lang['cs_CZ']['MathSpamProtection']['WHATIS'] = 'Kolik je %s plus %s?';
+$lang['cs_CZ']['MathSpamProtection']['ZERO'] = 'Nula';
+$lang['cs_CZ']['MemberImportForm']['ResultCreated'] = 'Vytvořeno %d členů';
+$lang['cs_CZ']['MemberImportForm']['ResultDeleted'] = 'Smazáno %d členů';
+$lang['cs_CZ']['MemberImportForm']['ResultNone'] = 'Žádné změny';
+$lang['cs_CZ']['MemberImportForm']['ResultUpdated'] = 'Aktualizováno %d členů';
 $lang['cs_CZ']['MemberList.ss']['FILTER'] = 'Filtr';
 $lang['cs_CZ']['MemberList_PageControls.ss']['DISPLAYING'] = 'Zobrazuji';
 $lang['cs_CZ']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'členové';
@@ -311,6 +356,8 @@ $lang['cs_CZ']['MemberTableField']['ADDEDTOGROUP'] = 'Přidat člena do skupiny'
 $lang['cs_CZ']['MemberTableField']['ADDINGFIELD'] = 'Přidání selhalo';
 $lang['cs_CZ']['MemberTableField']['ANYGROUP'] = 'Každá skupina';
 $lang['cs_CZ']['MemberTableField']['ASC'] = 'Vzestupně';
+$lang['cs_CZ']['MemberTableField']['DeleteTitleText'] = 'Smazat z této skupiny';
+$lang['cs_CZ']['MemberTableField']['DeleteTitleTextDatabase'] = 'Smazat z databáze a všech skupin';
 $lang['cs_CZ']['MemberTableField']['DESC'] = 'Sestupně';
 $lang['cs_CZ']['MemberTableField']['EMAIL'] = 'Email';
 $lang['cs_CZ']['MemberTableField']['ERRORADDINGUSER'] = 'Nastala chyba pri přidání uživatele do skupiny: %s';
@@ -365,7 +412,7 @@ $lang['cs_CZ']['PageComment']['IsSpam'] = 'Spam?';
 $lang['cs_CZ']['PageComment']['Name'] = 'Jméno autora';
 $lang['cs_CZ']['PageComment']['NeedsModeration'] = 'Vyžaduje moderování?';
 $lang['cs_CZ']['PageComment']['PLURALNAME'] = 'Komentáře stránky';
-$lang['cs_CZ']['PageComment']['SINGULARNAME'] = 'Komentáře';
+$lang['cs_CZ']['PageComment']['SINGULARNAME'] = 'Komentář stránky';
 $lang['cs_CZ']['PageCommentInterface']['COMMENTERURL'] = 'URL vaší webové stránky';
 $lang['cs_CZ']['PageCommentInterface']['POST'] = 'Příspěvek';
 $lang['cs_CZ']['PageCommentInterface']['SPAMQUESTION'] = 'Antispamová otázka: %s';
@@ -392,18 +439,24 @@ $lang['cs_CZ']['PageCommentInterface_singlecomment.ss']['ISNTSPAM'] = 'tento kom
 $lang['cs_CZ']['PageCommentInterface_singlecomment.ss']['ISSPAM'] = 'tento komentář je spam';
 $lang['cs_CZ']['PageCommentInterface_singlecomment.ss']['PBY'] = 'Zaslal(a)';
 $lang['cs_CZ']['PageCommentInterface_singlecomment.ss']['REMCOM'] = 'odstranit tento komentář';
-$lang['cs_CZ']['ReportAdmin']['MENUTITLE'] = 'Reporty';
+$lang['cs_CZ']['Permission']['CMS_ACCESS_CATEGORY'] = 'Přístup CMS';
+$lang['cs_CZ']['Permissions']['PERMISSIONS_CATEGORY'] = 'Role a přístupová práva';
+$lang['cs_CZ']['ReportAdmin']['MENUTITLE'] = 'Výkazy';
 $lang['cs_CZ']['ReportAdmin_left.ss']['REPORTS'] = 'Výkazy';
 $lang['cs_CZ']['ReportAdmin_right.ss']['WELCOME1'] = 'Vítejte v';
 $lang['cs_CZ']['ReportAdmin_right.ss']['WELCOME2'] = 'sekci výkazů. Prosím vyberte výkaz vlevo.';
 $lang['cs_CZ']['ReportAdmin_SiteTree.ss']['REPORTS'] = 'Výkazy';
 $lang['cs_CZ']['SecurityAdmin']['ADDMEMBER'] = 'Přidat člena';
+$lang['cs_CZ']['SecurityAdmin']['APPLY_ROLES'] = 'Použít role na skupiny';
 $lang['cs_CZ']['SecurityAdmin']['EDITPERMISSIONS'] = 'Upravit oprávnění a IP adresy pro každou skupinu';
+$lang['cs_CZ']['SecurityAdmin']['MemberListCaution'] = 'Varování: Odstranění členů z tohoto seznamu způsobí, že členové budou odtraněni ze všech skupin a databáze';
 $lang['cs_CZ']['SecurityAdmin']['MENUTITLE'] = 'Uživatelé & skupiny';
 $lang['cs_CZ']['SecurityAdmin']['MENUTITLE'] = 'Bezpečnost';
 $lang['cs_CZ']['SecurityAdmin']['NEWGROUP'] = 'Nová skupina';
 $lang['cs_CZ']['SecurityAdmin']['SAVE'] = 'Uložit';
 $lang['cs_CZ']['SecurityAdmin']['SGROUPS'] = 'Bezpečnostní skupiny';
+$lang['cs_CZ']['SecurityAdmin']['TABIMPORT'] = 'Import';
+$lang['cs_CZ']['SecurityAdmin']['TABROLES'] = 'Role';
 $lang['cs_CZ']['SecurityAdmin_left.ss']['CREATE'] = 'Vytvořit';
 $lang['cs_CZ']['SecurityAdmin_left.ss']['DEL'] = 'Smazat';
 $lang['cs_CZ']['SecurityAdmin_left.ss']['DELGROUPS'] = 'Smazat vybrané skupiny';
@@ -412,16 +465,29 @@ $lang['cs_CZ']['SecurityAdmin_left.ss']['GO'] = 'Proveď';
 $lang['cs_CZ']['SecurityAdmin_left.ss']['SECGROUPS'] = 'Bezpečnostní skupiny';
 $lang['cs_CZ']['SecurityAdmin_left.ss']['SELECT'] = 'Vyberte stárnky, které chcete smazat. Pak klikněte na tlačítko níže';
 $lang['cs_CZ']['SecurityAdmin_left.ss']['TOREORG'] = 'Pro reorganizaci Vašich stránek, přetáhněte stránky, kam potřebujete.';
+$lang['cs_CZ']['SecurityAdmin_MemberImportForm']['BtnImport'] = 'Import';
+$lang['cs_CZ']['SecurityAdmin_MemberImportForm']['FileFieldLabel'] = 'Soubor CSV <small>(Povoleny přípony: *.csv)</small>';
 $lang['cs_CZ']['SecurityAdmin_right.ss']['WELCOME1'] = 'Vítejte v';
 $lang['cs_CZ']['SecurityAdmin_right.ss']['WELCOME2'] = 'sekci administrace bezpečnosti. Prosím vyberte skupinu vlevo.';
+$lang['cs_CZ']['SideReport']['BROKENFILES'] = 'Stránky s porušenými soubory';
+$lang['cs_CZ']['SideReport']['BROKENLINKS'] = 'Stránky s porušenými odkazy';
+$lang['cs_CZ']['SideReport']['BrokenLinksGroupTitle'] = 'Výkazy porušených odkazů';
+$lang['cs_CZ']['SideReport']['BROKENREDIRECTORPAGES'] = 'RedirectorPages ukazuje na smazané stránky';
+$lang['cs_CZ']['SideReport']['BROKENVIRTUALPAGES'] = 'VirualPages ukazuje na smazané stránky';
+$lang['cs_CZ']['SideReport']['ContentGroupTitle'] = 'Výkazy obsahu';
 $lang['cs_CZ']['SideReport']['EMPTYPAGES'] = 'Prázdné stránky';
 $lang['cs_CZ']['SideReport']['LAST2WEEKS'] = 'Stránky upravené během posledních 2 týdnů';
+$lang['cs_CZ']['SideReport']['OtherGroupTitle'] = 'Jiné';
+$lang['cs_CZ']['SideReport']['ParameterLiveCheckbox'] = 'Zkontrolovat web';
 $lang['cs_CZ']['SideReport']['REPEMPTY'] = 'Výkaz %s je prázdný.';
 $lang['cs_CZ']['SideReport']['TODO'] = 'Udělat';
 $lang['cs_CZ']['StaticExporter']['BASEURL'] = 'Základní URL';
 $lang['cs_CZ']['StaticExporter']['EXPORTTO'] = 'Exportovat do této složky';
 $lang['cs_CZ']['StaticExporter']['FOLDEREXPORT'] = 'Složka, kam se má exportovat';
 $lang['cs_CZ']['StaticExporter']['NAME'] = 'Statický exportér';
+$lang['cs_CZ']['TableListField.ss']['NOITEMSFOUND'] = 'Žádné položky nalezeny';
+$lang['cs_CZ']['TableListField.ss']['SORTASC'] = 'Třídit v vzestupném pořadí';
+$lang['cs_CZ']['TableListField.ss']['SORTDESC'] = 'Třídit v sestupném pořadí';
 $lang['cs_CZ']['TableListField_PageControls.ss']['DISPLAYING'] = 'Zobrazuji';
 $lang['cs_CZ']['TableListField_PageControls.ss']['OF'] = 'z';
 $lang['cs_CZ']['TableListField_PageControls.ss']['TO'] = 'do';
@@ -438,9 +504,12 @@ $lang['cs_CZ']['ViewArchivedEmail.ss']['CANACCESS'] = 'Můžete přistupovat k a
 $lang['cs_CZ']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Požadovali jste prohlížet obsah našich stránek během';
 $lang['cs_CZ']['WaitingOn.ss']['ATO'] = 'přiřazeno k';
 $lang['cs_CZ']['WidgetAreaEditor.ss']['AVAILABLE'] = 'Dostupné widgety';
+$lang['cs_CZ']['WidgetAreaEditor.ss']['AVAILWIDGETS'] = 'Klikněte na titulek widgetu dole pro jeho použití na této stránce.';
 $lang['cs_CZ']['WidgetAreaEditor.ss']['INUSE'] = 'Aktuálně používané widgety';
 $lang['cs_CZ']['WidgetAreaEditor.ss']['NOAVAIL'] = 'V současnosti nejsou povoleny žádné widgety.';
 $lang['cs_CZ']['WidgetAreaEditor.ss']['TOADD'] = 'Pro přidání widgetu jej přetáhněte z levé strany do této oblasti.';
+$lang['cs_CZ']['WidgetAreaEditor.ss']['TOSORT'] = 'Pro pořadí právě používaných widgetů na této stránce, táhněte je nahoru a dolů.';
+$lang['cs_CZ']['WidgetDescription.ss']['CLICKTOADDWIDGET'] = 'Klikněte k přidání tohoto widgetu';
 $lang['cs_CZ']['WidgetEditor.ss']['DELETE'] = 'Odstranit';
 
 ?>
\ No newline at end of file
diff --git a/lang/da_DK.php b/lang/da_DK.php
index 609951d5..fb7a34b3 100644
--- a/lang/da_DK.php
+++ b/lang/da_DK.php
@@ -52,7 +52,6 @@ $lang['da_DK']['AssetTableField']['CAPTION'] = 'Billedetekst';
 $lang['da_DK']['AssetTableField']['CREATED'] = 'Først uploadet';
 $lang['da_DK']['AssetTableField']['DIM'] = 'Dimensioner';
 $lang['da_DK']['AssetTableField']['DIMLIMT'] = 'Begræns dimensionerne i popop-vinduet';
-$lang['da_DK']['AssetTableField']['EDITIMAGE'] = 'Rediger dette billede';
 $lang['da_DK']['AssetTableField']['FILENAME'] = 'Filnavn';
 $lang['da_DK']['AssetTableField']['GALLERYOPTIONS'] = 'Galleri Indstillinger';
 $lang['da_DK']['AssetTableField']['IMAGE'] = 'Billede';
@@ -73,6 +72,8 @@ $lang['da_DK']['AssetTableField']['SWFFILEOPTIONS'] = 'SWF Fil Indstillinger';
 $lang['da_DK']['AssetTableField']['TITLE'] = 'Titel';
 $lang['da_DK']['AssetTableField']['TYPE'] = 'Type';
 $lang['da_DK']['AssetTableField']['URL'] = 'URL Adresse';
+$lang['da_DK']['BrokenLinksReport']['ColumnURL'] = 'URL';
+$lang['da_DK']['BrokenLinksReport']['HoverTitleEditPage'] = 'Rediger siden';
 $lang['da_DK']['CMSBatchActions']['DELETED_PAGES'] = 'Slettede %d sider fra den publiserede side';
 $lang['da_DK']['CMSBatchActions']['DELETE_PAGES'] = 'Slet fra publiseret side';
 $lang['da_DK']['CMSBatchActions']['DELETING_PAGES'] = 'Slet valgte sider fra den publiserede side';
@@ -82,12 +83,6 @@ $lang['da_DK']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publisér';
 $lang['da_DK']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'U-publiserede %d sider';
 $lang['da_DK']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'U-publiserede %d sider';
 $lang['da_DK']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'U-publisér';
-$lang['da_DK']['CMSLeft.ss']['DELPAGE'] = 'Sletter sider...';
-$lang['da_DK']['CMSLeft.ss']['DELPAGES'] = 'Slet de valgte sider';
-$lang['da_DK']['CMSLeft.ss']['GO'] = 'Go';
-$lang['da_DK']['CMSLeft.ss']['NEWPAGE'] = 'Ny side...';
-$lang['da_DK']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Vælg de sider, som du ønsker at slette og tryk på knappen nedenfor';
-$lang['da_DK']['CMSLeft.ss']['SITECONT'] = 'Sideindhold';
 $lang['da_DK']['CMSMain']['ACCESS'] = 'Adgang til %S i CMS';
 $lang['da_DK']['CMSMain']['ACCESSALLINTERFACES'] = 'Adgang til alle CMS grænseflader';
 $lang['da_DK']['CMSMain']['CANCEL'] = 'Annuller';
@@ -160,13 +155,13 @@ $lang['da_DK']['CMSMain_left.ss']['GO'] = 'Go';
 $lang['da_DK']['CMSMain_left.ss']['HIDDEN'] = 'skjult';
 $lang['da_DK']['CMSMain_left.ss']['KEY'] = 'Nøgle:';
 $lang['da_DK']['CMSMain_left.ss']['NEW'] = 'ny';
+$lang['da_DK']['CMSMain_left.ss']['NOTINMENU'] = 'Udeluk fra navigations menuer';
 $lang['da_DK']['CMSMain_left.ss']['OPENBOX'] = 'klik for at åbne denne boks';
 $lang['da_DK']['CMSMain_left.ss']['PAGEVERSIONH'] = 'Sidens versionshistorie';
 $lang['da_DK']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Udgiv de valgte sider';
 $lang['da_DK']['CMSMain_left.ss']['SEARCH'] = 'Søg';
 $lang['da_DK']['CMSMain_left.ss']['SEARCHTITLE'] = 'Søg i URL, Titel, Menutitel, &amp; indhold';
 $lang['da_DK']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Vælg siderne som du ønsker at ændre og klik på en handling:';
-$lang['da_DK']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Vælg de sider, som du ønsker at duplikere, og hvorvidt du ønsker at inkludere deres undersider, og hvor de skal duplikeres hen';
 $lang['da_DK']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Vis kun ændrede sider';
 $lang['da_DK']['CMSMain_left.ss']['SHOWUNPUB'] = 'Vis ikke udgivne versioner';
 $lang['da_DK']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Sideindhold og Struktur';
@@ -184,14 +179,12 @@ $lang['da_DK']['CMSMain_versions.ss']['NOTPUB'] = 'Ikke udgivet';
 $lang['da_DK']['CMSMain_versions.ss']['PUBR'] = 'Udgiver';
 $lang['da_DK']['CMSMain_versions.ss']['UNKNOWN'] = 'Ukendt';
 $lang['da_DK']['CMSMain_versions.ss']['WHEN'] = 'når';
-$lang['da_DK']['CMSRight.ss']['CHOOSEPAGE'] = 'Vælg en side fra venstresiden.';
-$lang['da_DK']['CMSRight.ss']['ECONTENT'] = 'Rediger indhold';
-$lang['da_DK']['CMSRight.ss']['WELCOMETO'] = 'Velkommen til';
 $lang['da_DK']['CommentAdmin']['ACCEPT'] = 'Accepter';
 $lang['da_DK']['CommentAdmin']['APPROVED'] = '% kommentarer accepteret';
 $lang['da_DK']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Godkendte kommentarer';
 $lang['da_DK']['CommentAdmin']['AUTHOR'] = 'Forfatter';
 $lang['da_DK']['CommentAdmin']['COMMENT'] = 'Kommentar';
+$lang['da_DK']['CommentAdmin']['COMMENTERURL'] = 'URL';
 $lang['da_DK']['CommentAdmin']['COMMENTS'] = 'Kommentar';
 $lang['da_DK']['CommentAdmin']['COMMENTSAWAITINGMODERATION'] = 'Kommentaren venter på godkendelse';
 $lang['da_DK']['CommentAdmin']['DATEPOSTED'] = 'Dato indsendt';
@@ -230,6 +223,7 @@ $lang['da_DK']['CommentTableField.ss']['NOITEMSFOUND'] = 'Ingen poster fundet';
 $lang['da_DK']['CommentTableField.ss']['SPAM'] = 'spam';
 $lang['da_DK']['ComplexTableField']['CLOSEPOPUP'] = 'Luk popup';
 $lang['da_DK']['ComplexTableField']['SUCCESSADD'] = 'Tilføjede %s %s %s';
+$lang['da_DK']['Group']['IMPORTTABTITLE'] = 'Importer';
 $lang['da_DK']['ImageEditor.ss']['ACTIONS'] = 'handlinger';
 $lang['da_DK']['ImageEditor.ss']['ADJUST'] = 'tilpas';
 $lang['da_DK']['ImageEditor.ss']['APPLY'] = 'anvend';
@@ -252,6 +246,7 @@ $lang['da_DK']['ImageEditor.ss']['SEPIA'] = 'Sepia';
 $lang['da_DK']['ImageEditor.ss']['UNDO'] = 'fortryd';
 $lang['da_DK']['ImageEditor.ss']['UNTITLED'] = '"Ingen titel" dokument';
 $lang['da_DK']['ImageEditor.ss']['WIDTH'] = 'bredde';
+$lang['da_DK']['LeftAndMain']['CANT_REORGANISE'] = 'Du har ikke rettigheder to at omroker is sidetræet. Dine ændringer er ikke blevet gemt';
 $lang['da_DK']['LeftAndMain']['CHANGEDURL'] = 'Ændrede URL til \'%s\'';
 $lang['da_DK']['LeftAndMain']['COMMENTS'] = 'Kommentarer';
 $lang['da_DK']['LeftAndMain']['FILESIMAGES'] = 'Filer & Billeder';
@@ -287,6 +282,14 @@ $lang['da_DK']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Sidevisning:';
 $lang['da_DK']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = 'Publicerede \'%s\'';
 $lang['da_DK']['LeftAndMain']['STATUSTO'] = 'Status er ændret til \'%s\'';
 $lang['da_DK']['LeftAndMain']['TREESITECONTENT'] = 'Sideindhold';
+$lang['da_DK']['LeftAndMain_right.ss']['WELCOMETO'] = 'Velkommen til';
+$lang['da_DK']['MathSpamProtection']['EIGHT'] = 'otte';
+$lang['da_DK']['MathSpamProtection']['EIGHTEEN'] = 'atten';
+$lang['da_DK']['MathSpamProtection']['FIFTEEN'] = 'femten';
+$lang['da_DK']['MathSpamProtection']['FIVE'] = 'fem';
+$lang['da_DK']['MathSpamProtection']['FOUR'] = 'fire';
+$lang['da_DK']['MathSpamProtection']['FOURTEEN'] = 'fjorten';
+$lang['da_DK']['MathSpamProtection']['ZERO'] = 'nul';
 $lang['da_DK']['MemberList.ss']['FILTER'] = 'FIltrer';
 $lang['da_DK']['MemberList_PageControls.ss']['DISPLAYING'] = 'Viser';
 $lang['da_DK']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'medlemmer';
@@ -308,8 +311,11 @@ $lang['da_DK']['MemberTableField']['ADDEDTOGROUP'] = 'Tilføjede medlem til grup
 $lang['da_DK']['MemberTableField']['ADDINGFIELD'] = 'Tilføjelse fejlede';
 $lang['da_DK']['MemberTableField']['ANYGROUP'] = 'Alle grupper';
 $lang['da_DK']['MemberTableField']['ASC'] = 'Stigende';
+$lang['da_DK']['MemberTableField']['DeleteTitleText'] = 'Slet fra denne gruppe';
+$lang['da_DK']['MemberTableField']['DeleteTitleTextDatabase'] = 'Slet fra databasen og all grupper';
 $lang['da_DK']['MemberTableField']['DESC'] = 'Faldende';
 $lang['da_DK']['MemberTableField']['EMAIL'] = 'Email';
+$lang['da_DK']['MemberTableField']['ERRORADDINGUSER'] = 'Der opstod en fejl under oprettelsen af brugeren til gruppen : %s';
 $lang['da_DK']['MemberTableField']['FILTER'] = 'Filtrer';
 $lang['da_DK']['MemberTableField']['FILTERBYGROUP'] = 'Filtrer på gruppe';
 $lang['da_DK']['MemberTableField']['FIRSTNAME'] = 'Fornavn';
@@ -318,6 +324,7 @@ $lang['da_DK']['MemberTableField']['SEARCH'] = 'Søg';
 $lang['da_DK']['MemberTableField.ss']['ADDNEW'] = 'Tilføj ny';
 $lang['da_DK']['MemberTableField.ss']['DELETEMEMBER'] = 'Slet dette medlem';
 $lang['da_DK']['MemberTableField.ss']['EDITMEMBER'] = 'Rediger dette medlem';
+$lang['da_DK']['MemberTableField.ss']['NOITEMSFOUND'] = 'Inger punkter fundet';
 $lang['da_DK']['MemberTableField.ss']['SHOWMEMBER'] = 'Vis dette medlem';
 $lang['da_DK']['MemberTableField']['SURNAME'] = 'Efternavn';
 $lang['da_DK']['ModelAdmin']['ADDBUTTON'] = 'Tilføj';
@@ -338,6 +345,7 @@ $lang['da_DK']['ModelAdmin']['NOCSVFILE'] = 'Tryk p&aring; Gennemse for at v&ael
 $lang['da_DK']['ModelAdmin']['NOIMPORT'] = 'Intet at importere';
 $lang['da_DK']['ModelAdmin']['NORESULTS'] = 'Ingen resultater';
 $lang['da_DK']['ModelAdmin']['SAVE'] = 'Gem';
+$lang['da_DK']['ModelAdmin']['SEARCHFOR'] = 'Søg efter:';
 $lang['da_DK']['ModelAdmin']['SEARCHRESULTS'] = 'Søgeresultater';
 $lang['da_DK']['ModelAdmin']['SELECTALL'] = 'Vælg alle';
 $lang['da_DK']['ModelAdmin']['SELECTNONE'] = 'Vælg ingen';
@@ -350,6 +358,9 @@ $lang['da_DK']['ModelAdmin_left.ss']['ADDLISTING'] = 'Tilf&oslash;j';
 $lang['da_DK']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Importer';
 $lang['da_DK']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'S&oslash;g';
 $lang['da_DK']['ModelAdmin_right.ss']['WELCOME1'] = 'Velkommen til %s. V&aelig;lg venligst en af indgangene i venstre rude.';
+$lang['da_DK']['ModelSidebar.ss']['ADDLISTING'] = 'Tilføj';
+$lang['da_DK']['ModelSidebar.ss']['IMPORT_TAB_HEADER'] = 'Importer';
+$lang['da_DK']['ModelSidebar.ss']['SEARCHLISTINGS'] = 'Søg';
 $lang['da_DK']['PageComment']['Comment'] = 'Kommentér';
 $lang['da_DK']['PageComment']['COMMENTBY'] = 'Kommentar af \'%s\' den %s';
 $lang['da_DK']['PageComment']['IsSpam'] = 'Spam?';
@@ -360,7 +371,11 @@ $lang['da_DK']['PageComment']['SINGULARNAME'] = 'Side kommentarer';
 $lang['da_DK']['PageCommentInterface']['COMMENTERURL'] = 'Din hjemmesides adresse (URL)';
 $lang['da_DK']['PageCommentInterface']['POST'] = 'Post';
 $lang['da_DK']['PageCommentInterface']['SPAMQUESTION'] = 'Spørgsmål for Spam-beskyttelse: %s';
+$lang['da_DK']['PageCommentInterface.ss']['COMMENTLOGINERROR'] = 'Du kan ikke skrive en kommentar før du er logget ind';
+$lang['da_DK']['PageCommentInterface.ss']['COMMENTPERMISSIONERROR'] = 'og at du har de nødvendige rettigheder ';
+$lang['da_DK']['PageCommentInterface.ss']['COMMENTPOSTLOGIN'] = 'Login Her';
 $lang['da_DK']['PageCommentInterface.ss']['COMMENTS'] = 'Kommentarer';
+$lang['da_DK']['PageCommentInterface.ss']['COMMENTSDISABLED'] = 'Muligheden for at skrive kommentar er blevet deaktiveret';
 $lang['da_DK']['PageCommentInterface.ss']['NEXT'] = 'næste';
 $lang['da_DK']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'Ingen har kommenteret siden endnu';
 $lang['da_DK']['PageCommentInterface.ss']['POSTCOM'] = 'Indsend din kommentar';
diff --git a/lang/de_DE.php b/lang/de_DE.php
index b120ef59..9e32ec9f 100644
--- a/lang/de_DE.php
+++ b/lang/de_DE.php
@@ -52,7 +52,6 @@ $lang['de_DE']['AssetTableField']['CAPTION'] = 'Titel';
 $lang['de_DE']['AssetTableField']['CREATED'] = 'Erstmalig hochgeladen';
 $lang['de_DE']['AssetTableField']['DIM'] = 'Dimensionen';
 $lang['de_DE']['AssetTableField']['DIMLIMT'] = 'Maße im Popup-Fenster einstellen';
-$lang['de_DE']['AssetTableField']['EDITIMAGE'] = 'Bild bearbeiten';
 $lang['de_DE']['AssetTableField']['FILENAME'] = 'Dateiname';
 $lang['de_DE']['AssetTableField']['GALLERYOPTIONS'] = 'Galerie Optionen';
 $lang['de_DE']['AssetTableField']['IMAGE'] = 'Bild';
@@ -82,12 +81,6 @@ $lang['de_DE']['CMSBatchActions']['PUBLISH_PAGES'] = 'Veröffentlichen';
 $lang['de_DE']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'Veröffentlichung von %d Seiten zurückgenommen';
 $lang['de_DE']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'Veröffentlichung wird zurückgenommen';
 $lang['de_DE']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'Veröffentlichung zurücknehmen';
-$lang['de_DE']['CMSLeft.ss']['DELPAGE'] = 'Lösche Seiten...';
-$lang['de_DE']['CMSLeft.ss']['DELPAGES'] = 'Lösche die markierten Ordner';
-$lang['de_DE']['CMSLeft.ss']['GO'] = 'Los';
-$lang['de_DE']['CMSLeft.ss']['NEWPAGE'] = 'Neue Seite...';
-$lang['de_DE']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Markieren Sie die Ordner aus die Sie löschen möchten und drücken dann die nachstehende Schaltfläche ';
-$lang['de_DE']['CMSLeft.ss']['SITECONT'] = 'Seiten Inhalt';
 $lang['de_DE']['CMSMain']['ACCESS'] = 'Zugriff auf %s im CMS';
 $lang['de_DE']['CMSMain']['ACCESSALLINTERFACES'] = 'Zugriff auf alle CMS Schnittstellen';
 $lang['de_DE']['CMSMain']['CANCEL'] = 'Abbrechen';
@@ -167,7 +160,6 @@ $lang['de_DE']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Veröffentliche die marki
 $lang['de_DE']['CMSMain_left.ss']['SEARCH'] = 'Suche';
 $lang['de_DE']['CMSMain_left.ss']['SEARCHTITLE'] = 'Durchsuche URL, Titel, Menü Titel &amp; Inhalt';
 $lang['de_DE']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Markieren Sie die Seiten die Sie ändern möchten und wählen dann eine der Aktionen:';
-$lang['de_DE']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Wählen Sie die zu duplizierenden Seiten (und Kind-Elemente), und wo Sie die Kopien platzieren möchten.';
 $lang['de_DE']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Zeige nur veränderte Seiten';
 $lang['de_DE']['CMSMain_left.ss']['SHOWUNPUB'] = 'Zeige unveröffentlichte Versionen';
 $lang['de_DE']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Seitenbaum';
@@ -185,9 +177,6 @@ $lang['de_DE']['CMSMain_versions.ss']['NOTPUB'] = 'Nicht veröffentlicht';
 $lang['de_DE']['CMSMain_versions.ss']['PUBR'] = 'Veröffentlicher';
 $lang['de_DE']['CMSMain_versions.ss']['UNKNOWN'] = 'Unbekannt';
 $lang['de_DE']['CMSMain_versions.ss']['WHEN'] = 'Wann';
-$lang['de_DE']['CMSRight.ss']['CHOOSEPAGE'] = 'Bitte eine Seite links auswählen.';
-$lang['de_DE']['CMSRight.ss']['ECONTENT'] = 'Inhalt bearbeiten';
-$lang['de_DE']['CMSRight.ss']['WELCOMETO'] = 'Willkommen auf';
 $lang['de_DE']['CommentAdmin']['ACCEPT'] = 'Akzeptiert';
 $lang['de_DE']['CommentAdmin']['APPROVED'] = '%s Kommentare akzeptiert.';
 $lang['de_DE']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Überprüfte Kommentare';
@@ -290,6 +279,11 @@ $lang['de_DE']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Seitenansicht:';
 $lang['de_DE']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' erfolgreich veröffentlicht';
 $lang['de_DE']['LeftAndMain']['STATUSTO'] = 'Status geändert: \'%s\'';
 $lang['de_DE']['LeftAndMain']['TREESITECONTENT'] = 'Seiteninhalt';
+$lang['de_DE']['MathSpamProtection']['TWELVE'] = 'zwölf';
+$lang['de_DE']['MathSpamProtection']['TWO'] = 'zwei';
+$lang['de_DE']['MathSpamProtection']['WHATIS'] = 'Was gibt %s plus %s ?';
+$lang['de_DE']['MathSpamProtection']['ZERO'] = 'null';
+$lang['de_DE']['MemberImportForm']['ResultNone'] = 'Keine Änderungen';
 $lang['de_DE']['MemberList.ss']['FILTER'] = 'filtern';
 $lang['de_DE']['MemberList_PageControls.ss']['DISPLAYING'] = 'Anzeigen';
 $lang['de_DE']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'Mitglieder';
@@ -311,6 +305,8 @@ $lang['de_DE']['MemberTableField']['ADDEDTOGROUP'] = 'Mitglied zu Gruppe hinzuge
 $lang['de_DE']['MemberTableField']['ADDINGFIELD'] = 'Hinzufügen fehlgeschlagen';
 $lang['de_DE']['MemberTableField']['ANYGROUP'] = 'Jede Gruppe';
 $lang['de_DE']['MemberTableField']['ASC'] = 'Aufsteigend';
+$lang['de_DE']['MemberTableField']['DeleteTitleText'] = 'Aus dieser Gruppe entfernen';
+$lang['de_DE']['MemberTableField']['DeleteTitleTextDatabase'] = 'Aus der Datenbank und aus allen Gruppen löschen';
 $lang['de_DE']['MemberTableField']['DESC'] = 'Absteigend';
 $lang['de_DE']['MemberTableField']['EMAIL'] = 'E-Mail';
 $lang['de_DE']['MemberTableField']['ERRORADDINGUSER'] = 'Ein Fehler ist aufgetreten beim Versuch, den Benutzer zur Gruppe %s hinzuzufügen.';
diff --git a/lang/en_GB.php b/lang/en_GB.php
index 1d174144..021e3c97 100644
--- a/lang/en_GB.php
+++ b/lang/en_GB.php
@@ -49,7 +49,6 @@ $lang['en_GB']['AssetTableField']['CAPTION'] = 'Caption';
 $lang['en_GB']['AssetTableField']['CREATED'] = 'First uploaded';
 $lang['en_GB']['AssetTableField']['DIM'] = 'Dimensions';
 $lang['en_GB']['AssetTableField']['DIMLIMT'] = 'Limit The Dimensions In The Popup Window';
-$lang['en_GB']['AssetTableField']['EDITIMAGE'] = 'Edit this image';
 $lang['en_GB']['AssetTableField']['FILENAME'] = 'Filename';
 $lang['en_GB']['AssetTableField']['GALLERYOPTIONS'] = 'Gallery Options';
 $lang['en_GB']['AssetTableField']['IMAGE'] = 'Image';
@@ -70,12 +69,6 @@ $lang['en_GB']['AssetTableField']['SWFFILEOPTIONS'] = 'SWF File Options';
 $lang['en_GB']['AssetTableField']['TITLE'] = 'Title';
 $lang['en_GB']['AssetTableField']['TYPE'] = 'Type';
 $lang['en_GB']['AssetTableField']['URL'] = 'URL';
-$lang['en_GB']['CMSLeft.ss']['DELPAGE'] = 'Delete Pages...';
-$lang['en_GB']['CMSLeft.ss']['DELPAGES'] = 'Delete the selected pages';
-$lang['en_GB']['CMSLeft.ss']['GO'] = 'Go';
-$lang['en_GB']['CMSLeft.ss']['NEWPAGE'] = 'New Page...';
-$lang['en_GB']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Select the pages that you want to delete and then click the button below';
-$lang['en_GB']['CMSLeft.ss']['SITECONT'] = 'Site Content';
 $lang['en_GB']['CMSMain']['ACCESS'] = 'Access to \'%s\' (%s)';
 $lang['en_GB']['CMSMain']['ACCESSALLINTERFACES'] = 'Access to all CMS interfaces';
 $lang['en_GB']['CMSMain']['CANCEL'] = 'Cancel';
@@ -151,7 +144,6 @@ $lang['en_GB']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publish the selected page
 $lang['en_GB']['CMSMain_left.ss']['SEARCH'] = 'Search';
 $lang['en_GB']['CMSMain_left.ss']['SEARCHTITLE'] = 'Search through URL, Title, Menu Title, &amp; Content';
 $lang['en_GB']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Select the pages that you want to change &amp; then click an action:';
-$lang['en_GB']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Select the pages that you want to duplicate, whether it\'s children should be included, and where you want the duplicates placed';
 $lang['en_GB']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Show only changed pages';
 $lang['en_GB']['CMSMain_left.ss']['SHOWUNPUB'] = 'Show unpublished versions';
 $lang['en_GB']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Site Content and Structure';
@@ -169,9 +161,6 @@ $lang['en_GB']['CMSMain_versions.ss']['NOTPUB'] = 'Not published';
 $lang['en_GB']['CMSMain_versions.ss']['PUBR'] = 'Publisher';
 $lang['en_GB']['CMSMain_versions.ss']['UNKNOWN'] = 'Unknown';
 $lang['en_GB']['CMSMain_versions.ss']['WHEN'] = 'When';
-$lang['en_GB']['CMSRight.ss']['CHOOSEPAGE'] = 'Please choose a page from the left.';
-$lang['en_GB']['CMSRight.ss']['ECONTENT'] = 'Edit Content';
-$lang['en_GB']['CMSRight.ss']['WELCOMETO'] = 'Welcome to';
 $lang['en_GB']['CommentAdmin']['ACCEPT'] = 'Accept';
 $lang['en_GB']['CommentAdmin']['APPROVED'] = 'Accepted %s comments.';
 $lang['en_GB']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Approved Comments';
diff --git a/lang/eo_XX.php b/lang/eo_XX.php
index 7d7ec747..e1693b51 100644
--- a/lang/eo_XX.php
+++ b/lang/eo_XX.php
@@ -52,7 +52,6 @@ $lang['eo_XX']['AssetTableField']['CAPTION'] = 'Apudskribo';
 $lang['eo_XX']['AssetTableField']['CREATED'] = 'Unue alŝutita';
 $lang['eo_XX']['AssetTableField']['DIM'] = 'Dimensioj';
 $lang['eo_XX']['AssetTableField']['DIMLIMT'] = 'Limigi la Dimensiojn en la Ŝprucfenestro';
-$lang['eo_XX']['AssetTableField']['EDITIMAGE'] = 'Redakti ĉi tiun bildon';
 $lang['eo_XX']['AssetTableField']['FILENAME'] = 'Nomo de dosiero';
 $lang['eo_XX']['AssetTableField']['GALLERYOPTIONS'] = 'Galeriaj Agordoj';
 $lang['eo_XX']['AssetTableField']['IMAGE'] = 'Bildo';
@@ -82,12 +81,6 @@ $lang['eo_XX']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publikigi';
 $lang['eo_XX']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'Malpublikigis %d paĝojn';
 $lang['eo_XX']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'Malpublikigas paĝojn';
 $lang['eo_XX']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'Malpublikigi';
-$lang['eo_XX']['CMSLeft.ss']['DELPAGE'] = 'Forigi Paĝojn...';
-$lang['eo_XX']['CMSLeft.ss']['DELPAGES'] = 'Forigu la elektitajn paĝojn';
-$lang['eo_XX']['CMSLeft.ss']['GO'] = 'Ek';
-$lang['eo_XX']['CMSLeft.ss']['NEWPAGE'] = 'Nova Paĝo...';
-$lang['eo_XX']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Elektu la paĝojn forigotajn kaj poste alklaku la suban butonon';
-$lang['eo_XX']['CMSLeft.ss']['SITECONT'] = 'Enhavo de Retejo ';
 $lang['eo_XX']['CMSMain']['ACCESS'] = 'Aliro al \'%s\' (%s)';
 $lang['eo_XX']['CMSMain']['ACCESSALLINTERFACES'] = 'Aliro al ĉiuj interfacoj de CMS';
 $lang['eo_XX']['CMSMain']['CANCEL'] = 'Rezigni';
@@ -167,7 +160,6 @@ $lang['eo_XX']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Eldoni la elektitajn paĝ
 $lang['eo_XX']['CMSMain_left.ss']['SEARCH'] = 'Serĉi';
 $lang['eo_XX']['CMSMain_left.ss']['SEARCHTITLE'] = 'Serĉu tra URL, Titolo, Menua Titolo, kaj Enhavo';
 $lang['eo_XX']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Elektu la paĝojn ŝanĝotajn kaj alklaku agon:';
-$lang['eo_XX']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Elektu la paĝojn duobligotajn, ĉu enmeti ĝiajn idojn, kaj kien meti la kopiojn';
 $lang['eo_XX']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Montru nur ŝanĝitajn paĝojn';
 $lang['eo_XX']['CMSMain_left.ss']['SHOWUNPUB'] = 'Montri nepublikigitajn versiojn';
 $lang['eo_XX']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Enhavo kaj Strukturo de Retejo ';
@@ -185,9 +177,6 @@ $lang['eo_XX']['CMSMain_versions.ss']['NOTPUB'] = 'Ne eldonita';
 $lang['eo_XX']['CMSMain_versions.ss']['PUBR'] = 'Eldonejo';
 $lang['eo_XX']['CMSMain_versions.ss']['UNKNOWN'] = 'Nekonata';
 $lang['eo_XX']['CMSMain_versions.ss']['WHEN'] = 'Kiam';
-$lang['eo_XX']['CMSRight.ss']['CHOOSEPAGE'] = 'Bonvolu elekti paĝon maldekstre.';
-$lang['eo_XX']['CMSRight.ss']['ECONTENT'] = 'Redakti Enhavon';
-$lang['eo_XX']['CMSRight.ss']['WELCOMETO'] = 'Bonvenon al';
 $lang['eo_XX']['CommentAdmin']['ACCEPT'] = 'Akcepti';
 $lang['eo_XX']['CommentAdmin']['APPROVED'] = 'Akceptis %s komentojn.';
 $lang['eo_XX']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Aprobitaj Komentoj';
diff --git a/lang/es_AR.php b/lang/es_AR.php
index 7567b8b1..f28f93c9 100644
--- a/lang/es_AR.php
+++ b/lang/es_AR.php
@@ -49,7 +49,6 @@ $lang['es_AR']['AssetTableField']['CAPTION'] = 'Título';
 $lang['es_AR']['AssetTableField']['CREATED'] = 'Agregado por primera vez';
 $lang['es_AR']['AssetTableField']['DIM'] = 'Dimensiones';
 $lang['es_AR']['AssetTableField']['DIMLIMT'] = 'Limitar Dimensiones En La Ventana Emergente';
-$lang['es_AR']['AssetTableField']['EDITIMAGE'] = 'Editar esta imagen';
 $lang['es_AR']['AssetTableField']['FILENAME'] = 'Nombre del Archivo';
 $lang['es_AR']['AssetTableField']['GALLERYOPTIONS'] = 'Opciones de la Galería.';
 $lang['es_AR']['AssetTableField']['IMAGE'] = 'Imagen';
@@ -70,12 +69,6 @@ $lang['es_AR']['AssetTableField']['SWFFILEOPTIONS'] = 'Opciones de Archivo SWF';
 $lang['es_AR']['AssetTableField']['TITLE'] = 'Título';
 $lang['es_AR']['AssetTableField']['TYPE'] = 'Tipo';
 $lang['es_AR']['AssetTableField']['URL'] = 'URL';
-$lang['es_AR']['CMSLeft.ss']['DELPAGE'] = 'Eliminar Páginas...';
-$lang['es_AR']['CMSLeft.ss']['DELPAGES'] = 'Eliminar las páginas seleccionadas';
-$lang['es_AR']['CMSLeft.ss']['GO'] = 'Ir';
-$lang['es_AR']['CMSLeft.ss']['NEWPAGE'] = 'Nueva Página...';
-$lang['es_AR']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Selecciona las páginas que quieres eliminar y luego pulsa el siguiente botón';
-$lang['es_AR']['CMSLeft.ss']['SITECONT'] = 'Contenido del Sitio';
 $lang['es_AR']['CMSMain']['ACCESS'] = 'Acceso a \'%s\' (%s)';
 $lang['es_AR']['CMSMain']['ACCESSALLINTERFACES'] = 'Acceso a todas las interfaces del CMS';
 $lang['es_AR']['CMSMain']['CANCEL'] = 'Cancelar';
@@ -150,7 +143,6 @@ $lang['es_AR']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publicar las páginas sel
 $lang['es_AR']['CMSMain_left.ss']['SEARCH'] = 'Buscar';
 $lang['es_AR']['CMSMain_left.ss']['SEARCHTITLE'] = 'Buscar a través de la URL, Título, Título de Menú &amp; Contenido';
 $lang['es_AR']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Selecciona las páginas que quieres cambiar y luego pulsa sobre una acción:';
-$lang['es_AR']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Selecciona las páginas que quieras duplicar, también si deseas incluir las "páginas hijas", y la ubicación de los duplicados';
 $lang['es_AR']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Muestra sólo páginas modificadas';
 $lang['es_AR']['CMSMain_left.ss']['SHOWUNPUB'] = 'Mostrar versiones no publicadas';
 $lang['es_AR']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Contenido y Estructura del Sitio';
@@ -168,9 +160,6 @@ $lang['es_AR']['CMSMain_versions.ss']['NOTPUB'] = 'Sin publicar';
 $lang['es_AR']['CMSMain_versions.ss']['PUBR'] = 'Editor';
 $lang['es_AR']['CMSMain_versions.ss']['UNKNOWN'] = 'Desconocido';
 $lang['es_AR']['CMSMain_versions.ss']['WHEN'] = 'Cuando';
-$lang['es_AR']['CMSRight.ss']['CHOOSEPAGE'] = 'Por favor selecciona una página de la izquierda.';
-$lang['es_AR']['CMSRight.ss']['ECONTENT'] = 'Editar contenido';
-$lang['es_AR']['CMSRight.ss']['WELCOMETO'] = 'Bienvenido a';
 $lang['es_AR']['CommentAdmin']['ACCEPT'] = 'Aceptar';
 $lang['es_AR']['CommentAdmin']['APPROVED'] = '%s comentarios aceptados.';
 $lang['es_AR']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Comentarios Aprobados';
diff --git a/lang/es_ES.php b/lang/es_ES.php
index d6a2f621..28a0c38c 100644
--- a/lang/es_ES.php
+++ b/lang/es_ES.php
@@ -49,7 +49,6 @@ $lang['es_ES']['AssetTableField']['CAPTION'] = 'Título';
 $lang['es_ES']['AssetTableField']['CREATED'] = 'Agregado por primera vez';
 $lang['es_ES']['AssetTableField']['DIM'] = 'Dimensiones';
 $lang['es_ES']['AssetTableField']['DIMLIMT'] = 'Limitar las dimenciones de la ventana Popup';
-$lang['es_ES']['AssetTableField']['EDITIMAGE'] = 'Editar esta imagen';
 $lang['es_ES']['AssetTableField']['FILENAME'] = 'Nombre del archivo';
 $lang['es_ES']['AssetTableField']['GALLERYOPTIONS'] = 'Opciones de Galería';
 $lang['es_ES']['AssetTableField']['IMAGE'] = 'Imagen';
@@ -70,12 +69,6 @@ $lang['es_ES']['AssetTableField']['SWFFILEOPTIONS'] = 'Opciones del archivo SWF'
 $lang['es_ES']['AssetTableField']['TITLE'] = 'Título';
 $lang['es_ES']['AssetTableField']['TYPE'] = 'Tipo';
 $lang['es_ES']['AssetTableField']['URL'] = 'URL';
-$lang['es_ES']['CMSLeft.ss']['DELPAGE'] = 'Eliminar Páginas...';
-$lang['es_ES']['CMSLeft.ss']['DELPAGES'] = 'Eliminar las páginas seleccionadas';
-$lang['es_ES']['CMSLeft.ss']['GO'] = 'Ir';
-$lang['es_ES']['CMSLeft.ss']['NEWPAGE'] = 'Nueva Página...';
-$lang['es_ES']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Seleccione las páginas que quiere eliminar y luego pulse el siguiente botón';
-$lang['es_ES']['CMSLeft.ss']['SITECONT'] = 'Contenido del Sitio';
 $lang['es_ES']['CMSMain']['ACCESS'] = 'Acceso a \'%s\' (%s)';
 $lang['es_ES']['CMSMain']['ACCESSALLINTERFACES'] = 'Acceder a todas las interfaces del CMS';
 $lang['es_ES']['CMSMain']['CANCEL'] = 'Cancelar';
@@ -150,7 +143,6 @@ $lang['es_ES']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publica las páginas sele
 $lang['es_ES']['CMSMain_left.ss']['SEARCH'] = 'Buscar';
 $lang['es_ES']['CMSMain_left.ss']['SEARCHTITLE'] = 'Busca a través de la URL, Título, Título de Menú &amp; Contenido';
 $lang['es_ES']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Seleccione las páginas que quiere cambiar y luego haga pulse sobre una acción:';
-$lang['es_ES']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Seleccione las páginas que quiera duplicar, también si desea incluir las "páginas hija", y la ubicación de los duplicados';
 $lang['es_ES']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Muestra sólo páginas modificadas';
 $lang['es_ES']['CMSMain_left.ss']['SHOWUNPUB'] = 'Mostrar versiones no publicadas';
 $lang['es_ES']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Contenido del Sitio y Estructura';
@@ -168,9 +160,6 @@ $lang['es_ES']['CMSMain_versions.ss']['NOTPUB'] = 'Sin Publicar';
 $lang['es_ES']['CMSMain_versions.ss']['PUBR'] = 'Editor';
 $lang['es_ES']['CMSMain_versions.ss']['UNKNOWN'] = 'Desconocido';
 $lang['es_ES']['CMSMain_versions.ss']['WHEN'] = 'Cuando';
-$lang['es_ES']['CMSRight.ss']['CHOOSEPAGE'] = 'Por favor seleccione una página de la izquierda.';
-$lang['es_ES']['CMSRight.ss']['ECONTENT'] = 'Editar contenido';
-$lang['es_ES']['CMSRight.ss']['WELCOMETO'] = 'Bienvenido a';
 $lang['es_ES']['CommentAdmin']['ACCEPT'] = 'Aceptar';
 $lang['es_ES']['CommentAdmin']['APPROVED'] = 'Aceptados %s comentarios.';
 $lang['es_ES']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Comentarios Aprobados';
diff --git a/lang/es_MX.php b/lang/es_MX.php
index 5051e3d0..d1717f47 100644
--- a/lang/es_MX.php
+++ b/lang/es_MX.php
@@ -49,7 +49,6 @@ $lang['es_MX']['AssetTableField']['CAPTION'] = 'Título';
 $lang['es_MX']['AssetTableField']['CREATED'] = 'Agregado por primera vez';
 $lang['es_MX']['AssetTableField']['DIM'] = 'Dimensiones';
 $lang['es_MX']['AssetTableField']['DIMLIMT'] = 'Limitar Dimensiones En La Ventana Móvil';
-$lang['es_MX']['AssetTableField']['EDITIMAGE'] = 'Editar esta imagen';
 $lang['es_MX']['AssetTableField']['FILENAME'] = 'Nombre del archivo';
 $lang['es_MX']['AssetTableField']['GALLERYOPTIONS'] = 'Opciones de la Galería.';
 $lang['es_MX']['AssetTableField']['IMAGE'] = 'Imagen';
@@ -70,12 +69,6 @@ $lang['es_MX']['AssetTableField']['SWFFILEOPTIONS'] = 'Opciones de fichero SWF';
 $lang['es_MX']['AssetTableField']['TITLE'] = 'Título';
 $lang['es_MX']['AssetTableField']['TYPE'] = 'Tipo';
 $lang['es_MX']['AssetTableField']['URL'] = 'URL';
-$lang['es_MX']['CMSLeft.ss']['DELPAGE'] = 'Eliminar Páginas...';
-$lang['es_MX']['CMSLeft.ss']['DELPAGES'] = 'Eliminar las páginas seleccionadas';
-$lang['es_MX']['CMSLeft.ss']['GO'] = 'Ir';
-$lang['es_MX']['CMSLeft.ss']['NEWPAGE'] = 'Nueva Página...';
-$lang['es_MX']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Selecciona las páginas que quieres eliminar y luego pulsa el siguiente botón';
-$lang['es_MX']['CMSLeft.ss']['SITECONT'] = 'Contenido del Sitio';
 $lang['es_MX']['CMSMain']['ACCESS'] = 'Acceder a \'%s\' (%s)';
 $lang['es_MX']['CMSMain']['ACCESSALLINTERFACES'] = 'Acceder a todas las interfaces del CMS';
 $lang['es_MX']['CMSMain']['CANCEL'] = 'Cancelar';
@@ -150,7 +143,6 @@ $lang['es_MX']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publicar las páginas sel
 $lang['es_MX']['CMSMain_left.ss']['SEARCH'] = 'Buscar';
 $lang['es_MX']['CMSMain_left.ss']['SEARCHTITLE'] = 'Buscar a través de la URL, Título, Título de Menú y Contenido';
 $lang['es_MX']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Selecciona las páginas que quieres cambiar y luego pulsa sobre una acción:';
-$lang['es_MX']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Selecciona las páginas que quieras duplicar, también si deseas incluir las "páginas hijas" y la ubicación de los duplicados';
 $lang['es_MX']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Muestra sólo páginas modificadas';
 $lang['es_MX']['CMSMain_left.ss']['SHOWUNPUB'] = 'Mostrar versiones no publicadas';
 $lang['es_MX']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Contenido y Estructura del Sitio';
@@ -168,9 +160,6 @@ $lang['es_MX']['CMSMain_versions.ss']['NOTPUB'] = 'Sin Publicar';
 $lang['es_MX']['CMSMain_versions.ss']['PUBR'] = 'Editor';
 $lang['es_MX']['CMSMain_versions.ss']['UNKNOWN'] = 'Desconocido';
 $lang['es_MX']['CMSMain_versions.ss']['WHEN'] = 'Cuando';
-$lang['es_MX']['CMSRight.ss']['CHOOSEPAGE'] = 'Por favor selecciona una página de la izquierda.';
-$lang['es_MX']['CMSRight.ss']['ECONTENT'] = 'Editar contenido';
-$lang['es_MX']['CMSRight.ss']['WELCOMETO'] = 'Bienvenido a';
 $lang['es_MX']['CommentAdmin']['ACCEPT'] = 'Aceptar';
 $lang['es_MX']['CommentAdmin']['APPROVED'] = '%s comentarios aceptados.';
 $lang['es_MX']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Comentarios Aprobados';
diff --git a/lang/et_EE.php b/lang/et_EE.php
index fedd56b6..5511eb9d 100644
--- a/lang/et_EE.php
+++ b/lang/et_EE.php
@@ -49,7 +49,6 @@ $lang['et_EE']['AssetTableField']['CAPTION'] = 'Alapealkiri';
 $lang['et_EE']['AssetTableField']['CREATED'] = 'Esmakordselt üles laaditud';
 $lang['et_EE']['AssetTableField']['DIM'] = 'Mõõtmed';
 $lang['et_EE']['AssetTableField']['DIMLIMT'] = 'Piira hüpikakna mõõdud';
-$lang['et_EE']['AssetTableField']['EDITIMAGE'] = 'Muuda seda pilti';
 $lang['et_EE']['AssetTableField']['FILENAME'] = 'Failinimi';
 $lang['et_EE']['AssetTableField']['GALLERYOPTIONS'] = 'Galerii valikud';
 $lang['et_EE']['AssetTableField']['IMAGE'] = 'Pilt';
@@ -70,12 +69,6 @@ $lang['et_EE']['AssetTableField']['SWFFILEOPTIONS'] = 'SWF faili valikud';
 $lang['et_EE']['AssetTableField']['TITLE'] = 'Pealkiri';
 $lang['et_EE']['AssetTableField']['TYPE'] = 'Tüüp';
 $lang['et_EE']['AssetTableField']['URL'] = 'Aadress';
-$lang['et_EE']['CMSLeft.ss']['DELPAGE'] = 'Kustuta lehed...';
-$lang['et_EE']['CMSLeft.ss']['DELPAGES'] = 'Kustuta valitud lehed';
-$lang['et_EE']['CMSLeft.ss']['GO'] = 'Mine';
-$lang['et_EE']['CMSLeft.ss']['NEWPAGE'] = 'Uus leht...';
-$lang['et_EE']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Vali lehed mida soovid kustutada ja vajuta nuppu';
-$lang['et_EE']['CMSLeft.ss']['SITECONT'] = 'Saidi sisu';
 $lang['et_EE']['CMSMain']['ACCESS'] = 'Ligipääs \'%s\' (%s) juurde';
 $lang['et_EE']['CMSMain']['ACCESSALLINTERFACES'] = 'Ligipääs kõigile Sisuhalduse kasutajaliidestele';
 $lang['et_EE']['CMSMain']['CANCEL'] = 'Tühista';
@@ -150,7 +143,6 @@ $lang['et_EE']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Avalda valitud lehed';
 $lang['et_EE']['CMSMain_left.ss']['SEARCH'] = 'Otsing';
 $lang['et_EE']['CMSMain_left.ss']['SEARCHTITLE'] = 'Otsing läbi aadressi, pealkirja, menüü pealkirja ning sisu';
 $lang['et_EE']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Vali lehed mida soovid muuta &amp; ja vajuta tegevusele:';
-$lang['et_EE']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Vali lehed, mida soovid paljundada, määratle, kas kaasata ka nende alamlehed ning kuhu paljundused lisada';
 $lang['et_EE']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Näita ainult muudetud lehti';
 $lang['et_EE']['CMSMain_left.ss']['SHOWUNPUB'] = 'Näita avaldamata versioone';
 $lang['et_EE']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Lehe Sisu ja Struktuur';
@@ -168,9 +160,6 @@ $lang['et_EE']['CMSMain_versions.ss']['NOTPUB'] = 'Avaldamata';
 $lang['et_EE']['CMSMain_versions.ss']['PUBR'] = 'Kirjastaja';
 $lang['et_EE']['CMSMain_versions.ss']['UNKNOWN'] = 'Teadmata';
 $lang['et_EE']['CMSMain_versions.ss']['WHEN'] = 'Millal';
-$lang['et_EE']['CMSRight.ss']['CHOOSEPAGE'] = 'Palun vali lehekülg vasakult.';
-$lang['et_EE']['CMSRight.ss']['ECONTENT'] = 'Muuda sisu';
-$lang['et_EE']['CMSRight.ss']['WELCOMETO'] = 'Tere tulemast';
 $lang['et_EE']['CommentAdmin']['ACCEPT'] = 'Nõustu';
 $lang['et_EE']['CommentAdmin']['APPROVED'] = 'Nõustud %s kommentaariga.';
 $lang['et_EE']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Kinnitatud kommentaarid';
diff --git a/lang/fi_FI.php b/lang/fi_FI.php
index 68b3b296..d6bb1d29 100644
--- a/lang/fi_FI.php
+++ b/lang/fi_FI.php
@@ -48,7 +48,6 @@ $lang['fi_FI']['AssetTableField']['CAPTION'] = 'Kuvateksti';
 $lang['fi_FI']['AssetTableField']['CREATED'] = 'Ensimmäisen kerran ladattu palvelimelle';
 $lang['fi_FI']['AssetTableField']['DIM'] = 'Mitat';
 $lang['fi_FI']['AssetTableField']['DIMLIMT'] = 'Rajoita ponnahdusikkunan kokoa';
-$lang['fi_FI']['AssetTableField']['EDITIMAGE'] = 'Muokkaa tätä kuvaa';
 $lang['fi_FI']['AssetTableField']['FILENAME'] = 'Tiedoston nimi';
 $lang['fi_FI']['AssetTableField']['GALLERYOPTIONS'] = 'Gallerian asetukset';
 $lang['fi_FI']['AssetTableField']['IMAGE'] = 'Kuva';
@@ -66,12 +65,6 @@ $lang['fi_FI']['AssetTableField']['SWFFILEOPTIONS'] = 'SWF-tiedoston asetukset';
 $lang['fi_FI']['AssetTableField']['TITLE'] = 'Otsikko';
 $lang['fi_FI']['AssetTableField']['TYPE'] = 'Tyyppi';
 $lang['fi_FI']['AssetTableField']['URL'] = 'URL';
-$lang['fi_FI']['CMSLeft.ss']['DELPAGE'] = 'Poista sivut...';
-$lang['fi_FI']['CMSLeft.ss']['DELPAGES'] = 'Poista valitut sivut';
-$lang['fi_FI']['CMSLeft.ss']['GO'] = 'Siirry';
-$lang['fi_FI']['CMSLeft.ss']['NEWPAGE'] = 'Uusi sivu...';
-$lang['fi_FI']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Valitse poistettavat sivut ja paina alla olevaa nappia';
-$lang['fi_FI']['CMSLeft.ss']['SITECONT'] = 'Sivuston sisältö';
 $lang['fi_FI']['CMSMain']['ACCESS'] = 'Pääsy %s:ään CMS:ssä';
 $lang['fi_FI']['CMSMain']['CANCEL'] = 'Peruuta';
 $lang['fi_FI']['CMSMain']['CHOOSEREPORT'] = '(Valitse raportti)';
@@ -143,7 +136,6 @@ $lang['fi_FI']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Julkaise valitut sivut';
 $lang['fi_FI']['CMSMain_left.ss']['SEARCH'] = 'Etsi';
 $lang['fi_FI']['CMSMain_left.ss']['SEARCHTITLE'] = 'Etsi URL-osoitteesta, otsikosta, valikon otsikosta ja sisällöstä';
 $lang['fi_FI']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Valitse sivut, joita haluat muutettavan ja napsauta toimintoa:';
-$lang['fi_FI']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Valitse sivut, joista tehdään kaksoiskappaleet, ja minne kaksoiskappaleet sijoitetaan. Sivujen alasivut kopioidaan myös.';
 $lang['fi_FI']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Näytä ainoastaan muutetut sivut';
 $lang['fi_FI']['CMSMain_left.ss']['SHOWUNPUB'] = 'Näytä julkaisemattomat versiot';
 $lang['fi_FI']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Sivuston sisältö ja rakenne';
@@ -161,9 +153,6 @@ $lang['fi_FI']['CMSMain_versions.ss']['NOTPUB'] = 'Ei julkaistu';
 $lang['fi_FI']['CMSMain_versions.ss']['PUBR'] = 'Julkaisija';
 $lang['fi_FI']['CMSMain_versions.ss']['UNKNOWN'] = 'Tuntematon';
 $lang['fi_FI']['CMSMain_versions.ss']['WHEN'] = 'Milloin';
-$lang['fi_FI']['CMSRight.ss']['CHOOSEPAGE'] = 'Valitse sivu vasemmalta.';
-$lang['fi_FI']['CMSRight.ss']['ECONTENT'] = 'Muokkaa sisältöä';
-$lang['fi_FI']['CMSRight.ss']['WELCOMETO'] = 'Tervetuloa';
 $lang['fi_FI']['CommentAdmin']['ACCEPT'] = 'Hyväksy';
 $lang['fi_FI']['CommentAdmin']['APPROVED'] = 'Hyväksytty %s kommenttia.';
 $lang['fi_FI']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Hyväksytyt kommentit';
diff --git a/lang/fr_FR.php b/lang/fr_FR.php
index 54f65170..6d35da65 100644
--- a/lang/fr_FR.php
+++ b/lang/fr_FR.php
@@ -49,7 +49,6 @@ $lang['fr_FR']['AssetTableField']['CAPTION'] = 'Légende';
 $lang['fr_FR']['AssetTableField']['CREATED'] = 'Premier chargement';
 $lang['fr_FR']['AssetTableField']['DIM'] = 'Dimensions';
 $lang['fr_FR']['AssetTableField']['DIMLIMT'] = 'limite les dimensions dans la fenêtre surgissante';
-$lang['fr_FR']['AssetTableField']['EDITIMAGE'] = 'Editer l\'image';
 $lang['fr_FR']['AssetTableField']['FILENAME'] = 'Nom du fichier';
 $lang['fr_FR']['AssetTableField']['GALLERYOPTIONS'] = 'Options de la galerie';
 $lang['fr_FR']['AssetTableField']['IMAGE'] = 'Image';
@@ -70,12 +69,6 @@ $lang['fr_FR']['AssetTableField']['SWFFILEOPTIONS'] = 'Options de fichier SWF';
 $lang['fr_FR']['AssetTableField']['TITLE'] = 'Titre';
 $lang['fr_FR']['AssetTableField']['TYPE'] = 'Type';
 $lang['fr_FR']['AssetTableField']['URL'] = 'URL';
-$lang['fr_FR']['CMSLeft.ss']['DELPAGE'] = 'Supprimer Pages...';
-$lang['fr_FR']['CMSLeft.ss']['DELPAGES'] = 'Supprimer les pages sélectionnées';
-$lang['fr_FR']['CMSLeft.ss']['GO'] = 'Go';
-$lang['fr_FR']['CMSLeft.ss']['NEWPAGE'] = 'Nouvelle Page...';
-$lang['fr_FR']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Sélectionner les pages que vous voulez supprimer et puis cliquer sur le bouton ci-dessous';
-$lang['fr_FR']['CMSLeft.ss']['SITECONT'] = 'Contenu du Site';
 $lang['fr_FR']['CMSMain']['ACCESS'] = 'Accès à \'%s\' (%s)';
 $lang['fr_FR']['CMSMain']['ACCESSALLINTERFACES'] = 'Accès à toutes les interfaces du CMS';
 $lang['fr_FR']['CMSMain']['CANCEL'] = 'Annuler';
@@ -150,7 +143,6 @@ $lang['fr_FR']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publier les pages sélect
 $lang['fr_FR']['CMSMain_left.ss']['SEARCH'] = 'Chercher';
 $lang['fr_FR']['CMSMain_left.ss']['SEARCHTITLE'] = 'Chercher par URL, Titre, Titre de Menu &amp; Contenu';
 $lang['fr_FR']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Sélectionner les pages que vous voulez changer &amp; puis cliquer sur une action :';
-$lang['fr_FR']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Sélectionner les pages que vous voulez dupliquer, si leurs sous-pages doivent être inclues et où vous souhaitez les placer';
 $lang['fr_FR']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Afficher seulement les pages modifiées';
 $lang['fr_FR']['CMSMain_left.ss']['SHOWUNPUB'] = 'Afficher les versions non publiées';
 $lang['fr_FR']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Contenu du Site et Structure';
@@ -168,9 +160,6 @@ $lang['fr_FR']['CMSMain_versions.ss']['NOTPUB'] = 'Non publié';
 $lang['fr_FR']['CMSMain_versions.ss']['PUBR'] = 'Publieur';
 $lang['fr_FR']['CMSMain_versions.ss']['UNKNOWN'] = 'Inconnu';
 $lang['fr_FR']['CMSMain_versions.ss']['WHEN'] = 'Quand';
-$lang['fr_FR']['CMSRight.ss']['CHOOSEPAGE'] = 'Choisissez une page sur la gauche s\'il vous plaît.';
-$lang['fr_FR']['CMSRight.ss']['ECONTENT'] = 'Editer le Contenu';
-$lang['fr_FR']['CMSRight.ss']['WELCOMETO'] = 'Bienvenue à';
 $lang['fr_FR']['CommentAdmin']['ACCEPT'] = 'Accepter';
 $lang['fr_FR']['CommentAdmin']['APPROVED'] = 'Commentaire %s validé.';
 $lang['fr_FR']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Commentaires approuvés';
diff --git a/lang/he_IL.php b/lang/he_IL.php
index e9589dc2..76189ca2 100644
--- a/lang/he_IL.php
+++ b/lang/he_IL.php
@@ -50,7 +50,6 @@ $lang['he_IL']['AssetTableField']['CAPTION'] = 'כותרת';
 $lang['he_IL']['AssetTableField']['CREATED'] = 'הועלה לראשונה';
 $lang['he_IL']['AssetTableField']['DIM'] = 'מידות';
 $lang['he_IL']['AssetTableField']['DIMLIMT'] = 'הגבל ממדי חלון קופץ';
-$lang['he_IL']['AssetTableField']['EDITIMAGE'] = 'עריכת תמונה';
 $lang['he_IL']['AssetTableField']['FILENAME'] = 'שם הקובץ';
 $lang['he_IL']['AssetTableField']['GALLERYOPTIONS'] = 'אפשרויות גלריה';
 $lang['he_IL']['AssetTableField']['IMAGE'] = 'תמונה';
@@ -71,12 +70,6 @@ $lang['he_IL']['AssetTableField']['SWFFILEOPTIONS'] = 'אפשרויות קובץ
 $lang['he_IL']['AssetTableField']['TITLE'] = 'כותרת';
 $lang['he_IL']['AssetTableField']['TYPE'] = 'סוג';
 $lang['he_IL']['AssetTableField']['URL'] = 'כתובת הדף';
-$lang['he_IL']['CMSLeft.ss']['DELPAGE'] = 'מחיקת דפים...';
-$lang['he_IL']['CMSLeft.ss']['DELPAGES'] = 'מחק את הדפים הנבחרים';
-$lang['he_IL']['CMSLeft.ss']['GO'] = 'סע';
-$lang['he_IL']['CMSLeft.ss']['NEWPAGE'] = 'דף חדש...';
-$lang['he_IL']['CMSLeft.ss']['SELECTPAGESDEL'] = 'בחר את הדפים שברצונך למחוק ולחץ על הכפתור שמתחת';
-$lang['he_IL']['CMSLeft.ss']['SITECONT'] = 'תוכן האתר';
 $lang['he_IL']['CMSMain']['ACCESS'] = 'גישה ל \'%s\' (%s)';
 $lang['he_IL']['CMSMain']['ACCESSALLINTERFACES'] = 'גישה לכל ממשקי המערכת';
 $lang['he_IL']['CMSMain']['CANCEL'] = 'בטל';
@@ -152,7 +145,6 @@ $lang['he_IL']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'פרסם את הדפים
 $lang['he_IL']['CMSMain_left.ss']['SEARCH'] = 'חיפוש';
 $lang['he_IL']['CMSMain_left.ss']['SEARCHTITLE'] = 'חפש ב כתובת, כותרת, כותרת תפריט, &amp; תוכן';
 $lang['he_IL']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'בחר את הדפים שברצונך לשנות  &amp; ואז לחץ על פעולה:';
-$lang['he_IL']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'בחר את העמודים שברצונך לשכפל, את כללי הגישה אליהם ואת מיקום ההעתקים';
 $lang['he_IL']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'הצג רק דפים ששונו';
 $lang['he_IL']['CMSMain_left.ss']['SHOWUNPUB'] = 'הצג טיוטות';
 $lang['he_IL']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'תוכן ומבנה האתר';
@@ -170,10 +162,6 @@ $lang['he_IL']['CMSMain_versions.ss']['NOTPUB'] = 'לא מפורסם';
 $lang['he_IL']['CMSMain_versions.ss']['PUBR'] = 'מפרסם';
 $lang['he_IL']['CMSMain_versions.ss']['UNKNOWN'] = 'לא ידוע';
 $lang['he_IL']['CMSMain_versions.ss']['WHEN'] = 'כאשר';
-$lang['he_IL']['CMSRight.ss']['CHOOSEPAGE'] = 'בחר עמוד מהעמודה לשמאל
-';
-$lang['he_IL']['CMSRight.ss']['ECONTENT'] = 'ערוך תוכן';
-$lang['he_IL']['CMSRight.ss']['WELCOMETO'] = 'ברוכים הבאים ל';
 $lang['he_IL']['CommentAdmin']['ACCEPT'] = 'אשר';
 $lang['he_IL']['CommentAdmin']['APPROVED'] = 'אושרו %s תגובות';
 $lang['he_IL']['CommentAdmin']['APPROVEDCOMMENTS'] = 'תגובות מאושרות';
diff --git a/lang/hr_HR.php b/lang/hr_HR.php
index 32cbd9b9..206bdb9c 100644
--- a/lang/hr_HR.php
+++ b/lang/hr_HR.php
@@ -52,12 +52,6 @@ $lang['hr_HR']['AssetTableField.ss']['DELFILE'] = 'Obriši ov datoteku';
 $lang['hr_HR']['AssetTableField.ss']['DRAGTOFOLDER'] = 'Odvucite u direktorij lijevo kako bi ste prenijeli datoteku';
 $lang['hr_HR']['AssetTableField']['TITLE'] = 'Naslov';
 $lang['hr_HR']['AssetTableField']['TYPE'] = 'Tip';
-$lang['hr_HR']['CMSLeft.ss']['DELPAGE'] = 'Obriši stranice...';
-$lang['hr_HR']['CMSLeft.ss']['DELPAGES'] = 'Obriši označene stranice';
-$lang['hr_HR']['CMSLeft.ss']['GO'] = 'Idi';
-$lang['hr_HR']['CMSLeft.ss']['NEWPAGE'] = 'Nova stranica...';
-$lang['hr_HR']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Označite stranice koje želite obrisati i kliknite gumb ispod';
-$lang['hr_HR']['CMSLeft.ss']['SITECONT'] = 'Sadržaj stranice';
 $lang['hr_HR']['CMSMain']['ACCESS'] = 'Pristup u \'%s\' (%s)';
 $lang['hr_HR']['CMSMain']['CANCEL'] = 'Odustani';
 $lang['hr_HR']['CMSMain']['CHOOSEREPORT'] = '(Odaberite izvještaj)';
@@ -125,7 +119,6 @@ $lang['hr_HR']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Objavite označene strani
 $lang['hr_HR']['CMSMain_left.ss']['SEARCH'] = 'Traži';
 $lang['hr_HR']['CMSMain_left.ss']['SEARCHTITLE'] = 'Traži kroz URL, Naslov, Naslov Izbornika, &amp;  Sadržaj';
 $lang['hr_HR']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Odaberite stranice koje želite promjeniti &amp;  kliknite na akciju:';
-$lang['hr_HR']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Odaberite stranicu koju želite duplicirati, koje \'dijete\' želite, i gdje želite.';
 $lang['hr_HR']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Pokaži samo izmjenjene stranice';
 $lang['hr_HR']['CMSMain_left.ss']['SHOWUNPUB'] = 'Pokaži neobjavljene verzije';
 $lang['hr_HR']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Sadržaj i Struktura Site-a';
@@ -143,9 +136,6 @@ $lang['hr_HR']['CMSMain_versions.ss']['NOTPUB'] = 'Nije izdano';
 $lang['hr_HR']['CMSMain_versions.ss']['PUBR'] = 'Izdavač';
 $lang['hr_HR']['CMSMain_versions.ss']['UNKNOWN'] = 'Nepoznato';
 $lang['hr_HR']['CMSMain_versions.ss']['WHEN'] = 'Kada';
-$lang['hr_HR']['CMSRight.ss']['CHOOSEPAGE'] = 'Odaberite stranicu s lijeve strane';
-$lang['hr_HR']['CMSRight.ss']['ECONTENT'] = 'Uredi sadržaj';
-$lang['hr_HR']['CMSRight.ss']['WELCOMETO'] = 'Dobrodošli na';
 $lang['hr_HR']['CommentAdmin']['MENUTITLE'] = 'Komentari';
 $lang['hr_HR']['CommentAdmin']['MENUTITLE'] = 'Komentari';
 $lang['hr_HR']['CommentList.ss']['CREATEDW'] = 'Komentari se kreiraju za bilo koju od ovih akcija - Objavi, Otkaži, Podnesi';
diff --git a/lang/hu_HU.php b/lang/hu_HU.php
index 638b7450..8c062df7 100644
--- a/lang/hu_HU.php
+++ b/lang/hu_HU.php
@@ -49,7 +49,6 @@ $lang['hu_HU']['AssetTableField']['CAPTION'] = 'Címke';
 $lang['hu_HU']['AssetTableField']['CREATED'] = 'Először feltöltve';
 $lang['hu_HU']['AssetTableField']['DIM'] = 'Képméret';
 $lang['hu_HU']['AssetTableField']['DIMLIMT'] = 'A méretek korlátozása a felbukkanó ablakban';
-$lang['hu_HU']['AssetTableField']['EDITIMAGE'] = 'A kép szerkesztése';
 $lang['hu_HU']['AssetTableField']['FILENAME'] = 'Fájlnév';
 $lang['hu_HU']['AssetTableField']['GALLERYOPTIONS'] = 'Galéria beállításai';
 $lang['hu_HU']['AssetTableField']['IMAGE'] = 'Kép';
@@ -68,12 +67,6 @@ $lang['hu_HU']['AssetTableField']['SWFFILEOPTIONS'] = 'SWF fájl beállításai'
 $lang['hu_HU']['AssetTableField']['TITLE'] = 'Cím';
 $lang['hu_HU']['AssetTableField']['TYPE'] = 'Típus';
 $lang['hu_HU']['AssetTableField']['URL'] = 'URL';
-$lang['hu_HU']['CMSLeft.ss']['DELPAGE'] = 'Oldalak törlése…';
-$lang['hu_HU']['CMSLeft.ss']['DELPAGES'] = 'Kiválasztott oldalak törlése';
-$lang['hu_HU']['CMSLeft.ss']['GO'] = 'Mehet';
-$lang['hu_HU']['CMSLeft.ss']['NEWPAGE'] = 'Új oldal...';
-$lang['hu_HU']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Válaszd ki a törlendő oldalakat, majd kattints a lenti gombra.';
-$lang['hu_HU']['CMSLeft.ss']['SITECONT'] = 'Honlaptartalom';
 $lang['hu_HU']['CMSMain']['ACCESS'] = '\'%s\' elérése (%s)';
 $lang['hu_HU']['CMSMain']['ACCESSALLINTERFACES'] = 'Elérés minden CMS interfészhez';
 $lang['hu_HU']['CMSMain']['CANCEL'] = 'Mégse';
@@ -148,7 +141,6 @@ $lang['hu_HU']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Kiválasztott oldalak pub
 $lang['hu_HU']['CMSMain_left.ss']['SEARCH'] = 'Keresés';
 $lang['hu_HU']['CMSMain_left.ss']['SEARCHTITLE'] = 'Keresés az URL-ekben, a címekben, a menü címekben és a tartalmakban';
 $lang['hu_HU']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Válaszd ki a megváltoztatandó oldalakat, majd kattints egy műveletre:';
-$lang['hu_HU']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Válaszd ki az oldalakat, melyeket duplikálni szeretnél, azt hogy az aloldalait is át szeretnéd-e másolni, illetve hogy hova szeretnéd helyezni a duplikátumot.';
 $lang['hu_HU']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Csak megváltozott oldalak mutatása';
 $lang['hu_HU']['CMSMain_left.ss']['SHOWUNPUB'] = 'Nem publikált verziók megjelenítése';
 $lang['hu_HU']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Honlaptartalom és -szerkezet';
@@ -166,9 +158,6 @@ $lang['hu_HU']['CMSMain_versions.ss']['NOTPUB'] = 'Nem publikált';
 $lang['hu_HU']['CMSMain_versions.ss']['PUBR'] = 'Publikáló';
 $lang['hu_HU']['CMSMain_versions.ss']['UNKNOWN'] = 'Ismeretlen';
 $lang['hu_HU']['CMSMain_versions.ss']['WHEN'] = 'Mikor';
-$lang['hu_HU']['CMSRight.ss']['CHOOSEPAGE'] = 'Kérünk, válassz egy oldalt a bal oldali listából.';
-$lang['hu_HU']['CMSRight.ss']['ECONTENT'] = 'Tartalom szerkesztése';
-$lang['hu_HU']['CMSRight.ss']['WELCOMETO'] = 'Üdvözlünk itt:';
 $lang['hu_HU']['CommentAdmin']['ACCEPT'] = 'Jóváhagyás';
 $lang['hu_HU']['CommentAdmin']['APPROVED'] = '%s hozzászólás jóváhagyva.';
 $lang['hu_HU']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Jóváhagyott hozzászólások';
diff --git a/lang/id_ID.php b/lang/id_ID.php
index 6b8541d5..bfbcfe60 100644
--- a/lang/id_ID.php
+++ b/lang/id_ID.php
@@ -49,7 +49,6 @@ $lang['id_ID']['AssetTableField']['CAPTION'] = 'Teks bawah';
 $lang['id_ID']['AssetTableField']['CREATED'] = 'Upload pertama';
 $lang['id_ID']['AssetTableField']['DIM'] = 'Dimensi';
 $lang['id_ID']['AssetTableField']['DIMLIMT'] = 'Batasi Ukuran Pada Jendela Pop-up';
-$lang['id_ID']['AssetTableField']['EDITIMAGE'] = 'Edit gambar ini';
 $lang['id_ID']['AssetTableField']['FILENAME'] = 'Nama File';
 $lang['id_ID']['AssetTableField']['GALLERYOPTIONS'] = 'Opsi Galeri';
 $lang['id_ID']['AssetTableField']['IMAGE'] = 'Gambar';
@@ -70,12 +69,6 @@ $lang['id_ID']['AssetTableField']['SWFFILEOPTIONS'] = 'Opsi dokumen SWF';
 $lang['id_ID']['AssetTableField']['TITLE'] = 'Judul';
 $lang['id_ID']['AssetTableField']['TYPE'] = 'Tipe';
 $lang['id_ID']['AssetTableField']['URL'] = 'URL';
-$lang['id_ID']['CMSLeft.ss']['DELPAGE'] = 'Hapus Halaman...';
-$lang['id_ID']['CMSLeft.ss']['DELPAGES'] = 'Hapus halaman yang diseleksi';
-$lang['id_ID']['CMSLeft.ss']['GO'] = 'Maju';
-$lang['id_ID']['CMSLeft.ss']['NEWPAGE'] = 'Halaman Baru...';
-$lang['id_ID']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Pilih halaman yang Anda inginkan untuk dihapus dan klil tombol di bawah ini';
-$lang['id_ID']['CMSLeft.ss']['SITECONT'] = 'Konten Situs';
 $lang['id_ID']['CMSMain']['ACCESS'] = 'Akses ke %s dalam CMS';
 $lang['id_ID']['CMSMain']['CANCEL'] = 'Batalkan';
 $lang['id_ID']['CMSMain']['CHOOSEREPORT'] = '(Pilih laporan)';
@@ -149,7 +142,6 @@ $lang['id_ID']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publikasikan halaman yang
 $lang['id_ID']['CMSMain_left.ss']['SEARCH'] = 'Cari';
 $lang['id_ID']['CMSMain_left.ss']['SEARCHTITLE'] = 'Pilih sepanjang URL, Judul, Judul Menu, &amp; Konten';
 $lang['id_ID']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Pilih halaman yang Anda inginkan untuk diganti &amp; lalu klik aksi:';
-$lang['id_ID']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Pilih halaman yang anda inginkan untuk diduplikat, ';
 $lang['id_ID']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Perlihatkan hanya halaman yang telah diubah';
 $lang['id_ID']['CMSMain_left.ss']['SHOWUNPUB'] = 'Perlihatkan versi yang tidak dipublikasikan';
 $lang['id_ID']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Isi dan Struktur Situs';
@@ -167,9 +159,6 @@ $lang['id_ID']['CMSMain_versions.ss']['NOTPUB'] = 'Tidak dipublikasi';
 $lang['id_ID']['CMSMain_versions.ss']['PUBR'] = 'Penerbit';
 $lang['id_ID']['CMSMain_versions.ss']['UNKNOWN'] = 'Tidak dikenal';
 $lang['id_ID']['CMSMain_versions.ss']['WHEN'] = 'Kapan';
-$lang['id_ID']['CMSRight.ss']['CHOOSEPAGE'] = 'Harap pilih halaman dari sebelah kiri';
-$lang['id_ID']['CMSRight.ss']['ECONTENT'] = 'Edit Konten';
-$lang['id_ID']['CMSRight.ss']['WELCOMETO'] = 'Selamat datang di';
 $lang['id_ID']['CommentAdmin']['ACCEPT'] = 'Terima';
 $lang['id_ID']['CommentAdmin']['APPROVED'] = '%s komen telah diterima.';
 $lang['id_ID']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Komentar yang telah Disetujui';
diff --git a/lang/it_IT.php b/lang/it_IT.php
index 011dbf1c..e0f288e0 100644
--- a/lang/it_IT.php
+++ b/lang/it_IT.php
@@ -49,7 +49,6 @@ $lang['it_IT']['AssetTableField']['CAPTION'] = 'Didascalia';
 $lang['it_IT']['AssetTableField']['CREATED'] = 'Primo inserito';
 $lang['it_IT']['AssetTableField']['DIM'] = 'Dimensioni';
 $lang['it_IT']['AssetTableField']['DIMLIMT'] = 'Limita le dimensioni nella finestra di popup';
-$lang['it_IT']['AssetTableField']['EDITIMAGE'] = 'Modifica questa immagine';
 $lang['it_IT']['AssetTableField']['FILENAME'] = 'Nome del file';
 $lang['it_IT']['AssetTableField']['GALLERYOPTIONS'] = 'Opzioni galleria';
 $lang['it_IT']['AssetTableField']['IMAGE'] = 'Immagine';
@@ -70,12 +69,6 @@ $lang['it_IT']['AssetTableField']['SWFFILEOPTIONS'] = 'Opzioni file SWF';
 $lang['it_IT']['AssetTableField']['TITLE'] = 'Titolo';
 $lang['it_IT']['AssetTableField']['TYPE'] = 'Tipo';
 $lang['it_IT']['AssetTableField']['URL'] = 'URL';
-$lang['it_IT']['CMSLeft.ss']['DELPAGE'] = 'Cancella pagine...';
-$lang['it_IT']['CMSLeft.ss']['DELPAGES'] = 'Cancella le pagine selezionate';
-$lang['it_IT']['CMSLeft.ss']['GO'] = 'Vai';
-$lang['it_IT']['CMSLeft.ss']['NEWPAGE'] = 'Nuova pagina...';
-$lang['it_IT']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Seleziona le pagine che vuoi cancellare e clicca il bottone di seguito';
-$lang['it_IT']['CMSLeft.ss']['SITECONT'] = 'Contenuto del sito';
 $lang['it_IT']['CMSMain']['ACCESS'] = 'Accedi a %s nel CMS';
 $lang['it_IT']['CMSMain']['ACCESSALLINTERFACES'] = 'Accesso a tutte le interfaccia CMS';
 $lang['it_IT']['CMSMain']['CANCEL'] = 'Cancella';
@@ -150,7 +143,6 @@ $lang['it_IT']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Pubblica le pagine selezi
 $lang['it_IT']['CMSMain_left.ss']['SEARCH'] = 'Cerca';
 $lang['it_IT']['CMSMain_left.ss']['SEARCHTITLE'] = 'Cerca all\'interno degli URL, titoli, titoli dei menu e contenuti';
 $lang['it_IT']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Seleziona le pagine che vuoi cambiare &amp; clicca su una azione:';
-$lang['it_IT']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Seleziona le pagine che vuoi duplicare, se devono essere incluse le sottopagine, e dove vuoi posizionare i duplicati';
 $lang['it_IT']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Visualizza solamente le pagine cambiate';
 $lang['it_IT']['CMSMain_left.ss']['SHOWUNPUB'] = 'Visulizza le versioni non pubblicate';
 $lang['it_IT']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Contenuto del sito e struttura';
@@ -168,9 +160,6 @@ $lang['it_IT']['CMSMain_versions.ss']['NOTPUB'] = 'Non pubblicato';
 $lang['it_IT']['CMSMain_versions.ss']['PUBR'] = 'Editore';
 $lang['it_IT']['CMSMain_versions.ss']['UNKNOWN'] = 'Sconosciuto';
 $lang['it_IT']['CMSMain_versions.ss']['WHEN'] = 'Quando';
-$lang['it_IT']['CMSRight.ss']['CHOOSEPAGE'] = 'Per favore scegli una pagina sulla sinistra.';
-$lang['it_IT']['CMSRight.ss']['ECONTENT'] = 'Modifica contenuto';
-$lang['it_IT']['CMSRight.ss']['WELCOMETO'] = 'Benvenuto su';
 $lang['it_IT']['CommentAdmin']['ACCEPT'] = 'Accetta';
 $lang['it_IT']['CommentAdmin']['APPROVED'] = 'Accettati %s commenti.';
 $lang['it_IT']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Commenti approvati';
@@ -292,6 +281,8 @@ $lang['it_IT']['MemberTableField']['ADDEDTOGROUP'] = 'Inserito membro al gruppo'
 $lang['it_IT']['MemberTableField']['ADDINGFIELD'] = 'Inserimento non riuscito';
 $lang['it_IT']['MemberTableField']['ANYGROUP'] = 'Qualsiasi gruppo';
 $lang['it_IT']['MemberTableField']['ASC'] = 'Ascendente';
+$lang['it_IT']['MemberTableField']['DeleteTitleText'] = 'Cancella da questo gruppo';
+$lang['it_IT']['MemberTableField']['DeleteTitleTextDatabase'] = 'Cancella dal database e da tutti i gruppi';
 $lang['it_IT']['MemberTableField']['DESC'] = 'Discendente';
 $lang['it_IT']['MemberTableField']['EMAIL'] = 'Email';
 $lang['it_IT']['MemberTableField']['FILTER'] = 'Filtro';
@@ -393,6 +384,7 @@ $lang['it_IT']['StaticExporter']['BASEURL'] = 'URL di base';
 $lang['it_IT']['StaticExporter']['EXPORTTO'] = 'Esporta in questa cartella';
 $lang['it_IT']['StaticExporter']['FOLDEREXPORT'] = 'Cartella dove esportare';
 $lang['it_IT']['StaticExporter']['NAME'] = 'Sistema di esportazione statico';
+$lang['it_IT']['TableListField_PageControls.ss']['DISPLAYING'] = 'Mostrando';
 $lang['it_IT']['TableListField_PageControls.ss']['OF'] = 'di';
 $lang['it_IT']['TableListField_PageControls.ss']['TO'] = 'a';
 $lang['it_IT']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Vedi prima';
diff --git a/lang/ja_JP.php b/lang/ja_JP.php
index 510401e1..6bf32e21 100644
--- a/lang/ja_JP.php
+++ b/lang/ja_JP.php
@@ -49,7 +49,6 @@ $lang['ja_JP']['AssetTableField']['CAPTION'] = 'キャプション';
 $lang['ja_JP']['AssetTableField']['CREATED'] = '最初のアップロード';
 $lang['ja_JP']['AssetTableField']['DIM'] = '容量';
 $lang['ja_JP']['AssetTableField']['DIMLIMT'] = 'ポップアップウインドウのサイズを制限してください。';
-$lang['ja_JP']['AssetTableField']['EDITIMAGE'] = 'この画像を編集';
 $lang['ja_JP']['AssetTableField']['FILENAME'] = 'ファイル名';
 $lang['ja_JP']['AssetTableField']['GALLERYOPTIONS'] = 'ギャラリー オプション';
 $lang['ja_JP']['AssetTableField']['IMAGE'] = '画像';
@@ -71,12 +70,6 @@ $lang['ja_JP']['AssetTableField']['TITLE'] = 'タイトル';
 $lang['ja_JP']['AssetTableField']['TYPE'] = 'タイプ';
 $lang['ja_JP']['AssetTableField']['URL'] = 'URL';
 $lang['ja_JP']['CMSBatchActions']['PUBLISHING_PAGES'] = '公開ページ';
-$lang['ja_JP']['CMSLeft.ss']['DELPAGE'] = 'ページ削除';
-$lang['ja_JP']['CMSLeft.ss']['DELPAGES'] = '選択されたページを削除します';
-$lang['ja_JP']['CMSLeft.ss']['GO'] = 'Go';
-$lang['ja_JP']['CMSLeft.ss']['NEWPAGE'] = '新しいページ';
-$lang['ja_JP']['CMSLeft.ss']['SELECTPAGESDEL'] = '削除したいページを選択し、ボタンをクリックしてください';
-$lang['ja_JP']['CMSLeft.ss']['SITECONT'] = 'サイトコンテンツ';
 $lang['ja_JP']['CMSMain']['ACCESS'] = ' %s にあるCMSにアクセスします';
 $lang['ja_JP']['CMSMain']['ACCESSALLINTERFACES'] = 'すべてのCMSインターフェースにアクセス';
 $lang['ja_JP']['CMSMain']['CANCEL'] = 'キャンセル';
@@ -151,7 +144,6 @@ $lang['ja_JP']['CMSMain_left.ss']['PUBLISHCONFIRM'] = '選択されたページ
 $lang['ja_JP']['CMSMain_left.ss']['SEARCH'] = '検索';
 $lang['ja_JP']['CMSMain_left.ss']['SEARCHTITLE'] = 'URLの検索, タイトル, メインタイトル, &amp; 内容';
 $lang['ja_JP']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = '変更したいページを選んで &amp; クリックしてください:';
-$lang['ja_JP']['CMSMain_left.ss']['SELECTPAGESDUP'] = '複製したいページを選んで, 子供が含まれるべきかどうか, あと、どの部分を複製したいか';
 $lang['ja_JP']['CMSMain_left.ss']['SHOWONLYCHANGED'] = '変更されたページのみ閲覧';
 $lang['ja_JP']['CMSMain_left.ss']['SHOWUNPUB'] = '非公開のものを表示';
 $lang['ja_JP']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'サイト内容と構造';
@@ -169,9 +161,6 @@ $lang['ja_JP']['CMSMain_versions.ss']['NOTPUB'] = '非公開';
 $lang['ja_JP']['CMSMain_versions.ss']['PUBR'] = '投稿者';
 $lang['ja_JP']['CMSMain_versions.ss']['UNKNOWN'] = '不明';
 $lang['ja_JP']['CMSMain_versions.ss']['WHEN'] = 'いつ';
-$lang['ja_JP']['CMSRight.ss']['CHOOSEPAGE'] = '左側のメニューからページを選択してください';
-$lang['ja_JP']['CMSRight.ss']['ECONTENT'] = 'コンテンツ編集';
-$lang['ja_JP']['CMSRight.ss']['WELCOMETO'] = 'ようこそ';
 $lang['ja_JP']['CommentAdmin']['ACCEPT'] = '承認';
 $lang['ja_JP']['CommentAdmin']['APPROVED'] = ' %s のコメントを受け入れる';
 $lang['ja_JP']['CommentAdmin']['APPROVEDCOMMENTS'] = '承認されたコメント';
@@ -293,6 +282,7 @@ $lang['ja_JP']['MemberTableField']['ADDEDTOGROUP'] = 'グループにメンバ
 $lang['ja_JP']['MemberTableField']['ADDINGFIELD'] = '領域を追加しています';
 $lang['ja_JP']['MemberTableField']['ANYGROUP'] = 'いずれかのグループ';
 $lang['ja_JP']['MemberTableField']['ASC'] = '昇順';
+$lang['ja_JP']['MemberTableField']['DeleteTitleText'] = 'このグループから削除する';
 $lang['ja_JP']['MemberTableField']['DESC'] = '降順';
 $lang['ja_JP']['MemberTableField']['EMAIL'] = 'メールアドレス';
 $lang['ja_JP']['MemberTableField']['FILTER'] = 'フィルター';
@@ -388,12 +378,15 @@ $lang['ja_JP']['SecurityAdmin_right.ss']['WELCOME1'] = 'ようこそ';
 $lang['ja_JP']['SecurityAdmin_right.ss']['WELCOME2'] = 'セキュリティ管理について  左のグループから選択してください';
 $lang['ja_JP']['SideReport']['EMPTYPAGES'] = 'ページがありません';
 $lang['ja_JP']['SideReport']['LAST2WEEKS'] = '2週間以内の変更ページ';
+$lang['ja_JP']['SideReport']['OtherGroupTitle'] = 'その他';
 $lang['ja_JP']['SideReport']['REPEMPTY'] = '%s のレポートはありません';
 $lang['ja_JP']['SideReport']['TODO'] = '編集予定';
 $lang['ja_JP']['StaticExporter']['BASEURL'] = 'ベースURL';
 $lang['ja_JP']['StaticExporter']['EXPORTTO'] = 'あのフォルダに出力してください。';
 $lang['ja_JP']['StaticExporter']['FOLDEREXPORT'] = 'エクスポート先のフォルダ';
 $lang['ja_JP']['StaticExporter']['NAME'] = '固定のエクスポート先';
+$lang['ja_JP']['TableListField.ss']['SORTASC'] = '昇順に並び替える';
+$lang['ja_JP']['TableListField.ss']['SORTDESC'] = '降順に並び替える';
 $lang['ja_JP']['TableListField_PageControls.ss']['DISPLAYING'] = '表示中';
 $lang['ja_JP']['TableListField_PageControls.ss']['OF'] = 'of';
 $lang['ja_JP']['TableListField_PageControls.ss']['TO'] = 'to';
@@ -413,6 +406,7 @@ $lang['ja_JP']['WidgetAreaEditor.ss']['AVAILABLE'] = '利用できるウィッ
 $lang['ja_JP']['WidgetAreaEditor.ss']['INUSE'] = '利用中ウィッジット';
 $lang['ja_JP']['WidgetAreaEditor.ss']['NOAVAIL'] = '現在使用できるウィジェットはありません。';
 $lang['ja_JP']['WidgetAreaEditor.ss']['TOADD'] = 'ウィジェットを加えるには、左部からここまで、ドラッグしてください。';
+$lang['ja_JP']['WidgetDescription.ss']['CLICKTOADDWIDGET'] = 'ウィジェットを追加する';
 $lang['ja_JP']['WidgetEditor.ss']['DELETE'] = '削除';
 
 ?>
\ No newline at end of file
diff --git a/lang/lc_XX.php b/lang/lc_XX.php
index 8ce49308..ddfeaffc 100644
--- a/lang/lc_XX.php
+++ b/lang/lc_XX.php
@@ -52,12 +52,6 @@ $lang['lc_XX']['AssetTableField.ss']['DELFILE'] = 'DELETE DIS FILE';
 $lang['lc_XX']['AssetTableField.ss']['DRAGTOFOLDER'] = 'DRAG 2 FOLDR ON LEFT 2 MOOV FILE';
 $lang['lc_XX']['AssetTableField']['TITLE'] = 'TITLE';
 $lang['lc_XX']['AssetTableField']['TYPE'] = 'TYPE';
-$lang['lc_XX']['CMSLeft.ss']['DELPAGE'] = 'DELETE PAGEZ...';
-$lang['lc_XX']['CMSLeft.ss']['DELPAGES'] = 'DELETE TEH SELECTED PUJZ';
-$lang['lc_XX']['CMSLeft.ss']['GO'] = 'GOGOGO!111';
-$lang['lc_XX']['CMSLeft.ss']['NEWPAGE'] = 'NEW PAEG...';
-$lang['lc_XX']['CMSLeft.ss']['SELECTPAGESDEL'] = 'SELECT TEH PAGEZ DAT U WANTS 2 DELETE N DEN CLICK TEH BUTN BELOW';
-$lang['lc_XX']['CMSLeft.ss']['SITECONT'] = 'SITE CONTENTZ';
 $lang['lc_XX']['CMSMain']['CANCEL'] = 'DUNT DO DAT!';
 $lang['lc_XX']['CMSMain']['CHOOSEREPORT'] = '(PIK REPORT)';
 $lang['lc_XX']['CMSMain']['COMPARINGV'] = 'U R COMPAERING VERSHUNZ #%d and #%d';
@@ -124,7 +118,6 @@ $lang['lc_XX']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'PUBLISH TEH SELECTD PAGEZ
 $lang['lc_XX']['CMSMain_left.ss']['SEARCH'] = 'SEARCH';
 $lang['lc_XX']['CMSMain_left.ss']['SEARCHTITLE'] = 'SEARCH THRU TEH URL, TITLE, MENU TITLE, N CONTENT';
 $lang['lc_XX']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'SELECT TEH PAGEZ DAT U WANTS 2 CHANGE N DEN CLICK AN ACSHUN:';
-$lang['lc_XX']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'SELECT TEH PAGEZ DAT U WANTS 2 DUPLICATE, WHETHR IZ CHILDREN SHUD BE INCLUDD, AN WER U WANTS TEH DUPLICATEZ PLACD';
 $lang['lc_XX']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'SHOW ONLY CHANGD PAGEZ';
 $lang['lc_XX']['CMSMain_left.ss']['SHOWUNPUB'] = 'SHOW UNPUBLISHED VERSHUNZ';
 $lang['lc_XX']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'SITE CONTENT N STRUKSHUR';
@@ -142,9 +135,6 @@ $lang['lc_XX']['CMSMain_versions.ss']['NOTPUB'] = 'NOT PUBLISHD';
 $lang['lc_XX']['CMSMain_versions.ss']['PUBR'] = 'PUBLISHR';
 $lang['lc_XX']['CMSMain_versions.ss']['UNKNOWN'] = 'UNKNOWN';
 $lang['lc_XX']['CMSMain_versions.ss']['WHEN'] = 'WHEN';
-$lang['lc_XX']['CMSRight.ss']['CHOOSEPAGE'] = 'PLZ CHOOSE PAEG FRUM TEH LEFT.';
-$lang['lc_XX']['CMSRight.ss']['ECONTENT'] = 'EDIT CONTENT';
-$lang['lc_XX']['CMSRight.ss']['WELCOMETO'] = 'WELCUM TO';
 $lang['lc_XX']['CommentAdmin']['MENUTITLE'] = 'COMMENTZ';
 $lang['lc_XX']['CommentAdmin']['MENUTITLE'] = 'CUMMENTZ';
 $lang['lc_XX']['CommentList.ss']['CREATEDW'] = 'COMMENTz R CREATD WHENEVR WAN OV TEH WERKFLOW ACSHUNS
diff --git a/lang/lt_LT.php b/lang/lt_LT.php
index 494869eb..05fed085 100644
--- a/lang/lt_LT.php
+++ b/lang/lt_LT.php
@@ -52,7 +52,6 @@ $lang['lt_LT']['AssetTableField']['CAPTION'] = 'Antraštė';
 $lang['lt_LT']['AssetTableField']['CREATED'] = 'Pirmą kartą įkelta';
 $lang['lt_LT']['AssetTableField']['DIM'] = 'Matmenys';
 $lang['lt_LT']['AssetTableField']['DIMLIMT'] = 'Riboti dydį iššokančiuose languose';
-$lang['lt_LT']['AssetTableField']['EDITIMAGE'] = 'Redaguoti šį paveikslėlį';
 $lang['lt_LT']['AssetTableField']['FILENAME'] = 'Bylos pavadinimas';
 $lang['lt_LT']['AssetTableField']['GALLERYOPTIONS'] = 'Galerijų parinktys';
 $lang['lt_LT']['AssetTableField']['IMAGE'] = 'Paveikslėlis';
@@ -82,12 +81,6 @@ $lang['lt_LT']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publikuoti';
 $lang['lt_LT']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'Nepublikuoti %d puslapiai';
 $lang['lt_LT']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'Nepublikuojami puslapiai';
 $lang['lt_LT']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'Nepublikuoti';
-$lang['lt_LT']['CMSLeft.ss']['DELPAGE'] = 'Ištrinti puslapius...';
-$lang['lt_LT']['CMSLeft.ss']['DELPAGES'] = 'Ištrinti pažymėtus puslapius';
-$lang['lt_LT']['CMSLeft.ss']['GO'] = 'Eiti';
-$lang['lt_LT']['CMSLeft.ss']['NEWPAGE'] = 'Naujas puslapis...';
-$lang['lt_LT']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Pažymėkite norimus ištrinti puslapius ir paspauskite žemiau esantį mygtuką';
-$lang['lt_LT']['CMSLeft.ss']['SITECONT'] = 'Svetainės turinys';
 $lang['lt_LT']['CMSMain']['ACCESS'] = 'Prieiga prie \'%s\' (%s)';
 $lang['lt_LT']['CMSMain']['ACCESSALLINTERFACES'] = 'Prieiga prie visų TVS sąsajų';
 $lang['lt_LT']['CMSMain']['CANCEL'] = 'Atšaukti';
@@ -167,7 +160,6 @@ $lang['lt_LT']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publikuoti pažymėtus pu
 $lang['lt_LT']['CMSMain_left.ss']['SEARCH'] = 'Paieška';
 $lang['lt_LT']['CMSMain_left.ss']['SEARCHTITLE'] = 'Ieškoti tarp URL adresų, Pavadinimų, Meniu pavadinimų, &amp; Turinys';
 $lang['lt_LT']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Pažymėkite puslapius, kuriuos norite keisti ir paspauskite veiksmą:';
-$lang['lt_LT']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Pasirinkite puslapį, kurį norite dubliuoti, nurodykite ar jo "vaikai" turėtų būti irgi kopijuojami bei į kurią vietą patalpinti dublikatą.';
 $lang['lt_LT']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Rodyti tik redaguotus puslapius';
 $lang['lt_LT']['CMSMain_left.ss']['SHOWUNPUB'] = 'Rodyti nepublikuotas versijas';
 $lang['lt_LT']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Svetainės turinys ir struktūra';
@@ -185,9 +177,6 @@ $lang['lt_LT']['CMSMain_versions.ss']['NOTPUB'] = 'Dar nepublikuota';
 $lang['lt_LT']['CMSMain_versions.ss']['PUBR'] = 'Publikavo';
 $lang['lt_LT']['CMSMain_versions.ss']['UNKNOWN'] = 'Nežinoma';
 $lang['lt_LT']['CMSMain_versions.ss']['WHEN'] = 'Kada';
-$lang['lt_LT']['CMSRight.ss']['CHOOSEPAGE'] = 'Pasirinkite puslapį iš esančių kairėje.';
-$lang['lt_LT']['CMSRight.ss']['ECONTENT'] = 'Redaguoti turinį';
-$lang['lt_LT']['CMSRight.ss']['WELCOMETO'] = 'Sveiki atvykę į';
 $lang['lt_LT']['CommentAdmin']['ACCEPT'] = 'Patvirtinti';
 $lang['lt_LT']['CommentAdmin']['APPROVED'] = 'Patvirtinta komentarų: %s.';
 $lang['lt_LT']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Patvirtinti komentarai';
diff --git a/lang/ms_MY.php b/lang/ms_MY.php
index 0ccb21b6..10e4e200 100644
--- a/lang/ms_MY.php
+++ b/lang/ms_MY.php
@@ -49,7 +49,6 @@ $lang['ms_MY']['AssetTableField']['CAPTION'] = 'Keterangan gambar';
 $lang['ms_MY']['AssetTableField']['CREATED'] = 'Dimuat naik pertama kali';
 $lang['ms_MY']['AssetTableField']['DIM'] = 'Dimensi';
 $lang['ms_MY']['AssetTableField']['DIMLIMT'] = 'Hadkan Dimensi Tetingkap Popup';
-$lang['ms_MY']['AssetTableField']['EDITIMAGE'] = 'Sunting imej ini';
 $lang['ms_MY']['AssetTableField']['FILENAME'] = 'Nama fail';
 $lang['ms_MY']['AssetTableField']['GALLERYOPTIONS'] = 'Pilihan Galeri';
 $lang['ms_MY']['AssetTableField']['IMAGE'] = 'Imej';
@@ -70,12 +69,6 @@ $lang['ms_MY']['AssetTableField']['SWFFILEOPTIONS'] = 'Pilihan-pilihan fail SWF'
 $lang['ms_MY']['AssetTableField']['TITLE'] = 'Tajuk';
 $lang['ms_MY']['AssetTableField']['TYPE'] = 'Jenis';
 $lang['ms_MY']['AssetTableField']['URL'] = 'URL';
-$lang['ms_MY']['CMSLeft.ss']['DELPAGE'] = 'Hapuskan Halaman-Halaman...';
-$lang['ms_MY']['CMSLeft.ss']['DELPAGES'] = 'Hapuskan halaman-halamn yang dipilih';
-$lang['ms_MY']['CMSLeft.ss']['GO'] = 'Teruskan';
-$lang['ms_MY']['CMSLeft.ss']['NEWPAGE'] = 'Halaman Baru...';
-$lang['ms_MY']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Pilih halaman yang ingin dihapuskan dan klik butang di bawah';
-$lang['ms_MY']['CMSLeft.ss']['SITECONT'] = 'Kandungan Laman';
 $lang['ms_MY']['CMSMain']['ACCESS'] = 'Capaian kepada %s di dalam CMS';
 $lang['ms_MY']['CMSMain']['CANCEL'] = 'Batal';
 $lang['ms_MY']['CMSMain']['CHOOSEREPORT'] = '(Pilih jenis laporan)';
@@ -149,7 +142,6 @@ $lang['ms_MY']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Terbitkan mukasurat yang
 $lang['ms_MY']['CMSMain_left.ss']['SEARCH'] = 'Carian';
 $lang['ms_MY']['CMSMain_left.ss']['SEARCHTITLE'] = 'Cari menggunakan URL, Tajuk, Tajuk Menu, &amp; Kandungan';
 $lang['ms_MY']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Pilih halaman yang anda ingin mengubah &amp; kemudian klik tindakan yang diingini:';
-$lang['ms_MY']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Pilih halaman-halaman yang ingin disalin, sama ada anak-anaknya perlu dimasukkan, dan di mana anda ingin salinan ditempatkan';
 $lang['ms_MY']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Tunjukkan mukasurat yang telah diubah sahaja';
 $lang['ms_MY']['CMSMain_left.ss']['SHOWUNPUB'] = 'Paparkan version yang belum diterbitkan';
 $lang['ms_MY']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Struktur dan Kandungan Laman';
@@ -167,9 +159,6 @@ $lang['ms_MY']['CMSMain_versions.ss']['NOTPUB'] = 'Belum diterbitkan';
 $lang['ms_MY']['CMSMain_versions.ss']['PUBR'] = 'Penerbit';
 $lang['ms_MY']['CMSMain_versions.ss']['UNKNOWN'] = 'Tidak diketahui';
 $lang['ms_MY']['CMSMain_versions.ss']['WHEN'] = 'Pada';
-$lang['ms_MY']['CMSRight.ss']['CHOOSEPAGE'] = 'Sila pilih mukasurat dari pilihan di kiri.';
-$lang['ms_MY']['CMSRight.ss']['ECONTENT'] = 'Sunting Kandungan';
-$lang['ms_MY']['CMSRight.ss']['WELCOMETO'] = 'Selamat datang ke';
 $lang['ms_MY']['CommentAdmin']['ACCEPT'] = 'Terima';
 $lang['ms_MY']['CommentAdmin']['APPROVED'] = '%s komen diluluskan';
 $lang['ms_MY']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Komen yang diluluskan';
diff --git a/lang/nb_NO.php b/lang/nb_NO.php
index 4b293f14..dfc8cac2 100644
--- a/lang/nb_NO.php
+++ b/lang/nb_NO.php
@@ -49,7 +49,6 @@ $lang['nb_NO']['AssetTableField']['CAPTION'] = 'Tittel';
 $lang['nb_NO']['AssetTableField']['CREATED'] = 'Først lastet opp';
 $lang['nb_NO']['AssetTableField']['DIM'] = 'Dimensjoner';
 $lang['nb_NO']['AssetTableField']['DIMLIMT'] = 'Begrens dimensjoner i popup-vinduet';
-$lang['nb_NO']['AssetTableField']['EDITIMAGE'] = 'Endre dette bildet';
 $lang['nb_NO']['AssetTableField']['FILENAME'] = 'Filnavn';
 $lang['nb_NO']['AssetTableField']['GALLERYOPTIONS'] = 'Alternativer for galleri';
 $lang['nb_NO']['AssetTableField']['IMAGE'] = 'Bilde';
@@ -70,12 +69,6 @@ $lang['nb_NO']['AssetTableField']['SWFFILEOPTIONS'] = 'Alternativer for SWF fil'
 $lang['nb_NO']['AssetTableField']['TITLE'] = 'Tittel';
 $lang['nb_NO']['AssetTableField']['TYPE'] = 'Type';
 $lang['nb_NO']['AssetTableField']['URL'] = 'URL';
-$lang['nb_NO']['CMSLeft.ss']['DELPAGE'] = 'Slett sidene...';
-$lang['nb_NO']['CMSLeft.ss']['DELPAGES'] = 'Slett de merkede sidene';
-$lang['nb_NO']['CMSLeft.ss']['GO'] = 'Utfør';
-$lang['nb_NO']['CMSLeft.ss']['NEWPAGE'] = 'Ny side';
-$lang['nb_NO']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Velg sidene du vil slette og klikk på knappen under';
-$lang['nb_NO']['CMSLeft.ss']['SITECONT'] = 'Nettstedets Innhold';
 $lang['nb_NO']['CMSMain']['ACCESS'] = 'Tilgang til %s i CMS';
 $lang['nb_NO']['CMSMain']['ACCESSALLINTERFACES'] = 'Tilgang til alle grensesnitt i CMS\'en';
 $lang['nb_NO']['CMSMain']['CANCEL'] = 'Avbryt';
@@ -150,7 +143,6 @@ $lang['nb_NO']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publiser de merkede siden
 $lang['nb_NO']['CMSMain_left.ss']['SEARCH'] = 'Søk';
 $lang['nb_NO']['CMSMain_left.ss']['SEARCHTITLE'] = 'Søk gjennom URL, Tiitel, Meny Tittel, &amp; Innhold';
 $lang['nb_NO']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Merk sidene du vil endre og klikk deretter på en oppgave:';
-$lang['nb_NO']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Velg de sidene du vil kopiere, om du vil at under-sidene skal inkluderes, og hvor du vil plassere kopiene.';
 $lang['nb_NO']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Vis bare redigerte sider';
 $lang['nb_NO']['CMSMain_left.ss']['SHOWUNPUB'] = 'Vis upubliserte versjoner';
 $lang['nb_NO']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Innhold og struktur for nettsted';
@@ -168,9 +160,6 @@ $lang['nb_NO']['CMSMain_versions.ss']['NOTPUB'] = 'Ikke publisert';
 $lang['nb_NO']['CMSMain_versions.ss']['PUBR'] = 'Utgiver';
 $lang['nb_NO']['CMSMain_versions.ss']['UNKNOWN'] = 'Ukjent';
 $lang['nb_NO']['CMSMain_versions.ss']['WHEN'] = 'Når';
-$lang['nb_NO']['CMSRight.ss']['CHOOSEPAGE'] = 'Venligst velg en side fra venstre kolonne';
-$lang['nb_NO']['CMSRight.ss']['ECONTENT'] = 'Endre Innhold';
-$lang['nb_NO']['CMSRight.ss']['WELCOMETO'] = 'Velkommen til';
 $lang['nb_NO']['CommentAdmin']['ACCEPT'] = 'Tillat';
 $lang['nb_NO']['CommentAdmin']['APPROVED'] = 'Godkjente %s kommentarer';
 $lang['nb_NO']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Godkjente kommentarer';
diff --git a/lang/ne_NP.php b/lang/ne_NP.php
index 06802c38..84f9a5f0 100644
--- a/lang/ne_NP.php
+++ b/lang/ne_NP.php
@@ -50,12 +50,6 @@ $lang['ne_NP']['AssetTableField.ss']['DELFILE'] = 'यो फाइल हटा
 $lang['ne_NP']['AssetTableField.ss']['DRAGTOFOLDER'] = 'फाइललाई लैजान बाँयाको फोल्डरमा लतारेर लैजानुस्';
 $lang['ne_NP']['AssetTableField']['TITLE'] = 'शिषक';
 $lang['ne_NP']['AssetTableField']['TYPE'] = 'किसिम';
-$lang['ne_NP']['CMSLeft.ss']['DELPAGE'] = 'पेजहरु फल्नुहोस्...';
-$lang['ne_NP']['CMSLeft.ss']['DELPAGES'] = 'छन्निएक पेजहरु फल्नुहोस्';
-$lang['ne_NP']['CMSLeft.ss']['GO'] = 'जानु';
-$lang['ne_NP']['CMSLeft.ss']['NEWPAGE'] = 'नयाँ पेज...';
-$lang['ne_NP']['CMSLeft.ss']['SELECTPAGESDEL'] = 'तपाईंले फल्न चाहनु भएको पेजहरु छन्नुस् र तलको बटन थिचनुहोस् ';
-$lang['ne_NP']['CMSLeft.ss']['SITECONT'] = 'साईट सामाग्री  ';
 $lang['ne_NP']['CMSMain']['CANCEL'] = 'क्यान्सिल गर्नुस्';
 $lang['ne_NP']['CMSMain']['CHOOSEREPORT'] = '(एउटा रिपोर्ट छानुस्)';
 $lang['ne_NP']['CMSMain']['COMPARINGV'] = 'तपाईं #%d र #%d बिच तुलना गर्दै हुनुहुन्छ ।';
@@ -120,7 +114,6 @@ $lang['ne_NP']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'छानिएका प
 $lang['ne_NP']['CMSMain_left.ss']['SEARCH'] = 'खोज';
 $lang['ne_NP']['CMSMain_left.ss']['SEARCHTITLE'] = 'यू.र्.ल्,शिषक,मेनु शिषक,&amp;सामाग्री ';
 $lang['ne_NP']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'तपाईंले परिवर्तन &amp; गर्न चाहनुभएको पेजहरु छान्नुस् ;अनी कुनै पनि कार्यमा थिचुनुहोस् :';
-$lang['ne_NP']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'तपाईंले दुप्लिकेट गर्न खोज्न्नु भएको पेजहरु छन्नुहोस्,हाँगाहरु हाल्ने कि नहाल्ने र कहाँ हाल्ने छन्नुहोस्';
 $lang['ne_NP']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'परिवर्तन भएका पेजहरु मात्र देखाउनुहोस् ';
 $lang['ne_NP']['CMSMain_left.ss']['SHOWUNPUB'] = 'प्रकाशित नभएका संस्करणहरु देखाउनुहोस्';
 $lang['ne_NP']['CMSMain_left.ss']['SITECONTENT TITLE'] = ' साईट सामाग्री र बनोट';
@@ -138,9 +131,6 @@ $lang['ne_NP']['CMSMain_versions.ss']['NOTPUB'] = 'प्रकाशित न
 $lang['ne_NP']['CMSMain_versions.ss']['PUBR'] = 'प्रकाशक';
 $lang['ne_NP']['CMSMain_versions.ss']['UNKNOWN'] = 'थाहा नभएको';
 $lang['ne_NP']['CMSMain_versions.ss']['WHEN'] = 'कहिले';
-$lang['ne_NP']['CMSRight.ss']['CHOOSEPAGE'] = 'कृपया बाँयाबाट एउटा पेज छन्नुहोस् ।';
-$lang['ne_NP']['CMSRight.ss']['ECONTENT'] = 'सामाग्री मिलाउनुहोस्';
-$lang['ne_NP']['CMSRight.ss']['WELCOMETO'] = 'स्वागत छ';
 $lang['ne_NP']['CommentAdmin']['MENUTITLE'] = 'प्रतिक्रियाहरु';
 $lang['ne_NP']['CommentList.ss']['CREATEDW'] = 'प्रतिक्रियाहर तब बनाइन्छ जब कुनै पनि कार्य गरिन्छ जस्तै प्रकाशन ।';
 $lang['ne_NP']['CommentList.ss']['NOCOM'] = 'यो पेजमा प्रतिक्रियाहरु छौन्न्   ';
diff --git a/lang/nl_NL.php b/lang/nl_NL.php
index ce25155c..1b765a9a 100644
--- a/lang/nl_NL.php
+++ b/lang/nl_NL.php
@@ -52,7 +52,6 @@ $lang['nl_NL']['AssetTableField']['CAPTION'] = 'Onderschrift';
 $lang['nl_NL']['AssetTableField']['CREATED'] = 'Eerste upload';
 $lang['nl_NL']['AssetTableField']['DIM'] = 'Dimensies';
 $lang['nl_NL']['AssetTableField']['DIMLIMT'] = 'Beperk de afmetingen van het Popup Window';
-$lang['nl_NL']['AssetTableField']['EDITIMAGE'] = 'Wijzig deze afbeelding';
 $lang['nl_NL']['AssetTableField']['FILENAME'] = 'Bestandsnaam';
 $lang['nl_NL']['AssetTableField']['GALLERYOPTIONS'] = 'Galerij opties';
 $lang['nl_NL']['AssetTableField']['IMAGE'] = 'Afbeelding';
@@ -82,12 +81,6 @@ $lang['nl_NL']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publiceer';
 $lang['nl_NL']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'Publicatie van %d pagina\'s ingetrokken';
 $lang['nl_NL']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'Publicatie pagina\'s intrekken';
 $lang['nl_NL']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'Publicatie intrekken';
-$lang['nl_NL']['CMSLeft.ss']['DELPAGE'] = 'Pagina verwijderen...';
-$lang['nl_NL']['CMSLeft.ss']['DELPAGES'] = 'Geselecteerde pagina\'s verwijderen';
-$lang['nl_NL']['CMSLeft.ss']['GO'] = 'Doen';
-$lang['nl_NL']['CMSLeft.ss']['NEWPAGE'] = 'Nieuwe Pagina...';
-$lang['nl_NL']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Selecteer de pagina\'s welke U wilt verwijderen en klik op de onderstaande button';
-$lang['nl_NL']['CMSLeft.ss']['SITECONT'] = 'Site Inhoud';
 $lang['nl_NL']['CMSMain']['ACCESS'] = 'Toegang tot \'%s\'';
 $lang['nl_NL']['CMSMain']['ACCESSALLINTERFACES'] = 'Toegang tot alle CMS onderdelen';
 $lang['nl_NL']['CMSMain']['CANCEL'] = 'Annuleren';
@@ -167,7 +160,6 @@ $lang['nl_NL']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Geselecteerde pagina\'s p
 $lang['nl_NL']['CMSMain_left.ss']['SEARCH'] = 'Zoeken';
 $lang['nl_NL']['CMSMain_left.ss']['SEARCHTITLE'] = 'Zoeken door URL, Titel, Menu Titel, &amp; Inhoud';
 $lang['nl_NL']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Selecteer de pagina\'s die u wilt veranderen en kies dan een actie:';
-$lang['nl_NL']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Selecteer de pagina\'s welke U wilt dupliceren, geef aan of onderliggende items ook meegenomen moeten worden en geef aan waar de duplicaten moeten geplaatst worden';
 $lang['nl_NL']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Alleen gewijzigde pagina\'s tonen';
 $lang['nl_NL']['CMSMain_left.ss']['SHOWUNPUB'] = 'Niet gepubliceerde versies laten zien';
 $lang['nl_NL']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Site Inhoud en Structuur';
@@ -185,9 +177,6 @@ $lang['nl_NL']['CMSMain_versions.ss']['NOTPUB'] = 'Niet Gepubliceerd';
 $lang['nl_NL']['CMSMain_versions.ss']['PUBR'] = 'Uitgever';
 $lang['nl_NL']['CMSMain_versions.ss']['UNKNOWN'] = 'Onbekend';
 $lang['nl_NL']['CMSMain_versions.ss']['WHEN'] = 'Wanneer';
-$lang['nl_NL']['CMSRight.ss']['CHOOSEPAGE'] = 'Kies een pagina aan de linkerkant.';
-$lang['nl_NL']['CMSRight.ss']['ECONTENT'] = 'Inhoud wijzigen';
-$lang['nl_NL']['CMSRight.ss']['WELCOMETO'] = 'Welkom bij';
 $lang['nl_NL']['CommentAdmin']['ACCEPT'] = 'Aanvaard';
 $lang['nl_NL']['CommentAdmin']['APPROVED'] = '%s reacties aanvaard.';
 $lang['nl_NL']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Goedgekeurde Reacties';
@@ -381,8 +370,8 @@ $lang['nl_NL']['PageCommentInterface.ss']['PREV'] = 'vorige';
 $lang['nl_NL']['PageCommentInterface.ss']['RSSFEEDALLCOMMENTS'] = 'RSS-feed voor alle reacties';
 $lang['nl_NL']['PageCommentInterface.ss']['RSSFEEDCOMMENTS'] = 'RSS feed van de reacties op deze pagina';
 $lang['nl_NL']['PageCommentInterface.ss']['RSSVIEWALLCOMMENTS'] = 'Alle reacties bekijken';
-$lang['nl_NL']['PageCommentInterface']['YOURCOMMENT'] = 'Reacties';
-$lang['nl_NL']['PageCommentInterface']['YOURNAME'] = 'Jouw naam';
+$lang['nl_NL']['PageCommentInterface']['YOURCOMMENT'] = 'Uw Reactie';
+$lang['nl_NL']['PageCommentInterface']['YOURNAME'] = 'Uw naam';
 $lang['nl_NL']['PageCommentInterface_Controller']['SPAMQUESTION'] = 'Anti-spam vraag: %s';
 $lang['nl_NL']['PageCommentInterface_Form']['AWAITINGMODERATION'] = 'Jouw reactie werd verzonden en wacht nu op goedkeuring.';
 $lang['nl_NL']['PageCommentInterface_Form']['MSGYOUPOSTED'] = 'De boodschap die je verstuurde was:';
diff --git a/lang/pl_PL.php b/lang/pl_PL.php
index 6a471473..446f1c91 100644
--- a/lang/pl_PL.php
+++ b/lang/pl_PL.php
@@ -39,9 +39,7 @@ $lang['pl_PL']['AssetAdmin_left.ss']['DELETE'] = 'Usuń ...';
 $lang['pl_PL']['AssetAdmin_left.ss']['DELFOLDERS'] = 'Usuń zaznaczone foldery';
 $lang['pl_PL']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Zezwól na przeciąganie elementów';
 $lang['pl_PL']['AssetAdmin_left.ss']['FOLDERS'] = 'Foldery';
-$lang['pl_PL']['AssetAdmin_left.ss']['FILESYSTEMSYNC'] = 'Rozejrzyj się za nowymi plikami';
-$lang['pl_PL']['AssetAdmin_left.ss']['FILESYSTEMSYNC_DESC'] = 'SilverStripe utrzymuje własną baze danych plików przechowywanych w katalogu assets/ . Kliknij na ten przycisk aby dodać do tej bazy danych informację o plikach dodanych do katalogu assets/ przez inne programy, jak np. FTP';
-$lang['pl_PL']['AssetAdmin_left.ss']['GO'] = 'Ok';
+$lang['pl_PL']['AssetAdmin_left.ss']['GO'] = 'Idź';
 $lang['pl_PL']['AssetAdmin_left.ss']['SELECTTODEL'] = 'Wybierz foldery, które chcesz usunąć i kliknij przycisk poniżej';
 $lang['pl_PL']['AssetAdmin_left.ss']['TOREORG'] = 'Aby zreorganizować twoje foldery, przenieś je w wybrane miejsca';
 $lang['pl_PL']['AssetAdmin_right.ss']['CHOOSEPAGE'] = 'Proszę wybrać stronę po lewej';
@@ -51,7 +49,6 @@ $lang['pl_PL']['AssetTableField']['CAPTION'] = 'Nagłówek';
 $lang['pl_PL']['AssetTableField']['CREATED'] = 'Pierwszy wgrany';
 $lang['pl_PL']['AssetTableField']['DIM'] = 'Rozmiar';
 $lang['pl_PL']['AssetTableField']['DIMLIMT'] = 'Określ Limit Wymiarów Okienka Popup';
-$lang['pl_PL']['AssetTableField']['EDITIMAGE'] = 'Edytuj ten obrazek';
 $lang['pl_PL']['AssetTableField']['FILENAME'] = 'Nazwa pliku';
 $lang['pl_PL']['AssetTableField']['GALLERYOPTIONS'] = 'Opcje Galerii';
 $lang['pl_PL']['AssetTableField']['IMAGE'] = 'Obrazek';
@@ -72,21 +69,7 @@ $lang['pl_PL']['AssetTableField']['SWFFILEOPTIONS'] = 'Opcje Pliku SWF';
 $lang['pl_PL']['AssetTableField']['TITLE'] = 'Tytuł';
 $lang['pl_PL']['AssetTableField']['TYPE'] = 'Rodzaj';
 $lang['pl_PL']['AssetTableField']['URL'] = 'URL';
-$lang['pl_PL']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = 'Usunięto %d stron z wersji roboczej serwisu, %d nieudanych usunięć';
-$lang['pl_PL']['CMSBatchActions']['DELETED_PAGES'] = 'Usunięto %d stron z opublikowanej wersji serwisu, %d nieudanych usunięć';
-$lang['pl_PL']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Usuń z wersji roboczej serwisu';
-$lang['pl_PL']['CMSBatchActions']['DELETE_PAGES'] = 'Usuń z wersji opublikowanej serwisu';
-$lang['pl_PL']['CMSBatchActions']['DELETING_DRAFT_PAGES'] = 'Usuwanie wybranych stron z wersji roboczej serwisu';
-$lang['pl_PL']['CMSBatchActions']['DELETING_PAGES'] = 'Usuwanie wybranych stron z wersji opublikowanej serwisu';
-$lang['pl_PL']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Opublikowano %d stron, %d nieudanych publikacji';
-$lang['pl_PL']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Publikowanie stron';
 $lang['pl_PL']['CMSBatchActions']['PUBLISH_PAGES'] = 'Opublikuj';
-$lang['pl_PL']['CMSLeft.ss']['DELPAGE'] = 'Usuń strony ...';
-$lang['pl_PL']['CMSLeft.ss']['DELPAGES'] = 'Usuń zaznaczone strony';
-$lang['pl_PL']['CMSLeft.ss']['GO'] = 'Idż';
-$lang['pl_PL']['CMSLeft.ss']['NEWPAGE'] = 'Nowa strona ...';
-$lang['pl_PL']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Zaznacz strony które chcesz usunąć i kliknij przycisk poniżej';
-$lang['pl_PL']['CMSLeft.ss']['SITECONT'] = 'Zawartość strony';
 $lang['pl_PL']['CMSMain']['ACCESS'] = 'Dostęp do %s w CMSie';
 $lang['pl_PL']['CMSMain']['CANCEL'] = 'Anuluj';
 $lang['pl_PL']['CMSMain']['CHOOSEREPORT'] = '(Wybierz raport)';
@@ -95,7 +78,7 @@ $lang['pl_PL']['CMSMain']['COPYPUBTOSTAGE'] = 'Naprawdę chcesz skopiować publi
 $lang['pl_PL']['CMSMain']['DELETE'] = 'Usuń ze strony roboczej';
 $lang['pl_PL']['CMSMain']['DESCREMOVED'] = 'i %s potomków';
 $lang['pl_PL']['CMSMain']['EMAIL'] = 'E-mail';
-$lang['pl_PL']['CMSMain']['GO'] = 'Ok';
+$lang['pl_PL']['CMSMain']['GO'] = 'Idź';
 $lang['pl_PL']['CMSMain']['MENUTITLE'] = 'Zawartość strony';
 $lang['pl_PL']['CMSMain']['MENUTITLE'] = 'Zawartość Strony';
 $lang['pl_PL']['CMSMain']['METADESCOPT'] = 'Opis';
@@ -141,7 +124,7 @@ $lang['pl_PL']['CMSMain_dialog.ss']['BUTTONNOTFOUND'] = 'Nie znaleziono nazwy pr
 $lang['pl_PL']['CMSMain_dialog.ss']['NOLINKED'] = 'Nie odnaleziono window.linkedObject aby wysłać sygnał przyciśnięcia przycisku z powrotem do głównego okna';
 $lang['pl_PL']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'Dodałeś do oczekujących i jeszcze nie opublikowanych stron';
 $lang['pl_PL']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Dodaj kryterium ...';
-$lang['pl_PL']['CMSMain_left.ss']['BATCHACTIONS'] = 'Wykonaj na wielu';
+$lang['pl_PL']['CMSMain_left.ss']['BATCHACTIONS'] = 'Akcja pliku';
 $lang['pl_PL']['CMSMain_left.ss']['CHANGED'] = 'zmienione';
 $lang['pl_PL']['CMSMain_left.ss']['CLOSEBOX'] = 'kliknij aby zamknąć';
 $lang['pl_PL']['CMSMain_left.ss']['COMPAREMODE'] = 'Tryb porównania (wybierz 2 poniżej)';
@@ -151,9 +134,8 @@ $lang['pl_PL']['CMSMain_left.ss']['DELETECONFIRM'] = 'Usuń zaznaczone strony';
 $lang['pl_PL']['CMSMain_left.ss']['DELETEDSTILLLIVE'] = 'Usunąłeś z oczekujących stron ale ciągle jest aktywna';
 $lang['pl_PL']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Zmieniłeś oczekującą stronę ale jeszcze nie opublikowałeś ';
 $lang['pl_PL']['CMSMain_left.ss']['EDITEDSINCE'] = 'Edytowane od';
-$lang['pl_PL']['CMSMain_left.ss']['SHOWITEMS'] = 'Pokaż:';
 $lang['pl_PL']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Zezwól na zmianę przenieś i puść ';
-$lang['pl_PL']['CMSMain_left.ss']['GO'] = 'Ok';
+$lang['pl_PL']['CMSMain_left.ss']['GO'] = 'idź';
 $lang['pl_PL']['CMSMain_left.ss']['HIDDEN'] = 'ukryte';
 $lang['pl_PL']['CMSMain_left.ss']['KEY'] = 'Klucz:';
 $lang['pl_PL']['CMSMain_left.ss']['NEW'] = 'nowy';
@@ -164,7 +146,6 @@ $lang['pl_PL']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publikuj zaznaczone stron
 $lang['pl_PL']['CMSMain_left.ss']['SEARCH'] = 'Szukaj';
 $lang['pl_PL']['CMSMain_left.ss']['SEARCHTITLE'] = 'Szukaj przez URL, Tytuł, Tytuł Menu i Zawartość';
 $lang['pl_PL']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Zaznacz strony które chcesz zmienić i kliknij polecenie: ';
-$lang['pl_PL']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Wybierz strony, które chcesz zduplikować, to, czy ich podstrony powinny zostać uwzględnione oraz gdzie chcesz umieścić duplikaty';
 $lang['pl_PL']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Pokaż tylko zmienione strony';
 $lang['pl_PL']['CMSMain_left.ss']['SHOWUNPUB'] = 'pokaż nieopublikowane wersje';
 $lang['pl_PL']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Zawartość i struktura strony';
@@ -182,13 +163,6 @@ $lang['pl_PL']['CMSMain_versions.ss']['NOTPUB'] = 'Nie opublikowany';
 $lang['pl_PL']['CMSMain_versions.ss']['PUBR'] = 'Publikujący';
 $lang['pl_PL']['CMSMain_versions.ss']['UNKNOWN'] = 'Nieznany';
 $lang['pl_PL']['CMSMain_versions.ss']['WHEN'] = 'Kiedy';
-$lang['pl_PL']['CMSSiteTreeFilter']['ALL'] = 'Wszystko';
-$lang['pl_PL']['CMSSiteTreeFilter']['DELETEDPAGES'] = 'Wszystkie strony, także te usunięte';
-$lang['pl_PL']['CMSSiteTreeFilter']['CHANGEDPAGES'] = "Strony, które uległy zmianie";
-$lang['pl_PL']['CMSSiteTreeFilter']['SEARCH'] = "Szukaj";
-$lang['pl_PL']['CMSRight.ss']['CHOOSEPAGE'] = 'Proszę wybrać stronę po lewej';
-$lang['pl_PL']['CMSRight.ss']['ECONTENT'] = 'Edytuj zawartość';
-$lang['pl_PL']['CMSRight.ss']['WELCOMETO'] = 'Witamy w';
 $lang['pl_PL']['CommentAdmin']['ACCEPT'] = 'Akceptuj';
 $lang['pl_PL']['CommentAdmin']['APPROVED'] = 'Zaakceptowano %s komentarzy.';
 $lang['pl_PL']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Zaakceptowane Komentarze';
@@ -361,7 +335,7 @@ $lang['pl_PL']['PageComment']['NeedsModeration'] = 'Wymaga Moderacji?';
 $lang['pl_PL']['PageComment']['PLURALNAME'] = 'Komentarze do strony';
 $lang['pl_PL']['PageComment']['SINGULARNAME'] = 'Komentarz do strony';
 $lang['pl_PL']['PageCommentInterface']['COMMENTERURL'] = 'Adres URL strony';
-$lang['pl_PL']['PageCommentInterface']['POST'] = 'Wystaw';
+$lang['pl_PL']['PageCommentInterface']['POST'] = 'Post';
 $lang['pl_PL']['PageCommentInterface']['SPAMQUESTION'] = 'Pytanie anty-spamowe: %s';
 $lang['pl_PL']['PageCommentInterface.ss']['COMMENTS'] = 'Komentarze';
 $lang['pl_PL']['PageCommentInterface.ss']['NEXT'] = 'następny';
@@ -398,7 +372,7 @@ $lang['pl_PL']['SecurityAdmin_left.ss']['CREATE'] = 'Stwórz';
 $lang['pl_PL']['SecurityAdmin_left.ss']['DEL'] = 'Usuń ...';
 $lang['pl_PL']['SecurityAdmin_left.ss']['DELGROUPS'] = 'Usuń zaznaczone grupy';
 $lang['pl_PL']['SecurityAdmin_left.ss']['ENABLEDRAGGING'] = 'Zezwól na przeciąganie elementów';
-$lang['pl_PL']['SecurityAdmin_left.ss']['GO'] = 'Ok';
+$lang['pl_PL']['SecurityAdmin_left.ss']['GO'] = 'Idź';
 $lang['pl_PL']['SecurityAdmin_left.ss']['SECGROUPS'] = 'Grupa bezpieczeństwa';
 $lang['pl_PL']['SecurityAdmin_left.ss']['SELECT'] = 'Zaznacz strony które chcesz usunąć i kliknij przycisk poniżej';
 $lang['pl_PL']['SecurityAdmin_left.ss']['TOREORG'] = 'Aby zmienić układ witryny, przeciągnij strony w odpowiadające Ci miejsca.';
diff --git a/lang/pt_BR.php b/lang/pt_BR.php
index 6a452b23..95eeee3d 100644
--- a/lang/pt_BR.php
+++ b/lang/pt_BR.php
@@ -49,7 +49,6 @@ $lang['pt_BR']['AssetTableField']['CAPTION'] = 'Titulo';
 $lang['pt_BR']['AssetTableField']['CREATED'] = 'Primeiro upload';
 $lang['pt_BR']['AssetTableField']['DIM'] = 'Dimensões';
 $lang['pt_BR']['AssetTableField']['DIMLIMT'] = 'Limite as dimensões de uma janela Popup';
-$lang['pt_BR']['AssetTableField']['EDITIMAGE'] = 'Editar esta imagem';
 $lang['pt_BR']['AssetTableField']['FILENAME'] = 'Nome do Arquivo';
 $lang['pt_BR']['AssetTableField']['GALLERYOPTIONS'] = 'Opções da galeria';
 $lang['pt_BR']['AssetTableField']['IMAGE'] = 'Imagem';
@@ -70,12 +69,6 @@ $lang['pt_BR']['AssetTableField']['SWFFILEOPTIONS'] = 'Opções de arquivo SWF';
 $lang['pt_BR']['AssetTableField']['TITLE'] = 'Título';
 $lang['pt_BR']['AssetTableField']['TYPE'] = 'Tipo';
 $lang['pt_BR']['AssetTableField']['URL'] = 'URL';
-$lang['pt_BR']['CMSLeft.ss']['DELPAGE'] = 'Remover Páginas...';
-$lang['pt_BR']['CMSLeft.ss']['DELPAGES'] = 'Remover as páginas selecionadas';
-$lang['pt_BR']['CMSLeft.ss']['GO'] = 'Ir';
-$lang['pt_BR']['CMSLeft.ss']['NEWPAGE'] = 'Nova Página...';
-$lang['pt_BR']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Selecione as páginas que você quer remover e clique no botão abaixo';
-$lang['pt_BR']['CMSLeft.ss']['SITECONT'] = 'Conteúdo do Site';
 $lang['pt_BR']['CMSMain']['ACCESS'] = 'Acesso a \'%s\' (%s)';
 $lang['pt_BR']['CMSMain']['ACCESSALLINTERFACES'] = 'Acessar todas as interfaces do CMS';
 $lang['pt_BR']['CMSMain']['CANCEL'] = 'Cancelar';
@@ -150,7 +143,6 @@ $lang['pt_BR']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publicar as páginas sele
 $lang['pt_BR']['CMSMain_left.ss']['SEARCH'] = 'Busca';
 $lang['pt_BR']['CMSMain_left.ss']['SEARCHTITLE'] = 'Procurar através de URL, Titúlo, Titúlo de menu, &amp; Conteúdo';
 $lang['pt_BR']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Seleccione as páginas que pretende alterar  &amp; depois clique numa acção:';
-$lang['pt_BR']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Selecione as páginas que pretende duplicar, se pretende que as paginas filho sejam incluídas, e onde quer colocar as páginas duplicadas.';
 $lang['pt_BR']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Mostrar somente páginas alteradas';
 $lang['pt_BR']['CMSMain_left.ss']['SHOWUNPUB'] = 'Exibir versões não publicadas';
 $lang['pt_BR']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Conteúdo do Site e Estrutura';
@@ -168,9 +160,6 @@ $lang['pt_BR']['CMSMain_versions.ss']['NOTPUB'] = 'Não publicado';
 $lang['pt_BR']['CMSMain_versions.ss']['PUBR'] = 'Editor';
 $lang['pt_BR']['CMSMain_versions.ss']['UNKNOWN'] = 'Desconhecido';
 $lang['pt_BR']['CMSMain_versions.ss']['WHEN'] = 'Quando';
-$lang['pt_BR']['CMSRight.ss']['CHOOSEPAGE'] = 'Por favor, escolha uma página à esquerda.';
-$lang['pt_BR']['CMSRight.ss']['ECONTENT'] = 'Alterar Conteúdo';
-$lang['pt_BR']['CMSRight.ss']['WELCOMETO'] = 'Bem vindo ao';
 $lang['pt_BR']['CommentAdmin']['ACCEPT'] = 'Aceitar';
 $lang['pt_BR']['CommentAdmin']['APPROVED'] = 'Comentários  %s Aceitos';
 $lang['pt_BR']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Comentários aprovados';
diff --git a/lang/pt_PT.php b/lang/pt_PT.php
index 9c295c6b..a814452b 100644
--- a/lang/pt_PT.php
+++ b/lang/pt_PT.php
@@ -45,7 +45,6 @@ $lang['pt_PT']['AssetAdmin_right.ss']['WELCOME'] = 'Bem vindo a';
 $lang['pt_PT']['AssetAdmin_uploadiframe.ss']['PERMFAILED'] = 'Não tem permissões para enviar ficheiros para esta pasta.';
 $lang['pt_PT']['AssetTableField']['CREATED'] = 'Criado em';
 $lang['pt_PT']['AssetTableField']['DIM'] = 'Dimensões';
-$lang['pt_PT']['AssetTableField']['EDITIMAGE'] = 'Editar Imagem';
 $lang['pt_PT']['AssetTableField']['FILENAME'] = 'Ficheiro';
 $lang['pt_PT']['AssetTableField']['IMAGE'] = 'Imagem';
 $lang['pt_PT']['AssetTableField']['LASTEDIT'] = 'Actualizado em';
@@ -57,12 +56,6 @@ $lang['pt_PT']['AssetTableField.ss']['DELFILE'] = 'Apagar este ficheiro';
 $lang['pt_PT']['AssetTableField.ss']['DRAGTOFOLDER'] = 'Arraste a pasta na esquerda para mover o ficheiro';
 $lang['pt_PT']['AssetTableField']['TITLE'] = 'Título';
 $lang['pt_PT']['AssetTableField']['TYPE'] = 'Tipo';
-$lang['pt_PT']['CMSLeft.ss']['DELPAGE'] = 'Apagar páginas...';
-$lang['pt_PT']['CMSLeft.ss']['DELPAGES'] = 'Apagar as páginas seleccionadas';
-$lang['pt_PT']['CMSLeft.ss']['GO'] = 'Ir';
-$lang['pt_PT']['CMSLeft.ss']['NEWPAGE'] = 'Nova página...';
-$lang['pt_PT']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Seleccione as páginas que deseja apagar, em seguida pressione o botão abaixo';
-$lang['pt_PT']['CMSLeft.ss']['SITECONT'] = 'Conteúdo';
 $lang['pt_PT']['CMSMain']['ACCESS'] = 'Acesso a %s (%s)';
 $lang['pt_PT']['CMSMain']['CANCEL'] = 'Cancelar';
 $lang['pt_PT']['CMSMain']['CHOOSEREPORT'] = '(Escolha Relatório)';
@@ -138,7 +131,6 @@ $lang['pt_PT']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publicar as páginas sele
 $lang['pt_PT']['CMSMain_left.ss']['SEARCH'] = 'Procurar';
 $lang['pt_PT']['CMSMain_left.ss']['SEARCHTITLE'] = 'Procurar em URL, Título, Título do Menu, e Conteúdo';
 $lang['pt_PT']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Seleccione as paginas que deseja modificar, em seguida pressione na acção:';
-$lang['pt_PT']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Seleccione as páginas que deseja duplicar, se os filhos devem ser incluídos, e, onde deseja colocar os duplicados';
 $lang['pt_PT']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Mostrar apenas páginas modificadas';
 $lang['pt_PT']['CMSMain_left.ss']['SHOWUNPUB'] = 'Mostrar versões não publicadas';
 $lang['pt_PT']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Conteúdo do Site e Estrutura';
@@ -156,9 +148,6 @@ $lang['pt_PT']['CMSMain_versions.ss']['NOTPUB'] = 'Não publicado';
 $lang['pt_PT']['CMSMain_versions.ss']['PUBR'] = 'Públicado por';
 $lang['pt_PT']['CMSMain_versions.ss']['UNKNOWN'] = 'Desconhecido';
 $lang['pt_PT']['CMSMain_versions.ss']['WHEN'] = 'Quando';
-$lang['pt_PT']['CMSRight.ss']['CHOOSEPAGE'] = 'Por favor escolha uma página na esquerda.';
-$lang['pt_PT']['CMSRight.ss']['ECONTENT'] = 'Editar Conteúdo';
-$lang['pt_PT']['CMSRight.ss']['WELCOMETO'] = 'Bem vindo a';
 $lang['pt_PT']['CommentAdmin']['ACCEPT'] = 'Aceitar';
 $lang['pt_PT']['CommentAdmin']['APPROVED'] = '%s comentários aceites.';
 $lang['pt_PT']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Comentários Aprovados';
diff --git a/lang/ru_RU.php b/lang/ru_RU.php
index 538b91a7..aebf4916 100644
--- a/lang/ru_RU.php
+++ b/lang/ru_RU.php
@@ -49,7 +49,6 @@ $lang['ru_RU']['AssetTableField']['CAPTION'] = 'Заголовок';
 $lang['ru_RU']['AssetTableField']['CREATED'] = 'Первая загрузка';
 $lang['ru_RU']['AssetTableField']['DIM'] = 'Размеры';
 $lang['ru_RU']['AssetTableField']['DIMLIMT'] = 'Задать размеры всплывающего окна';
-$lang['ru_RU']['AssetTableField']['EDITIMAGE'] = 'Редактировать изображ.';
 $lang['ru_RU']['AssetTableField']['FILENAME'] = 'Имя файла';
 $lang['ru_RU']['AssetTableField']['GALLERYOPTIONS'] = 'Настройки галереи';
 $lang['ru_RU']['AssetTableField']['IMAGE'] = 'Изображение';
@@ -70,12 +69,6 @@ $lang['ru_RU']['AssetTableField']['SWFFILEOPTIONS'] = 'Настройки фай
 $lang['ru_RU']['AssetTableField']['TITLE'] = 'Название';
 $lang['ru_RU']['AssetTableField']['TYPE'] = 'Тип';
 $lang['ru_RU']['AssetTableField']['URL'] = 'URL';
-$lang['ru_RU']['CMSLeft.ss']['DELPAGE'] = 'Удалить страницы...';
-$lang['ru_RU']['CMSLeft.ss']['DELPAGES'] = 'Удалить выбранные страницы';
-$lang['ru_RU']['CMSLeft.ss']['GO'] = 'Перейти';
-$lang['ru_RU']['CMSLeft.ss']['NEWPAGE'] = 'Новая страница...';
-$lang['ru_RU']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Выберите страницы, которые Вы хотите удалить, и нажмите кнопку внизу';
-$lang['ru_RU']['CMSLeft.ss']['SITECONT'] = 'Содержимое сайта';
 $lang['ru_RU']['CMSMain']['ACCESS'] = 'Доступ к %s в Системе';
 $lang['ru_RU']['CMSMain']['ACCESSALLINTERFACES'] = 'Доступ ко всему интерфейсу CMS';
 $lang['ru_RU']['CMSMain']['CANCEL'] = 'Отмена';
@@ -150,7 +143,7 @@ $lang['ru_RU']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Опубликовать
 $lang['ru_RU']['CMSMain_left.ss']['SEARCH'] = 'Найти';
 $lang['ru_RU']['CMSMain_left.ss']['SEARCHTITLE'] = 'Поиск по URL, названию, пункту в меню и содержимому';
 $lang['ru_RU']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Выберите страницы для изменения и затем выберите действие:';
-$lang['ru_RU']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Выберите страницы, которые Вы хотите дублировать, нужно ли включать их дочерние страницы, а также, куда поместить дубликаты';
+$lang['ru_RU']['CMSMain_left.ss']['SHOWITEMS'] = 'Показать:';
 $lang['ru_RU']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Показать только измененные страницы';
 $lang['ru_RU']['CMSMain_left.ss']['SHOWUNPUB'] = 'Показать неопубликованные';
 $lang['ru_RU']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Содержимое и Структура сайта';
@@ -168,9 +161,7 @@ $lang['ru_RU']['CMSMain_versions.ss']['NOTPUB'] = 'Не опубликовано
 $lang['ru_RU']['CMSMain_versions.ss']['PUBR'] = 'Публикация';
 $lang['ru_RU']['CMSMain_versions.ss']['UNKNOWN'] = 'Неизвестный';
 $lang['ru_RU']['CMSMain_versions.ss']['WHEN'] = 'Когда';
-$lang['ru_RU']['CMSRight.ss']['CHOOSEPAGE'] = 'Пожалуйста, выберите слева страницу.';
-$lang['ru_RU']['CMSRight.ss']['ECONTENT'] = 'Редактировать';
-$lang['ru_RU']['CMSRight.ss']['WELCOMETO'] = 'Добро пожаловать в';
+$lang['ru_RU']['CMSSiteTreeFilter']['ALL'] = 'Все элементы';
 $lang['ru_RU']['CommentAdmin']['ACCEPT'] = 'Принять';
 $lang['ru_RU']['CommentAdmin']['APPROVED'] = 'Принято %s комментариев. ';
 $lang['ru_RU']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Одобренные комментарии';
diff --git a/lang/si_LK.php b/lang/si_LK.php
index c4d9266c..7c1d7538 100644
--- a/lang/si_LK.php
+++ b/lang/si_LK.php
@@ -45,7 +45,6 @@ $lang['si_LK']['AssetAdmin_uploadiframe.ss']['PERMFAILED'] = 'මෙම ගො
 $lang['si_LK']['AssetTableField']['CREATED'] = 'පලමු ලිපිය අප්ලෝඩ් කරන ලදී';
 $lang['si_LK']['AssetTableField']['DIM'] = 'මාන';
 $lang['si_LK']['AssetTableField']['DIMLIMT'] = 'Popup Windowට අදාල මාන සීමා කරන්න';
-$lang['si_LK']['AssetTableField']['EDITIMAGE'] = 'මෙම පින්තූරය සකසන්න';
 $lang['si_LK']['AssetTableField']['FILENAME'] = 'ලිපි නම';
 $lang['si_LK']['AssetTableField']['GALLERYOPTIONS'] = 'ගැලරි තේරීම්';
 $lang['si_LK']['AssetTableField']['IMAGE'] = 'පින්තූරය';
@@ -63,12 +62,6 @@ $lang['si_LK']['AssetTableField.ss']['DRAGTOFOLDER'] = 'ලිපිය චල
 $lang['si_LK']['AssetTableField']['TITLE'] = 'මතකව';
 $lang['si_LK']['AssetTableField']['TYPE'] = 'වර්ගය';
 $lang['si_LK']['AssetTableField']['URL'] = 'URL';
-$lang['si_LK']['CMSLeft.ss']['DELPAGE'] = 'පිටු මකන්න';
-$lang['si_LK']['CMSLeft.ss']['DELPAGES'] = 'තෝරාගත් පිටු මකන්න';
-$lang['si_LK']['CMSLeft.ss']['GO'] = 'යන්න';
-$lang['si_LK']['CMSLeft.ss']['NEWPAGE'] = 'අලුත් පිටුවක්';
-$lang['si_LK']['CMSLeft.ss']['SELECTPAGESDEL'] = 'මකන්න අවශය පිටු තෝරා බොත්තම ඹබන්න';
-$lang['si_LK']['CMSLeft.ss']['SITECONT'] = 'අඩවි අන්තර්ගතය';
 $lang['si_LK']['CMSMain']['CANCEL'] = 'අවලoගු කරනවා';
 $lang['si_LK']['CMSMain']['CHOOSEREPORT'] = '(වාර්තාවක් තෝරන්න)';
 $lang['si_LK']['CMSMain']['COMPARINGV'] = 'ඹබ #%d හා #%d සංස්කරන සසදයි';
@@ -136,7 +129,6 @@ $lang['si_LK']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'තෝරාගත් ප
 $lang['si_LK']['CMSMain_left.ss']['SEARCH'] = 'සොයන්න';
 $lang['si_LK']['CMSMain_left.ss']['SEARCHTITLE'] = 'URL, මාතෘකා, මෙනුව, මාතෘකා හා අන්තර්ගතය තුල සොයන්න';
 $lang['si_LK']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'වෙනස් කිරීමට අවශය පිටු තෝරා අදාල බොත්තම ඹබන්න';
-$lang['si_LK']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'ද්වීකරනය කිරීමට අවශය පිටු තෝරන්න, ඵ්වායේ ශාකා අවශයයද යන වග, හා ඵ්වා තැබිය යුතු ස්තානය';
 $lang['si_LK']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'වෙනස් පිටු පමනක් පෙන්වන්න';
 $lang['si_LK']['CMSMain_left.ss']['SHOWUNPUB'] = 'ප්‍රකාශයට පත් නොකරන ලද සංස්කරන';
 $lang['si_LK']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'වෙබ අඩවි අන්තර්ගතය සහ සැකසුම';
@@ -154,9 +146,6 @@ $lang['si_LK']['CMSMain_versions.ss']['NOTPUB'] = 'ප්‍රකාශ නො
 $lang['si_LK']['CMSMain_versions.ss']['PUBR'] = 'ප්‍රකාශකයා';
 $lang['si_LK']['CMSMain_versions.ss']['UNKNOWN'] = 'නොදනී ';
 $lang['si_LK']['CMSMain_versions.ss']['WHEN'] = 'කවදාද';
-$lang['si_LK']['CMSRight.ss']['CHOOSEPAGE'] = 'වමෙන් පිටුවක් තෝරනන';
-$lang['si_LK']['CMSRight.ss']['ECONTENT'] = 'අන්ර්ගතය සකසන්න';
-$lang['si_LK']['CMSRight.ss']['WELCOMETO'] = 'ආයුබෝවන්';
 $lang['si_LK']['CommentAdmin']['ACCEPT'] = 'පිලිගැනීම';
 $lang['si_LK']['CommentAdmin']['APPROVED'] = '%s විචාර පිලිගන්න';
 $lang['si_LK']['CommentAdmin']['AUTHOR'] = 'කතෘ';
diff --git a/lang/sk_SK.php b/lang/sk_SK.php
index 839fce13..e885c123 100644
--- a/lang/sk_SK.php
+++ b/lang/sk_SK.php
@@ -16,23 +16,31 @@ if(array_key_exists('sk_SK', $lang) && is_array($lang['sk_SK'])) {
 	$lang['sk_SK'] = $lang['en_US'];
 }
 
+$lang['sk_SK']['']['CHOOSEPAGE'] = 'Prosím zvolte položku vľavo.';
 $lang['sk_SK']['AssetAdmin']['CHOOSEFILE'] = 'Vybrať súbor';
 $lang['sk_SK']['AssetAdmin']['DELETEDX'] = 'Odstránených %s súborov.%s';
 $lang['sk_SK']['AssetAdmin']['FILESREADY'] = 'Súbory pripravené na nahranie:';
+$lang['sk_SK']['AssetAdmin']['FOLDERDELETED'] = 'Adresár zmazaný';
+$lang['sk_SK']['AssetAdmin']['FOLDERSDELETED'] = 'Adresáre zmazané';
 $lang['sk_SK']['AssetAdmin']['MENUTITLE'] = 'Súbory a obrázky';
 $lang['sk_SK']['AssetAdmin']['MENUTITLE'] = 'Súbory a obrázky';
 $lang['sk_SK']['AssetAdmin']['MOVEDX'] = 'Presunuté %s súbory';
 $lang['sk_SK']['AssetAdmin']['NEWFOLDER'] = 'Nový Adresár';
+$lang['sk_SK']['AssetAdmin']['NOTEMP'] = 'Neexistuje žiaden dočasný adresár pre nahrávanie dát. Prosím nastavte upload_tmp_dir v php.ini.';
 $lang['sk_SK']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Žiadne súbory na nahranie';
 $lang['sk_SK']['AssetAdmin']['NOWBROKEN'] = 'Tieto stránky majú momentálne nefunkčné odkazy:';
+$lang['sk_SK']['AssetAdmin']['NOWBROKEN2'] = 'Vlastníkom bol zaslaný email a opravia dané stranky';
 $lang['sk_SK']['AssetAdmin']['SAVEDFILE'] = 'Súbor uložený %s';
 $lang['sk_SK']['AssetAdmin']['SAVEFOLDERNAME'] = 'Uložiť meno adresára';
+$lang['sk_SK']['AssetAdmin']['THUMBSDELETED'] = '%s nepouživané thumbnaily boli vymazané';
 $lang['sk_SK']['AssetAdmin']['UPLOAD'] = 'Nahrať nižšie vypísané súbory';
 $lang['sk_SK']['AssetAdmin']['UPLOADEDX'] = 'Nahraných %s súborov';
 $lang['sk_SK']['AssetAdmin_left.ss']['CREATE'] = 'Vytvoriť';
 $lang['sk_SK']['AssetAdmin_left.ss']['DELETE'] = 'Vymazať';
 $lang['sk_SK']['AssetAdmin_left.ss']['DELFOLDERS'] = 'Vymazať vybrané adresáre';
 $lang['sk_SK']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Povoliť jednoduché organizovanie pretiahnutím';
+$lang['sk_SK']['AssetAdmin_left.ss']['FILESYSTEMSYNC'] = 'Vyhľadať nové súbory';
+$lang['sk_SK']['AssetAdmin_left.ss']['FILESYSTEMSYNC_DESC'] = 'SilverStripe udržuje vlastnú databázu súborov a obrázkov, uložených v assets/ adresáry. Stlačte toto tlačitko pre aktualizáciu tejto databázy, pokiaľ sú súbory pridávané mimo SilverStripe rozhranie, napríklad pokiaľ boli nahraté cez FTP.';
 $lang['sk_SK']['AssetAdmin_left.ss']['FOLDERS'] = 'Adresáre';
 $lang['sk_SK']['AssetAdmin_left.ss']['GO'] = 'Vykonať';
 $lang['sk_SK']['AssetAdmin_left.ss']['SELECTTODEL'] = 'Vyberte adresáre, ktoré chcete vymazať a kliknite na tlačidlo nižšie';
@@ -40,13 +48,17 @@ $lang['sk_SK']['AssetAdmin_left.ss']['TOREORG'] = 'Pretiahnutím si adresáre zo
 $lang['sk_SK']['AssetAdmin_right.ss']['CHOOSEPAGE'] = 'Prosím vyberte stránku zľava.';
 $lang['sk_SK']['AssetAdmin_right.ss']['WELCOME'] = 'Vitajte v';
 $lang['sk_SK']['AssetAdmin_uploadiframe.ss']['PERMFAILED'] = 'Nemáte oprávnenie nahrávať súbory do tohto adresára.';
+$lang['sk_SK']['AssetAdmin_uploadiframe.ss']['TITLE'] = 'Iframe pre nahrávanie obrázkov';
+$lang['sk_SK']['AssetTableField']['CAPTION'] = 'Nadpis';
 $lang['sk_SK']['AssetTableField']['CREATED'] = 'Prvýkrát nahrané';
 $lang['sk_SK']['AssetTableField']['DIM'] = 'Rozmery';
-$lang['sk_SK']['AssetTableField']['EDITIMAGE'] = 'Upraviť obrázok';
+$lang['sk_SK']['AssetTableField']['DIMLIMT'] = 'Limitovať rozmery v prekrývaciom okne';
 $lang['sk_SK']['AssetTableField']['FILENAME'] = 'Názov';
 $lang['sk_SK']['AssetTableField']['GALLERYOPTIONS'] = 'Nastavenia galérie';
 $lang['sk_SK']['AssetTableField']['IMAGE'] = 'Obrázok';
+$lang['sk_SK']['AssetTableField']['ISFLASH'] = 'je flash dokument';
 $lang['sk_SK']['AssetTableField']['LASTEDIT'] = 'Posledne zmenené';
+$lang['sk_SK']['AssetTableField']['MAIN'] = 'Hlavné';
 $lang['sk_SK']['AssetTableField']['NOLINKS'] = 'Na tento súbor nevedie odkaz zo žiadnej stránky';
 $lang['sk_SK']['AssetTableField']['OWNER'] = 'Vlastník';
 $lang['sk_SK']['AssetTableField']['PAGESLINKING'] = 'Nasledujúce stránky odkazujú na tento súbor:';
@@ -55,23 +67,56 @@ $lang['sk_SK']['AssetTableField']['POPUPWIDTH'] = 'Šírka popup okna';
 $lang['sk_SK']['AssetTableField']['SIZE'] = 'Veľkosť';
 $lang['sk_SK']['AssetTableField.ss']['DELFILE'] = 'Vymazať tento súbor';
 $lang['sk_SK']['AssetTableField.ss']['DRAGTOFOLDER'] = 'Súbor presuniete pretiahnutím do adresára vľavo';
+$lang['sk_SK']['AssetTableField.ss']['EDIT'] = 'Upraviť položku';
+$lang['sk_SK']['AssetTableField.ss']['SHOW'] = 'Zobraz položku';
+$lang['sk_SK']['AssetTableField']['SWFFILEOPTIONS'] = 'Možnosti SWF súboru';
 $lang['sk_SK']['AssetTableField']['TITLE'] = 'Titulok';
 $lang['sk_SK']['AssetTableField']['TYPE'] = 'Typ';
 $lang['sk_SK']['AssetTableField']['URL'] = 'URL';
-$lang['sk_SK']['CMSLeft.ss']['DELPAGE'] = 'Vymazať stránky...';
-$lang['sk_SK']['CMSLeft.ss']['DELPAGES'] = 'Vymazať vybrané stránky';
-$lang['sk_SK']['CMSLeft.ss']['GO'] = 'Vykonať';
-$lang['sk_SK']['CMSLeft.ss']['NEWPAGE'] = 'Nová stránka';
-$lang['sk_SK']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Vyberte stránky, ktoré chcete vymazať a kliknite na tlačidlo nižšie';
-$lang['sk_SK']['CMSLeft.ss']['SITECONT'] = 'Obsah webu';
+$lang['sk_SK']['BrokenLinksReport']['BROKENLINKS'] = 'Správa o nefunkčných odkazoch';
+$lang['sk_SK']['BrokenLinksReport']['CheckSiteDropdownDraft'] = 'Navrhový web';
+$lang['sk_SK']['BrokenLinksReport']['CheckSiteDropdownPublished'] = 'Publikovaný web';
+$lang['sk_SK']['BrokenLinksReport']['ColumnDateLastModified'] = 'Dátum poslednej úpravy';
+$lang['sk_SK']['BrokenLinksReport']['ColumnDateLastPublished'] = 'Dátum poslednej publikácie';
+$lang['sk_SK']['BrokenLinksReport']['ColumnProblemType'] = 'Problémový typ';
+$lang['sk_SK']['BrokenLinksReport']['ColumnURL'] = 'URL';
+$lang['sk_SK']['BrokenLinksReport']['HasBrokenFile'] = 'obsahuje porušený súbor';
+$lang['sk_SK']['BrokenLinksReport']['HasBrokenLink'] = 'obsahuje porušený odkaz';
+$lang['sk_SK']['BrokenLinksReport']['HasBrokenLinkAndFile'] = 'obsahuje porušený odkaz a súbor';
+$lang['sk_SK']['BrokenLinksReport']['HoverTitleEditPage'] = 'Upraviť stránku';
+$lang['sk_SK']['BrokenLinksReport']['ReasonDropdown'] = 'Problem pri skontrolovaní';
+$lang['sk_SK']['BrokenLinksReport']['ReasonDropdownBROKENFILE'] = 'Porušnený súbor';
+$lang['sk_SK']['BrokenLinksReport']['ReasonDropdownBROKENLINK'] = 'Porušnený odkaz';
+$lang['sk_SK']['BrokenLinksReport']['ReasonDropdownRPBROKENLINK'] = 'Presmerovávacia stránka odkazuje na ne-existujúcu stránku';
+$lang['sk_SK']['BrokenLinksReport']['ReasonDropdownVPBROKENLINK'] = 'Virtuálna stránka odkazuje na ne-existujúcu stránku';
+$lang['sk_SK']['BrokenLinksReport']['RedirectorNonExistent'] = 'presmerovávacia stránka odkazuje na ne-existujúcu stránku';
+$lang['sk_SK']['BrokenLinksReport']['VirtualPageNonExistent'] = 'virtuálna stránka odkazuje na ne-existujúcu stránku';
+$lang['sk_SK']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = 'Vymazané %d stránky z návhrového webu, %d zlyhaní';
+$lang['sk_SK']['CMSBatchActions']['DELETED_PAGES'] = 'Vymazaných %d stránok z publikovaného webu, %d zlyhaní';
+$lang['sk_SK']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Vymazať z návhrového webu';
+$lang['sk_SK']['CMSBatchActions']['DELETE_PAGES'] = 'Vymazať z publikovaného webu';
+$lang['sk_SK']['CMSBatchActions']['DELETING_DRAFT_PAGES'] = 'Vymazávm označné stránky z návhrového webu';
+$lang['sk_SK']['CMSBatchActions']['DELETING_PAGES'] = 'Vymazať označené stránky z publikovaného webu';
+$lang['sk_SK']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Publikovaných %d stránok, %d zlyhaní';
+$lang['sk_SK']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Publikované stránky';
+$lang['sk_SK']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publikovať';
+$lang['sk_SK']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'Od-publikované %d stranky';
+$lang['sk_SK']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'Od-publikovávam stranky';
+$lang['sk_SK']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'Od-publikovať';
+$lang['sk_SK']['CMSMain']['ACCESS'] = 'Prístup do \'%s\' sekcie';
+$lang['sk_SK']['CMSMain']['ACCESSALLINTERFACES'] = 'Prebije bližsie špecifikované prúistupové nastavenia.';
+$lang['sk_SK']['CMSMain']['ACCESS_HELP'] = 'Povoliť prezeranie sekcie obshujúcej štruktúru a obsah webu. Právomoci na prezeranie a úpravu môžu byť nastavené cez menu pre samostanú stránku tak isto ako jednotlivé právomoci pre obsah.';
 $lang['sk_SK']['CMSMain']['CANCEL'] = 'Zrušiť';
 $lang['sk_SK']['CMSMain']['CHOOSEREPORT'] = '(Vyberte správu)';
 $lang['sk_SK']['CMSMain']['COMPARINGV'] = 'Porovnávate verzie #%d a #%d';
 $lang['sk_SK']['CMSMain']['COPYPUBTOSTAGE'] = 'Naozaj chcete skopírovať publikovaný obsah do úschovne?';
+$lang['sk_SK']['CMSMain']['DELETE'] = 'Vymazať návrhový web';
+$lang['sk_SK']['CMSMain']['DESCREMOVED'] = 'a %s nasledníkov';
 $lang['sk_SK']['CMSMain']['EMAIL'] = 'Pošli e-mailom';
 $lang['sk_SK']['CMSMain']['GO'] = 'Vykonať';
 $lang['sk_SK']['CMSMain']['MENUTITLE'] = 'Obsah webu';
 $lang['sk_SK']['CMSMain']['MENUTITLE'] = 'Obsah webu';
+$lang['sk_SK']['CMSMain']['MENUTITLEOPT'] = 'Navigačné meno';
 $lang['sk_SK']['CMSMain']['METADESCOPT'] = 'Popis';
 $lang['sk_SK']['CMSMain']['METAKEYWORDSOPT'] = 'Kľúčové slová';
 $lang['sk_SK']['CMSMain']['NEW'] = 'Nový';
@@ -92,8 +137,10 @@ $lang['sk_SK']['CMSMain']['PUBALLCONFIRM'] = 'Publikovať všetky stránky z ús
 $lang['sk_SK']['CMSMain']['PUBALLFUN'] = 'Funkcia "Publikovať všetko"';
 $lang['sk_SK']['CMSMain']['PUBALLFUN2'] = 'Stlačením tohto tlačidla vykonáte to isté ako keby ste navštívili každú stránku a stlačili "publikuj". Je určené na použite po rozsiahlych zmenách obsahu, napríklad keď bol web prvýkrát vytvorený.';
 $lang['sk_SK']['CMSMain']['PUBPAGES'] = 'Dokončené: Publikovaných %d stránok';
+$lang['sk_SK']['CMSMain']['REMOVED'] = 'Vymazané \'%s\'%s z publikovaného webu';
 $lang['sk_SK']['CMSMain']['REMOVEDFD'] = 'Vymazané z rozpísaných článkov';
 $lang['sk_SK']['CMSMain']['REMOVEDPAGE'] = 'Odstránené \'%s\' z publikovaného webu';
+$lang['sk_SK']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Odstránené \'%s\' z návrhového webu';
 $lang['sk_SK']['CMSMain']['REPORT'] = 'Report';
 $lang['sk_SK']['CMSMain']['RESTORED'] = 'Obnovenie %s úspešné';
 $lang['sk_SK']['CMSMain']['ROLLBACK'] = 'Návrat späť na túto verziu';
@@ -102,6 +149,7 @@ $lang['sk_SK']['CMSMain']['ROLLEDBACKVERSION'] = 'Vrátené späť na verziu: #%
 $lang['sk_SK']['CMSMain']['SAVE'] = 'Uložiť';
 $lang['sk_SK']['CMSMain']['SENTTO'] = 'Odoslať osobe %s %s na schválenie';
 $lang['sk_SK']['CMSMain']['STATUSOPT'] = 'Stav';
+$lang['sk_SK']['CMSMain']['TITLEOPT'] = 'Názov';
 $lang['sk_SK']['CMSMain']['TOTALPAGES'] = 'Celkovo stránok:';
 $lang['sk_SK']['CMSMain']['VERSIONSNOPAGE'] = 'Nemôžem nájsť stránku #%d';
 $lang['sk_SK']['CMSMain']['VIEWING'] = 'Prezeráte si verziu #%d, vytvorenú %s
@@ -109,10 +157,14 @@ $lang['sk_SK']['CMSMain']['VIEWING'] = 'Prezeráte si verziu #%d, vytvorenú %s
 $lang['sk_SK']['CMSMain']['VISITRESTORE'] = 'navštíviť restorepage/(ID)';
 $lang['sk_SK']['CMSMain']['WAITINGON'] = 'Čakáte za inými ľuďmi, aby ste mohli pracovať na týchto <b>%d</b> stránkach';
 $lang['sk_SK']['CMSMain']['WORKTODO'] = 'Máte nedokončenú prácu na týchto <b>%d</b> stránkach.';
+$lang['sk_SK']['CMSMain_dialog.ss']['BUTTONNOTFOUND'] = 'Nenajdený meno tlačítka';
+$lang['sk_SK']['CMSMain_dialog.ss']['NOLINKED'] = 'Nenajdený window.linkedObject pre poslanie stlačenie tlačítka spať do hlavného prehľadu';
 $lang['sk_SK']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'Pridané na návrh webu, ešte nepublikované';
 $lang['sk_SK']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Pridať kritérium...';
 $lang['sk_SK']['CMSMain_left.ss']['BATCHACTIONS'] = 'Hromadné akcie';
 $lang['sk_SK']['CMSMain_left.ss']['CHANGED'] = 'zmenené';
+$lang['sk_SK']['CMSMain_left.ss']['CLEAR'] = 'Vyprázniť';
+$lang['sk_SK']['CMSMain_left.ss']['CLEARTITLE'] = 'Vymazáť výsledky vyhľadávania a zobraziť všetky položky';
 $lang['sk_SK']['CMSMain_left.ss']['CLOSEBOX'] = 'kliknite pre zatvorenie tohto poľa';
 $lang['sk_SK']['CMSMain_left.ss']['COMPAREMODE'] = 'Porovnávací mód (kliknite nižšie)';
 $lang['sk_SK']['CMSMain_left.ss']['CREATE'] = 'Vytvoriť';
@@ -126,13 +178,13 @@ $lang['sk_SK']['CMSMain_left.ss']['GO'] = 'Vykonať';
 $lang['sk_SK']['CMSMain_left.ss']['HIDDEN'] = 'skrité';
 $lang['sk_SK']['CMSMain_left.ss']['KEY'] = 'Kľúč:';
 $lang['sk_SK']['CMSMain_left.ss']['NEW'] = 'nový';
+$lang['sk_SK']['CMSMain_left.ss']['NOTINMENU'] = 'Vylúčené z navigačných menu';
 $lang['sk_SK']['CMSMain_left.ss']['OPENBOX'] = 'kliknite pre otvorenie tohto poľa';
 $lang['sk_SK']['CMSMain_left.ss']['PAGEVERSIONH'] = 'História verzií stránok ';
 $lang['sk_SK']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publikovať vybrané stránky';
 $lang['sk_SK']['CMSMain_left.ss']['SEARCH'] = 'Hľadať';
 $lang['sk_SK']['CMSMain_left.ss']['SEARCHTITLE'] = 'Hľadať v URL, titulkoch, položkách menu, &amp; v obsahu';
 $lang['sk_SK']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Vyberte stránky, ktoré chcete zmeniť a potom kliknite na akciu';
-$lang['sk_SK']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Vyberte stránky, ktoré chcete duplikovať, či chcete duplikovať aj ich podstránky a kam chcete nové kópie umiestniť';
 $lang['sk_SK']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Ukázať len zmenené stránky';
 $lang['sk_SK']['CMSMain_left.ss']['SHOWUNPUB'] = 'Ukázať nepublikované verzie';
 $lang['sk_SK']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Obsah a štruktúra webu';
@@ -150,37 +202,85 @@ $lang['sk_SK']['CMSMain_versions.ss']['NOTPUB'] = 'Nepublikované';
 $lang['sk_SK']['CMSMain_versions.ss']['PUBR'] = 'Vydavateľ';
 $lang['sk_SK']['CMSMain_versions.ss']['UNKNOWN'] = 'Neznámy';
 $lang['sk_SK']['CMSMain_versions.ss']['WHEN'] = 'Kedy';
-$lang['sk_SK']['CMSRight.ss']['CHOOSEPAGE'] = 'Prosím vyberte si stránku zľava.';
-$lang['sk_SK']['CMSRight.ss']['ECONTENT'] = 'Upraviť obsah';
-$lang['sk_SK']['CMSRight.ss']['WELCOMETO'] = 'Vitajte na';
+$lang['sk_SK']['CommentAdmin']['ACCEPT'] = 'Potvrdiť';
+$lang['sk_SK']['CommentAdmin']['APPROVED'] = 'Prijatých %s príspevkov.';
+$lang['sk_SK']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Schválené príspevky';
 $lang['sk_SK']['CommentAdmin']['AUTHOR'] = 'Autor';
 $lang['sk_SK']['CommentAdmin']['COMMENT'] = 'Komentár';
+$lang['sk_SK']['CommentAdmin']['COMMENTERURL'] = 'URL';
 $lang['sk_SK']['CommentAdmin']['COMMENTS'] = 'Komentáre';
+$lang['sk_SK']['CommentAdmin']['COMMENTSAWAITINGMODERATION'] = 'Príspevky čakajúce na prekontrolovanie';
+$lang['sk_SK']['CommentAdmin']['DATEPOSTED'] = 'Dátum prispenia';
 $lang['sk_SK']['CommentAdmin']['DELETE'] = 'Vymazať';
 $lang['sk_SK']['CommentAdmin']['DELETEALL'] = 'Vymazať všetko';
+$lang['sk_SK']['CommentAdmin']['DELETED'] = 'Vymazáné %s príspevky.';
+$lang['sk_SK']['CommentAdmin']['MARKASNOTSPAM'] = 'Označit nie ako spam';
+$lang['sk_SK']['CommentAdmin']['MARKEDNOTSPAM'] = 'Označené %s príspevky nie ako spam.';
+$lang['sk_SK']['CommentAdmin']['MARKEDSPAM'] = 'Označené %s príspevky ako spam.';
 $lang['sk_SK']['CommentAdmin']['MENUTITLE'] = 'Komentáre';
 $lang['sk_SK']['CommentAdmin']['MENUTITLE'] = 'Komentáre';
+$lang['sk_SK']['CommentAdmin']['NAME'] = 'Meno';
 $lang['sk_SK']['CommentAdmin']['PAGE'] = 'Stránka';
+$lang['sk_SK']['CommentAdmin']['SPAM'] = 'Spam';
 $lang['sk_SK']['CommentAdmin']['SPAMMARKED'] = 'Označiť ako spam';
 $lang['sk_SK']['CommentAdmin_left.ss']['COMMENTS'] = 'Komentáre';
+$lang['sk_SK']['CommentAdmin_right.ss']['WELCOME1'] = 'Vitajte v';
+$lang['sk_SK']['CommentAdmin_right.ss']['WELCOME2'] = 'spravovanie komentárov. Prosím vyberte adresár v štruktúre vľavo.';
+$lang['sk_SK']['CommentAdmin_SiteTree.ss']['APPROVED'] = 'Schávlené';
+$lang['sk_SK']['CommentAdmin_SiteTree.ss']['AWAITMODERATION'] = 'Čakajúce na moderáciu';
 $lang['sk_SK']['CommentAdmin_SiteTree.ss']['COMMENTS'] = 'Komentáre';
+$lang['sk_SK']['CommentAdmin_SiteTree.ss']['SPAM'] = 'Spam';
 $lang['sk_SK']['CommentList.ss']['CREATEDW'] = 'Komentáre sa vytvárajú vždy keď vykonáte nejakú pracovnú akciu - Publikovanie, Odmietnutie, Odovzdanie.';
 $lang['sk_SK']['CommentList.ss']['NOCOM'] = 'Na stránke sa nenachádzajú žiadne komentáre.';
+$lang['sk_SK']['CommentTableField']['FILTER'] = 'Filter';
+$lang['sk_SK']['CommentTableField']['SEARCH'] = 'Vyhľadať';
+$lang['sk_SK']['CommentTableField.ss']['APPROVE'] = 'schváliť';
+$lang['sk_SK']['CommentTableField.ss']['APPROVECOMMENT'] = 'Schváliť tento komentár';
 $lang['sk_SK']['CommentTableField.ss']['DELETE'] = 'vymazať';
 $lang['sk_SK']['CommentTableField.ss']['DELETEROW'] = 'Vymazať riadok';
 $lang['sk_SK']['CommentTableField.ss']['EDIT'] = 'editovať';
+$lang['sk_SK']['CommentTableField.ss']['HAM'] = 'šunka';
 $lang['sk_SK']['CommentTableField.ss']['MARKASSPAM'] = 'Označiť komentár ako spam';
+$lang['sk_SK']['CommentTableField.ss']['MARKNOSPAM'] = 'Označiť tento komentár ako ne-spam';
+$lang['sk_SK']['CommentTableField.ss']['NOITEMSFOUND'] = 'Nenájdené žiadne položky';
 $lang['sk_SK']['CommentTableField.ss']['SPAM'] = 'spam';
 $lang['sk_SK']['ComplexTableField']['CLOSEPOPUP'] = 'Zatvoriť okno';
+$lang['sk_SK']['ComplexTableField']['SUCCESSADD'] = 'Pridané %s %s %s';
+$lang['sk_SK']['Group']['IMPORTTABTITLE'] = 'Importovať';
+$lang['sk_SK']['Group']['RolesAddEditLink'] = 'Pridať/upraviť úlohy';
+$lang['sk_SK']['GroupImportForm']['Help1'] = 'Importovať jednu alebo viac skupín v CSV formáte (čiarkov oddelené hodnoty). Zobraziť pokročilé použitie';
+$lang['sk_SK']['GroupImportForm']['Help2'] = 'pokročilé použitie
+
+Povolené stĺpce: %s
+Existujúce skupiny sú najdené podla ich unikátnej hodnoty <em>Code</em>, a aktualizované novými hodnotami z importovaného súboru.
+Hierarchia skupín môže byť vytvorená použitím stĺpca <em>ParentCode</em>.
+Právomoci môžu byt pridelené pomocou stĺpca <em>PermissionCode</em>. Existujúce právomoci nie su vymazané.';
+$lang['sk_SK']['GroupImportForm']['ResultCreated'] = 'Vytvorené %d skupiny';
+$lang['sk_SK']['GroupImportForm']['ResultDeleted'] = 'Vymazané %d skupiny';
+$lang['sk_SK']['GroupImportForm']['ResultUpdated'] = 'Aktualizované %d skupiny';
+$lang['sk_SK']['ImageEditor.ss']['ACTIONS'] = 'funkcie';
+$lang['sk_SK']['ImageEditor.ss']['ADJUST'] = 'nastaviť';
+$lang['sk_SK']['ImageEditor.ss']['APPLY'] = 'aplikovať';
+$lang['sk_SK']['ImageEditor.ss']['BLUR'] = 'rozmazať';
+$lang['sk_SK']['ImageEditor.ss']['BRIGHTNESS'] = 'jas';
 $lang['sk_SK']['ImageEditor.ss']['CANCEL'] = 'zrušiť';
+$lang['sk_SK']['ImageEditor.ss']['CONTRAST'] = 'kontrast';
 $lang['sk_SK']['ImageEditor.ss']['CROP'] = 'orezať';
+$lang['sk_SK']['ImageEditor.ss']['CURRENTACTION'] = 'momentálna funkcia';
+$lang['sk_SK']['ImageEditor.ss']['EDITFUNCTIONS'] = 'upravovať funkcie';
+$lang['sk_SK']['ImageEditor.ss']['EFFECTS'] = 'efekty';
+$lang['sk_SK']['ImageEditor.ss']['EXIT'] = 'skončiť';
+$lang['sk_SK']['ImageEditor.ss']['GAMMA'] = 'gamma';
+$lang['sk_SK']['ImageEditor.ss']['GREYSCALE'] = 'čierno-biela škála';
 $lang['sk_SK']['ImageEditor.ss']['HEIGHT'] = 'výška';
 $lang['sk_SK']['ImageEditor.ss']['REDO'] = 'znovu';
 $lang['sk_SK']['ImageEditor.ss']['ROT'] = 'otáčať';
 $lang['sk_SK']['ImageEditor.ss']['SAVE'] = 'ulož&nbsp;obrázok';
+$lang['sk_SK']['ImageEditor.ss']['SEPIA'] = 'sépia';
 $lang['sk_SK']['ImageEditor.ss']['UNDO'] = 'späť';
 $lang['sk_SK']['ImageEditor.ss']['UNTITLED'] = 'Nepomenovaný dokument';
 $lang['sk_SK']['ImageEditor.ss']['WIDTH'] = 'šírka';
+$lang['sk_SK']['LeftAndMain']['CANT_REORGANISE'] = 'Nemáte právomoc na preorganizovanie štruktúry. Vaša zmena nebol uložená.';
 $lang['sk_SK']['LeftAndMain']['CHANGEDURL'] = 'URL adresa zmenená na \'%s\'';
 $lang['sk_SK']['LeftAndMain']['COMMENTS'] = 'Komentáre';
 $lang['sk_SK']['LeftAndMain']['FILESIMAGES'] = 'Súbory a obrázky';
@@ -202,6 +302,7 @@ $lang['sk_SK']['LeftAndMain.ss']['APPVERSIONTEXT2'] = 'verzia, ktorú teraz pou
 $lang['sk_SK']['LeftAndMain.ss']['ARCHS'] = 'Archivovaný web';
 $lang['sk_SK']['LeftAndMain.ss']['DRAFTS'] = 'Návrhový web';
 $lang['sk_SK']['LeftAndMain.ss']['EDIT'] = 'Upraviť';
+$lang['sk_SK']['LeftAndMain.ss']['EDITINCMS'] = 'Editovať stránku v CMS';
 $lang['sk_SK']['LeftAndMain.ss']['EDITPROFILE'] = 'Profil';
 $lang['sk_SK']['LeftAndMain.ss']['LOADING'] = 'Nahrávam...';
 $lang['sk_SK']['LeftAndMain.ss']['LOGGEDINAS'] = 'Prihlásený ako';
@@ -209,53 +310,167 @@ $lang['sk_SK']['LeftAndMain.ss']['LOGOUT'] = 'odhlásiť';
 $lang['sk_SK']['LeftAndMain.ss']['PUBLIS'] = 'Publikovaný web';
 $lang['sk_SK']['LeftAndMain.ss']['REQUIREJS'] = 'CMS vyžaduje povolený JavaScript.';
 $lang['sk_SK']['LeftAndMain.ss']['SSWEB'] = 'Silverstripe Website';
+$lang['sk_SK']['LeftAndMain.ss']['VIEWINDRAFT'] = 'Zobraziť návrh stránky';
+$lang['sk_SK']['LeftAndMain.ss']['VIEWINPUBLISHED'] = 'Zobraziť publikovanú stránku';
 $lang['sk_SK']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Zobrazenie stránky:';
+$lang['sk_SK']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = 'Stránka \'%s\' úspešne publikovaná';
 $lang['sk_SK']['LeftAndMain']['STATUSTO'] = 'Stav zmenený na \'%s\'';
 $lang['sk_SK']['LeftAndMain']['TREESITECONTENT'] = 'Obsah webu';
+$lang['sk_SK']['LeftAndMain_right.ss']['WELCOMETO'] = 'Vitajte v';
+$lang['sk_SK']['MathSpamProtection']['EIGHT'] = 'osem';
+$lang['sk_SK']['MathSpamProtection']['EIGHTEEN'] = 'osemnásť';
+$lang['sk_SK']['MathSpamProtection']['ELEVEN'] = 'jedenásť';
+$lang['sk_SK']['MathSpamProtection']['FIFTEEN'] = 'pätnásť';
+$lang['sk_SK']['MathSpamProtection']['FIVE'] = 'päť';
+$lang['sk_SK']['MathSpamProtection']['FOUR'] = 'štyri';
+$lang['sk_SK']['MathSpamProtection']['FOURTEEN'] = 'štrnásť';
+$lang['sk_SK']['MathSpamProtection']['NINE'] = 'devät';
+$lang['sk_SK']['MathSpamProtection']['ONE'] = 'jeden';
+$lang['sk_SK']['MathSpamProtection']['SEVEN'] = 'sedem';
+$lang['sk_SK']['MathSpamProtection']['SEVENTEEN'] = 'sedemnásť';
+$lang['sk_SK']['MathSpamProtection']['SIX'] = 'šesť';
+$lang['sk_SK']['MathSpamProtection']['SIXTEEN'] = 'šesťnásť';
+$lang['sk_SK']['MathSpamProtection']['TEN'] = 'desať';
+$lang['sk_SK']['MathSpamProtection']['THIRTEEN'] = 'trinásť';
+$lang['sk_SK']['MathSpamProtection']['THREE'] = 'tri';
+$lang['sk_SK']['MathSpamProtection']['TWELVE'] = 'dvanásť';
+$lang['sk_SK']['MathSpamProtection']['TWO'] = 'dva';
+$lang['sk_SK']['MathSpamProtection']['WHATIS'] = 'Koľko je %s plus %s?';
+$lang['sk_SK']['MathSpamProtection']['ZERO'] = 'nula';
+$lang['sk_SK']['MemberImportForm']['Help1'] = 'Importovať členov v <em>CSV formáte</em> (čiarkov oddelené hodnoty). Zobraziť pokročile použitie';
+$lang['sk_SK']['MemberImportForm']['Help2'] = 'Pokročile použitie
+Povolené stĺpce
+Existujúci uživatelia sú najdený podľa ich unikátnej <em>Code</em> hodnoty, a aktualizovaný novými hodnotami z importovaného súboru.
+Skupiny môžu byť pridelené cez stĺpec <em>Groups</em>. Skupiny sú identifikované cez ich <em>Code</em> hodnotu, viacero skupín môže byť oddelených pomocou čiarky. Existujúce členstvá v skupinách nie su vymazané.';
+$lang['sk_SK']['MemberImportForm']['ResultCreated'] = 'Vytvorených %d členov';
+$lang['sk_SK']['MemberImportForm']['ResultDeleted'] = 'Zmazaných %d členov';
+$lang['sk_SK']['MemberImportForm']['ResultNone'] = 'Žiadne zmeny';
+$lang['sk_SK']['MemberImportForm']['ResultUpdated'] = 'Aktualizovaných %d členov';
 $lang['sk_SK']['MemberList.ss']['FILTER'] = 'Filtrovanie';
+$lang['sk_SK']['MemberList_PageControls.ss']['DISPLAYING'] = 'Zobrazujem';
+$lang['sk_SK']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'členovia';
+$lang['sk_SK']['MemberList_PageControls.ss']['LASTMEMBERS'] = 'členovia';
+$lang['sk_SK']['MemberList_PageControls.ss']['NEXTMEMBERS'] = 'Členovia';
+$lang['sk_SK']['MemberList_PageControls.ss']['OF'] = 'z';
+$lang['sk_SK']['MemberList_PageControls.ss']['PREVIOUSMEMBERS'] = 'členovia';
+$lang['sk_SK']['MemberList_PageControls.ss']['TO'] = 'do';
+$lang['sk_SK']['MemberList_PageControls.ss']['VIEWFIRST'] = 'Zobraziť prvé';
+$lang['sk_SK']['MemberList_PageControls.ss']['VIEWLAST'] = 'Zobraziť posledné';
+$lang['sk_SK']['MemberList_PageControls.ss']['VIEWNEXT'] = 'Zobraziť nasledujúci';
+$lang['sk_SK']['MemberList_PageControls.ss']['VIEWPREVIOUS'] = 'Zobraziť predchádzajúce';
 $lang['sk_SK']['MemberList_Table.ss']['EMAIL'] = 'E-mailová adresa';
 $lang['sk_SK']['MemberList_Table.ss']['FN'] = 'Krstné meno';
 $lang['sk_SK']['MemberList_Table.ss']['PASSWD'] = 'Heslo';
 $lang['sk_SK']['MemberList_Table.ss']['SN'] = 'Priezvisko';
 $lang['sk_SK']['MemberTableField']['ADD'] = 'Pridať';
 $lang['sk_SK']['MemberTableField']['ADDEDTOGROUP'] = 'Člen pridaný do skupiny';
+$lang['sk_SK']['MemberTableField']['ADDINGFIELD'] = 'Pridávanie zlyhalo';
+$lang['sk_SK']['MemberTableField']['ANYGROUP'] = 'Akákoľvek skupina';
+$lang['sk_SK']['MemberTableField']['ASC'] = 'vzostupné';
+$lang['sk_SK']['MemberTableField']['DeleteTitleText'] = 'Vymazať z tejto skupiny';
+$lang['sk_SK']['MemberTableField']['DeleteTitleTextDatabase'] = 'Vymazať z databázy a všetkých skupín';
+$lang['sk_SK']['MemberTableField']['DESC'] = 'zostupné';
 $lang['sk_SK']['MemberTableField']['EMAIL'] = 'E-mail';
+$lang['sk_SK']['MemberTableField']['ERRORADDINGUSER'] = 'Nastala chyba pri pridávani uživatela do skupiny: %s';
+$lang['sk_SK']['MemberTableField']['FILTER'] = 'Filter';
+$lang['sk_SK']['MemberTableField']['FILTERBYGROUP'] = 'Filtorvat podľa skupiny';
 $lang['sk_SK']['MemberTableField']['FIRSTNAME'] = 'Meno';
+$lang['sk_SK']['MemberTableField']['ORDERBY'] = 'Objednať cez';
+$lang['sk_SK']['MemberTableField']['SEARCH'] = 'Vyhľadať';
 $lang['sk_SK']['MemberTableField.ss']['ADDNEW'] = 'Pridať nový';
 $lang['sk_SK']['MemberTableField.ss']['DELETEMEMBER'] = 'Vymazať tohto člena';
 $lang['sk_SK']['MemberTableField.ss']['EDITMEMBER'] = 'Upraviť tohto člena';
+$lang['sk_SK']['MemberTableField.ss']['NOITEMSFOUND'] = 'Nenajdené žiadne položky';
 $lang['sk_SK']['MemberTableField.ss']['SHOWMEMBER'] = 'Zobraziť tohto člena';
 $lang['sk_SK']['MemberTableField']['SURNAME'] = 'Priezvisko';
 $lang['sk_SK']['ModelAdmin']['ADDBUTTON'] = 'Pridať';
+$lang['sk_SK']['ModelAdmin']['ADDFORM'] = 'Vyplnte tento formulár aby ste pridali %s do databázy.';
+$lang['sk_SK']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Zvoliťe stĺpce výsledkov';
+$lang['sk_SK']['ModelAdmin']['CLEAR_SEARCH'] = 'Zmazať vysledky vyhľadávania';
 $lang['sk_SK']['ModelAdmin']['CREATEBUTTON'] = 'Vytvoriť \'%s\'';
 $lang['sk_SK']['ModelAdmin']['DELETE'] = 'Vymazať';
+$lang['sk_SK']['ModelAdmin']['DELETEDRECORDS'] = 'Vymazaných %s záznamov.';
+$lang['sk_SK']['ModelAdmin']['FOUNDRESULTS'] = 'Vaše vyhľadávanie našlo %s zhodných položiek';
 $lang['sk_SK']['ModelAdmin']['GOBACK'] = 'Späť';
+$lang['sk_SK']['ModelAdmin']['GOFORWARD'] = 'Nasledujúce';
 $lang['sk_SK']['ModelAdmin']['IMPORT'] = 'Importovať z CSV';
+$lang['sk_SK']['ModelAdmin']['IMPORTEDRECORDS'] = 'Importovaných %s záznamov.';
+$lang['sk_SK']['ModelAdmin']['ITEMNOTFOUND'] = 'Neviem najsť tú položku';
+$lang['sk_SK']['ModelAdmin']['LOADEDFOREDITING'] = 'Načítané \'%s\' pre úpravu.';
+$lang['sk_SK']['ModelAdmin']['NOCSVFILE'] = 'Prosím vyhľadajte CSV súbor pre importovanie';
+$lang['sk_SK']['ModelAdmin']['NOIMPORT'] = 'Nie je čo importovať';
+$lang['sk_SK']['ModelAdmin']['NORESULTS'] = 'Žiadne výsledky';
 $lang['sk_SK']['ModelAdmin']['SAVE'] = 'Uložiť';
+$lang['sk_SK']['ModelAdmin']['SEARCHFOR'] = 'Vyhľadať:';
+$lang['sk_SK']['ModelAdmin']['SEARCHRESULTS'] = 'Výsledky vyhľadávania';
+$lang['sk_SK']['ModelAdmin']['SELECTALL'] = 'označ všetky';
+$lang['sk_SK']['ModelAdmin']['SELECTNONE'] = 'odznač všetky';
+$lang['sk_SK']['ModelAdmin']['UPDATEDRECORDS'] = 'Aktualizovaných %s záznamov.';
+$lang['sk_SK']['ModelAdmin_ImportSpec.ss']['IMPORTSPECFIELDS'] = 'Stĺpce databázy';
+$lang['sk_SK']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Ukáž špecifikáciu pre %s';
+$lang['sk_SK']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Vzťahy';
+$lang['sk_SK']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'špecifikácia pre %s';
+$lang['sk_SK']['ModelAdmin_left.ss']['ADDLISTING'] = 'Pridať';
+$lang['sk_SK']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Importovať';
+$lang['sk_SK']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Vyhľadávanie';
+$lang['sk_SK']['ModelAdmin_right.ss']['WELCOME1'] = 'Vitajte v %s. Prosím vyberte jeden zo záznamov v ľavom paneli.';
+$lang['sk_SK']['ModelSidebar.ss']['ADDLISTING'] = 'Pridať';
+$lang['sk_SK']['ModelSidebar.ss']['IMPORT_TAB_HEADER'] = 'Importovať';
+$lang['sk_SK']['ModelSidebar.ss']['SEARCHLISTINGS'] = 'Vyhľadať';
 $lang['sk_SK']['PageComment']['Comment'] = 'Komentár';
 $lang['sk_SK']['PageComment']['COMMENTBY'] = 'Komentáre od \'%s\' na %s';
 $lang['sk_SK']['PageComment']['IsSpam'] = 'Spam?';
 $lang['sk_SK']['PageComment']['Name'] = 'Meno autora';
+$lang['sk_SK']['PageComment']['NeedsModeration'] = 'Potrebuje kontrolu?';
+$lang['sk_SK']['PageComment']['PLURALNAME'] = 'Komentáre';
+$lang['sk_SK']['PageComment']['SINGULARNAME'] = 'Komentrár';
+$lang['sk_SK']['PageCommentInterface']['COMMENTERURL'] = 'URL vašej web stránky';
+$lang['sk_SK']['PageCommentInterface']['POST'] = 'Príspevok';
+$lang['sk_SK']['PageCommentInterface']['SPAMQUESTION'] = 'Otázka na ochranu pred Spamom: %s';
+$lang['sk_SK']['PageCommentInterface.ss']['COMMENTLOGINERROR'] = 'Nemôžete pridávať komentáre, pokiaľ nie ste prihlásený';
+$lang['sk_SK']['PageCommentInterface.ss']['COMMENTPERMISSIONERROR'] = 'a pokiaľ nemáte dostatočné práva';
+$lang['sk_SK']['PageCommentInterface.ss']['COMMENTPOSTLOGIN'] = 'Prihlásiť';
 $lang['sk_SK']['PageCommentInterface.ss']['COMMENTS'] = 'Komentáre';
+$lang['sk_SK']['PageCommentInterface.ss']['COMMENTSDISABLED'] = 'Pridávanie komentárov bolo vypnuté';
 $lang['sk_SK']['PageCommentInterface.ss']['NEXT'] = 'ďalší';
 $lang['sk_SK']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'Nikto na tejto stránke ešte nepridal komentár.';
 $lang['sk_SK']['PageCommentInterface.ss']['POSTCOM'] = 'Pridajte svoj komentár';
 $lang['sk_SK']['PageCommentInterface.ss']['PREV'] = 'predchádzajúci';
+$lang['sk_SK']['PageCommentInterface.ss']['RSSFEEDALLCOMMENTS'] = 'RSS pre všetky komentáre';
+$lang['sk_SK']['PageCommentInterface.ss']['RSSFEEDCOMMENTS'] = 'RSS pre komentáre na tejto stránke';
+$lang['sk_SK']['PageCommentInterface.ss']['RSSVIEWALLCOMMENTS'] = 'Zobraziť všetky komentáre';
+$lang['sk_SK']['PageCommentInterface']['YOURCOMMENT'] = 'Komentár';
+$lang['sk_SK']['PageCommentInterface']['YOURNAME'] = 'Vaše meno';
+$lang['sk_SK']['PageCommentInterface_Controller']['SPAMQUESTION'] = 'Otázka na ochranu pred Spamom: %s';
+$lang['sk_SK']['PageCommentInterface_Form']['AWAITINGMODERATION'] = 'Váš komentár bol prijatý a teraz čaká na moderáciu.';
+$lang['sk_SK']['PageCommentInterface_Form']['MSGYOUPOSTED'] = 'Sprava ktorú ste poslali bola:';
+$lang['sk_SK']['PageCommentInterface_Form']['SPAMDETECTED'] = 'Zistený Spam';
+$lang['sk_SK']['PageCommentInterface_singlecomment.ss']['APPROVE'] = 'scháľ tento prispevok';
 $lang['sk_SK']['PageCommentInterface_singlecomment.ss']['ISNTSPAM'] = 'tento komentár nie je spam';
 $lang['sk_SK']['PageCommentInterface_singlecomment.ss']['ISSPAM'] = 'tento komentár je spam';
 $lang['sk_SK']['PageCommentInterface_singlecomment.ss']['PBY'] = 'Zaslal';
 $lang['sk_SK']['PageCommentInterface_singlecomment.ss']['REMCOM'] = 'odstrániť tento komentár';
+$lang['sk_SK']['Permission']['CMS_ACCESS_CATEGORY'] = 'Prístup do CMS';
+$lang['sk_SK']['Permissions']['PERMISSIONS_CATEGORY'] = 'Úlohy a prístupové práva';
 $lang['sk_SK']['ReportAdmin']['MENUTITLE'] = 'Reporty';
 $lang['sk_SK']['ReportAdmin_left.ss']['REPORTS'] = 'Správy';
 $lang['sk_SK']['ReportAdmin_right.ss']['WELCOME1'] = 'Vitajte v';
 $lang['sk_SK']['ReportAdmin_right.ss']['WELCOME2'] = 'správach. Prosím vyberte si správu zľava.';
 $lang['sk_SK']['ReportAdmin_SiteTree.ss']['REPORTS'] = 'Správy';
+$lang['sk_SK']['SecurityAdmin']['ACCESS_HELP'] = 'Povoliť prezeranie, pridávanie a úpravu uživaťeľov, ako aj pridelovanie právomoci pre nich.';
 $lang['sk_SK']['SecurityAdmin']['ADDMEMBER'] = 'Pridať člena';
+$lang['sk_SK']['SecurityAdmin']['APPLY_ROLES'] = 'Aplikovať úlohy skupinám';
+$lang['sk_SK']['SecurityAdmin']['APPLY_ROLES_HELP'] = 'Schopnosť upravovať úlohy pridelené skupine. Vyžaduje prístup do sekcie "Bezpečnosť".';
+$lang['sk_SK']['SecurityAdmin']['EDITPERMISSIONS'] = 'Spravovať právomoci pre skupiny';
+$lang['sk_SK']['SecurityAdmin']['EDITPERMISSIONS_HELP'] = 'Schopnosť upravovať právomoci a IP adresi pre skupinu. Vyžaduje prístup do sekcie "Bezpečnosť".';
+$lang['sk_SK']['SecurityAdmin']['MemberListCaution'] = 'Upozornenie: Odstánenie členov z tohto zoznamu ich odstáni zo všetkých skupín a databázy.';
 $lang['sk_SK']['SecurityAdmin']['MENUTITLE'] = 'Bezpečnosť';
 $lang['sk_SK']['SecurityAdmin']['MENUTITLE'] = 'Bezpečnosť';
 $lang['sk_SK']['SecurityAdmin']['NEWGROUP'] = 'Nová skupina';
 $lang['sk_SK']['SecurityAdmin']['SAVE'] = 'Uložiť';
 $lang['sk_SK']['SecurityAdmin']['SGROUPS'] = 'Bezpečnostné skupiny';
+$lang['sk_SK']['SecurityAdmin']['TABIMPORT'] = 'Importovať';
+$lang['sk_SK']['SecurityAdmin']['TABROLES'] = 'Úlohy';
 $lang['sk_SK']['SecurityAdmin_left.ss']['CREATE'] = 'Vytvoriť';
 $lang['sk_SK']['SecurityAdmin_left.ss']['DEL'] = 'Vymazať';
 $lang['sk_SK']['SecurityAdmin_left.ss']['DELGROUPS'] = 'Vymazať vybrané skupiny';
@@ -264,19 +479,51 @@ $lang['sk_SK']['SecurityAdmin_left.ss']['GO'] = 'Vykonať';
 $lang['sk_SK']['SecurityAdmin_left.ss']['SECGROUPS'] = 'Bezpečnostné skupiny';
 $lang['sk_SK']['SecurityAdmin_left.ss']['SELECT'] = 'Vyberte stránky, ktoré chcete vymazať a potom kliknite na tlačidlo nižšie';
 $lang['sk_SK']['SecurityAdmin_left.ss']['TOREORG'] = 'Pre reorganizáciu Vašich stránok, premiestňujte stránky kam potrebujete.';
+$lang['sk_SK']['SecurityAdmin_MemberImportForm']['BtnImport'] = 'Importovať';
+$lang['sk_SK']['SecurityAdmin_MemberImportForm']['FileFieldLabel'] = 'CSV súbor <small>(Povoléné koncovki súborov: *.csv)</small>';
 $lang['sk_SK']['SecurityAdmin_right.ss']['WELCOME1'] = 'Vitajte v';
 $lang['sk_SK']['SecurityAdmin_right.ss']['WELCOME2'] = 'administrácii bezpečnosti. Prosím vyberte si skupinu zľava.';
+$lang['sk_SK']['SideReport']['BROKENFILES'] = 'Stránky z poškodenými súbormi';
+$lang['sk_SK']['SideReport']['BROKENLINKS'] = 'Stránky z poškodenými odkazmi';
+$lang['sk_SK']['SideReport']['BrokenLinksGroupTitle'] = 'Správy o poškodených odkazoch';
+$lang['sk_SK']['SideReport']['BROKENREDIRECTORPAGES'] = 'Presmerovávacie stránky odkazujú na vymazané stránky';
+$lang['sk_SK']['SideReport']['BROKENVIRTUALPAGES'] = 'Virtuálne stránky odkazujú na vymazané stránky';
+$lang['sk_SK']['SideReport']['ContentGroupTitle'] = 'Správy o obsahu';
 $lang['sk_SK']['SideReport']['EMPTYPAGES'] = 'Prázdne stránky';
 $lang['sk_SK']['SideReport']['LAST2WEEKS'] = 'Stránky upravené počaas posledných 2 týždňov';
+$lang['sk_SK']['SideReport']['OtherGroupTitle'] = 'Ostatné';
+$lang['sk_SK']['SideReport']['ParameterLiveCheckbox'] = 'Skontolovať živú stránku';
 $lang['sk_SK']['SideReport']['REPEMPTY'] = '%s správa je prázdna.';
+$lang['sk_SK']['SideReport']['TODO'] = 'Stranky s položkami "Čo urobiť"';
 $lang['sk_SK']['StaticExporter']['BASEURL'] = 'Základná URL adresa';
 $lang['sk_SK']['StaticExporter']['EXPORTTO'] = 'Exportovať do tohto adresára';
 $lang['sk_SK']['StaticExporter']['FOLDEREXPORT'] = 'Adresár, kam sa má exportovať';
 $lang['sk_SK']['StaticExporter']['NAME'] = 'Statický export';
+$lang['sk_SK']['TableListField.ss']['NOITEMSFOUND'] = 'Nenajdené žiadne položky';
+$lang['sk_SK']['TableListField.ss']['SORTASC'] = 'Zoradiť vzostupne';
+$lang['sk_SK']['TableListField.ss']['SORTDESC'] = 'Zoradiť zostupne';
+$lang['sk_SK']['TableListField_PageControls.ss']['DISPLAYING'] = 'Zobrazujem';
+$lang['sk_SK']['TableListField_PageControls.ss']['OF'] = 'z';
+$lang['sk_SK']['TableListField_PageControls.ss']['TO'] = 'do';
+$lang['sk_SK']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Zobraziť prvé';
+$lang['sk_SK']['TableListField_PageControls.ss']['VIEWLAST'] = 'Zobraziť posledné';
+$lang['sk_SK']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Zobraziť nasledujúce';
+$lang['sk_SK']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Zobraziť predchádzajúce';
+$lang['sk_SK']['ThumbnailStripField']['NOFLASHFOUND'] = 'Nenajdené žiadne flash súbory';
+$lang['sk_SK']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'Nenajdené žiadne flash súbory v';
+$lang['sk_SK']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'Nenajdené žiadne obrázky v';
+$lang['sk_SK']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Nenajdené žiadne obrázky';
 $lang['sk_SK']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Vyberte adresár vyššie)';
 $lang['sk_SK']['ViewArchivedEmail.ss']['CANACCESS'] = 'Archivovaný web môžete navštíviť týmto odkazom:';
 $lang['sk_SK']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Požiadali ste o zobrazenie obsahu webu z';
 $lang['sk_SK']['WaitingOn.ss']['ATO'] = 'pridelené k';
+$lang['sk_SK']['WidgetAreaEditor.ss']['AVAILABLE'] = 'Dostupné pomôcky';
+$lang['sk_SK']['WidgetAreaEditor.ss']['AVAILWIDGETS'] = 'Stlačte názov pomôcky, pre použitie na tejto stránke.';
+$lang['sk_SK']['WidgetAreaEditor.ss']['INUSE'] = 'Pomôcky momentálne používané';
+$lang['sk_SK']['WidgetAreaEditor.ss']['NOAVAIL'] = 'Momentálne nie sú dostupné žiadne pomôcky';
+$lang['sk_SK']['WidgetAreaEditor.ss']['TOADD'] = 'Pre pridanie pomôcok, ich preneste z ľavej časti sem.';
+$lang['sk_SK']['WidgetAreaEditor.ss']['TOSORT'] = 'Pre usporiadanie momentálne používaných pomôcok na tejto stránke ich môžte prenášať.';
+$lang['sk_SK']['WidgetDescription.ss']['CLICKTOADDWIDGET'] = 'Stlačťe pre pridanie pomôcky';
 $lang['sk_SK']['WidgetEditor.ss']['DELETE'] = 'Vymazať';
 
 ?>
\ No newline at end of file
diff --git a/lang/sr_RS.php b/lang/sr_RS.php
index f08f091c..a71ca9f9 100644
--- a/lang/sr_RS.php
+++ b/lang/sr_RS.php
@@ -47,7 +47,6 @@ $lang['sr_RS']['AssetTableField']['CAPTION'] = 'Наслов';
 $lang['sr_RS']['AssetTableField']['CREATED'] = 'Прво достављено';
 $lang['sr_RS']['AssetTableField']['DIM'] = 'Димензије';
 $lang['sr_RS']['AssetTableField']['DIMLIMT'] = 'Ограничи димензије искачућег прозора';
-$lang['sr_RS']['AssetTableField']['EDITIMAGE'] = 'Измени ову слику';
 $lang['sr_RS']['AssetTableField']['FILENAME'] = 'Име датотеке';
 $lang['sr_RS']['AssetTableField']['GALLERYOPTIONS'] = 'Опције галерије';
 $lang['sr_RS']['AssetTableField']['IMAGE'] = 'Слика';
@@ -66,12 +65,6 @@ $lang['sr_RS']['AssetTableField']['SWFFILEOPTIONS'] = 'Опције SWF дато
 $lang['sr_RS']['AssetTableField']['TITLE'] = 'Наслов';
 $lang['sr_RS']['AssetTableField']['TYPE'] = 'Тип';
 $lang['sr_RS']['AssetTableField']['URL'] = 'URL';
-$lang['sr_RS']['CMSLeft.ss']['DELPAGE'] = 'Избриши стране...';
-$lang['sr_RS']['CMSLeft.ss']['DELPAGES'] = 'Избриши изабране стране';
-$lang['sr_RS']['CMSLeft.ss']['GO'] = 'Иди';
-$lang['sr_RS']['CMSLeft.ss']['NEWPAGE'] = 'Нова страна...';
-$lang['sr_RS']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Изаберите стране које желите да избришете и кликните на дугме';
-$lang['sr_RS']['CMSLeft.ss']['SITECONT'] = 'Садржај сајта';
 $lang['sr_RS']['CMSMain']['CANCEL'] = 'Откажи';
 $lang['sr_RS']['CMSMain']['CHOOSEREPORT'] = '(Изаберите извештај)';
 $lang['sr_RS']['CMSMain']['COMPARINGV'] = 'Упоређујете верзије #%d и #%d';
@@ -137,7 +130,6 @@ $lang['sr_RS']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Објави изабра
 $lang['sr_RS']['CMSMain_left.ss']['SEARCH'] = 'Претрага';
 $lang['sr_RS']['CMSMain_left.ss']['SEARCHTITLE'] = 'Претражите URL-ове, наслове, меније и садржај';
 $lang['sr_RS']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Изаберите стране које желите да промените и кликните на акцију:';
-$lang['sr_RS']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Изаберите стране које желите да дуплирате, да ли желите да се то односи и на њихову децу као и где желите да сместите дупликате';
 $lang['sr_RS']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Прикажи само промењене стране';
 $lang['sr_RS']['CMSMain_left.ss']['SHOWUNPUB'] = 'Прикажи необјављене верзије';
 $lang['sr_RS']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Садржај сајта и структура';
@@ -155,9 +147,6 @@ $lang['sr_RS']['CMSMain_versions.ss']['NOTPUB'] = 'Није објављено';
 $lang['sr_RS']['CMSMain_versions.ss']['PUBR'] = 'Објављивач';
 $lang['sr_RS']['CMSMain_versions.ss']['UNKNOWN'] = 'Непознато';
 $lang['sr_RS']['CMSMain_versions.ss']['WHEN'] = 'Када';
-$lang['sr_RS']['CMSRight.ss']['CHOOSEPAGE'] = 'Изаберите страну са леве стране.';
-$lang['sr_RS']['CMSRight.ss']['ECONTENT'] = 'Измени садржај';
-$lang['sr_RS']['CMSRight.ss']['WELCOMETO'] = 'Добродошли у ';
 $lang['sr_RS']['CommentAdmin']['ACCEPT'] = 'Прихвати';
 $lang['sr_RS']['CommentAdmin']['APPROVED'] = 'Прихваћено %s коментара.';
 $lang['sr_RS']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Одобрени коментари';
diff --git a/lang/sv_SE.php b/lang/sv_SE.php
index 2989a736..df591364 100644
--- a/lang/sv_SE.php
+++ b/lang/sv_SE.php
@@ -52,7 +52,6 @@ $lang['sv_SE']['AssetTableField']['CAPTION'] = 'Rubrik';
 $lang['sv_SE']['AssetTableField']['CREATED'] = 'Först uppladdad';
 $lang['sv_SE']['AssetTableField']['DIM'] = 'Dimensioner';
 $lang['sv_SE']['AssetTableField']['DIMLIMT'] = 'Begränsa dimensionerna i popup-fönstret';
-$lang['sv_SE']['AssetTableField']['EDITIMAGE'] = 'Redigera bilden';
 $lang['sv_SE']['AssetTableField']['FILENAME'] = 'Filnamn';
 $lang['sv_SE']['AssetTableField']['GALLERYOPTIONS'] = 'Galleri-alternativ';
 $lang['sv_SE']['AssetTableField']['IMAGE'] = 'Bild';
@@ -82,12 +81,6 @@ $lang['sv_SE']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publicera';
 $lang['sv_SE']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'Un-publicerade % d sidor';
 $lang['sv_SE']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'Dölj publicerade sidor';
 $lang['sv_SE']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'Dölj publicerad';
-$lang['sv_SE']['CMSLeft.ss']['DELPAGE'] = 'Radera sidor...';
-$lang['sv_SE']['CMSLeft.ss']['DELPAGES'] = 'Radera markerade sidor';
-$lang['sv_SE']['CMSLeft.ss']['GO'] = 'Kör';
-$lang['sv_SE']['CMSLeft.ss']['NEWPAGE'] = 'Ny sida...';
-$lang['sv_SE']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Markera de sidor du vill radera och klicka sedan på knappen nedan';
-$lang['sv_SE']['CMSLeft.ss']['SITECONT'] = 'Sidinnehåll';
 $lang['sv_SE']['CMSMain']['ACCESS'] = 'Tillgång till \'%s\' (%s)';
 $lang['sv_SE']['CMSMain']['ACCESSALLINTERFACES'] = 'Tillgång till alla CMS-delar';
 $lang['sv_SE']['CMSMain']['CANCEL'] = 'Avbryt';
@@ -166,7 +159,6 @@ $lang['sv_SE']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publicera de markerade si
 $lang['sv_SE']['CMSMain_left.ss']['SEARCH'] = 'Sök';
 $lang['sv_SE']['CMSMain_left.ss']['SEARCHTITLE'] = 'Sök genom URL, Titel, Menytitel , &amp; Innehåll';
 $lang['sv_SE']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Markera de sidor du vill ändra och klicka sedan på en funktion';
-$lang['sv_SE']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Markera de sidor du vill duplicera, om deras barn också ska dupliceras, och var du vill att kopiorna ska placeras';
 $lang['sv_SE']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Visa bara ändrade sidor';
 $lang['sv_SE']['CMSMain_left.ss']['SHOWUNPUB'] = 'Visa opublicerade versioner';
 $lang['sv_SE']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Sajt-innehåll och struktur';
@@ -184,9 +176,6 @@ $lang['sv_SE']['CMSMain_versions.ss']['NOTPUB'] = 'Inte publicerad';
 $lang['sv_SE']['CMSMain_versions.ss']['PUBR'] = 'Utgivare';
 $lang['sv_SE']['CMSMain_versions.ss']['UNKNOWN'] = 'Okänd';
 $lang['sv_SE']['CMSMain_versions.ss']['WHEN'] = 'När';
-$lang['sv_SE']['CMSRight.ss']['CHOOSEPAGE'] = 'Var god välj en sida till vänster.';
-$lang['sv_SE']['CMSRight.ss']['ECONTENT'] = 'Redigera innehåll';
-$lang['sv_SE']['CMSRight.ss']['WELCOMETO'] = 'Välkommen till';
 $lang['sv_SE']['CommentAdmin']['ACCEPT'] = 'Acceptera';
 $lang['sv_SE']['CommentAdmin']['APPROVED'] = 'Accepterade %s kommentarer.';
 $lang['sv_SE']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Godkända kommentarer';
diff --git a/lang/tr_TR.php b/lang/tr_TR.php
index a773657a..3d4e8956 100644
--- a/lang/tr_TR.php
+++ b/lang/tr_TR.php
@@ -49,7 +49,6 @@ $lang['tr_TR']['AssetTableField']['CAPTION'] = 'Başlık';
 $lang['tr_TR']['AssetTableField']['CREATED'] = 'Yüklenme tarihi';
 $lang['tr_TR']['AssetTableField']['DIM'] = 'Boyutları';
 $lang['tr_TR']['AssetTableField']['DIMLIMT'] = 'Popup Pencerede Boyutlari Limitle';
-$lang['tr_TR']['AssetTableField']['EDITIMAGE'] = 'Bu resmi düzenle';
 $lang['tr_TR']['AssetTableField']['FILENAME'] = 'Dosya Adı';
 $lang['tr_TR']['AssetTableField']['GALLERYOPTIONS'] = 'Galeri Seçenekleri';
 $lang['tr_TR']['AssetTableField']['IMAGE'] = 'Resim';
@@ -70,12 +69,6 @@ $lang['tr_TR']['AssetTableField']['SWFFILEOPTIONS'] = 'SWF Dosya Seçenekleri';
 $lang['tr_TR']['AssetTableField']['TITLE'] = 'Başlık';
 $lang['tr_TR']['AssetTableField']['TYPE'] = 'Türü';
 $lang['tr_TR']['AssetTableField']['URL'] = 'URL';
-$lang['tr_TR']['CMSLeft.ss']['DELPAGE'] = 'Sayfaları Sil...';
-$lang['tr_TR']['CMSLeft.ss']['DELPAGES'] = 'Seçili sayfaları sil';
-$lang['tr_TR']['CMSLeft.ss']['GO'] = 'Git';
-$lang['tr_TR']['CMSLeft.ss']['NEWPAGE'] = 'Yeni Sayfa...';
-$lang['tr_TR']['CMSLeft.ss']['SELECTPAGESDEL'] = 'Silmek istediğiniz sayfaları seçip aşağıdaki tuşa basınız';
-$lang['tr_TR']['CMSLeft.ss']['SITECONT'] = 'Site İçeriği';
 $lang['tr_TR']['CMSMain']['ACCESS'] = '\'%s\' (%s) erişimi';
 $lang['tr_TR']['CMSMain']['ACCESSALLINTERFACES'] = 'Tüm İYS arayüzlerine erişim';
 $lang['tr_TR']['CMSMain']['CANCEL'] = 'İptal';
@@ -150,7 +143,6 @@ $lang['tr_TR']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Seçilen sayfaları yayı
 $lang['tr_TR']['CMSMain_left.ss']['SEARCH'] = 'Ara';
 $lang['tr_TR']['CMSMain_left.ss']['SEARCHTITLE'] = 'URL, Başlık, Menü Başlığı ve İçerikte Arama Yap';
 $lang['tr_TR']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Değiştirmek istediğiniz sayfaları seçin ve yapmak istediğiniz toplu işlemi seçin:';
-$lang['tr_TR']['CMSMain_left.ss']['SELECTPAGESDUP'] = 'Çoğaltmak istediğiniz sayfaları, bu sayfaların altındaki sayfalarında dahil edilip edilmeyeceğini ve bu kopyaların nerede yer almasını istediğinizi seçiniz.';
 $lang['tr_TR']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Sadece değiştirilmiş sayfaları göster';
 $lang['tr_TR']['CMSMain_left.ss']['SHOWUNPUB'] = 'Yayınlanmamış sürümleri göster';
 $lang['tr_TR']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Site İçerik ve Yapısı';
@@ -168,9 +160,6 @@ $lang['tr_TR']['CMSMain_versions.ss']['NOTPUB'] = 'Yayınlanmadı';
 $lang['tr_TR']['CMSMain_versions.ss']['PUBR'] = 'Yayınlayan';
 $lang['tr_TR']['CMSMain_versions.ss']['UNKNOWN'] = 'Bilinmiyor';
 $lang['tr_TR']['CMSMain_versions.ss']['WHEN'] = 'Tarih';
-$lang['tr_TR']['CMSRight.ss']['CHOOSEPAGE'] = 'Lütfen sol taraftan bir sayfa seçiniz.';
-$lang['tr_TR']['CMSRight.ss']['ECONTENT'] = 'İçeriği Düzenle';
-$lang['tr_TR']['CMSRight.ss']['WELCOMETO'] = 'Hoşgeldiniz!';
 $lang['tr_TR']['CommentAdmin']['ACCEPT'] = 'Kabul';
 $lang['tr_TR']['CommentAdmin']['APPROVED'] = 'Kabul edilen %s yorum.';
 $lang['tr_TR']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Onaylanmış Yorumlar';
diff --git a/lang/zh_CN.php b/lang/zh_CN.php
index 5865609e..53a918ba 100644
--- a/lang/zh_CN.php
+++ b/lang/zh_CN.php
@@ -49,7 +49,6 @@ $lang['zh_CN']['AssetTableField']['CAPTION'] = '标题';
 $lang['zh_CN']['AssetTableField']['CREATED'] = '第一次被上传';
 $lang['zh_CN']['AssetTableField']['DIM'] = '尺寸';
 $lang['zh_CN']['AssetTableField']['DIMLIMT'] = '限制在弹出窗口中的尺寸大小';
-$lang['zh_CN']['AssetTableField']['EDITIMAGE'] = '编辑此图片';
 $lang['zh_CN']['AssetTableField']['FILENAME'] = '文件名';
 $lang['zh_CN']['AssetTableField']['GALLERYOPTIONS'] = '相册选项';
 $lang['zh_CN']['AssetTableField']['IMAGE'] = '图片';
@@ -68,12 +67,6 @@ $lang['zh_CN']['AssetTableField']['SWFFILEOPTIONS'] = 'SWF 文件选项';
 $lang['zh_CN']['AssetTableField']['TITLE'] = '文件名称';
 $lang['zh_CN']['AssetTableField']['TYPE'] = '类型';
 $lang['zh_CN']['AssetTableField']['URL'] = 'URL';
-$lang['zh_CN']['CMSLeft.ss']['DELPAGE'] = '删除网页中...';
-$lang['zh_CN']['CMSLeft.ss']['DELPAGES'] = '删除所选网页';
-$lang['zh_CN']['CMSLeft.ss']['GO'] = '执行';
-$lang['zh_CN']['CMSLeft.ss']['NEWPAGE'] = '创建网页中...';
-$lang['zh_CN']['CMSLeft.ss']['SELECTPAGESDEL'] = '选择您想要删除的网页，然后点击下面的按钮';
-$lang['zh_CN']['CMSLeft.ss']['SITECONT'] = '网站内容';
 $lang['zh_CN']['CMSMain']['ACCESS'] = '在 CMS 访问 %s';
 $lang['zh_CN']['CMSMain']['CANCEL'] = '取消';
 $lang['zh_CN']['CMSMain']['CHOOSEREPORT'] = '（请选择一个报告）';
@@ -145,7 +138,6 @@ $lang['zh_CN']['CMSMain_left.ss']['PUBLISHCONFIRM'] = '发布所选网页';
 $lang['zh_CN']['CMSMain_left.ss']['SEARCH'] = '搜索';
 $lang['zh_CN']['CMSMain_left.ss']['SEARCHTITLE'] = '搜索URL（路径），名称，菜单名称以及内容';
 $lang['zh_CN']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = '选择您想要更改的网页，然后点击一个按钮';
-$lang['zh_CN']['CMSMain_left.ss']['SELECTPAGESDUP'] = '选择您想要复制的网页，不管其子页是否应包括在内，还是在哪放置复制出的网页';
 $lang['zh_CN']['CMSMain_left.ss']['SHOWONLYCHANGED'] = '只显示更改的网页';
 $lang['zh_CN']['CMSMain_left.ss']['SHOWUNPUB'] = '显示未发布的版本';
 $lang['zh_CN']['CMSMain_left.ss']['SITECONTENT TITLE'] = '网站内容与结构';
@@ -163,9 +155,6 @@ $lang['zh_CN']['CMSMain_versions.ss']['NOTPUB'] = '还未发布';
 $lang['zh_CN']['CMSMain_versions.ss']['PUBR'] = '发布人';
 $lang['zh_CN']['CMSMain_versions.ss']['UNKNOWN'] = '未知';
 $lang['zh_CN']['CMSMain_versions.ss']['WHEN'] = '上一次被编辑';
-$lang['zh_CN']['CMSRight.ss']['CHOOSEPAGE'] = '请选择左边的某一网页';
-$lang['zh_CN']['CMSRight.ss']['ECONTENT'] = '编辑内容';
-$lang['zh_CN']['CMSRight.ss']['WELCOMETO'] = '欢迎来到';
 $lang['zh_CN']['CommentAdmin']['ACCEPT'] = '提交';
 $lang['zh_CN']['CommentAdmin']['APPROVED'] = '通过 %s 评论';
 $lang['zh_CN']['CommentAdmin']['APPROVEDCOMMENTS'] = '已经审核的评论';
diff --git a/lang/zh_TW.php b/lang/zh_TW.php
index e26dbac1..1d1e5e80 100644
--- a/lang/zh_TW.php
+++ b/lang/zh_TW.php
@@ -51,12 +51,6 @@ $lang['zh_TW']['AssetTableField.ss']['DELFILE'] = '刪除這個檔案';
 $lang['zh_TW']['AssetTableField.ss']['DRAGTOFOLDER'] = '拖拽到左邊的資料夾即可移動';
 $lang['zh_TW']['AssetTableField']['TITLE'] = '標題';
 $lang['zh_TW']['AssetTableField']['TYPE'] = '類型';
-$lang['zh_TW']['CMSLeft.ss']['DELPAGE'] = '刪除網頁...';
-$lang['zh_TW']['CMSLeft.ss']['DELPAGES'] = '刪除已選擇的網頁';
-$lang['zh_TW']['CMSLeft.ss']['GO'] = '執行';
-$lang['zh_TW']['CMSLeft.ss']['NEWPAGE'] = '新增網頁...';
-$lang['zh_TW']['CMSLeft.ss']['SELECTPAGESDEL'] = '選擇您要刪除的網頁並點擊按鈕';
-$lang['zh_TW']['CMSLeft.ss']['SITECONT'] = '網站內容';
 $lang['zh_TW']['CMSMain']['CANCEL'] = '取消';
 $lang['zh_TW']['CMSMain']['CHOOSEREPORT'] = '(選擇報告)';
 $lang['zh_TW']['CMSMain']['COMPARINGV'] = '您正在比較第%d版與第%d版';
@@ -121,7 +115,6 @@ $lang['zh_TW']['CMSMain_left.ss']['PUBLISHCONFIRM'] = '發布已選擇的網頁'
 $lang['zh_TW']['CMSMain_left.ss']['SEARCH'] = '搜尋';
 $lang['zh_TW']['CMSMain_left.ss']['SEARCHTITLE'] = '搜索URL(路徑)、標題、選單標題、內容';
 $lang['zh_TW']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = '選擇您要變更的網頁並點擊一個動作：';
-$lang['zh_TW']['CMSMain_left.ss']['SELECTPAGESDUP'] = '選擇你要複製的網頁，並說明其子頁是否包括在內及其目的地。';
 $lang['zh_TW']['CMSMain_left.ss']['SHOWONLYCHANGED'] = '只顯示被變更的網頁';
 $lang['zh_TW']['CMSMain_left.ss']['SHOWUNPUB'] = '顯示尚未發布的版本';
 $lang['zh_TW']['CMSMain_left.ss']['SITECONTENT TITLE'] = '網站內容及架構';
@@ -139,9 +132,6 @@ $lang['zh_TW']['CMSMain_versions.ss']['NOTPUB'] = '尚未發布';
 $lang['zh_TW']['CMSMain_versions.ss']['PUBR'] = '發布者';
 $lang['zh_TW']['CMSMain_versions.ss']['UNKNOWN'] = '不知';
 $lang['zh_TW']['CMSMain_versions.ss']['WHEN'] = '上一次被編輯';
-$lang['zh_TW']['CMSRight.ss']['CHOOSEPAGE'] = '請從左邊選擇一個網頁。';
-$lang['zh_TW']['CMSRight.ss']['ECONTENT'] = '編輯內容';
-$lang['zh_TW']['CMSRight.ss']['WELCOMETO'] = '歡迎來到';
 $lang['zh_TW']['CommentAdmin']['MENUTITLE'] = '留言';
 $lang['zh_TW']['CommentList.ss']['CREATEDW'] = '當被發布、退回、或送出時，留言將會被建立。';
 $lang['zh_TW']['CommentList.ss']['NOCOM'] = '這頁沒有留言。';

From 1b5b1404294001fd1738d4ab47ab89041c89fcb7 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 3 May 2010 04:32:18 +0000
Subject: [PATCH 373/483] BUGFIX Fixed SS_Report::unregister() parameter naming
 (fixes #5511, thanks ktauber)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103932 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/Report.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/Report.php b/code/Report.php
index 0b4488bf..a004199d 100644
--- a/code/Report.php
+++ b/code/Report.php
@@ -308,7 +308,7 @@ class SS_Report extends ViewableData {
 	/**
 	 * Unregister a report, removing it from the list
 	 */
-	static function unregister($list, $identifier) {
+	static function unregister($list, $reportClass) {
 		unset(self::$registered_reports[$list][$reportClass]);
 	}
 	

From db447250623db88050992e55672ea2f6ce70bf4c Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 3 May 2010 05:04:31 +0000
Subject: [PATCH 374/483] BUGFIX login BackURL wrong when using nested urls
 (fixes #5520, thanks ktauber)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103933 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 templates/PageCommentInterface.ss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/PageCommentInterface.ss b/templates/PageCommentInterface.ss
index b0f9509a..321e89b7 100755
--- a/templates/PageCommentInterface.ss
+++ b/templates/PageCommentInterface.ss
@@ -7,7 +7,7 @@
 		<% else %>
 			<p><% _t('COMMENTLOGINERROR', 'You cannot post comments until you have logged in') %>,
 				<% if PostingRequiresPermission %><% _t('COMMENTPERMISSIONERROR', 'and that you have an appropriate permission level') %><% end_if %>. 
-				<a href="Security/login?BackURL={$Page.URLSegment}/" title="Login to post a comment"><% _t('COMMENTPOSTLOGIN', 'Login Here') %></a>.
+				<a href="Security/login?BackURL={$Page.Link}/" title="Login to post a comment"><% _t('COMMENTPOSTLOGIN', 'Login Here') %></a>.
 			</p>
 		<% end_if %>
 	<% else %>

From aeacbafe16b967d392cd647b3175091c9b2e863c Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 3 May 2010 22:41:30 +0000
Subject: [PATCH 375/483] BUGFIX Fixed publication of homepage with '/' URL
 through StaticPublisher (fixes #5514, thanks ktauber)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103960 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/staticpublisher/StaticPublisher.php | 6 +++++-
 tasks/RebuildStaticCacheTask.php         | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/code/staticpublisher/StaticPublisher.php b/code/staticpublisher/StaticPublisher.php
index 43309737..20a4da57 100644
--- a/code/staticpublisher/StaticPublisher.php
+++ b/code/staticpublisher/StaticPublisher.php
@@ -72,12 +72,16 @@ abstract class StaticPublisher extends DataObjectDecorator {
 			}
 		}
 		
+		// Note: Similiar to RebuildStaticCacheTask->rebuildCache()
 		foreach($urls as $i => $url) {
 			if(!is_string($url)) {
 				user_error("Bad URL: " . var_export($url, true), E_USER_WARNING);
 				continue;
 			}
-			if(substr($url,-1) == '/') $url = substr($url,0,-1);
+
+			// Remove leading slashes from all URLs (apart from the homepage)
+			if(substr($url,-1) == '/' && $url != '/') $url = substr($url,0,-1);
+			
 			$urls[$i] = $url;
 		}
 
diff --git a/tasks/RebuildStaticCacheTask.php b/tasks/RebuildStaticCacheTask.php
index 99c044d0..6d1df6eb 100644
--- a/tasks/RebuildStaticCacheTask.php
+++ b/tasks/RebuildStaticCacheTask.php
@@ -54,13 +54,16 @@ class RebuildStaticCacheTask extends Controller {
 		
 		touch($cacheBaseDir.'/lock');
 		
+		// Note: Similiar to StaticPublisher->republish()
 		foreach($urls as $i => $url) {
 			if($url && !is_string($url)) {
 				user_error("Bad URL: " . var_export($url, true), E_USER_WARNING);
 				continue;
 			}
 
-			if(substr($url,-1) == '/') $url = substr($url,0,-1);
+			// Remove leading slashes from all URLs (apart from the homepage)
+			if(substr($url,-1) == '/' && $url != '/') $url = substr($url,0,-1);
+			
 			$urls[$i] = $url;
 		}
 		$urls = array_unique($urls);

From 0aba4e6bc1280ae0ca86efc399bf97fad9f196e7 Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Tue, 4 May 2010 22:30:26 +0000
Subject: [PATCH 376/483] MINOR: Add README.md describing salad tests

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104077 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/salad/README.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 tests/salad/README.md

diff --git a/tests/salad/README.md b/tests/salad/README.md
new file mode 100644
index 00000000..12f4fa30
--- /dev/null
+++ b/tests/salad/README.md
@@ -0,0 +1,20 @@
+# Tests #
+
+Given I click on the "Tab Name" tab
+Given I close window and go back to clean state
+Given I fill out the log in form with user "user" and password "password"
+Given I get a permission denied error
+Given I go to the draft site
+Given I log in as Fred
+Given I log in as user
+Given I log into the CMS as Fred@example.com
+Given I log out
+Given I visit admin/security
+Given I wait for a status message
+Given I wait for a success message
+Given a "Blog" page called "News" as a child of "Blogs"
+Given a "Publishers" group
+Given a top-level "BlogPage" page called "News"
+Given a user called "Fred" in the "Authors" group
+Given the "News" page can be edited by the "Publishers" group
+Given the site can be edited by the "Publishers" group

From cbc0b0a84969a8f931e2bf7441b7cd293e09065e Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Tue, 4 May 2010 22:30:26 +0000
Subject: [PATCH 377/483] MINOR: Tweaks to ModelAdmin tabs HTML, and salad
 tests

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104078 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 templates/Includes/ModelAdmin_left.ss   |  4 ++--
 tests/salad/step_definitions/general.rb | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/templates/Includes/ModelAdmin_left.ss b/templates/Includes/ModelAdmin_left.ss
index 006ba86d..3503eca5 100755
--- a/templates/Includes/ModelAdmin_left.ss
+++ b/templates/Includes/ModelAdmin_left.ss
@@ -6,7 +6,7 @@
 		<% if SearchClassSelector = tabs %>
 			<ul class="tabstrip">
 				<% control ModelForms %>
-					<li class="$FirstLast"><a href="#{$Form.Name}_$ClassName">$Title</a></li>
+					<li class="$FirstLast"><a id="tab-ModelAdmin_$Title.HTMLATT" href="#{$Form.Name}_$ClassName">$Title</a></li>
 				<% end_control %>
 			</ul>
 		<% end_if %>
@@ -28,4 +28,4 @@
 			</div>
 		<% end_control %>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/tests/salad/step_definitions/general.rb b/tests/salad/step_definitions/general.rb
index 487769fc..994689bf 100644
--- a/tests/salad/step_definitions/general.rb
+++ b/tests/salad/step_definitions/general.rb
@@ -2,8 +2,23 @@
 ## General rules for the SilverStripe CMS as a whole.  They mostly have to do with the LeftAndMain
 ## interface
 
+# Match general CMS tabs, ModelAdmin needs another system
 Given /I click on the "([^\"]*)" tab/ do |tab|
-  Given "I click the \"tab-Root_Content_set_#{tab}\" link"
+	found = nil
+	links = @salad.browser.links()
+	links.each {|link|
+		if /^tab-.+/.match(link.id) then
+			if link.innerText == tab or /^tab-.*#{tab}(_set)?/.match(link.id) then
+				found = link
+				break
+			end
+		end
+	}
+	if found then
+		Given "I click the \"#{found.id}\" link"
+	else
+		fail("Could not find the \"#{tab}\" tab")
+	end
 end
 
 Given /I wait for a status message/ do

From 6c12757a91398dd42c74c786f89345f6bc791c56 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 9 May 2010 20:11:00 +0000
Subject: [PATCH 378/483] MINOR Documentation

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104402 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/SSAkismet.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/code/sitefeatures/SSAkismet.php b/code/sitefeatures/SSAkismet.php
index 2bf0d8fe..60da63ac 100644
--- a/code/sitefeatures/SSAkismet.php
+++ b/code/sitefeatures/SSAkismet.php
@@ -1,5 +1,21 @@
 <?php
 /**
+ * The SSAkismet class provides spam detection for comments using http://akismet.com/. 
+ * In order to use it, you must get an API key, which you can get free for non-commercial use by signing 
+ * up for a http://www.wordpress.com account. Commercial keys can be bought at http://akismet.com/commercial/.
+ * 
+ * To enable spam detection, set your API key in _config.php.  
+ * The following lines should be added to **mysite/_config.php** 
+ * (or to the _config.php in another folder if you're not using mysite). 
+ * 
+ * <code>
+ * SSAkismet::setAPIKey('<your-key>');
+ * </code>
+ * 
+ * You can then view spam for a page by appending <i>?showspam=1</i> to the url, or use the {@link CommentAdmin} in the CMS.
+ * 
+ * @see http://demo.silverstripe.com/blog Demo of SSAkismet in action
+ * 
  * @package cms
  * @subpackage comments
  */

From 38e1a09fb8bbd0fc5a619d58b01813363256f4bb Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 9 May 2010 20:11:21 +0000
Subject: [PATCH 379/483] BUGFIX Wrong HTML syntax in LeftAndMain.ss (fixes
 #5552, thanks simon_w)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104403 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 templates/LeftAndMain.ss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/LeftAndMain.ss b/templates/LeftAndMain.ss
index d7fc7429..4c6b92b2 100644
--- a/templates/LeftAndMain.ss
+++ b/templates/LeftAndMain.ss
@@ -48,7 +48,7 @@
 			<div id="switchView" class="bottomTabs">
 				<% if ShowSwitchView %>
 					<div class="blank"> <% _t('VIEWPAGEIN','Page view:') %> </div>
-					<span id="SwitchView">$SwitchView</div>
+					<span id="SwitchView">$SwitchView</span>
 				<% end_if %>
 			</div>
 		</div>

From 44f22fd880def34533ba0f9631f551b8f0109cdb Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Mon, 10 May 2010 03:42:11 +0000
Subject: [PATCH 380/483] BUGFIX: Removed erroneous default config for unused
 templates module.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104436 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 _config.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/_config.php b/_config.php
index 8c17feb2..326e6e8b 100644
--- a/_config.php
+++ b/_config.php
@@ -31,10 +31,6 @@ HtmlEditorConfig::get('cms')->setOptions(array(
 	'setupcontent_callback' => "sapphiremce_setupcontent",
 	'cleanup_callback' => "sapphiremce_cleanup",
 
-	'template_templates' => array(
-    	array( 'title' => "Three column", 'src' => "assets/snippet.html", 'description' => "A simple 3 column layout" )
-	),
-
 	'use_native_selects' => true, // fancy selects are bug as of SS 2.3.0
 	'valid_elements' => "@[id|class|style|title],#a[id|rel|rev|dir|tabindex|accesskey|type|name|href|target|title|class],-strong/-b[class],-em/-i[class],-strike[class],-u[class],#p[id|dir|class|align|style],-ol[class],-ul[class],-li[class],br,img[id|dir|longdesc|usemap|class|src|border|alt=|title|width|height|align],-sub[class],-sup[class],-blockquote[dir|class],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|dir|id|style],-tr[id|dir|class|rowspan|width|height|align|valign|bgcolor|background|bordercolor|style],tbody[id|class|style],thead[id|class|style],tfoot[id|class|style],#td[id|dir|class|colspan|rowspan|width|height|align|valign|scope|style],-th[id|dir|class|colspan|rowspan|width|height|align|valign|scope|style],caption[id|dir|class],-div[id|dir|class|align|style],-span[class|align|style],-pre[class|align],address[class|align],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style],-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|dir|class|align|style],hr[class],dd[id|class|title|dir],dl[id|class|title|dir],dt[id|class|title|dir],@[id,style,class]",
 	'extended_valid_elements' => "img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|usemap],iframe[src|name|width|height|align|frameborder|marginwidth|marginheight|scrolling],object[width|height|data|type],param[name|value],map[class|name|id],area[shape|coords|href|target|alt]"

From b5cdd69598c0db1ae0fd3708769621f25b4f8189 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Mon, 10 May 2010 22:22:44 +0000
Subject: [PATCH 381/483] MINOR Removed ForumAdmin.js which shouldn't belong in
 the CMS module

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104490 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/ForumAdmin.js | 115 ---------------------------------------
 1 file changed, 115 deletions(-)
 delete mode 100755 javascript/ForumAdmin.js

diff --git a/javascript/ForumAdmin.js b/javascript/ForumAdmin.js
deleted file mode 100755
index 5656376a..00000000
--- a/javascript/ForumAdmin.js
+++ /dev/null
@@ -1,115 +0,0 @@
-var _GroupID;
-Behaviour.register({
-	'#Form_EditForm_Type input':{
-		onclick:function(){
-			var requiredlogin = $('Form_EditForm_RequiredLogin');
-			var usersTab = $('Form_EditForm').getElementsByTagName('ul')[0].getElementsByTagName('li')[2];
-			if(this.value == 'consultation'){
-				if(requiredlogin.checked != 'checked')
-					requiredlogin.checked = 'checked';
-				usersTab.style.display = 'block';
-				if(_GroupID)
-					this.recoverGroupID();
-				Element.disable(requiredlogin);
-			}else{ // this.value == 'open'
-				usersTab.style.display = 'none';
-				this.treatGroupIDAs0();
-				Element.enable(requiredlogin);
-			}
-		},
-
-		treatGroupIDAs0:function(){
-			var groupIDDiv = $('GroupID');
-			var groupIDs = groupIDDiv.getElementsByTagName('option');
-			for(var i=0; i<groupIDs.length; i++){
-				if(groupIDs[i].selected == true){
-					groupIDs[i].selected = false;
-					break;
-				}
-			}
-			_GroupID = groupIDs[i].value;
-			groupIDs[0].selected = true;
-		},
-		
-		recoverGroupID:function(){
-			var groupIDDiv = $('GroupID');
-			var groupIDs = groupIDDiv.getElementsByTagName('option');
-			groupIDs[0].selected = false;
-			for(var i=0; i<groupIDs.length; i++){
-				if(groupIDs[i].value == _GroupID){
-					groupIDs[i].selected = true;
-					break;
-				}
-			}
-			_GrouipID = null;
-		}
-	},
-	
-	'#Root_Users #GroupID select':{
-		onchange:function() {
-			var source = this.getElementsByTagName('option');
-			
-			for(var i=0; i<source.length; i++){
-				if(source[i].selected == true){
-					break;
-				}
-			}
-			
-			var action=getAjaxURL('getMembersByGroup', source[i].value, 'ajax=1');
-			new Ajax.Updater(
-				{success: 'MemberList'},
-				action,
-				{
-					method: 'get',
-					onFailure: function(response) {errorMessage("Error getting data", response);},
-					onComplete: function() {Behaviour.apply($('MemberList'));}
-				}
-			);
-			
-			return false;
-		}
-	}
-});
-
-function getAjaxURL(action, param, getvars) {
-	var base = document.getElementsByTagName('base')[0].href;
-	var url = window.location.href.substr(base.length);
-	if(url.match(/^([^?]+)(\?.*)/)){
-		url=RegExp.$1;
-	}
-	if(!url.match(/^([^\/]+\/)$/)){
-		url = url+"/";
-	}
-	
-	if(getvars) getvars = "?" + getvars;
-	else getvars = "";
-	return base + url.replace(/^([^\/]+\/).*/, '$1' + action + '/' + param + getvars);
-}
-
-Element.disable = function(el){
-	el.disabled = true;
-}
-
-Element.enable = function(el){
-	el.disabled = false;
-}
-
-initialiseCMSIfAForumLoaded = function(){
-	if($('Form_EditForm_Type')) {
-		var types=($('Form_EditForm_Type').getElementsByTagName('input'));
-		for(var i=0; i<types.length; i++){
-	
-			if(types[i].checked)
-			{
-				if(types[i].onclick) types[i].onclick();
-			}
-		}
-	}
-}
-
-Behaviour.addLoader(function(){
-	if($('Form_EditForm') && $('Form_EditForm').observeMethod) {
-		$('Form_EditForm').observeMethod('PageLoaded', initialiseCMSIfAForumLoaded());
-	}
-	
-});
\ No newline at end of file

From 5a083b9b1daa32790af55dd46f52f25cf47a115f Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Tue, 11 May 2010 02:31:41 +0000
Subject: [PATCH 382/483] BUGFIX: Fix ModelAdmin Import hang (ticket 5569)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104533 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/ModelAdmin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/ModelAdmin.js b/javascript/ModelAdmin.js
index ffcf7fbd..7c08bcff 100644
--- a/javascript/ModelAdmin.js
+++ b/javascript/ModelAdmin.js
@@ -129,7 +129,7 @@ $(document).ready(function() {
 	 * 
 	 * @todo use jQuery.live to manage ResultTable click handlers
 	 */
-	$('#SearchForm_holder .tab form:not(#Form_ImportForm)').submit(function () {
+	$('#SearchForm_holder .tab form:not([id^=Form_ImportForm])').submit(function () {
 	    var $form = $(this);
 		$('#contentPanel').fn('closeRightPanel');
 		// @todo TinyMCE coupling

From 5fd8e78f3182548b3698b641fe96d11b95ac5cc1 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 12 May 2010 05:29:25 +0000
Subject: [PATCH 383/483] BUGFIX: Make RsyncMultiHostPublisher protected; give
 default value.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104672 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/staticpublisher/RsyncMultiHostPublisher.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/staticpublisher/RsyncMultiHostPublisher.php b/code/staticpublisher/RsyncMultiHostPublisher.php
index e20b5842..b59a5895 100644
--- a/code/staticpublisher/RsyncMultiHostPublisher.php
+++ b/code/staticpublisher/RsyncMultiHostPublisher.php
@@ -13,7 +13,7 @@ class RsyncMultiHostPublisher extends FilesystemPublisher {
 	/**
 	 * Array of rsync targets to publish to.  These can either be local file names, or scp-style targets, in the form "user@server:path"
 	 */
-	static $targets;
+	protected static $targets = array();
 	
 	/**
 	 * Set the targets to publish to.

From bafeaaea1cf430508c50417f7ebf554f02f8a8f2 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 12 May 2010 05:29:26 +0000
Subject: [PATCH 384/483] API CHANGE: Added
 RsyncMultiHostPublisher::set_excluded_folders().

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104673 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 .../RsyncMultiHostPublisher.php               | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/code/staticpublisher/RsyncMultiHostPublisher.php b/code/staticpublisher/RsyncMultiHostPublisher.php
index b59a5895..55ac87ff 100644
--- a/code/staticpublisher/RsyncMultiHostPublisher.php
+++ b/code/staticpublisher/RsyncMultiHostPublisher.php
@@ -15,6 +15,8 @@ class RsyncMultiHostPublisher extends FilesystemPublisher {
 	 */
 	protected static $targets = array();
 	
+	protected static $excluded_folders = array();
+	
 	/**
 	 * Set the targets to publish to.
 	 * If target is an scp-style remote path, no password is accepted - we assume key-based authentication to be set up on the application server
@@ -25,6 +27,14 @@ class RsyncMultiHostPublisher extends FilesystemPublisher {
 	static function set_targets($targets) {
 		self::$targets = $targets;
 	}
+	
+	/**
+	 * Specify folders to exclude from the rsync
+	 * For example, you could exclude assets.
+	 */
+	static function set_excluded_folders($folders) {
+		self::$excluded_folders = $folders;
+	}
 
 	function publishPages($urls) {
 		parent::publishPages($urls);
@@ -33,11 +43,16 @@ class RsyncMultiHostPublisher extends FilesystemPublisher {
 		// Get variable that can turn off the rsync component of publication 
 		if(isset($_GET['norsync']) && $_GET['norsync']) return;
 		
+		$extraArg = "";
+		if(self::$excluded_folders) foreach(self::$excluded_folders as $folder) {
+			$extraArg .= " --exclude " . escapeshellarg($folder);
+		}
+		
 		foreach(self::$targets as $target) {
 			// Transfer non-PHP content from everything to the target; that will ensure that we have all the JS/CSS/etc
-			$rsyncOutput = `cd $base; rsync -av -e ssh --exclude /.htaccess --exclude '*.php' --exclude '*.svn' --exclude '*~' --delete . $target`;
+			$rsyncOutput = `cd $base; rsync -av -e ssh --exclude /.htaccess --exclude /web.config --exclude '*.php' --exclude '*.svn' --exclude '*.git' --exclude '*~' $extraArg --delete . $target`;
 			// Then transfer "safe" PHP from the cache/ directory
-			$rsyncOutput .= `cd $base; rsync -av -e ssh --exclude '*.svn' --exclude '*~' --delete cache $target`;
+			$rsyncOutput .= `cd $base; rsync -av -e ssh --exclude '*.svn' --exclude '*~' $extraArg --delete cache $target`;
 			if(StaticPublisher::echo_progress()) echo $rsyncOutput;
 		}
 	}

From e0b5c8f39fa126d99b1d5bd44191acaf68e27e34 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 12 May 2010 05:29:26 +0000
Subject: [PATCH 385/483] ENHANCMENT: RsyncMultiHostPublisher also rsyncs
 sapphire/static-main.php.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104674 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/staticpublisher/RsyncMultiHostPublisher.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/staticpublisher/RsyncMultiHostPublisher.php b/code/staticpublisher/RsyncMultiHostPublisher.php
index 55ac87ff..9962361a 100644
--- a/code/staticpublisher/RsyncMultiHostPublisher.php
+++ b/code/staticpublisher/RsyncMultiHostPublisher.php
@@ -53,6 +53,8 @@ class RsyncMultiHostPublisher extends FilesystemPublisher {
 			$rsyncOutput = `cd $base; rsync -av -e ssh --exclude /.htaccess --exclude /web.config --exclude '*.php' --exclude '*.svn' --exclude '*.git' --exclude '*~' $extraArg --delete . $target`;
 			// Then transfer "safe" PHP from the cache/ directory
 			$rsyncOutput .= `cd $base; rsync -av -e ssh --exclude '*.svn' --exclude '*~' $extraArg --delete cache $target`;
+			// Transfer sapphire/static-main.php to the target
+			$rsyncOutput .= `cd $base; rsync -av -e ssh --delete sapphire/static-main.php $target/sapphire`;
 			if(StaticPublisher::echo_progress()) echo $rsyncOutput;
 		}
 	}

From 24b83db9c2a5ada218fc72e35b5bf64c6e5dee5f Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 12 May 2010 05:29:27 +0000
Subject: [PATCH 386/483] BUGFIX: Prevent DataDifferencer from creating empty
 <ins /> and <del /> takes that confuse the browser.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104675 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/Diff.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/Diff.php b/code/Diff.php
index b7c5f9d9..708cc814 100755
--- a/code/Diff.php
+++ b/code/Diff.php
@@ -686,6 +686,10 @@ class Diff
 			$doc = new SS_HTMLValue($content);
 			$content = $doc->getContent();
 		}
+
+		// Remove empty <ins /> and <del /> tags because browsers hate them
+		$content = preg_replace('/<(ins|del)[^>]*\/>/','', $content);
+
 		return $content;
 	}
 

From 97c1ff1e18a9679ae2ad082c0d4b27e6d8afcdbb Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 16 May 2010 23:50:03 +0000
Subject: [PATCH 387/483] ENHANCEMENT Added
 PageComment->canView()/canEdit()/canDelete(), and using these permissions in
 PageCommentInterface. Caution: canCreate() actions are still determined by
 PageCommentInterface::$comments_require_login/$comments_require_permission
 BUGFIX Requiring CMS_ACCESS_CommentAdmin instead of ADMIN permissions in
 PageCommentInterface and CommentAdmin administrative actions

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104968 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/PageComment.php          | 206 +++++++++++++--------
 code/sitefeatures/PageCommentInterface.php |   4 +-
 tests/CommentAdminTest.php                 |   2 +-
 tests/PageCommentsTest.php                 |  57 +++++-
 tests/PageCommentsTest.yml                 |  22 ++-
 5 files changed, 207 insertions(+), 84 deletions(-)

diff --git a/code/sitefeatures/PageComment.php b/code/sitefeatures/PageComment.php
index 15e800d8..f63dc9fe 100755
--- a/code/sitefeatures/PageComment.php
+++ b/code/sitefeatures/PageComment.php
@@ -60,7 +60,7 @@ class PageComment extends DataObject {
 	}
 
 	function DeleteLink() {
-		return (Permission::check('CMS_ACCESS_CMSMain')) ? "PageComment_Controller/deletecomment/$this->ID" : false;
+		return ($this->canDelete()) ? "PageComment_Controller/deletecomment/$this->ID" : false;
 	}
 	
 	function CommentTextWithLinks() {
@@ -70,15 +70,15 @@ class PageComment extends DataObject {
 	}
 	
 	function SpamLink() {
-		return (Permission::check('CMS_ACCESS_CMSMain') && !$this->IsSpam) ? "PageComment_Controller/reportspam/$this->ID" : false;
+		return ($this->canEdit() && !$this->IsSpam) ? "PageComment_Controller/reportspam/$this->ID" : false;
 	}
 	
 	function HamLink() {
-		return (Permission::check('CMS_ACCESS_CMSMain') && $this->IsSpam) ? "PageComment_Controller/reportham/$this->ID" : false;
+		return ($this->canEdit() && $this->IsSpam) ? "PageComment_Controller/reportham/$this->ID" : false;
 	}
 	
 	function ApproveLink() {
-		return (Permission::check('CMS_ACCESS_CMSMain') && $this->NeedsModeration) ? "PageComment_Controller/approve/$this->ID" : false;
+		return ($this->canEdit() && $this->NeedsModeration) ? "PageComment_Controller/approve/$this->ID" : false;
 	}
 	
 	function SpamClass() {
@@ -156,6 +156,77 @@ class PageComment extends DataObject {
 			}
 		}
 	}
+	
+	/**
+	 * This always returns true, and should be handled by {@link PageCommentInterface->CanPostComment()}.
+	 * 
+	 * @todo Integrate with PageCommentInterface::$comments_require_permission and $comments_require_login
+	 * 
+	 * @param Member $member
+	 * @return Boolean
+	 */
+	function canCreate($member = null) {
+		return true;
+	}
+	
+	/**
+	 * Checks for association with a page,
+	 * and {@link SiteTree->ProvidePermission} flag being set to TRUE.
+	 * Note: There's an additional layer of permission control
+	 * in {@link PageCommentInterface}.
+	 * 
+	 * @param Member $member
+	 * @return Boolean
+	 */
+	function canView($member = null) {
+		if(!$member) $member = Member::currentUser();
+		
+		// Standard mechanism for accepting permission changes from decorators
+		$extended = $this->extendedCan('canView', $member);
+		if($extended !== null) return $extended;
+		
+		$page = $this->Parent();
+		return (
+			($page && $page->ProvideComments)
+			|| (bool)Permission::checkMember($member, 'CMS_ACCESS_CommentAdmin')
+		);
+	}
+	
+	/**
+	 * Checks for "CMS_ACCESS_CommentAdmin" permission codes
+	 * and {@link canView()}. 
+	 * 
+	 * @param Member $member
+	 * @return Boolean
+	 */
+	function canEdit($member = null) {
+		if(!$member) $member = Member::currentUser();
+		
+		// Standard mechanism for accepting permission changes from decorators
+		$extended = $this->extendedCan('canEdit', $member);
+		if($extended !== null) return $extended;
+		
+		if(!$this->canView($member)) return false;
+		
+		return (bool)Permission::checkMember($member, 'CMS_ACCESS_CommentAdmin');
+	}
+	
+	/**
+	 * Checks for "CMS_ACCESS_CommentAdmin" permission codes
+	 * and {@link canEdit()}.
+	 * 
+	 * @param Member $member
+	 * @return Boolean
+	 */
+	function canDelete($member = null) {
+		if(!$member) $member = Member::currentUser();
+		
+		// Standard mechanism for accepting permission changes from decorators
+		$extended = $this->extendedCan('canDelete', $member);
+		if($extended !== null) return $extended;
+		
+		return $this->canEdit($member);
+	}
 }
 
 
@@ -180,13 +251,11 @@ class PageComment_Controller extends Controller {
 	 * Deletes all comments on the page referenced by the url param pageid
 	 */
 	function deleteallcomments() {
-		if(Permission::check('CMS_ACCESS_CMSMain')) {
-			$pageId = $_REQUEST['pageid'];
-			if(preg_match('/^\d+$/', $pageId)) {
-				$comments = DataObject::get("PageComment", "\"ParentID\" = $pageId");
-				if($comments) foreach($comments as $c) {
-					$c->delete();
-				}
+		$pageId = $_REQUEST['pageid'];
+		if(preg_match('/^\d+$/', $pageId)) {
+			$comments = DataObject::get("PageComment", "\"ParentID\" = $pageId");
+			if($comments) foreach($comments as $c) {
+				if($c->canDelete()) $c->delete();
 			}
 		}
 		
@@ -198,11 +267,9 @@ class PageComment_Controller extends Controller {
 	}
 	
 	function deletecomment() {
-		if(Permission::check('CMS_ACCESS_CMSMain')) {
-			$comment = DataObject::get_by_id("PageComment", $this->urlParams['ID']);
-			if($comment) {
-				$comment->delete();
-			}
+		$comment = DataObject::get_by_id("PageComment", $this->urlParams['ID']);
+		if($comment && $comment->canDelete()) {
+			$comment->delete();
 		}
 		
 		if(Director::is_ajax()) {
@@ -213,52 +280,47 @@ class PageComment_Controller extends Controller {
 	}
 	
 	function approve() {
-		if(Permission::check('CMS_ACCESS_CMSMain')) {
-			$comment = DataObject::get_by_id("PageComment", $this->urlParams['ID']);
+		$comment = DataObject::get_by_id("PageComment", $this->urlParams['ID']);
 
-			if($comment) {
-				$comment->NeedsModeration = false;
-				$comment->write();
-			
-				// @todo Report to spamprotecter this is true
-			
-				if(Director::is_ajax()) {
-					echo $comment->renderWith('PageCommentInterface_singlecomment');
-				} else {
-					Director::redirectBack();
-				}
+		if($comment && $comment->canEdit()) {
+			$comment->NeedsModeration = false;
+			$comment->write();
+		
+			// @todo Report to spamprotecter this is true
+		
+			if(Director::is_ajax()) {
+				echo $comment->renderWith('PageCommentInterface_singlecomment');
+			} else {
+				Director::redirectBack();
 			}
 		}
 	}
 	
 	function reportspam() {
 		$comment = DataObject::get_by_id("PageComment", $this->urlParams['ID']);
-		if($comment) {
-			// check they have access
-			if(Permission::check('CMS_ACCESS_CMSMain')) {
-				
-				// if spam protection module exists
-				if(class_exists('SpamProtectorManager')) {
-					SpamProtectorManager::send_feedback($comment, 'spam');
-				}
-				
-				// If Akismet is enabled
-				else if(SSAkismet::isEnabled()) {
-					try {
-						$akismet = new SSAkismet();
-						$akismet->setCommentAuthor($comment->getField('Name'));
-						$akismet->setCommentContent($comment->getField('Comment'));
-						$akismet->submitSpam();
-					} catch (Exception $e) {
-						// Akismet didn't work, most likely the service is down.
-					}
-				}
-				
-				$comment->IsSpam = true;
-				$comment->NeedsModeration = false;
-				$comment->write();
+		if($comment && $comment->canEdit()) {
+			// if spam protection module exists
+			if(class_exists('SpamProtectorManager')) {
+				SpamProtectorManager::send_feedback($comment, 'spam');
 			}
+			
+			// If Akismet is enabled
+			else if(SSAkismet::isEnabled()) {
+				try {
+					$akismet = new SSAkismet();
+					$akismet->setCommentAuthor($comment->getField('Name'));
+					$akismet->setCommentContent($comment->getField('Comment'));
+					$akismet->submitSpam();
+				} catch (Exception $e) {
+					// Akismet didn't work, most likely the service is down.
+				}
+			}
+			
+			$comment->IsSpam = true;
+			$comment->NeedsModeration = false;
+			$comment->write();
 		}
+
 		if(Director::is_ajax()) {
 			if(SSAkismet::isEnabled() && SSAkismet::getSaveSpam()) {
 				echo $comment->renderWith('PageCommentInterface_singlecomment');
@@ -274,28 +336,26 @@ class PageComment_Controller extends Controller {
 	 */
 	function reportham() {
 		$comment = DataObject::get_by_id("PageComment", $this->urlParams['ID']);
-		if($comment) {
-			if(Permission::check('CMS_ACCESS_CMSMain')) {
-					
-				// if spam protection module exists
-				if(class_exists('SpamProtectorManager')) {
-					SpamProtectorManager::send_feedback($comment, 'ham');
-				}
-				
-				if(SSAkismet::isEnabled()) {
-					try {
-						$akismet = new SSAkismet();
-						$akismet->setCommentAuthor($comment->getField('Name'));
-						$akismet->setCommentContent($comment->getField('Comment'));
-						$akismet->submitHam();
-					} catch (Exception $e) {
-						// Akismet didn't work, most likely the service is down.
-					}
-				}
-				$comment->setField('IsSpam', false);
-				$comment->write();
+		if($comment && $comment->canEdit()) {
+			// if spam protection module exists
+			if(class_exists('SpamProtectorManager')) {
+				SpamProtectorManager::send_feedback($comment, 'ham');
 			}
+			
+			if(SSAkismet::isEnabled()) {
+				try {
+					$akismet = new SSAkismet();
+					$akismet->setCommentAuthor($comment->getField('Name'));
+					$akismet->setCommentContent($comment->getField('Comment'));
+					$akismet->submitHam();
+				} catch (Exception $e) {
+					// Akismet didn't work, most likely the service is down.
+				}
+			}
+			$comment->setField('IsSpam', false);
+			$comment->write();
 		}
+
 		if(Director::is_ajax()) {
 			echo $comment->renderWith('PageCommentInterface_singlecomment');
 		} else {		
diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index 7d068139..c4228a40 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -231,7 +231,7 @@ class PageCommentInterface extends RequestHandler {
 		$limit['limit'] = PageComment::$comments_per_page;
 		
 		$spamfilter = isset($_GET['showspam']) ? '' : "AND \"IsSpam\" = 0";
-		$unmoderatedfilter = Permission::check('ADMIN') ? '' : "AND \"NeedsModeration\" = 0";
+		$unmoderatedfilter = Permission::check('CMS_ACCESS_CommentAdmin') ? '' : "AND \"NeedsModeration\" = 0";
 		$order = self::$order_comments_by;
 		$comments =  DataObject::get("PageComment", "\"ParentID\" = '" . Convert::raw2sql($this->page->ID) . "' $spamfilter $unmoderatedfilter", $order, "", $limit);
 		
@@ -254,7 +254,7 @@ class PageCommentInterface extends RequestHandler {
 	 * comments on a page referenced by the url param pageid
 	 */
 	function DeleteAllLink() {
-		if(Permission::check('CMS_ACCESS_CMSMain')) {
+		if(Permission::check('CMS_ACCESS_CommentAdmin')) {
 			return Director::absoluteBaseURL() . "PageComment/deleteallcomments?pageid=" . $this->page->ID;
 		}
 	}
diff --git a/tests/CommentAdminTest.php b/tests/CommentAdminTest.php
index 9a3cfa92..9ec92e26 100644
--- a/tests/CommentAdminTest.php
+++ b/tests/CommentAdminTest.php
@@ -28,7 +28,7 @@ class CommentAdminTest extends FunctionalTest {
 	function testdeletemarked(){
 		$comm = $this->objFromFixture('PageComment', 'Comment1');
 		$id = $comm->ID;
-		$this->logInWithPermission('ADMIN');
+		$this->logInWithPermission('CMS_ACCESS_CommentAdmin');
 		$result = $this->get("admin/comments/EditForm/field/Comments/item/$id/delete");
 		$checkComm = DataObject::get_by_id('PageComment',$id);
 
diff --git a/tests/PageCommentsTest.php b/tests/PageCommentsTest.php
index 7d2f6b81..4510a31f 100644
--- a/tests/PageCommentsTest.php
+++ b/tests/PageCommentsTest.php
@@ -4,13 +4,64 @@ class PageCommentsTest extends FunctionalTest {
 	
 	static $fixture_file = 'cms/tests/PageCommentsTest.yml';
 	
+	function testCanView() {
+		$visitor = $this->objFromFixture('Member', 'visitor');
+		$admin = $this->objFromFixture('Member', 'commentadmin');
+		$comment = $this->objFromFixture('PageComment', 'firstComA');
+		
+		$this->assertTrue($comment->canView($visitor), 
+			'Unauthenticated members can view comments associated to a page with ProvideComments=1'
+		);
+		$this->assertTrue($comment->canView($admin),
+			'Admins with CMS_ACCESS_CommentAdmin permissions can view comments associated to a page with ProvideComments=1'
+		);
+		
+		$disabledComment = $this->objFromFixture('PageComment', 'disabledCom');
+		
+		$this->assertFalse($disabledComment->canView($visitor),
+		'Unauthenticated members can not view comments associated to a page with ProvideComments=0'
+		);
+		$this->assertTrue($disabledComment->canView($admin),
+			'Admins with CMS_ACCESS_CommentAdmin permissions can view comments associated to a page with ProvideComments=0'
+		);
+	}
+	
+	function testCanEdit() {
+		$visitor = $this->objFromFixture('Member', 'visitor');
+		$admin = $this->objFromFixture('Member', 'commentadmin');
+		$comment = $this->objFromFixture('PageComment', 'firstComA');
+		
+		$this->assertFalse($comment->canEdit($visitor));
+		$this->assertTrue($comment->canEdit($admin));
+	}
+	
+	function testCanDelete() {
+		$visitor = $this->objFromFixture('Member', 'visitor');
+		$admin = $this->objFromFixture('Member', 'commentadmin');
+		$comment = $this->objFromFixture('PageComment', 'firstComA');
+		
+		$this->assertFalse($comment->canEdit($visitor));
+		$this->assertTrue($comment->canEdit($admin));
+	}
+	
+	function testDeleteComment() {
+		$firstPage = $this->objFromFixture('Page', 'first');
+		$this->autoFollowRedirection = false;
+		$this->logInAs('commentadmin');
+		
+		$firstComment = $this->objFromFixture('PageComment', 'firstComA');
+		$firstCommentID = $firstComment->ID;
+		Director::test($firstPage->RelativeLink(), null, $this->session());
+		Director::test('PageComment/deletecomment/'.$firstComment->ID, null, $this->session());
+		
+		$this->assertFalse(DataObject::get_by_id('PageComment', $firstCommentID));
+	}
 	
 	function testDeleteAllCommentsOnPage() {
-		
-		
 		$second = $this->objFromFixture('Page', 'second');
 		$this->autoFollowRedirection = false;
-		$this->logInAs('admin');
+		$this->logInAs('commentadmin');
+		
 		Director::test('second-page', null, $this->session());
 		Director::test('PageComment/deleteallcomments?pageid='.$second->ID,
 			null, $this->session());
diff --git a/tests/PageCommentsTest.yml b/tests/PageCommentsTest.yml
index b70d5c0f..5ec73a0e 100644
--- a/tests/PageCommentsTest.yml
+++ b/tests/PageCommentsTest.yml
@@ -1,27 +1,36 @@
 Member:
-   admin:
+   commentadmin:
       FirstName: admin
+   visitor:
+      FirstName: visitor
 
 Group:
-   admin:
+   commentadmins:
       Title: Admin
-      Members: =>Member.admin
+      Members: =>Member.commentadmin
 
 Permission:
    admin:
-      Code: ADMIN
-      Group: =>Group.admin
+      Code: CMS_ACCESS_CommentAdmin
+      Group: =>Group.commentadmins
 
 Page:
     first:
         Title: First page
         URLSegment: first-page
+        ProvideComments: 1
     second:
         Title: Second page
         URLSegment: second-page
+        ProvideComments: 1
     third:
         Title: Third page
         URLSegment:third-page
+        ProvideComments: 1
+    pageNoComments:
+        Title: No comments
+        URLSegment: no-comments
+        ProvideComments: 0
 
 PageComment:
     firstComA:
@@ -48,3 +57,6 @@ PageComment:
         ParentID: =>Page.third
         Name: TC
         Comment: textTC
+    disabledCom:
+        ParentID: =>Page.pageNoComments
+        Name: Disabled
\ No newline at end of file

From 4ff657e03f364cc232dc8e09b5eee4e7c93c365d Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 17 May 2010 00:23:53 +0000
Subject: [PATCH 388/483] MINOR Translations in PageCommentInterface.ss (fixes
 #5598, thanks Pike)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104970 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 lang/en_US.php                    | 1 +
 templates/PageCommentInterface.ss | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lang/en_US.php b/lang/en_US.php
index cc657347..db2f845c 100755
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -456,6 +456,7 @@ $lang['en_US']['PageComment']['SINGULARNAME'] = array(
 	'Singular name of the object, used in dropdowns and to generally identify a single object in the interface'
 );
 $lang['en_US']['PageCommentInterface']['COMMENTERURL'] = 'Your website URL';
+$lang['en_US']['PageCommentInterface']['DELETEALLCOMMENTS'] = 'Delete all comments on this page';
 $lang['en_US']['PageCommentInterface']['POST'] = 'Post';
 $lang['en_US']['PageCommentInterface']['SPAMQUESTION'] = 'Spam protection question: %s';
 $lang['en_US']['PageCommentInterface']['YOURCOMMENT'] = 'Comments';
diff --git a/templates/PageCommentInterface.ss b/templates/PageCommentInterface.ss
index 321e89b7..f4b124bb 100755
--- a/templates/PageCommentInterface.ss
+++ b/templates/PageCommentInterface.ss
@@ -54,7 +54,9 @@
 		<% end_if %>
 	</div>
 	<% if DeleteAllLink %>
-		<p id="DeleteComments"><a href="$DeleteAllLink">Delete all comments on this page</a></p>
+		<p id="DeleteComments"><a href="$DeleteAllLink">
+			<% _t('PageCommentInterface.DELETEALLCOMMENTS','Delete all comments on this page' %>
+		</a></p>
 	<% end_if %>
 	<p id="CommentsRSSFeed">
 		<a class="commentrss" href="$CommentRssLink"><% _t('RSSFEEDCOMMENTS', 'RSS feed for comments on this page') %></a> | 

From 8c40e6f4a34627697dabac5d7ad246f6e5d97813 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 17 May 2010 02:44:25 +0000
Subject: [PATCH 389/483] MINOR Added translations for BrokenLinksReport,
 ReportAdminForm.ss, AssetTableField.ss (fixes #5527, thanks Martimiz)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104980 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/reports/BrokenLinksReport.php    |  6 +++---
 lang/en_US.php                        | 15 +++++++++------
 templates/Includes/AssetTableField.ss |  2 +-
 templates/ReportAdminForm.ss          |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
index af20c5a6..a4ed908b 100644
--- a/code/reports/BrokenLinksReport.php
+++ b/code/reports/BrokenLinksReport.php
@@ -82,7 +82,7 @@ class BrokenLinksReport extends SS_Report {
 		
 		$fields = array(
 			"Title" => array(
-				"title" => "Page name",
+				"title" => _t('BrokenLinksReport.PageName', 'Page name'),
 				'formatting' => sprintf(
 					'<a href=\"admin/show/$ID\" title=\"%s\">$value</a>',
 					_t('BrokenLinksReport.HoverTitleEditPage', 'Edit page')
@@ -105,7 +105,7 @@ class BrokenLinksReport extends SS_Report {
 	}
 	function parameterFields() {
 		return new FieldSet(
-			new DropdownField('CheckSite', 'Check site', array(
+			new DropdownField('CheckSite', _t('BrokenLinksReport.CheckSite','Check site'), array(
 				'Published' => _t('BrokenLinksReport.CheckSiteDropdownPublished', 'Published Site'),
 				'Draft' => _t('BrokenLinksReport.CheckSiteDropdownDraft', 'Draft Site')
 			)),
@@ -113,7 +113,7 @@ class BrokenLinksReport extends SS_Report {
 				'Reason', 
 				_t('BrokenLinksReport.ReasonDropdown', 'Problem to check'), 
 				array(
-					'' => 'Any',
+					'' => _t('BrokenLinksReport.Any', 'Any'),
 					'BROKENFILE' => _t('BrokenLinksReport.ReasonDropdownBROKENFILE', 'Broken file'),
 					'BROKENLINK' => _t('BrokenLinksReport.ReasonDropdownBROKENLINK', 'Broken link'),
 					'VPBROKENLINK' => _t('BrokenLinksReport.ReasonDropdownVPBROKENLINK', 'Virtual page pointing to non-existent page'),
diff --git a/lang/en_US.php b/lang/en_US.php
index db2f845c..fd7d1f20 100755
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -17,8 +17,7 @@ $lang['en_US']['AssetAdmin']['MOVEDX'] = 'Moved %s files';
 $lang['en_US']['AssetAdmin']['NEWFOLDER'] = 'NewFolder';
 $lang['en_US']['AssetAdmin']['NOTEMP'] = 'There is no temporary folder for uploads. Please set upload_tmp_dir in php.ini.';
 $lang['en_US']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'There was nothing to upload';
-$lang['en_US']['AssetAdmin']['NOWBROKEN'] = 'The following pages now have broken links:';
-$lang['en_US']['AssetAdmin']['NOWBROKEN2'] = 'Their owners have been emailed and they will fix up those pages.';
+$lang['en_US']['AssetAdmin']['NOWBROKEN'] = 'These pages now have broken links:';
 $lang['en_US']['AssetAdmin']['SAVEDFILE'] = 'Saved file %s';
 $lang['en_US']['AssetAdmin']['SAVEFOLDERNAME'] = 'Save folder name';
 $lang['en_US']['AssetAdmin']['THUMBSDELETED'] = '%s unused thumbnails have been deleted';
@@ -47,6 +46,7 @@ $lang['en_US']['AssetTableField']['FILENAME'] = 'Filename';
 $lang['en_US']['AssetTableField']['IMAGE'] = 'Image';
 $lang['en_US']['AssetTableField']['LASTEDIT'] = 'Last changed';
 $lang['en_US']['AssetTableField']['MAIN'] = 'Main';
+$lang['en_US']['AssetTableField']['NODATAFOUND'] = 'No %s found';
 $lang['en_US']['AssetTableField']['NOLINKS'] = 'This file hasn\'t been linked to from any pages.';
 $lang['en_US']['AssetTableField']['OWNER'] = 'Owner';
 $lang['en_US']['AssetTableField']['PAGESLINKING'] = 'The following pages link to this file:';
@@ -58,7 +58,9 @@ $lang['en_US']['AssetTableField.ss']['DELFILE'] = 'Delete this file';
 $lang['en_US']['AssetTableField.ss']['DRAGTOFOLDER'] = 'Drag to folder on left to move file';
 $lang['en_US']['AssetTableField.ss']['EDIT'] = 'Edit asset';
 $lang['en_US']['AssetTableField.ss']['SHOW'] = 'Show asset';
+$lang['en_US']['BrokenLinksReport']['Any'] = 'Any';
 $lang['en_US']['BrokenLinksReport']['BROKENLINKS'] = 'Broken links report';
+$lang['en_US']['BrokenLinksReport']['CheckSite'] = 'Check site';
 $lang['en_US']['BrokenLinksReport']['CheckSiteDropdownDraft'] = 'Draft Site';
 $lang['en_US']['BrokenLinksReport']['CheckSiteDropdownPublished'] = 'Published Site';
 $lang['en_US']['BrokenLinksReport']['ColumnDateLastModified'] = 'Date last modified';
@@ -69,6 +71,7 @@ $lang['en_US']['BrokenLinksReport']['HasBrokenFile'] = 'has broken file';
 $lang['en_US']['BrokenLinksReport']['HasBrokenLink'] = 'has broken link';
 $lang['en_US']['BrokenLinksReport']['HasBrokenLinkAndFile'] = 'has broken link and file';
 $lang['en_US']['BrokenLinksReport']['HoverTitleEditPage'] = 'Edit page';
+$lang['en_US']['BrokenLinksReport']['PageName'] = 'Page name';
 $lang['en_US']['BrokenLinksReport']['ReasonDropdown'] = 'Problem to check';
 $lang['en_US']['BrokenLinksReport']['ReasonDropdownBROKENFILE'] = 'Broken file';
 $lang['en_US']['BrokenLinksReport']['ReasonDropdownBROKENLINK'] = 'Broken link';
@@ -173,7 +176,6 @@ $lang['en_US']['CMSMain_left.ss']['DELETECONFIRM'] = 'Delete the selected pages'
 $lang['en_US']['CMSMain_left.ss']['DELETEDSTILLLIVE'] = 'Deleted from the draft site but still on the live site';
 $lang['en_US']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Edited on the draft site and not published yet';
 $lang['en_US']['CMSMain_left.ss']['EDITEDSINCE'] = 'Edited Since';
-$lang['en_US']['CMSMain_left.ss']['SHOWITEMS'] = 'Show:';
 $lang['en_US']['CMSMain_left.ss']['ENABLEDRAGGING'] = array(
 	'Allow drag &amp; drop reordering',
 	PR_HIGH
@@ -189,6 +191,7 @@ $lang['en_US']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publish the selected page
 $lang['en_US']['CMSMain_left.ss']['SEARCH'] = 'Search';
 $lang['en_US']['CMSMain_left.ss']['SEARCHTITLE'] = 'Search through URL, Title, Menu Title, &amp; Content';
 $lang['en_US']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Select the pages that you want to change &amp; then click an action:';
+$lang['en_US']['CMSMain_left.ss']['SHOWITEMS'] = 'Show:';
 $lang['en_US']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Show only changed pages';
 $lang['en_US']['CMSMain_left.ss']['SHOWUNPUB'] = 'Show unpublished versions';
 $lang['en_US']['CMSMain_left.ss']['SITECONTENT TITLE'] = array(
@@ -204,9 +207,9 @@ $lang['en_US']['CMSMain_versions.ss']['PUBR'] = 'Publisher';
 $lang['en_US']['CMSMain_versions.ss']['UNKNOWN'] = 'Unknown';
 $lang['en_US']['CMSMain_versions.ss']['WHEN'] = 'When';
 $lang['en_US']['CMSSiteTreeFilter']['ALL'] = 'All items';
+$lang['en_US']['CMSSiteTreeFilter']['CHANGEDPAGES'] = 'Changed pages';
 $lang['en_US']['CMSSiteTreeFilter']['DELETEDPAGES'] = 'All pages, including deleted';
-$lang['en_US']['CMSSiteTreeFilter']['CHANGEDPAGES'] = "Changed pages";
-$lang['en_US']['CMSSiteTreeFilter']['SEARCH'] = "Search";
+$lang['en_US']['CMSSiteTreeFilter']['SEARCH'] = 'Search';
 $lang['en_US']['CommentAdmin']['ACCEPT'] = 'Accept';
 $lang['en_US']['CommentAdmin']['APPROVED'] = 'Accepted %s comments.';
 $lang['en_US']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Approved Comments';
@@ -456,7 +459,6 @@ $lang['en_US']['PageComment']['SINGULARNAME'] = array(
 	'Singular name of the object, used in dropdowns and to generally identify a single object in the interface'
 );
 $lang['en_US']['PageCommentInterface']['COMMENTERURL'] = 'Your website URL';
-$lang['en_US']['PageCommentInterface']['DELETEALLCOMMENTS'] = 'Delete all comments on this page';
 $lang['en_US']['PageCommentInterface']['POST'] = 'Post';
 $lang['en_US']['PageCommentInterface']['SPAMQUESTION'] = 'Spam protection question: %s';
 $lang['en_US']['PageCommentInterface']['YOURCOMMENT'] = 'Comments';
@@ -489,6 +491,7 @@ $lang['en_US']['ReportAdmin']['MENUTITLE'] = array(
 	100,
 	'Menu title'
 );
+$lang['en_US']['ReportAdminForm']['FILTERBY'] = 'Filter by';
 $lang['en_US']['ReportAdmin_SiteTree.ss']['REPORTS'] = 'Reports';
 $lang['en_US']['ReportAdmin_left.ss']['REPORTS'] = 'Reports';
 $lang['en_US']['ReportAdmin_right.ss']['WELCOME1'] = array(
diff --git a/templates/Includes/AssetTableField.ss b/templates/Includes/AssetTableField.ss
index 75e4b2bd..136b95ad 100755
--- a/templates/Includes/AssetTableField.ss
+++ b/templates/Includes/AssetTableField.ss
@@ -48,7 +48,7 @@
 				<tr class="notfound"> 
 					<td>&nbsp;</td> 
 					<% if Markable %><td width="18">&nbsp;</td><% end_if %> 
-					<td colspan="$Headings.Count"><i>No $NamePlural found</i></td> 
+					<td colspan="$Headings.Count"><i><% sprintf(_t('AssetTableField.NODATAFOUND', 'No %s found'),$NamePlural) %></i></td> 
 					<% if Can(show) %><td width="18">&nbsp;</td><% end_if %> 
 					<% if Can(edit) %><td width="18">&nbsp;</td><% end_if %> 
 					<% if Can(delete) %><td width="18">&nbsp;</td><% end_if %> 
diff --git a/templates/ReportAdminForm.ss b/templates/ReportAdminForm.ss
index 798b5be6..eaec9431 100644
--- a/templates/ReportAdminForm.ss
+++ b/templates/ReportAdminForm.ss
@@ -12,7 +12,7 @@
 			<!-- Filters -->
 			
 			<% if FieldMap.Filters.Children %>
-			<div style="border-bottom: 1px #AAA solid"><b>Filter by</b></div>
+			<div style="border-bottom: 1px #AAA solid"><b><% _t('ReportAdminForm.FILTERBY', 'Filter by') %></b></div>
 			
 			<% control FieldMap.Filters %>
 			<% control Children %>

From fc19125698273bce401dcd3229d4be1bec602484 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 17 May 2010 03:04:26 +0000
Subject: [PATCH 390/483] API CHANGE Removed ImageEditor functionality, please
 use thirdparty modules, e.g. "silverstripe-pixlr"
 (http://github.com/nyeholt/silverstripe-pixlr)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104987 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 _config.php                                  |   1 -
 code/AssetTableField.php                     |   1 -
 code/ImageEditor.php                         | 265 --------------
 javascript/ImageEditor/Activator.js          |  43 ---
 javascript/ImageEditor/Adjust.js             |  16 -
 javascript/ImageEditor/Crop.js               | 203 -----------
 javascript/ImageEditor/DocumentBody.js       |  34 --
 javascript/ImageEditor/Effects.js            |  35 --
 javascript/ImageEditor/Effects/AdjustBase.js | 120 ------
 javascript/ImageEditor/Effects/Base.js       |  76 ----
 javascript/ImageEditor/Environment.js        |   9 -
 javascript/ImageEditor/History.js            | 362 -------------------
 javascript/ImageEditor/Image.js              |  74 ----
 javascript/ImageEditor/ImageBox.js           |  52 ---
 javascript/ImageEditor/ImageEditor.js        |  57 ---
 javascript/ImageEditor/ImageHistory.js       | 264 --------------
 javascript/ImageEditor/Resize.js             |  77 ----
 javascript/ImageEditor/Resizeable.js         | 298 ---------------
 javascript/ImageEditor/Transformation.js     | 156 --------
 javascript/ImageEditor/Utils.js              | 106 ------
 lang/en_US.php                               |  22 --
 templates/ImageEditor.ss                     | 191 ----------
 22 files changed, 2462 deletions(-)
 delete mode 100644 code/ImageEditor.php
 delete mode 100644 javascript/ImageEditor/Activator.js
 delete mode 100644 javascript/ImageEditor/Adjust.js
 delete mode 100644 javascript/ImageEditor/Crop.js
 delete mode 100644 javascript/ImageEditor/DocumentBody.js
 delete mode 100644 javascript/ImageEditor/Effects.js
 delete mode 100644 javascript/ImageEditor/Effects/AdjustBase.js
 delete mode 100644 javascript/ImageEditor/Effects/Base.js
 delete mode 100644 javascript/ImageEditor/Environment.js
 delete mode 100644 javascript/ImageEditor/History.js
 delete mode 100644 javascript/ImageEditor/Image.js
 delete mode 100644 javascript/ImageEditor/ImageBox.js
 delete mode 100644 javascript/ImageEditor/ImageEditor.js
 delete mode 100644 javascript/ImageEditor/ImageHistory.js
 delete mode 100644 javascript/ImageEditor/Resize.js
 delete mode 100644 javascript/ImageEditor/Resizeable.js
 delete mode 100644 javascript/ImageEditor/Transformation.js
 delete mode 100644 javascript/ImageEditor/Utils.js
 delete mode 100644 templates/ImageEditor.ss

diff --git a/_config.php b/_config.php
index 326e6e8b..bb0e26f7 100644
--- a/_config.php
+++ b/_config.php
@@ -9,7 +9,6 @@ Director::addRules(50, array(
 	'processes//$Action/$ID/$Batch' => 'BatchProcess_Controller',
 	'admin/help//$Action/$ID' => 'CMSHelp',
 	'admin/bulkload//$Action/$ID/$OtherID' => 'BulkLoaderAdmin',
-	'admin//ImageEditor/$Action' => 'ImageEditor',
 	'admin/cms//$Action/$ID/$OtherID' => 'CMSMain', 
 	'PageComment//$Action/$ID' => 'PageComment_Controller',
 	'dev/buildcache/$Action' => 'RebuildStaticCacheTask',
diff --git a/code/AssetTableField.php b/code/AssetTableField.php
index e80d8700..3b602d8b 100755
--- a/code/AssetTableField.php
+++ b/code/AssetTableField.php
@@ -72,7 +72,6 @@ class AssetTableField extends ComplexTableField {
 		$ret = parent::FieldHolder();
 		
 		Requirements::javascript(CMS_DIR . '/javascript/AssetTableField.js');
-		Requirements::javascript('cms/javascript/ImageEditor/Activator.js');
 
 		return $ret;
 	}
diff --git a/code/ImageEditor.php b/code/ImageEditor.php
deleted file mode 100644
index 4825e6f7..00000000
--- a/code/ImageEditor.php
+++ /dev/null
@@ -1,265 +0,0 @@
-<?php
-/**
- * This Controller handles all operation needed for ImageEditor to work(expect for GD operations).
- * @package cms
- * @subpackage assets
- */
-class ImageEditor extends Controller {
-	
-	static $allowed_actions = array(
-		'*' => 'CMS_ACCESS_CMSMain'
-	);
-	
-	public $fileToEdit = "";
-	
-	public $fileToEditOnlyName = "";
-	
-	/**
-	 * Includes all JS required for ImageEditor. This method requires setting
-	 * a fileToEdit URL in POST.
-	 *
-	 * @return String
-	*/ 
-	public function index() {
-		Requirements::clear();
-		Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/scriptaculous.js');
-		Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/Utils.js');
-		//Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/ImageHistory.js');
-		Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/Image.js');
-		//Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/ImageTransformation.js');
-		Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/Resizeable.js');
-		Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/Effects.js');
-		Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/Environment.js');
-		Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/Crop.js');
-		Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/Resize.js');
-		Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/ImageBox.js');
-		Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/ImageEditor.js');
-		Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/DocumentBody.js');
-
-		Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.js');
-		Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js');
-		Requirements::javascript(CMS_DIR . '/javascript/LeftAndMain.js');
-		Requirements::css(CMS_DIR . 'css/ImageEditor/ImageEditor.css');
-
-		if(!isset($this->requestParams['fileToEdit'])) $this->raiseError();
-		$fileWithPath = $this->requestParams['fileToEdit'];
-		$this->fileToEdit = $this->file2Origin($fileWithPath);
-		$this->fileToEditOnlyName = $this->urlToFilename($this->fileToEdit);  
-		return $this->renderWith(__CLASS__);
-	}
-	
-	/**
-	 * Method is used for manipulating photos.
-	 * Method requires two params set in POST
-	 * 	file - file on which operation will be performed
-	 *  command - name of operation(crop|rotate|resize)
-	 * 
-	 * Each operation requires additional parameters.
-	 *
-	 * @return String - JSON array with image properties (width,height,url).
-	*/ 
-	public function manipulate() {
-		$fileName = $this->requestParams['file'];
-		if(strpos($fileName,'?') !== false) $fileName = substr($fileName,0,strpos($fileName,'?'));
-		$command = $this->requestParams['command'];
-		$this->checkFileExists($fileName);
-		$fileInfo = pathinfo($fileName);
-		$gd = new GD($this->url2File($fileName));
-		switch($command) {
-			case 'rotate':
-				$gd = $gd->rotate(90);
-			break;
-			case 'resize':
-				$imageNewWidth = $_POST['newImageWidth'];
-				$imageNewHeight = $_POST['newImageHeight'];
-				$gd = $gd->resize($imageNewWidth,$imageNewHeight);	
-			break;
-			case 'crop':
-				$top = $_POST['top'];
-				$left = $_POST['left'];
-				$width = $_POST['width'];
-				$height = $_POST['height'];
-				$gd = $gd->crop($top,$left,$width,$height);
-			break;
-  			case 'greyscale':
-				$gd = $gd->greyscale();                 
-				break;
-            case 'sepia':
-				$gd = $gd->sepia();                 
-				break;
-			case 'blur':
-				$gd = $gd->blur();                 
-				break;
-			case 'adjust-contrast':
-				$value = intval($_POST['value']);
-				$gd = $gd->contrast($value);
-				break;
-			case 'adjust-brightness':
-				$value = intval($_POST['value']);
-				$gd = $gd->brightness($value);
-				break;
-			case 'adjust-gamma':
-				$value = floatval($_POST['value']);
-				$gd = $gd->gamma($value);
-				break;
-		}
-		$rand = md5(rand(1,100000));
-		$gd->writeTo(ASSETS_PATH . '/_tmp/' . $rand . '.' . $fileInfo['extension']);
-		return $this->getImageInfoInJSON($gd,ASSETS_PATH . '/_tmp/' . $rand . '.' . $fileInfo['extension']);	
-	}
-	
-	/**
-	 * Method is used for saving photos.
-	 * Method requires two params set in POST
-	 * 	originalFile - this file will be replaced by second file
-	 *  editedFile - this file will replace first file.
-	 * 
-	 * After replacing original file all thumbnails created from it are removed.
-	 *
-	 * @return String - Message that everything went ok.
-	*/ 
-	
-	public function save() {
-		if(isset($this->requestParams['originalFile']) && isset($this->requestParams['editedFile'])) {
-			$originalFile = $this->requestParams['originalFile'];
-			$editedFile = $this->requestParams['editedFile'];
-			if(strpos($originalFile,'?') !== false) $originalFile = substr($originalFile,0,strpos($originalFile,'?'));
-			if($this->checkFileExists($originalFile) && $this->checkFileExists($editedFile)) {
-				if($editedFile != $originalFile && copy($this->url2File($editedFile),$this->url2File($originalFile))) {
-					$image = DataObject::get_one('File','"Filename" = \'' . substr($this->url2File($originalFile),3) . '\'');
-                       $image->deleteFormattedImages();
-					$image->generateFormattedImage('AssetLibraryPreview');
-				} else {
-					$this->raiseError();
-				}					
-			} else {
-				$this->raiseError();
-			}
-		} else {
-			$this->raiseError();
-		}
-		return 'parent.parent.parent.statusMessage(\'Image saved\',\'good\',false);';
-	}
-	
-	/**
-	 * Method is invoked when ImageEditor is closed whether image is saved or not.
-	 * 
-	 * /assets/tmp is folder where we store temporary images created during editing so 
-	 * after closing they are no necessity to keep them.
-	 * 
-	 * @return null
-	*/ 
-	
-	public function close() {
-		$tmpDir = ASSETS_PATH . '/_tmp';
-		if(file_exists($tmpDir)) {
-		    Filesystem::removeFolder($tmpDir);
-		    mkdir($tmpDir, Filesystem::$folder_create_mask);
-		}
-	}
-	
-	/**
-	 * Method return JSON array containing info about image.
-	 * 
-	 * @param gd - GD object used for retrieving info about image
-	 * @param file 
-	 * 
-	 * @return string JSON array explained in manipulate method comment
-	*/ 
-	
-	private function getImageInfoInJSON(GD $gd,$file) {
-		return '{"fileName":"' . $file . '","width":' . $gd->getWidth() . ',"height":' . $gd->getHeight() . '}';
-	}
-	
-	/**
-	 * Method converts thumbnail file name to file name of it's "parent"
-	 * 
-	 * @param file - name of thumbnail file
-	 * 
-	 * @return string name of parent file.
-	*/ 
-	
-	private function file2Origin($file) {
-		$file = str_replace('_resampled/','',$file);
-		$file = str_replace('_resampled/','',$file);
-		$file = str_replace('AssetLibraryPreview-','',$file);
-		$this->checkFileExists($file);
-		return $file;
-	}
-	/**
-	 * Method converts URL of file to file path in file system.
-	 * 
-	 * @param url - url of file
-	 * 
-	 * @return string path of file in file system
-	*/ 
-	
-	private function url2File($url) {
-		return '..' . substr($url,strpos($url,'/assets'));
-	}
-	
-	/**
-	 * Method checks if file exists and have proper name and extension.
-	 * 
-	 * If any of constraints aren't fulfilled method will generate error.
-	 * 
-	 * @param url - url of file
-	 * 
-	 * @return boolean 
-	*/ 
-	
-	private function checkFileExists($url) {
-		if(strpos($url,'?') !== false) $url = substr($url,0,strpos($url,'?'));
-		$pathInfo = pathinfo($url);
-		if(count($pathInfo) < 3) $this->raiseError();
-		if(!in_array($pathInfo['extension'],array('jpeg','jpg','jpe','png','gif','JPEG','JPG','JPE','PNG','GIF'))) $this->raiseError();
-		$path = explode('/',$pathInfo['dirname']);
-		if(count($path) > 1) {
-			$assetId = array_search('assets',$path);
-			if($assetId > 0) {
-				$realPath = '../' . implode('/',array_slice($path,$assetId,count($path) - $assetId));
-				if(strpos($pathInfo['basename'],'AssetLibraryPreview') !== false) {
-					$realPath .= '/' . substr($pathInfo['basename'],strpos($pathInfo['basename'],'-'));
-				} else {
-					$realPath .= '/' . $pathInfo['basename']; 
-				}
-			} else {
-				$this->raiseError();
-			}
-			if(file_exists($realPath)) {
-				return true;
-			} else {
-				$this->raiseError();
-			}
-		} else {
-			$this->raiseError();
-		}		
-	}
-	
-	/**
-	 * Method raiser error. Error is showed using statusMessage function.
-	 * 
-	 * @param message - error message
-	 * 
-	*/ 
-	
-	private function raiseError($message = "") {
-		echo "parent.parent.parent.statusMessage('Error: " . $message . "','bad',false);";
-		exit();	
-	}
-	
-	/**
-        * Method converts retrieves filename from url
-        *
-        * @param url
-        * 
-       */ 
-	
-	private function urlToFilename($url) {
-	    $path = pathinfo($url);
-	    return $path['filename'] . "." . substr($path['extension'],0,strpos($path['extension'],'?'));  	
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/javascript/ImageEditor/Activator.js b/javascript/ImageEditor/Activator.js
deleted file mode 100644
index c52323e9..00000000
--- a/javascript/ImageEditor/Activator.js
+++ /dev/null
@@ -1,43 +0,0 @@
-ImageEditor = {};
-
-ImageEditor.Activator = {
-	initialize: function() {
-		this.onOpen = ImageEditor.Activator.onOpen.bind(this);		
-	},
-	
-	onOpen: function() {
-		var windowWidth = Element.getDimensions(window.top.document.body).width;
-        var windowHeight = Element.getDimensions(window.top.document.body).height;
-		var iframe = window.top.document.getElementById('imageEditorIframe');
-		if(iframe != null) {
-			iframe.parentNode.removeChild(iframe);
-		}
-		iframe = window.top.document.createElement('iframe');
-		var fileToEdit = $('ImageEditorActivator').firstChild.src;
-		iframe.setAttribute("src","admin/ImageEditor?fileToEdit=" + fileToEdit);
-		iframe.id = 'imageEditorIframe';
-		iframe.style.width = windowWidth - 6 + 'px';
-		iframe.style.height = windowHeight + 10 + 'px';
-		iframe.style.zIndex = "1000";
-		iframe.style.position = "absolute";
-		iframe.style.top = "8px";
-		iframe.style.left = "8px";
-		window.top.document.body.appendChild(iframe);
-		var divLeft = window.top.document.createElement('div');
-		var divRight = window.top.document.createElement('div');
-        divLeft.style.width = "8px";
-        divLeft.style.height = "300%";
-        divLeft.style.zIndex = "1000";
-        divLeft.style.top = "0";
-        divLeft.style.position = "absolute";
-        divRight.style.width = "10px";
-        divRight.style.height = "300%";
-        divRight.style.zIndex = "1000";
-        divRight.style.top = "0";
-        divRight.style.position = "absolute";
-        divRight.style.left = Element.getDimensions(divLeft).width + Element.getDimensions(iframe).width - 4 + 'px';
-		window.top.document.body.appendChild(divLeft);
-		window.top.document.body.appendChild(divRight);
-	}
-		
-}
\ No newline at end of file
diff --git a/javascript/ImageEditor/Adjust.js b/javascript/ImageEditor/Adjust.js
deleted file mode 100644
index e719d27a..00000000
--- a/javascript/ImageEditor/Adjust.js
+++ /dev/null
@@ -1,16 +0,0 @@
-ImageEditor.Adjust = {
-    initialize: function() {
-        this.perform = ImageEditor.Adjust.perform.bind(this); 
-        this.setListener = ImageEditor.Adjust.setListener.bind(this);
-        this.setListener();
-    },
-    
-    setListener: function() {
-        Element.toggle($('AdjustMenu'));   
-        Event.observe('AdjustButton','click',this.perform);
-    },
-    
-    perform: function() {
-        Element.toggle($('AdjustMenu'));            
-    }
-}  
\ No newline at end of file
diff --git a/javascript/ImageEditor/Crop.js b/javascript/ImageEditor/Crop.js
deleted file mode 100644
index 7dc2de76..00000000
--- a/javascript/ImageEditor/Crop.js
+++ /dev/null
@@ -1,203 +0,0 @@
-/**
- * @author Mateusz
- */
-ImageEditor.Crop = {
-	
-	initialize: function() {
-		this.cropBox = $('cropBox');
-		new ImageEditor.Positioning.addBehaviour(this.cropBox);
-		this.imageContainer = $('imageContainer');
-		this.leftGreyBox = $('leftGreyBox');
-		this.rightGreyBox = $('rightGreyBox');
-		this.upperGreyBox = $('upperGreyBox');
-		this.lowerGreyBox = $('lowerGreyBox');		
-		this.centerCropBox = ImageEditor.Crop.centerCropBox.bind(this);
-		this.placeGreyBox = ImageEditor.Crop.placeGreyBox.bind(this);
-		this.setListeners = ImageEditor.Crop.setListeners.bind(this);
-		this.onCropStart = ImageEditor.Crop.onCropStart.bind(this);
-		this.onCropOk = ImageEditor.Crop.onCropOk.bind(this);
-		this.onCropCancel = ImageEditor.Crop.onCropCancel.bind(this);
-		this.doCrop = ImageEditor.Crop.doCrop.bind(this);
-		this.setVisible = ImageEditor.Crop.setVisible.bind(this);
-		this.enable = ImageEditor.Crop.enable.bind(this);
-		this.disable = ImageEditor.Crop.disable.bind(this);
-		this.onImageLoadCallback = ImageEditor.Crop.onImageLoadCallback.bind(this);
-		Event.observe('image','load',this.centerCropBox);
-		var options = {
-			resizeStop: ImageEditor.Crop.resizeStop.bind(this),
-			onDrag: ImageEditor.Crop.onDrag.bind(this),
-			onResize: ImageEditor.Crop.onResize.bind(this),
-			getMousePos: ImageEditor.Crop.getMousePos.bind(this)
-		};	
-		this.resizeCropBox = new ImageEditor.Resizeable.initialize(this.cropBox,options);
-		Event.observe(this.cropBox,'dblclick',this.onCropOk.bind(this));
-		this.setListeners();
-		this.isVisible = false;
-		this.setVisible(this.isVisible);
-		this.isEnabled = true;
-		this.lastCrop = {};
-	},
-	
-	resizeStop: function(event) {
-		if(this.isVisible) {
-			ImageEditor.EventStack.clearStack();
-			this.resizeCropBox.originalHeight = this.cropBox.getHeight();
-			this.resizeCropBox.originalWidth = this.cropBox.getWidth();
-		}
-	},
-	
-	onDrag: function(event) {
-		if(this.cropBox.getLeft() <= 0 ) this.cropBox.style.left = '0px';
-		if(this.cropBox.getTop() <= 0 ) this.cropBox.style.top = '0px';
-		if(this.cropBox.getLeft() + this.cropBox.getWidth() > this.cropBox.getParentWidth()) this.cropBox.style.left = this.cropBox.getParentWidth()- this.cropBox.getWidth() + 'px';
-		if(this.cropBox.getTop() + this.cropBox.getHeight() > this.cropBox.getParentHeight()) this.cropBox.style.top = this.cropBox.getParentHeight() - this.cropBox.getHeight() + 'px';
-		this.placeGreyBox(this.cropBox.getWidth(),this.cropBox.getHeight());
-	},
-	
-	centerCropBox: function() {
-		this.cropBox.style.width = this.cropBox.getParentWidth()/2 + 'px';
-		this.cropBox.style.height = this.cropBox.getParentHeight()/2 + 'px';
-		this.cropBox.style.left = (this.cropBox.getParentWidth() - this.cropBox.getWidth())/2 + "px";
-		this.cropBox.style.top = (this.cropBox.getParentHeight() - this.cropBox.getHeight())/2 + "px";
-		this.placeGreyBox(this.cropBox.getWidth(),this.cropBox.getHeight());
-		this.leftBoxConstraint = this.cropBox.getParentLeft();
-		this.topBoxConstraint = this.cropBox.getParentTop();
-		this.rightBoxConstraint = this.cropBox.getParentLeft() + this.cropBox.getParentWidth();
-		this.bottomBoxConstraint = this.cropBox.getParentTop() + this.cropBox.getParentHeight()-1;//hack without 1 doesn't work;
-	},
-	
-	placeGreyBox: function(width,height) {
-		if(this.isVisible) {
-			this.lowerGreyBox.style.left = this.cropBox.getLeft()  + 'px';				
-			this.lowerGreyBox.style.width = width + 'px';
-			this.lowerGreyBox.style.height = this.cropBox.getParentHeight() - this.cropBox.getTop() - height + "px";
-			this.lowerGreyBox.style.top = this.cropBox.getTop() + height + "px";
-			this.leftGreyBox.style.width = this.cropBox.getLeft() + "px";		
-			this.leftGreyBox.style.height = $('imageContainer').getHeight() + 'px';
-			this.rightGreyBox.style.width = this.cropBox.getParentWidth() - this.cropBox.getLeft() - width + "px";
-			this.rightGreyBox.style.height = $('imageContainer').getHeight() + 'px';
-			this.rightGreyBox.style.left = this.cropBox.getLeft()  + width  + "px";
-			this.upperGreyBox.style.width = width + 'px';
-			this.upperGreyBox.style.left = this.cropBox.getLeft()  + 'px';				
-			this.upperGreyBox.style.height = this.cropBox.getTop() + 'px';
-			this.resizeCropBox.placeClickBox();
-		}
-	},
-	
-	onResize: function(width,height) {
-		if(width + parseInt(this.cropBox.style.left) > Element.getDimensions(this.imageContainer).width) {
-            this.cropBox.style.left = parseInt(this.cropBox.style.left) - Math.abs(Element.getDimensions(this.imageContainer).width - (width + parseInt(this.cropBox.style.left))) +  "px";    		
-		}
-		if(parseInt(this.cropBox.style.left) < 0) {
-            this.cropBox.style.left = "0px";         
-        }
-        if(width > Element.getDimensions(this.imageContainer).width) {
-            this.cropBox.style.width = Element.getDimensions(this.imageContainer).width + "px";
-            width = Element.getDimensions(this.imageContainer).width;
-        }
-		this.placeGreyBox(width,height);
-	},
-	
-	getMousePos: function(event) {
-		var x = Event.pointerX(event) + $('imageEditorContainer').scrollLeft;
-		var y = Event.pointerY(event) + $('imageEditorContainer').scrollTop;
-		if(x <= this.leftBoxConstraint) x = this.leftBoxConstraint;
-		if(y <= this.topBoxConstraint) y = this.topBoxConstraint;
-		if(x >= this.rightBoxConstraint) x = this.rightBoxConstraint;
-		if(y >= this.bottomBoxConstraint) y = this.bottomBoxConstraint;
-		return {x: x,y: y};		
-	},
-	
-	doCrop: function() {
-		if(this.isEnabled) {
-			var newWidth = this.cropBox.getWidth() 
-			var newHeight = this.cropBox.getHeight() ;
-			var startTop = this.cropBox.getTop() ;
-			var startLeft = this.cropBox.getLeft() ;
-			if(newWidth > 35 && newHeight > 35) {
-				this.lastCrop.top = startTop;
-				this.lastCrop.left = startLeft;
-				this.lastCrop.newWidth = newWidth;
-				this.lastCrop.newHeight = newHeight;
-				ImageEditor.transformation.crop(startTop,startLeft,newWidth,newHeight,ImageEditor.Crop.cropCallback.bind(this));
-				this.disable();
-			} else {
-				ImageEditor.statusMessageWrapper.statusMessage("Crop area too small","bad");
-				return false;
-			}
-			$('image').style.visibility = 'visible';//hack for IE for not selecting image during crop
-			return true;
-		}
-	},
-	
-	cropCallback: function() {
-	   ImageEditor.history.addCrop($('image').src,
-	                                               this.lastCrop.top,
-	                                               this.lastCrop.left,
-	                                               this.lastCrop.newWidth,
-	                                               this.lastCrop.newHeight
-	                               );
-	   ImageEditor.resize.imageContainerResize.placeClickBox();
-   	   ImageEditor.resize.imageContainerResize.setVisible(true);
-	   Element.show($('CropText'));
-	   Element.hide(this.cropBox,this.leftGreyBox,this.rightGreyBox,this.upperGreyBox,this.lowerGreyBox,$('CurrentAction'));							
-	},
-	
-	setListeners: function() {
-		Event.observe('CropButton','click',this.onCropStart);
-		Event.observe('CancelButton','click',this.onCropCancel);
-		Event.observe('ApplyButton','click',this.onCropOk);
-	},
-	onCropStart: function()	 {
-		if(this.isEnabled) {
-			$('image').style.visibility = "hidden";//hack for IE for not selecting image during crop
-			this.setVisible(true);	
-			Element.show($('CurrentAction'));
-			ImageEditor.Main.disableFunctionality();
-			this.enable();
-		}
-	},
-	
-	onCropOk: function() {
-		if(this.isEnabled) {
-		    if(this.doCrop()) Element.hide($('CurrentAction'));
-		}	
-	},
-	
-	onCropCancel: function(event) {
-		if(this.isEnabled) {
-		    Element.hide($('CurrentAction'));
-		    Element.show($('CropText'));
-		    this.setVisible(false);
-		    ImageEditor.Main.enableFunctionality();
-			this.enable();
-		}
-		$('image').style.visibility = 'visible';//hack for IE for not selecting image during crop
-	},
-	
-	setVisible: function(setVisible) {
-		this.isVisible = setVisible;
-		if(setVisible) {
-			Element.show(this.cropBox,this.leftGreyBox,this.rightGreyBox,this.upperGreyBox,this.lowerGreyBox);			
-			this.centerCropBox();
-			this.placeGreyBox(this.cropBox.getWidth(),this.cropBox.getHeight());
-		} else {
-			Element.hide(this.cropBox,this.leftGreyBox,this.rightGreyBox,this.upperGreyBox,this.lowerGreyBox,$('CurrentAction'));							
-		}
-		ImageEditor.resize.imageContainerResize.setVisible(!setVisible);
-		this.resizeCropBox.setVisible(setVisible);
-	},
-	
-	enable: function() {
-	   this.isEnabled = true;
-	},
-	
-	disable: function() {
-	   this.isEnabled = false;
-	},
-	
-	onImageLoadCallback: function() {
-		ImageEditor.crop.setVisible(false);	
-	}
-	
-}
\ No newline at end of file
diff --git a/javascript/ImageEditor/DocumentBody.js b/javascript/ImageEditor/DocumentBody.js
deleted file mode 100644
index bcac0e09..00000000
--- a/javascript/ImageEditor/DocumentBody.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @author Mateusz
- */
-ImageEditor.DocumentBody = {
-	initialize: function() {
-		this.placeUI = ImageEditor.DocumentBody.placeUI.bind(this);
-		this.placeUI();
-		Event.observe(window.top,'resize',ImageEditor.DocumentBody.resizeIframe.bind(this));
-	},
-	
-	resizeIframe: function(event) {
-	    var windowWidth = Element.getDimensions(window.top.document.body).width;
-        var windowHeight = Element.getDimensions(window.top.document.body).height;
-        var iframe = window.top.document.getElementById('imageEditorIframe');
-        iframe.style.width = windowWidth - 6 + 'px';
-        iframe.style.height = windowHeight + 10 + 'px';
-        this.placeUI();
-	},
-	
-	placeUI: function() {
-        var iframe = window.top.document.getElementById('imageEditorIframe');
-        $('imageEditorContainer').style.height = Element.getDimensions(iframe).height - Element.getDimensions($('TopRuler')).height - Element.getDimensions($('MenuBar')).height - 32  + 'px';
-        $('imageEditorContainer').style.width = Element.getDimensions(iframe).width - Element.getDimensions($('LeftRuler')).width - 14 + 'px';
-        $('LeftRuler').style.height = $('imageEditorContainer').style.height; 
-        $('TopLeft').style.width = Element.getDimensions($('MenuBar')).width -
-                                   Element.getDimensions($('TopRight')).width + 'px';
-        $('TopRight').style.left = Element.getDimensions($('TopLeft')).width + 'px';
-                                   		
-	},
-	
-	onImageEditorScroll: function() {
-	   ImageEditor.imageBox.reCenterIndicator();
-	}
-}
diff --git a/javascript/ImageEditor/Effects.js b/javascript/ImageEditor/Effects.js
deleted file mode 100644
index 0aa2e45e..00000000
--- a/javascript/ImageEditor/Effects.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @author Mateusz
- */
-ImageEditor.Effects.Main = {
-	initialize: function() {
-		this.enable = ImageEditor.Effects.Main.enable.bind(this);
-		this.disable = ImageEditor.Effects.Main.disable.bind(this);
-		this.effects = Array();
-		this.effects['rotate'] = new ImageEditor.Effects.Base.initialize('rotate');
-		this.effects['greyscale'] = new ImageEditor.Effects.Base.initialize('greyscale');
-		this.effects['sepia'] = new ImageEditor.Effects.Base.initialize('sepia');
-		this.effects['blur'] = new ImageEditor.Effects.Base.initialize('blur');
-		this.effects['adjust-contrast'] = new ImageEditor.Effects.AdjustBase.initialize('adjust-contrast',$R(-100, 100),0.1,62);
-		this.effects['adjust-brightness'] = new ImageEditor.Effects.AdjustBase.initialize('adjust-brightness',$R(-255, 255),0.1,160);
-		this.effects['adjust-gamma'] = new ImageEditor.Effects.AdjustBase.initialize('adjust-gamma',$R(0, 5),1.2,4);
-		this.getEffect = ImageEditor.Effects.Main.getEffect.bind(this);
-	},
-	
-	enable: function() {
- 	    for (var name in this.effects) { 
-             if(this.effects.hasOwnProperty(name)) this.effects[name].enable();            
-         }
-  	},
-  	
- 	disable: function() {
- 	    for (var name in this.effects) { 
-             if(this.effects.hasOwnProperty(name)) this.effects[name].disable();
-         }
-  	},
-  	
- 	getEffect: function(name) {
- 	    return this.effects[name];
-  	}
-		
-}
\ No newline at end of file
diff --git a/javascript/ImageEditor/Effects/AdjustBase.js b/javascript/ImageEditor/Effects/AdjustBase.js
deleted file mode 100644
index 74938e22..00000000
--- a/javascript/ImageEditor/Effects/AdjustBase.js
+++ /dev/null
@@ -1,120 +0,0 @@
-ImageEditor.Effects.AdjustBase = {
-    initialize: function(name,minMax,firstValue,maxValue) {
-        this.name = name;
-        this.minMax = minMax;
-        this.firstValue = firstValue;
-        this.maxValue = maxValue;
-        this.setListener = ImageEditor.Effects.AdjustBase.setListener.bind(this);
-        this.callback = ImageEditor.Effects.AdjustBase.callback.bind(this);
-        this.setValue = ImageEditor.Effects.AdjustBase.setValue.bind(this);
-        this.getDefaultValue = ImageEditor.Effects.AdjustBase.getDefaultValue.bind(this);
-        this.setListener();
-        this.lastValue = this.firstValue;
-        this.stopListenining = false;
-    },
-    
-    setListener: function() {
-        var upperCaseName = this.name.substring(7,8).toUpperCase() + this.name.substring(8,this.name.length);
-        this.slider = new Control.Slider('AdjustMenu' + upperCaseName + 'SliderTrackHandler','AdjustMenu' + upperCaseName + 'SliderTrack', {
-            range: this.minMax,
-            sliderValue: this.firstValue,
-            onChange: ImageEditor.Effects.AdjustBase.onChange.bind(this),
-            onSlide: ImageEditor.Effects.AdjustBase.onSlide.bind(this)
-        });
-    },
-    
-    onSlide: function(v) {
-        if(this.disabled || this.stopListenining) return;
-        if(v > this.maxValue) this.setValue(this.maxValue);
-    },
-    
-    onChange: function(v) {
-        if(this.disabled || this.stopListenining) return;
-        this.lastValue = v;
-        file = $('image').src;
-        if(ImageEditor.history.hasOperation(this.name)) {
-           var history = ImageEditor.history.getOptimizedHistory(this.name);
-           if(history[1] != undefined) {
-               file = ImageEditor.transformation.applyHistory(history);
-           } else {
-               file = history[0].fileUrl;
-           }
-        }
-        ImageEditor.transformation.customRequest(this.name,this.callback,file,this.lastValue,true);
-    },
-    
-    callback: function() {
-        ImageEditor.history.addAdjust(this.name,this.lastValue,$('image').src);            
-    },
-    
-    setValue: function(value) {
-        this.stopListenining = true;
-        this.slider.setValue(value);
-        this.stopListenining = false;
-    }, 
-    
-    getDefaultValue: function() {
-        return this.firstValue;
-    }        
-}
-ImageEditor.Effects.AdjustBase.initialize.prototype = new ImageEditor.Effects.Base.initialize("adjustbase");
-ImageEditor.Effects.AdjustBase = {
-    initialize: function(name,minMax,firstValue,maxValue) {
-        this.name = name;
-        this.minMax = minMax;
-        this.firstValue = firstValue;
-        this.maxValue = maxValue;
-        this.setListener = ImageEditor.Effects.AdjustBase.setListener.bind(this);
-        this.callback = ImageEditor.Effects.AdjustBase.callback.bind(this);
-        this.setValue = ImageEditor.Effects.AdjustBase.setValue.bind(this);
-        this.getDefaultValue = ImageEditor.Effects.AdjustBase.getDefaultValue.bind(this);
-        this.setListener();
-        this.lastValue = this.firstValue;
-        this.stopListenining = false;
-    },
-    
-    setListener: function() {
-        var upperCaseName = this.name.substring(7,8).toUpperCase() + this.name.substring(8,this.name.length);
-        this.slider = new Control.Slider('AdjustMenu' + upperCaseName + 'SliderTrackHandler','AdjustMenu' + upperCaseName + 'SliderTrack', {
-            range: this.minMax,
-            sliderValue: this.firstValue,
-            onChange: ImageEditor.Effects.AdjustBase.onChange.bind(this),
-            onSlide: ImageEditor.Effects.AdjustBase.onSlide.bind(this)
-        });
-    },
-    
-    onSlide: function(v) {
-        if(this.disabled || this.stopListenining) return;
-        if(v > this.maxValue) this.setValue(this.maxValue);
-    },
-    
-    onChange: function(v) {
-        if(this.disabled || this.stopListenining) return;
-        this.lastValue = v;
-        file = $('image').src;
-        if(ImageEditor.history.hasOperation(this.name)) {
-           var history = ImageEditor.history.getOptimizedHistory(this.name);
-           if(history[1] != undefined) {
-               file = ImageEditor.transformation.applyHistory(history);
-           } else {
-               file = history[0].fileUrl;
-           }
-        }
-        ImageEditor.transformation.customRequest(this.name,this.callback,file,this.lastValue,true);
-    },
-    
-    callback: function() {
-        ImageEditor.history.addAdjust(this.name,this.lastValue,$('image').src);            
-    },
-    
-    setValue: function(value) {
-        this.stopListenining = true;
-        this.slider.setValue(value);
-        this.stopListenining = false;
-    }, 
-    
-    getDefaultValue: function() {
-        return this.firstValue;
-    }        
-}
-ImageEditor.Effects.AdjustBase.initialize.prototype = new ImageEditor.Effects.Base.initialize("adjustbase");
\ No newline at end of file
diff --git a/javascript/ImageEditor/Effects/Base.js b/javascript/ImageEditor/Effects/Base.js
deleted file mode 100644
index be4f2aec..00000000
--- a/javascript/ImageEditor/Effects/Base.js
+++ /dev/null
@@ -1,76 +0,0 @@
-ImageEditor.Effects = {};
-ImageEditor.Effects.Base = {
-    initialize: function(effectName) {
-        this.disabled = false;
-        this.perform = ImageEditor.Effects.Base.perform.bind(this);
-        this.setListener = ImageEditor.Effects.Base.setListener.bind(this);
-        this.enable = ImageEditor.Effects.Base.enable.bind(this);        
-        this.disable = ImageEditor.Effects.Base.disable.bind(this);
-        this.callback = ImageEditor.Effects.Base.callback.bind(this);
-        this.effectName = effectName;
-        this.setListener();
-    },
-    
-    perform: function() {
-        if(!this.disabled) {
-            ImageEditor.transformation.customRequest(this.effectName,this.callback,undefined,undefined,true);
-        }
-    },
-    
-    callback: function() {
-        ImageEditor.history.addEffect($('image').src,this.effectName);
-    },
-    
-    setListener: function(eventHandler) {
-        var effectName = this.effectName.substring(0,1).toUpperCase() + this.effectName.substring(1,this.effectName.length);
-        if($(effectName + 'Button')) {
-            Event.observe(effectName + 'Button','click',this.perform);
-        }
-    },
-    
-    disable: function() {
-        this.disabled = true;
-    },
-    
-    enable: function() {
-        this.disabled = false;
-    }
-}
-ImageEditor.Effects = {};
-ImageEditor.Effects.Base = {
-    initialize: function(effectName) {
-        this.disabled = false;
-        this.perform = ImageEditor.Effects.Base.perform.bind(this);
-        this.setListener = ImageEditor.Effects.Base.setListener.bind(this);
-        this.enable = ImageEditor.Effects.Base.enable.bind(this);        
-        this.disable = ImageEditor.Effects.Base.disable.bind(this);
-        this.callback = ImageEditor.Effects.Base.callback.bind(this);
-        this.effectName = effectName;
-        this.setListener();
-    },
-    
-    perform: function() {
-        if(!this.disabled) {
-            ImageEditor.transformation.customRequest(this.effectName,this.callback,undefined,undefined,true);
-        }
-    },
-    
-    callback: function() {
-        ImageEditor.history.addEffect($('image').src,this.effectName);
-    },
-    
-    setListener: function(eventHandler) {
-        var effectName = this.effectName.substring(0,1).toUpperCase() + this.effectName.substring(1,this.effectName.length);
-        if($(effectName + 'Button')) {
-            Event.observe(effectName + 'Button','click',this.perform);
-        }
-    },
-    
-    disable: function() {
-        this.disabled = true;
-    },
-    
-    enable: function() {
-        this.disabled = false;
-    }
-}
\ No newline at end of file
diff --git a/javascript/ImageEditor/Environment.js b/javascript/ImageEditor/Environment.js
deleted file mode 100644
index 75748188..00000000
--- a/javascript/ImageEditor/Environment.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @author Mateusz
- */
-ImageEditor.Environment = {
-	initialize: function (imageFile) {
-		ImageEditor.imageBox = new ImageEditor.ImageBox.initialize();
-		ImageEditor.imageToResize = new ImageEditor.ImageToResize.initialize(imageFile);		
-	}		
-}
\ No newline at end of file
diff --git a/javascript/ImageEditor/History.js b/javascript/ImageEditor/History.js
deleted file mode 100644
index 40d6d584..00000000
--- a/javascript/ImageEditor/History.js
+++ /dev/null
@@ -1,362 +0,0 @@
-/**
- * @author Mateusz
- */
-ImageEditor.History = {
-	
-	initialize: function() {
-		this.history = new Array();
-		this.historyPointer = -1;
-		this.isEnabled = true;
-		this.image = ImageEditor.Positioning.addBehaviour($('image'));
-		this.size = new Array();
-		this.fakeImage = $('fakeImg');
-		this.image = $('image');
-		this.adjust = new Array();
-		this.undo = ImageEditor.History.undo.bind(this);
-		this.redo = ImageEditor.History.redo.bind(this);
-		this.add = ImageEditor.History.add.bind(this);
-		this.addListeners = ImageEditor.History.addListeners.bind(this);
-		this.hasOperation = ImageEditor.History.hasOperation.bind(this);		
-		this.isInHistory = ImageEditor.History.isInHistory.bind(this);
-		this.onImageLoad = ImageEditor.History.onImageLoad.bind(this);
-		this.removeLastOperation = ImageEditor.History.removeLastOperation.bind(this);
-		this.getOptimizedHistory = ImageEditor.History.getOptimizedHistory.bind(this);
-		this.addCrop = ImageEditor.History.addCrop.bind(this);
-        this.addResize = ImageEditor.History.addResize.bind(this);
-        this.addEffect = ImageEditor.History.addEffect.bind(this);
-        this.addAdjust = ImageEditor.History.addAdjust.bind(this);
-		this.enable = ImageEditor.History.enable.bind(this);
-		this.disable = ImageEditor.History.disable.bind(this);
-		this.clear = ImageEditor.History.clear.bind(this);
-		this.onlyResized = ImageEditor.History.onlyResized.bind(this);
-		this.optimizeOtherEffects = ImageEditor.History.optimizeOtherEffects.bind(this);
-		this.optimizeCrop = ImageEditor.History.optimizeCrop.bind(this);
-		this.optimizeResize = ImageEditor.History.optimizeResize.bind(this);
-		this.optimizeRotate = ImageEditor.History.optimizeRotate.bind(this);
-		this.checkSpecialOperation = ImageEditor.History.checkSpecialOperation.bind(this);
-		this.addListeners();
-	},
-		
-	undo: function() {
-		if(this.isEnabled) {
-			if(this.historyPointer >= 1) {
-				var operation = this.history[this.historyPointer].operation;
-				this.checkSpecialOperation('undo',this.history[this.historyPointer]);
-				Event.observe('image','load',this.onImageLoad);
-				this.historyPointer = this.historyPointer - 1;
-				this.image.src = this.history[this.historyPointer].fileUrl;
-			} else {
-				ImageEditor.statusMessageWrapper.statusMessage("No more undo","bad");
-			}
-		}
-	},
-	
-	redo: function() {
-		if(this.isEnabled) {
-			if(this.historyPointer < this.history.length-1) {
-				var operation = this.history[this.historyPointer+1].operation;
-				this.checkSpecialOperation('redo',this.history[this.historyPointer+1]);
-				Event.observe('image','load',this.onImageLoad);
-				this.historyPointer = this.historyPointer + 1;
-				this.image.src = this.history[this.historyPointer].fileUrl;
-			} else {
-				ImageEditor.statusMessageWrapper.statusMessage("No more redo","bad");
-			}
-		}
-	},
-	
-	add: function(operation,url,additionalInfo) {
-		var imageWidth =  isNaN(parseInt($('image').style.width)) ? Element.getDimensions($('image')).width : parseInt($('image').style.width);//IE hack
-		var imageHeight = isNaN(parseInt($('image').style.height)) ? Element.getDimensions($('image')).height : parseInt($('image').style.height);//IE hack
-		//code above should be moved to Positioning.addBehaviour
-		if(!this.isInHistory(operation,url)) {
-			this.historyPointer++;
-			this.size[this.historyPointer] = {'width': imageWidth,'height': imageHeight};
-			this.history[this.historyPointer] = {'operation': operation,'fileUrl' : url,'additionalInfo': additionalInfo};
-			this.size = this.size.slice(0,this.historyPointer+1);
-			this.history = this.history.slice(0,this.historyPointer+1);
-		}
-	},
-	
-	addCrop: function(url,top,left,width,height) {
-	   this.add('crop',url,{
-	                        'top':top,
-	                        'left': left,
-	                        'width': width,
-	                        'height': height
-	                       });
-	},
-	
-	addResize: function(url,width,height) {
-	   this.add('resize',url,{
-                            'width': width,
-                            'height': height
-                           });
-	},
-	
-	addEffect: function(url,name) {
-	   this.add(name,url);
-	},
-	
-	addAdjust: function(name,value,url) {
-	   this.add(name,url,{'value': value});
-       if(this.adjust[name] == undefined) {
-           this.adjust[name] = {'pointer': 0,'values': Array()}
-           this.adjust[name].values[0] = ImageEditor.effects.getEffect(name).getDefaultValue();
-       }
-       this.adjust[name].values[this.adjust[name].values.length] = value;
-       this.adjust[name].pointer++;
-	},
-	
-	addListeners: function() {
-		this.undoListener = Event.observe('UndoButton','click',this.undo);	
-		this.redoListener = Event.observe('RedoButton','click',this.redo);
-	},
-	
-	hasOperation: function(operation,historyPointer) {
-		if(historyPointer == undefined) historyPointer = this.history.length-1;
-		for(i=historyPointer;i>=0;i--) {
-			if(this.history[i].operation == operation) {
-				return true;
-			}
-		}
-		return false;
-	},
-	
-	getOptimizedHistory: function(without) {
-	   var history = this.history.slice(0,this.historyPointer+1);
-	   var result = {};
-	   var historyPointer = 1;
-	   result[0] = {fileUrl : history[0].fileUrl};
-	   var resize = this.optimizeResize(history,this.size);
-	   var rotate = this.optimizeRotate(history);
-	   var crop = this.optimizeCrop(history,this.size);
-	   var other = this.optimizeOtherEffects(history,without);
-       if(rotate != undefined) {
-           for(var i =0;i<rotate.length;i++) {
-               result[historyPointer] = rotate[i];
-               historyPointer++;               
-           }
-       }
-       if(resize != undefined){ 
-           result[historyPointer] = resize;
-           historyPointer++;
-       }
-       if(crop != undefined) {
-	       result[historyPointer] = crop;
-	       historyPointer++;
-	   }	
-	   if(other != undefined) {
-	       for(var i =0;i<other.length;i++) {
-	           result[historyPointer] = other[i];
-	           historyPointer++;
-	       }
-	   }
-	   return result;
-	},
-	
-	enable: function() {
-		this.isEnabled = true;
-	},
-	
-	disable: function() {
-		this.isEnabled = false;
-	},
-	
-	clear: function() {
-	   this.history = new Array();
-       this.historyPointer = -1;
-	   this.size = new Array();
-	},
-	
-	removeLastOperation: function() {
-		this.history.pop();
-		this.size.pop();
-		this.historyPointer--;		
-	},
-	
-	isInHistory: function(operation,url) {
-		if(operation == 'initialize' && this.historyPointer != -1) return true;
-		for(var k=0;k<this.history.length;k++) {
-			if(this.history[k].operation == operation && this.history[k].fileUrl == url) {
-				return true;	
-			}
-		}
-		return false;	
-	},
-	
-	onImageLoad: function(event) {
-		Event.stopObserving($('image'),'load',this.onImageLoad);
-		this.image.style.width = this.size[this.historyPointer].width + 'px';
-		this.image.style.height = this.size[this.historyPointer].height + 'px';
-		$('imageContainer').style.width = this.size[this.historyPointer].width + 'px';
-		$('imageContainer').style.height = this.size[this.historyPointer].height + 'px';
-		ImageEditor.resize.imageContainerResize.originalWidth = this.size[this.historyPointer].width;
-		ImageEditor.resize.imageContainerResize.originalHeight = this.size[this.historyPointer].height;
-		ImageEditor.imageToResize.onImageLoad();
-	},
-	
-	onlyResized: function() {
-        for(i=this.historyPointer;i>=0;i--) {
-            if(this.history[i].operation != 'resize') {
-                return false;
-            }
-        }
-        return true;
-	},
-	
-	optimizeResize: function(history,size) {
-	   var scallingXFactor = 1;var scallingYFactor = 1;
-	   var initWidth = size[0].width;var initHeight = size[0].height;
-	   for(var i=0;i<history.length && i < (this.historyPointer+1);i++) {
-           switch(history[i].operation) {
-               case 'resize':
-                   if(i == 0) {
-                       var previousWidth = 0;
-                       var previousHeight = 0;
-                   } else {
-                       previousWidth = size[i-1].width;
-                       previousHeight = size[i-1].height;
-                   }                   
-                   if(i != 0) {
-                       scallingXFactor *= history[i].additionalInfo.width/previousWidth
-                       scallingYFactor *= history[i].additionalInfo.height/previousHeight;
-                   }                   
-               break;  
-               case 'rotate': 
-                   var tempX = scallingXFactor;
-                   scallingXFactor = scallingYFactor;
-                   scallingYFactor = tempX;
-                   
-                   var tempW = initWidth;
-                   initWidth = initHeight;
-                   initHeight = tempW;
-               break;             
-           }    
-       }
-       if(scallingXFactor != 1 || scallingYFactor != 1) return {'operation': 'resize','additionalInfo': {'width': initWidth*scallingXFactor,'height': initHeight*scallingYFactor}};
-	},
-	
-	optimizeCrop: function(history,size) {
-		var imageWidth = size[0].width;var imageHeight = size[0].height;
-		var topCrop = 0;var leftCrop = 0;
-		var scallingXFactor = 1;var scallingYFactor = 1;
-		var crops = new Array();var cropNumber = 0;var resizeNumber = 0;
-		var lastResizeNumber = 0;
-		for(var i=0;i<history.length && i < (this.historyPointer+1);i++) {
-           switch(history[i].operation) {
-               case 'crop':
-                   crops[cropNumber] = {
-                       'width': history[i].additionalInfo.width, 'height': history[i].additionalInfo.height,
-                       'top': history[i].additionalInfo.top, 'left': history[i].additionalInfo.left,
-                       'parent': {'width': size[i-1].width,'height': size[i-1].height}
-                   };
-                   imageWidth = crops[cropNumber].width;
-                   imageHeight = crops[cropNumber].height;
-                   cropNumber++;
-                   scallingXFactor = 1;scallingYFactor = 1;
-               break;
-               case 'resize':
-                   if(crops.length != 0) { 
-	                   resizeNumber++;
-	                   if(i == 0) {
-	                       var previousWidth = 0;
-	                       var previousHeight = 0;
-	                   } else {
-	                       previousWidth = size[i-1].width;
-	                       previousHeight = size[i-1].height;
-	                   }                   
-	                   if(i != 0) {
-	                       scallingXFactor = history[i].additionalInfo.width/previousWidth
-	                       scallingYFactor = history[i].additionalInfo.height/previousHeight;
-	                   }
-	                   for(var k=0;k<crops.length;k++) {
-	                       crops[k].top *= scallingYFactor;
-	                       crops[k].left *= scallingXFactor;
-	                       crops[k].parent.width *= scallingXFactor;
-	                       crops[k].parent.height *= scallingYFactor;
-	                       crops[k].width *= scallingXFactor;
-	                       crops[k].height *= scallingYFactor; 
-	                   }
-	                   crops[cropNumber-1].width = history[i].additionalInfo.width;          
-	                   crops[cropNumber-1].height = history[i].additionalInfo.height;
-	               }
-               break; 
-               case 'rotate': 
-                   if(crops.length != 0) {
-                       for(var k = 0;k<crops.length;k++) {
-                           var tempTop = crops[k].top;
-                           crops[k].top = crops[k].parent.width - crops[k].width - crops[k].left;
-                           crops[k].left = tempTop;
-                           
-                           tempWidth = crops[k].parent.width;
-                           crops[k].parent.width = crops[k].parent.height;
-                           crops[k].parent.height = tempWidth;
-                           
-                           var tempWidth = crops[k].width;
-                           crops[k].width = crops[k].height;
-                           crops[k].height = tempWidth;
-                       }                        
-                   }
-               break;  
-           }    
-	    }
-        for(var l=0;l<crops.length;l++) {
-            topCrop += crops[l].top;
-            leftCrop += crops[l].left;
-        }        
-        if(cropNumber == 0) return;
-        if((topCrop + leftCrop + crops[cropNumber-1].width + crops[cropNumber-1].height) == 0) return;
-        return {'operation': 'crop','additionalInfo': {'top': topCrop,'left': leftCrop,'width': crops[cropNumber-1].width,'height': crops[cropNumber-1].height}};
-	},
-	
-	optimizeOtherEffects: function(history,without) {
-        var result = Array();var effectsNumber = 0;var isInResult = false;
-        for(var i=0;i<history.length;i++) {
-            if(history[i].operation == 'resize' || history[i].operation == 'crop' || history[i].operation == 'rotate' || history[i].operation == without) continue;
-            if(history[i].operation.indexOf('adjust') != -1) {
-                isInResult = false;
-                for(var k=0;k<result.length;k++) {
-                    if(result[k].operation == history[i].operation) {
-                        result[k] = history[i];
-                        isInResult = true;
-                    }
-                }
-                if(!isInResult) {
-                    result[effectsNumber] = history[i];
-                    effectsNumber++;
-                }
-            } else {
-                result[effectsNumber] = history[i];
-                effectsNumber++;
-            }
-        }
-        return result;               
-	},
-	
-	optimizeRotate: function(history) {
-        var result = Array();var rotateNumber = 0;var rotate;
-        for(var i=0;i<history.length;i++) {
-            if(history[i].operation.indexOf('rotate') != -1) {
-                rotateNumber++;
-                rotate = history[i];
-            }
-        }
-        rotateNumber = rotateNumber % 4;
-        for(var i=0;i<rotateNumber;i++) {
-            result[result.length] = rotate;
-        }
-        return result.length == 0 ? undefined : result;      
-	},
-	
-	checkSpecialOperation: function(operationType,historyEntry) {
-	    if(this.adjust[historyEntry.operation] != undefined) {
-		    if(operationType == 'undo') {
-		        if(this.adjust[historyEntry.operation].pointer > 0) this.adjust[historyEntry.operation].pointer--;               
-		    } else {
-		        this.adjust[historyEntry.operation].pointer++;
-		    }
-		    ImageEditor.effects.getEffect(historyEntry.operation).setValue(this.adjust[historyEntry.operation].values[this.adjust[historyEntry.operation].pointer]);
-		}
-	}
-};
\ No newline at end of file
diff --git a/javascript/ImageEditor/Image.js b/javascript/ImageEditor/Image.js
deleted file mode 100644
index 058afed9..00000000
--- a/javascript/ImageEditor/Image.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * @author Mateusz
- */
-ImageEditor.ImageToResize = {	
-	initialize: function(imageFile) {
-		Element.hide($('image'));
-		this.imageToResize = $('image');
-		this.imageToResize.src = imageFile;
-		this.reportSize = ImageEditor.ImageToResize.reportSize.bind(this);
-		this.onImageLoad = ImageEditor.ImageToResize.onImageLoad.bind(this);
-		this.resizeOnFirstLoad = ImageEditor.ImageToResize.resizeOnFirstLoad.bind(this);
-		Event.observe(this.imageToResize,'load',this.onImageLoad);
-		this.firstResize = {};
-	},
-		
-	reportSize: function(width,height) {
-		if(width != null && height != null) {
-			$('ImageWidth').innerHTML = width + "px";
-            $('ImageHeight').innerHTML = height + "px";	
-		} else {
-            $('ImageWidth').innerHTML = this.imageToResize.width + "px";
-            $('ImageHeight').innerHTML = this.imageToResize.height + "px";  
-		}
-	},
-	
-	onImageLoad: function(event) {
-		if(this.imageToResize.width != 0 && this.imageToResize.height != 0) {
-			$('imageContainer').style.backgroundImage = 'url("' + $('image').src + '")';
-			ImageEditor.imageBox.hideIndicator();
-			Element.show($('imageContainer'),$('image'));
-            if(ImageEditor.resize.imageContainerResize.originalHeight == 0 && ImageEditor.resize.imageContainerResize.originalWidth == 0) {
-				ImageEditor.history.add('initialize',$('image').src);
-				this.resizeOnFirstLoad();
-				ImageEditor.imageBox.center();
-	        }
-			ImageEditor.resize.imageContainerResize.originalWidth = this.imageToResize.width;
-			ImageEditor.resize.imageContainerResize.originalHeight = this.imageToResize.height;
-			ImageEditor.resize.imageContainerResize.placeClickBox();
-			ImageEditor.crop.onImageLoadCallback();
-		}
-		this.reportSize();
-	},
-	
-	resizeOnFirstLoad: function() {	
-	   var windowWidth = Element.getDimensions($('Main')).width;
-	   var windowHeight = Element.getDimensions($('Main')).height - 100;
-	   var imageWidth =  Element.getDimensions($('image')).width;
-	   var imageHeight = Element.getDimensions($('image')).height;
-	   if(imageWidth > windowWidth - 40 || imageHeight >  windowHeight - 40) {
-		   ImageEditor.history.clear();
-		   Element.hide($('imageContainer'),$('image'));
-		   var ratio = imageWidth / imageHeight;
-	       $('loadingIndicatorContainer2').style.left = windowWidth/2 + 'px';
-	       $('loadingIndicatorContainer2').style.top = windowHeight/2 + 100 + 'px';
-		   while(imageWidth > windowWidth - 40 || imageHeight >  windowHeight - 40) {
-	           imageWidth--;
-	           imageHeight = imageWidth * (1/ratio);
-	       }
-	       this.reportSize(0,0);
-	       ImageEditor.resize.imageContainerResize.setVisible(false);
-	       ImageEditor.transformation.resize(imageWidth,imageHeight,ImageEditor.ImageToResize.resizeOnFirstLoadCallBack.bind(this),false);
-	       this.firstResize.width = imageWidth;
-           this.firstResize.height = imageHeight;
-	   }	
-    },
-    
-    resizeOnFirstLoadCallBack: function() {
-        ImageEditor.history.addResize($('image').src,this.firstResize.width,this.firstResize.height);
-        Element.hide($('loadingIndicatorContainer2'));
-		ImageEditor.resize.imageContainerResize.setVisible(true);
-		ImageEditor.resize.imageContainerResize.placeClickBox();
-        ImageEditor.imageBox.center();
-    }
-};
diff --git a/javascript/ImageEditor/ImageBox.js b/javascript/ImageEditor/ImageBox.js
deleted file mode 100644
index b9e421dc..00000000
--- a/javascript/ImageEditor/ImageBox.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * @author Mateusz
- */
-ImageEditor.ImageBox = {
-	
-	initialize: function() {
-		this.indicatorWidth = 32;
-		this.indicatorHeight = 32;
-		this.showIndicator = ImageEditor.ImageBox.showIndicator.bind(this);
-		this.hideIndicator = ImageEditor.ImageBox.hideIndicator.bind(this);
-		this.reCenterIndicator = ImageEditor.ImageBox.reCenterIndicator.bind(this);
-		this.centerIndicator = ImageEditor.ImageBox.centerIndicator.bind(this);					
-		this.center = ImageEditor.ImageBox.center.bind(this);
-		this.imageContainer = ImageEditor.Positioning.addBehaviour($('imageContainer'));
-		Element.hide(this.imageContainer);
-		this.indicator = ImageEditor.Positioning.addBehaviour($('loadingIndicatorContainer'));
-        this.indicatorImage = ImageEditor.Positioning.addBehaviour($('loadingIndicator'));
-		ImageEditor.Positioning.addBehaviour($('Main'));
-	},
-		
-	showIndicator: function(container) {
-		Element.show(this.indicator,this.indicatorImage);
-		if(container == null) container = this.imageContainer;
-		this.centerIndicator(container);
-	},
-	
-	hideIndicator: function() {
-		Element.hide(this.indicator,this.indicatorImage);
-	},	
-	
-	centerIndicator: function(container) {
-		var top = container.getTop();
-		var left = container.getLeft();
-		var width = container.getWidth();
-		var height = container.getHeight();
-		var parentTop =  container.getParentTop();
-		var parentLeft = container.getParentLeft();
-		this.indicator.style.left = width/2 - this.indicatorWidth/2 + "px"; 
-		this.indicator.style.top = height/2 - this.indicatorHeight/2 + "px";
-	},
-	
-	reCenterIndicator: function() {
-		if(Element.visible(this.indicator)) {
-			this.centerIndicator(this.imageContainer);
-		}		
-	},
-	
-	center: function() {
-		this.imageContainer.style.left = this.imageContainer.getParentWidth()/2 - this.imageContainer.getWidth()/2 + 'px';
-		this.imageContainer.style.top = this.imageContainer.getParentHeight()/2 - this.imageContainer.getHeight()/2 + 'px';
-	}
-};
diff --git a/javascript/ImageEditor/ImageEditor.js b/javascript/ImageEditor/ImageEditor.js
deleted file mode 100644
index bebb7035..00000000
--- a/javascript/ImageEditor/ImageEditor.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * @author Mateusz
- */
-ImageEditor.Main = {
-	initialize: function(imageFile) {
-		imageFile += '1234';
-		ImageEditor.crop = null;
-		ImageEditor.history = new ImageEditor.History.initialize();
-		ImageEditor.environment = new ImageEditor.Environment.initialize(imageFile);		
-		ImageEditor.transformation = new ImageEditor.Transformation.initialize();
-		ImageEditor.resize = new ImageEditor.Resize.initialize($('imageContainer'));
-		ImageEditor.effects = new ImageEditor.Effects.Main.initialize();	
-		ImageEditor.crop = new ImageEditor.Crop.initialize();
-		ImageEditor.documentBody = new ImageEditor.DocumentBody.initialize();
-		ImageEditor.adjust = new ImageEditor.Adjust.initialize();
-		this.originalImageFile = imageFile;
-		this.tottalyOriginalImageFile = imageFile;
-		this.onSaveClick = ImageEditor.Main.onSaveClick.bind(this);
-		this.onCloseClick = ImageEditor.Main.onCloseClick.bind(this);
-		this.enableFunctionality = ImageEditor.Main.enableFunctionality.bind(this);
-		this.disableFunctionality = ImageEditor.Main.disableFunctionality.bind(this);
-		Event.observe($('SaveButton'),'click',this.onSaveClick);
-		Event.observe($('ExitButton'),'click',this.onCloseClick);
-		Element.hide($('CurrentAction'));
-	}, 
-	
-	onSaveClick: function() {
-		if(this.tottalyOriginalImageFile != $('image').src) {
-			ImageEditor.transformation.save(this.tottalyOriginalImageFile,$('image').src,this.onCloseClick);
-		} else {
-			this.onCloseClick();
-		}
-	},
-	
-	onCloseClick: function() {
-		window.parent.imageEditorClosed();
-		ImageEditor.transformation.close(ImageEditor.Main.onCloseCallback.bind(this));
-	},
-	
-	onCloseCallback: function() {
-	    Element.hide(window.frameElement);
-	},
-	
-	enableFunctionality: function() {
-       ImageEditor.effects.enable();
-       ImageEditor.crop.enable();
-       ImageEditor.resize.enable();
-       ImageEditor.history.enable();
-    },
-    
-    disableFunctionality: function() {
-       ImageEditor.effects.disable();
-       ImageEditor.crop.disable();
-       ImageEditor.resize.disable();
-       ImageEditor.history.disable();
-    }
-}
\ No newline at end of file
diff --git a/javascript/ImageEditor/ImageHistory.js b/javascript/ImageEditor/ImageHistory.js
deleted file mode 100644
index 430d9270..00000000
--- a/javascript/ImageEditor/ImageHistory.js
+++ /dev/null
@@ -1,264 +0,0 @@
-/**
- * @author Mateusz
- */
-ImageEditor.ImageHistory = {
-	
-	initialize: function() {
-		this.history = new Array();
-		this.historyPointer = -1;
-		this.modifiedOriginalImage = false;		
-		this.isEnabled = true;
-		this.image = ImageEditor.Positioning.addBehaviour($('image'));
-		this.size = new Array();
-		this.fakeImage = $('fakeImg');
-		this.image = $('image');
-		this.undo = ImageEditor.ImageHistory.undo.bind(this);
-		this.redo = ImageEditor.ImageHistory.redo.bind(this);
-		this.add = ImageEditor.ImageHistory.add.bind(this);
-		this.addListeners = ImageEditor.ImageHistory.addListeners.bind(this);
-		this.operationMade = ImageEditor.ImageHistory.operationMade.bind(this);		
-		this.isInHistory = ImageEditor.ImageHistory.isInHistory.bind(this);
-		this.onImageLoad = ImageEditor.ImageHistory.onImageLoad.bind(this);
-		this.removeLastOperation = ImageEditor.ImageHistory.removeLastOperation.bind(this);
-	
-		this.enable = ImageEditor.ImageHistory.enable.bind(this);
-		this.disable = ImageEditor.ImageHistory.disable.bind(this);
-		this.clear = ImageEditor.ImageHistory.clear.bind(this);
-		this.addListeners();
-	},
-		
-	undo: function() {
-		if(this.historyPointer >= 1) {
-			var operation = this.history[this.historyPointer].operation;
-			if(operation == 'rotate' || operation == 'crop') {
-				if(this.operationMade(this.historyPointer-1,'rotate') || this.operationMade(this.historyPointer-1,'crop')) 
-					this.modifiedOriginalImage = true; else this.modifiedOriginalImage = false;
-			}
-			Event.observe('image','load',this.onImageLoad);
-			this.historyPointer = this.historyPointer - 1;
-			this.image.src = this.history[this.historyPointer].fileUrl;
-		} else {
-			ImageEditor.statusMessageWrapper.statusMessage("No more undo","bad");
-		}
-	},
-	
-	redo: function() {
-		if(this.historyPointer < this.history.length-1) {
-			var operation = this.history[this.historyPointer+1].operation;
-			if(operation == 'rotate' || operation == 'crop') this.modifiedOriginalImage = true;
-			Event.observe('image','load',this.onImageLoad);
-			this.historyPointer = this.historyPointer + 1;
-			this.image.src = this.history[this.historyPointer].fileUrl;
-		} else {
-			ImageEditor.statusMessageWrapper.statusMessage("No more redo","bad");
-		}
-	},
-	
-	add: function(operation,url) {
-		var imageWidth =  isNaN(parseInt($('image').style.width)) ? Element.getDimensions($('image')).width : parseInt($('image').style.width);//IE hack
-		var imageHeight = isNaN(parseInt($('image').style.height)) ? Element.getDimensions($('image')).height : parseInt($('image').style.height);//IE hack
-		//code above should be moved to Positioning.addBehaviour
-		if(!this.isInHistory(operation,url)) {
-			this.historyPointer++;
-			this.size[this.historyPointer] = {'width': imageWidth,'height': imageHeight};
-			this.history[this.historyPointer] = {'operation': operation,'fileUrl' : url};
-			this.size = this.size.slice(0,this.historyPointer+1);
-			this.history = this.history.slice(0,this.historyPointer+1);
-			if(operation == 'rotate' || operation == 'crop') this.modifiedOriginalImage = true;
-		}
-	},
-	
-	addListeners: function() {
-		this.undoListener = Event.observe('UndoButton','click',this.undo);	
-		this.redoListener = Event.observe('RedoButton','click',this.redo);
-	},
-	
-	operationMade: function(historyPointer,operation) {
-		for(i=historyPointer;i>=0;i--) {
-			if(this.history[i].operation == operation) {
-				return true;
-			}
-		}
-		return false;
-	},
-	
-	enable: function() {
-		if(!this.isEnabled) {
-			this.addListeners();
-			this.isEnabled = true;
-		}
-	},
-	
-	disable: function() {
-		if(this.isEnabled) {
-			Event.stopObserving($('UndoButton'),'click', this.undo);			
-			Event.stopObserving($('RedoButton'),'click', this.redo);
-			this.isEnabled = false;
-		}
-	},
-	
-	clear: function() {
-	   this.history = new Array();
-       this.historyPointer = -1;
-	   this.size = new Array();
-	},
-	
-	removeLastOperation: function() {
-		this.history.pop();
-		this.size.pop();
-		this.historyPointer--;		
-	},
-	
-	isInHistory: function(operation,url) {
-		if(operation == 'initialize' && this.historyPointer != -1) return true;
-		for(var k=0;k<this.history.length;k++) {
-			if(this.history[k].operation == operation && this.history[k].fileUrl == url) {
-				return true;	
-			}
-		}
-		return false;	
-	},
-	
-	onImageLoad: function(event) {
-		Event.stopObserving($('image'),'load',this.onImageLoad);
-		this.image.style.width = this.size[this.historyPointer].width + 'px';
-		this.image.style.height = this.size[this.historyPointer].height + 'px';
-		$('imageContainer').style.width = this.size[this.historyPointer].width + 'px';
-		$('imageContainer').style.height = this.size[this.historyPointer].height + 'px';
-		ImageEditor.resize.imageContainerResize.originalWidth = this.size[this.historyPointer].width;
-		ImageEditor.resize.imageContainerResize.originalHeight = this.size[this.historyPointer].height;
-		ImageEditor.imageToResize.onImageLoad();
-	}
-};
-/**
- * @author Mateusz
- */
-ImageEditor.ImageHistory = {
-	
-	initialize: function() {
-		this.history = new Array();
-		this.historyPointer = -1;
-		this.modifiedOriginalImage = false;		
-		this.isEnabled = true;
-		this.image = ImageEditor.Positioning.addBehaviour($('image'));
-		this.size = new Array();
-		this.fakeImage = $('fakeImg');
-		this.image = $('image');
-		this.undo = ImageEditor.ImageHistory.undo.bind(this);
-		this.redo = ImageEditor.ImageHistory.redo.bind(this);
-		this.add = ImageEditor.ImageHistory.add.bind(this);
-		this.addListeners = ImageEditor.ImageHistory.addListeners.bind(this);
-		this.operationMade = ImageEditor.ImageHistory.operationMade.bind(this);		
-		this.isInHistory = ImageEditor.ImageHistory.isInHistory.bind(this);
-		this.onImageLoad = ImageEditor.ImageHistory.onImageLoad.bind(this);
-		this.removeLastOperation = ImageEditor.ImageHistory.removeLastOperation.bind(this);
-	
-		this.enable = ImageEditor.ImageHistory.enable.bind(this);
-		this.disable = ImageEditor.ImageHistory.disable.bind(this);
-		this.clear = ImageEditor.ImageHistory.clear.bind(this);
-		this.addListeners();
-	},
-		
-	undo: function() {
-		if(this.historyPointer >= 1) {
-			var operation = this.history[this.historyPointer].operation;
-			if(operation == 'rotate' || operation == 'crop') {
-				if(this.operationMade(this.historyPointer-1,'rotate') || this.operationMade(this.historyPointer-1,'crop')) 
-					this.modifiedOriginalImage = true; else this.modifiedOriginalImage = false;
-			}
-			Event.observe('image','load',this.onImageLoad);
-			this.historyPointer = this.historyPointer - 1;
-			this.image.src = this.history[this.historyPointer].fileUrl;
-		} else {
-			ImageEditor.statusMessageWrapper.statusMessage("No more undo","bad");
-		}
-	},
-	
-	redo: function() {
-		if(this.historyPointer < this.history.length-1) {
-			var operation = this.history[this.historyPointer+1].operation;
-			if(operation == 'rotate' || operation == 'crop') this.modifiedOriginalImage = true;
-			Event.observe('image','load',this.onImageLoad);
-			this.historyPointer = this.historyPointer + 1;
-			this.image.src = this.history[this.historyPointer].fileUrl;
-		} else {
-			ImageEditor.statusMessageWrapper.statusMessage("No more redo","bad");
-		}
-	},
-	
-	add: function(operation,url) {
-		var imageWidth =  isNaN(parseInt($('image').style.width)) ? Element.getDimensions($('image')).width : parseInt($('image').style.width);//IE hack
-		var imageHeight = isNaN(parseInt($('image').style.height)) ? Element.getDimensions($('image')).height : parseInt($('image').style.height);//IE hack
-		//code above should be moved to Positioning.addBehaviour
-		if(!this.isInHistory(operation,url)) {
-			this.historyPointer++;
-			this.size[this.historyPointer] = {'width': imageWidth,'height': imageHeight};
-			this.history[this.historyPointer] = {'operation': operation,'fileUrl' : url};
-			this.size = this.size.slice(0,this.historyPointer+1);
-			this.history = this.history.slice(0,this.historyPointer+1);
-			if(operation == 'rotate' || operation == 'crop') this.modifiedOriginalImage = true;
-		}
-	},
-	
-	addListeners: function() {
-		this.undoListener = Event.observe('UndoButton','click',this.undo);	
-		this.redoListener = Event.observe('RedoButton','click',this.redo);
-	},
-	
-	operationMade: function(historyPointer,operation) {
-		for(i=historyPointer;i>=0;i--) {
-			if(this.history[i].operation == operation) {
-				return true;
-			}
-		}
-		return false;
-	},
-	
-	enable: function() {
-		if(!this.isEnabled) {
-			this.addListeners();
-			this.isEnabled = true;
-		}
-	},
-	
-	disable: function() {
-		if(this.isEnabled) {
-			Event.stopObserving($('UndoButton'),'click', this.undo);			
-			Event.stopObserving($('RedoButton'),'click', this.redo);
-			this.isEnabled = false;
-		}
-	},
-	
-	clear: function() {
-	   this.history = new Array();
-       this.historyPointer = -1;
-	   this.size = new Array();
-	},
-	
-	removeLastOperation: function() {
-		this.history.pop();
-		this.size.pop();
-		this.historyPointer--;		
-	},
-	
-	isInHistory: function(operation,url) {
-		if(operation == 'initialize' && this.historyPointer != -1) return true;
-		for(var k=0;k<this.history.length;k++) {
-			if(this.history[k].operation == operation && this.history[k].fileUrl == url) {
-				return true;	
-			}
-		}
-		return false;	
-	},
-	
-	onImageLoad: function(event) {
-		Event.stopObserving($('image'),'load',this.onImageLoad);
-		this.image.style.width = this.size[this.historyPointer].width + 'px';
-		this.image.style.height = this.size[this.historyPointer].height + 'px';
-		$('imageContainer').style.width = this.size[this.historyPointer].width + 'px';
-		$('imageContainer').style.height = this.size[this.historyPointer].height + 'px';
-		ImageEditor.resize.imageContainerResize.originalWidth = this.size[this.historyPointer].width;
-		ImageEditor.resize.imageContainerResize.originalHeight = this.size[this.historyPointer].height;
-		ImageEditor.imageToResize.onImageLoad();
-	}
-};
\ No newline at end of file
diff --git a/javascript/ImageEditor/Resize.js b/javascript/ImageEditor/Resize.js
deleted file mode 100644
index cc9e9fcc..00000000
--- a/javascript/ImageEditor/Resize.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * @author Mateusz
- */
-ImageEditor.Resize = {
-	
-	initialize: function(element) {		
-		this.element = element;
-		this.leftBoxConstraint = 1;
-		this.topBoxConstraint = 0;
-		this.getRelativeMousePos = ImageEditor.Resize.getRelativeMousePos.bind(this);
-		this.enable = ImageEditor.Resize.enable.bind(this);
-		this.disable = ImageEditor.Resize.disable.bind(this);
-		var options = {
-				resizeStop: ImageEditor.Resize.resizeStop.bind(this),
-				onDrag: ImageEditor.Resize.onDrag.bind(this),
-				onResize: ImageEditor.Resize.onResize.bind(this),
-				getMousePos: ImageEditor.Resize.getMousePos.bind(this)
-			};		
-		new ImageEditor.Positioning.addBehaviour(this.element);
-		this.imageContainerResize = new ImageEditor.Resizeable.initialize(element,options);
-		this.imageContainerResize.setVisible(false);
-		this.lastResize = {};
-	},
-	
-	resizeStop: function(event) {
-		if(ImageEditor.EventStack.getLastEventElement() != null) {
-			var imageElement = $('image');
-			ImageEditor.EventStack.clearStack();
-			if(this.imageContainerResize.isEnabled) {
-				if(this.imageContainerResize.originalWidth != imageElement.width || this.imageContainerResize.originalHeight != imageElement.height) {
-					$('imageContainer').style.backgroundImage = 'url("")';
-					this.lastResize.width = imageElement.width;
-					this.lastResize.height = imageElement.height;
-					ImageEditor.transformation.resize(imageElement.width,imageElement.height,ImageEditor.Resize.resizeCallback.bind(this));
-				}	
-			}
-		}
-	},
-	
-	resizeCallback: function() {
-		$('imageContainer').style.backgroundImage = 'url("' + $('image').src + '")';
-		ImageEditor.history.addResize($('image').src,this.lastResize.width,this.lastResize.height);
-	},
-	
-	onDrag: function()
-	{
-		if(this.element.getTop() < this.topBoxConstraint) this.element.style.top = this.topBoxConstraint + "px";
-		if(this.element.getLeft() < this.leftBoxConstraint) this.element.style.left = this.leftBoxConstraint + "px";
-		ImageEditor.imageBox.reCenterIndicator();		
-	},
-	
- 	onResize: function(width,height) {
-		$('image').style.width = width + "px";
-		$('image').style.height = height + "px"; 
-	},
-	getMousePos: function(event) {
-		var relativeMouseX = this.getRelativeMousePos(event).x;
-		var relativeMouseY = this.getRelativeMousePos(event).y;
-		if(relativeMouseX <= this.leftBoxConstraint) x = this.leftBoxConstraint + this.element.getParentLeft(); else x = relativeMouseX + this.element.getParentLeft();
-		if(relativeMouseY <= this.topBoxConstraint) y = this.topBoxConstraint + this.element.getParentTop(); else y = relativeMouseY + this.element.getParentTop();
-		return {x: x,y: y};				
-	},
-	
-	getRelativeMousePos: function(event) {
-		var relativeMouseX = Event.pointerX(event) + $('imageEditorContainer').scrollLeft - this.element.getParentLeft();
-		var relativeMouseY = Event.pointerY(event) + $('imageEditorContainer').scrollTop - this.element.getParentTop();
-		return {x: relativeMouseX,y: relativeMouseY};				
-	},
-	
-	enable: function() {
-	   this.imageContainerResize.enable();
-	},
-	
-	disable: function() {
-	   this.imageContainerResize.disable();
-	}
-}
\ No newline at end of file
diff --git a/javascript/ImageEditor/Resizeable.js b/javascript/ImageEditor/Resizeable.js
deleted file mode 100644
index 875ca9df..00000000
--- a/javascript/ImageEditor/Resizeable.js
+++ /dev/null
@@ -1,298 +0,0 @@
-/**
- * @author Mateusz
- */
-ImageEditor.Resizeable = {
-	
-	initialize: function(element,options) {		
-		this.resizeStop = options.resizeStop.bind(this);
-		this.onDrag = options.onDrag.bind(this);
-		this.customOnResize = options.onResize.bind(this);
-		this.getMousePos = options.getMousePos.bind(this);
-		this.bindAll = ImageEditor.Resizeable.bindAll.bind(this);
-		this.bindAll();
-		this.element = element;
-		this.createClickBoxes();
-		this.setListeners();
-		this.originalHeight = 0;
-		this.originalWidth = 0;
-		this.isEnabled = true;
-	},
-	
-	resizeStart: function(event) {
-		if(Element.hasClassName(Event.element(event),'clickBox')) {
-			ImageEditor.EventStack.addEvent(event);
-			Event.stop(event);
-		}
-	},
-	
-	leftUpperDrag: function(event,top,left,height,width,parentTop,parentLeft,relativeMouseX,relativeMouseY,ratio) {
-		var newHeight = top - relativeMouseY + height;
-		var newWidth = Math.round(newHeight / ratio);
-		if(this.resize(newWidth,newHeight)) { 
-			this.element.style.top = top - (newHeight - height) + "px";
-			this.element.style.left = left - (newWidth - width) + "px";
-			if(parseInt(this.element.style.left) < 0) this.element.style.left = "1px";			
-		}		
-	},
-	
-	leftMiddleDrag: function(event,top,left,height,width,parentTop,parentLeft,relativeMouseX,relativeMouseY) {
-		var newWidth = left - relativeMouseX + width;											 
-		if(this.resize(newWidth,-1000)) this.element.style.left = left - (left - relativeMouseX) + "px";	
-	},
-	
-	leftLowerDrag: function(event,top,left,height,width,parentTop,parentLeft,relativeMouseX,relativeMouseY,ratio) {
-		var newHeight = relativeMouseY - (top + height) + height;
-        var newWidth = Math.round(newHeight / ratio);
-		if(this.resize(newWidth,newHeight)) {
-		    this.element.style.left = left - (newWidth - width) + "px";
-		    if(parseInt(this.element.style.left) < 0) this.element.style.left = "1px";
-		}
-	},
-	
-	rightUpperDrag: function(event,top,left,height,width,parentTop,parentLeft,relativeMouseX,relativeMouseY,ratio) {
-        var newHeight = top - relativeMouseY + height;
-        var newWidth = Math.round(newHeight / ratio);
-        if(this.resize(newWidth,newHeight)) this.element.style.top = (top - (newHeight - height) ) + 'px';
-	},
-	
-	rightMiddleDrag: function(event,top,left,height,width,parentTop,parentLeft,relativeMouseX,relativeMouseY) {
-		var newWidth = relativeMouseX - left; 
-		this.resize(newWidth,-1000);	
-	},
-	
-	rightLowerDrag: function(event,top,left,height,width,parentTop,parentLeft,relativeMouseX,relativeMouseY,ratio) {
-		var newHeight = relativeMouseY - top;
-        var newWidth = Math.round(newHeight / ratio);
-		this.resize(newWidth,newHeight);	
-	},
-	
-	upperMiddleDrag: function(event,top,left,height,width,parentTop,parentLeft,relativeMouseX,relativeMouseY) {
-		var newHeight = top - relativeMouseY + height; 
-		if(this.resize(-1000,newHeight)) {
-			this.element.style.top = (top - (newHeight - height)) + 'px';								
-		}
-	},
-	
-	lowerMiddleDrag: function(event,top,left,height,width,parentTop,parentLeft,relativeMouseX,relativeMouseY) {
-		var newHeight = relativeMouseY - (top + height) + height;						
-		this.resize(-1000,newHeight);
-	},
-	
-	onResize: function(event) {		
-		if(ImageEditor.EventStack.getLastEventElement() != null && this.isVisible && this.isEnabled) {					
-		    var lastEventElement = ImageEditor.EventStack.getLastEventElement();
-			var relativeMouseX = this.getMousePos(event).x - this.element.getParentLeft();
-			var relativeMouseY = this.getMousePos(event).y - this.element.getParentTop();
-			if(Element.hasClassName(lastEventElement,'leftUpperClickBox')) {
-				this.leftUpperDrag(event,this.element.getTop(),this.element.getLeft(),this.element.getHeight(),this.element.getWidth(),this.element.getParentTop(),this.element.getParentLeft(),relativeMouseX,relativeMouseY,this.originalHeight/this.originalWidth);						
-			}
-			if(Element.hasClassName(lastEventElement,'leftMiddleClickBox')) {
-				this.leftMiddleDrag(event,this.element.getTop(),this.element.getLeft(),this.element.getHeight(),this.element.getWidth(),this.element.getParentTop(),this.element.getParentLeft(),relativeMouseX,relativeMouseY);						
-			}
-			if(Element.hasClassName(lastEventElement,'leftLowerClickBox')) {
-				this.leftLowerDrag(event,this.element.getTop(),this.element.getLeft(),this.element.getHeight(),this.element.getWidth(),this.element.getParentTop(),this.element.getParentLeft(),relativeMouseX,relativeMouseY,this.originalHeight/this.originalWidth);						
-			}
-			if(Element.hasClassName(lastEventElement,'rightUpperClickBox')) {
-				this.rightUpperDrag(event,this.element.getTop(),this.element.getLeft(),this.element.getHeight(),this.element.getWidth(),this.element.getParentTop(),this.element.getParentLeft(),relativeMouseX,relativeMouseY,this.originalHeight/this.originalWidth);						
-			}
-			if(Element.hasClassName(lastEventElement,'rightMiddleClickBox')) {
-				this.rightMiddleDrag(event,this.element.getTop(),this.element.getLeft(),this.element.getHeight(),this.element.getWidth(),this.element.getParentTop(),this.element.getParentLeft(),relativeMouseX,relativeMouseY);						
-			}
-			if(Element.hasClassName(lastEventElement,'rightLowerClickBox')) {
-				this.rightLowerDrag(event,this.element.getTop(),this.element.getLeft(),this.element.getHeight(),this.element.getWidth(),this.element.getParentTop(),this.element.getParentLeft(),relativeMouseX,relativeMouseY,this.originalHeight/this.originalWidth);						
-			}
-			if(Element.hasClassName(lastEventElement,'upperMiddleClickBox')) {
-				this.upperMiddleDrag(event,this.element.getTop(),this.element.getLeft(),this.element.getHeight(),this.element.getWidth(),this.element.getParentTop(),this.element.getParentLeft(),relativeMouseX,relativeMouseY);						
-			}
-			if(Element.hasClassName(lastEventElement,'lowerMiddleClickBox')) {
-				this.lowerMiddleDrag(event,this.element.getTop(),this.element.getLeft(),this.element.getHeight(),this.element.getWidth(),this.element.getParentTop(),this.element.getParentLeft(),relativeMouseX,relativeMouseY);						
-			}
-			this.placeClickBox();
-			this.customOnResize(this.element.getWidth(),this.element.getHeight());		
-			ImageEditor.imageBox.reCenterIndicator();			
-			Event.stop(event);
-		}	
-	},
-	
-	resize: function(width,height) {
-		if(width < 35 && height == -1000) {
-			return false;
-		}
-		if(height < 35 && width == -1000) {
-			return false;
-		}
-		if((width < 35 || height < 35) && (width != -1000 && height != -1000)) {
-			return false;
-		}		
-		if(width == -1000)	{ 			
-			width = this.originalWidth;
-		}
-		if(height == -1000) {			
-			height = this.originalHeight;
-		}	
-		if(!ImageEditor.crop.isVisible) {		
-			$('image').style.width = width + 'px';
-			$('image').style.height =  height + 'px';
-		}
-		this.element.style.width = width + "px";	
-		this.element.style.height = height + "px";
-		return true;		
-	},
-	
-	placeClickBox: function(event) {
-		if(event != null) {
-			this.originalHeight = Element.getDimensions(this.element).height;
-			this.originalWidth = Element.getDimensions(this.element).width;
-		}
-		var width = Element.getDimensions(this.element).width;
-		var height = Element.getDimensions(this.element).height;
-		var clickBoxHalfWidth =  Math.floor(Element.getDimensions(this.leftUpperClickBox2).width/2)+1;
-		
-		var leftUpper = new ImageEditor.Point.initialize(-clickBoxHalfWidth,-clickBoxHalfWidth);
-		var leftMiddle = new ImageEditor.Point.initialize(-clickBoxHalfWidth,height/2-clickBoxHalfWidth);
-		var leftLower = new ImageEditor.Point.initialize(-clickBoxHalfWidth,height-clickBoxHalfWidth);
-		var rightUpper = new ImageEditor.Point.initialize(width-clickBoxHalfWidth,-clickBoxHalfWidth);
-		var rightMiddle = new ImageEditor.Point.initialize(width-clickBoxHalfWidth,height/2-clickBoxHalfWidth);
-		var rightLower = new ImageEditor.Point.initialize(width-clickBoxHalfWidth,height-clickBoxHalfWidth);
-		var upperMiddle = new ImageEditor.Point.initialize(width/2-clickBoxHalfWidth,-clickBoxHalfWidth);
-		var lowerMiddle = new ImageEditor.Point.initialize(width/2-clickBoxHalfWidth,height-clickBoxHalfWidth);
-		
-		this.leftUpperClickBox.style.left = leftUpper.x + 'px';
-		this.leftUpperClickBox.style.top = leftUpper.y + 'px';
-		this.leftUpperClickBox2.style.left = leftUpper.x + 'px';
-		this.leftUpperClickBox2.style.top = leftUpper.y + 'px';
-		this.leftMiddleClickBox.style.left = leftMiddle.x + 'px';
-		this.leftMiddleClickBox.style.top = leftMiddle.y + 'px';
-		this.leftLowerClickBox.style.left = leftLower.x + 'px';
-		this.leftLowerClickBox.style.top = leftLower.y + 'px';		
-		
-		this.rightUpperClickBox.style.left = rightUpper.x + 'px';
-		this.rightUpperClickBox.style.top = rightUpper.y + 'px';
-		this.rightMiddleClickBox.style.left = rightMiddle.x + 'px';
-		this.rightMiddleClickBox.style.top = rightMiddle.y + 'px';
-		this.rightLowerClickBox.style.left = rightLower.x + 'px';
-		this.rightLowerClickBox.style.top = rightLower.y + 'px';
-		
-		this.upperMiddleClickBox.style.left = upperMiddle.x + 'px';
-		this.upperMiddleClickBox.style.top = upperMiddle.y + 'px';
-		this.lowerMiddleClickBox.style.left = lowerMiddle.x + 'px';
-		this.lowerMiddleClickBox.style.top = lowerMiddle.y + 'px';	
-		
-	},
-	
-	createClickBoxes: function() {
-		this.leftUpperClickBox = this.createElement('div',ImageEditor.Random.string(5),["leftUpperClickBox","clickBox"]);
-		this.leftMiddleClickBox = this.createElement('div',ImageEditor.Random.string(5),["leftMiddleClickBox","clickBox"]);
-		this.leftLowerClickBox = this.createElement('div',ImageEditor.Random.string(5),["leftLowerClickBox","clickBox"]);
-		this.rightUpperClickBox = this.createElement('div',ImageEditor.Random.string(5),["rightUpperClickBox","clickBox"]);
-		this.rightMiddleClickBox = this.createElement('div',ImageEditor.Random.string(5),["rightMiddleClickBox","clickBox"]);
-		this.rightLowerClickBox = this.createElement('div',ImageEditor.Random.string(5),["rightLowerClickBox","clickBox"]);
-		this.upperMiddleClickBox = this.createElement('div',ImageEditor.Random.string(5),["upperMiddleClickBox","clickBox"]);
-		this.lowerMiddleClickBox = this.createElement('div',ImageEditor.Random.string(5),["lowerMiddleClickBox","clickBox"]);		
-		this.leftUpperClickBox2 = this.createElement('div',ImageEditor.Random.string(5),["leftUpperClickBox","clickBox"]);		
-		//Safarai requires creating another clickbox because leftUppperClickBox is hidden (hack)
-		
-	},
-	
-	createElement: function(tag,id,classes) {
-		var newElement = document.createElement(tag);
-		newElement.id = id;
-		classes.each(function(item) {
-				Element.addClassName(newElement,item);		
-			}
-		);
-		this.addListener(newElement);
-		this.element.appendChild(newElement);
-		return newElement;		
-	},
-	
-	bindAll: function() {
-		this.setListeners = ImageEditor.Resizeable.setListeners.bind(this);
-		this.placeClickBox = ImageEditor.Resizeable.placeClickBox.bind(this);
-		this.resizeStart = ImageEditor.Resizeable.resizeStart.bind(this);	
-		this.onResize = ImageEditor.Resizeable.onResize.bind(this);
-		this.resize = ImageEditor.Resizeable.resize.bind(this);
-		this.createClickBoxes = ImageEditor.Resizeable.createClickBoxes.bind(this);
-		this.createElement = ImageEditor.Resizeable.createElement.bind(this);
-		this.addListener = ImageEditor.Resizeable.addListener.bind(this);
-		this.addDraging = ImageEditor.Resizeable.addDraging.bind(this);
-		this.setVisible = ImageEditor.Resizeable.setVisible.bind(this);
-		this.removeDraging = ImageEditor.Resizeable.removeDraging.bind(this);
-		this.disable = ImageEditor.Resizeable.disable.bind(this);
-		this.enable = ImageEditor.Resizeable.enable.bind(this);
-		
-		this.leftUpperDrag = ImageEditor.Resizeable.leftUpperDrag.bind(this);
-		this.leftMiddleDrag = ImageEditor.Resizeable.leftMiddleDrag.bind(this);
-		this.leftLowerDrag = ImageEditor.Resizeable.leftLowerDrag.bind(this);		
-		this.rightUpperDrag = ImageEditor.Resizeable.rightUpperDrag.bind(this);
-		this.rightMiddleDrag = ImageEditor.Resizeable.rightMiddleDrag.bind(this);
-		this.rightLowerDrag = ImageEditor.Resizeable.rightLowerDrag.bind(this);
-		this.upperMiddleDrag = ImageEditor.Resizeable.upperMiddleDrag.bind(this);
-		this.lowerMiddleDrag = ImageEditor.Resizeable.lowerMiddleDrag.bind(this);		
-	},
-	
-	setListeners: function() {
-		Event.observe('Main','mousemove',this.onResize);
-		Event.observe('Main','mouseup',this.resizeStop);
-	},
-	
-	addListener: function(element) {
-		Event.observe(element,'mousedown',this.resizeStart);		
-		Event.observe(element,'mousemove',this.onResize);		
-		
-	},	
-	
-	addDraging: function() {
-		if(this.draggableImage) this.removeDraging();
-		var options =  {
-			starteffect: function() {},
-			endeffect: function() {},
-			change: this.onDrag
-		};		
-		this.draggableImage = new Draggable(this.element,options);
-	},
-	
-	removeDraging: function() {
-		if(this.draggableImage) {
-			this.draggableImage.destroy();
-			this.draggableImage = null;
-		}
-	},
-	
-	setVisible: function(setVisible) {
-		this.isVisible = setVisible;
-		if(setVisible) {
-			Element.show(
-				this.leftUpperClickBox,
-				this.leftUpperClickBox2,
-				this.leftMiddleClickBox,
-				this.leftLowerClickBox,
-				this.rightUpperClickBox,
-				this.rightMiddleClickBox,
-				this.rightLowerClickBox,
-				this.upperMiddleClickBox,
-				this.lowerMiddleClickBox);
-			this.addDraging();
-		} else {
-			Element.hide(
-				this.leftUpperClickBox,
-				this.leftUpperClickBox2,
-				this.leftMiddleClickBox,
-				this.leftLowerClickBox,
-				this.rightUpperClickBox,
-				this.rightMiddleClickBox,
-				this.rightLowerClickBox,
-				this.upperMiddleClickBox,
-				this.lowerMiddleClickBox);					
-			this.removeDraging();
-		}
-	},
-	
-	disable: function() {
-        this.isEnabled = false;   
-	},
-	
-	enable: function() {
-	   this.isEnabled = true;
-	}
-}
\ No newline at end of file
diff --git a/javascript/ImageEditor/Transformation.js b/javascript/ImageEditor/Transformation.js
deleted file mode 100644
index 9d61662a..00000000
--- a/javascript/ImageEditor/Transformation.js
+++ /dev/null
@@ -1,156 +0,0 @@
-ImageEditor.Transformation = {
-	initialize: function() {
-		this.currentOperation = "";
-		this.currentResponse = new Array();
-		this.currentCallback = null;
-		this.queue = new Array();
-		this.resize = ImageEditor.Transformation.resize.bind(this);
-		this.customRequest = ImageEditor.Transformation.customRequest.bind(this);
-		this.crop = ImageEditor.Transformation.crop.bind(this);
-		this.save = ImageEditor.Transformation.save.bind(this);
-		this.close = ImageEditor.Transformation.close.bind(this);
-		this.onSuccess = ImageEditor.Transformation.onSuccess.bind(this);
-		this.onImageLoad = ImageEditor.Transformation.onImageLoad.bind(this);
-		this.getOptions = ImageEditor.Transformation.getOptions.bind(this);
-		this.applyHistory = ImageEditor.Transformation.applyHistory.bind(this);
-		this.processLastOperationFromQueue = ImageEditor.Transformation.processLastOperationFromQueue.bind(this);
-		this.addToQueueBeginning = ImageEditor.Transformation.addToQueueBeginning.bind(this);
-		this.removeLastElementFromQueue = ImageEditor.Transformation.removeLastElementFromQueue.bind(this);
-	},
-	
-    resize: function(width,height,callback,imageAlreadyChangedSize,file) {
-		this.currentOperation = "resize";
-		this.currentCallback = callback;	
-		if(ImageEditor.history.onlyResized()) {
-			var fileToResize = ImageEditor.imageEditor.originalImageFile;
-	} else {
-			var fileToResize = $('image').src;
-		}	
-		options = this.getOptions('command=resize&file=' + (file != undefined ? file : fileToResize) + '&newImageWidth=' + width + '&newImageHeight=' + height)
-		if(imageAlreadyChangedSize == false) {
-		    ImageEditor.imageBox.showIndicator($('Main'));
-	    } else {
-		    ImageEditor.imageBox.showIndicator();
-		}
-		ImageEditor.Main.disableFunctionality();
-		return new Ajax.Request('admin/ImageEditor/manipulate', options);
-},
-	
-	customRequest: function(name,callback,file,value,addToQueue) {
-        if(this.queue.length > 0 && addToQueue) {
-            this.addToQueueBeginning({'operation' : name,'callback' : callback,'additionalInfo': {'value' : value}});     
-        } else {
-	        this.currentOperation = name;
-        this.currentCallback = callback;
-	        var options = this.getOptions(  'command=' + name + 
-	                                        '&file=' + (file != undefined ? file : $('image').src) + 
-	                                        (value != undefined ? ('&value=' + value) : '')
-	                                      );
-	        ImageEditor.imageBox.showIndicator();
-	        ImageEditor.Main.disableFunctionality();
-	        return new Ajax.Request('admin/ImageEditor/manipulate', options);
-	   }
-    },
-    
-	crop: function(top,left,width,height,callback,file) {
-		this.currentOperation = "crop";
-		this.currentCallback = callback;
-		var options = this.getOptions('command=crop&file=' + (file != undefined ? file : $('image').src) + '&top=' + top + '&left=' + left + '&width=' + width + '&height=' + height);
-		ImageEditor.imageBox.showIndicator();
-		ImageEditor.Main.disableFunctionality();
-		return new Ajax.Request('admin/ImageEditor/manipulate', options);	
-	},
-	save: function(originalFile,editedFile,callback) {
-		var options = this.getOptions('command=save&editedFile=' + editedFile + '&originalFile=' + originalFile);
-        options.onSuccess = function(transport) {
-                                eval(transport.responseText);
-                                callback();
-                           }
-		new Ajax.Request('admin/ImageEditor/save', options);
-	},
-	
-	close: function(callback) {
-		var options = this.getOptions('');
-        options.onSuccess = function(transport) {
-				eval(transport.responseText);
-			callback();
-			}
-		 new Ajax.Request('admin/ImageEditor/close', options);
-	},
-	
-onSuccess: function(transport) {
-		this.currentResponse = eval('(' + transport.responseText + ')');
-		if(this.queue.length > 0) this.removeLastElementFromQueue();
-		if(this.queue.length > 0) {
-		    this.processLastOperationFromQueue('http://' + location.host + '/' + this.currentResponse.fileName);
-		} else {
-		    $('fakeImg').src = this.currentResponse.fileName;
-            Event.observe('fakeImg','load',this.onImageLoad);
-		}
-	},
-	
-	onImageLoad: function(event) {
-		Event.stopObserving('fakeImg','load', this.onImageLoad);	
-		$('image').src = this.currentResponse.fileName;
-		ImageEditor.imageBox.hideIndicator();			
-		ImageEditor.resize.imageContainerResize.originalWidth = this.currentResponse.width;
-		ImageEditor.resize.imageContainerResize.originalHeight = this.currentResponse.height;
-		$('imageContainer').style.height = this.currentResponse.height + 'px';
-        $('imageContainer').style.width = this.currentResponse.width + 'px';
-		$('image').style.height = this.currentResponse.height + 'px';
-        $('image').style.width = this.currentResponse.width + 'px';
-		ImageEditor.resize.imageContainerResize.placeClickBox();
-	if(this.queue.length == 0) ImageEditor.Main.enableFunctionality();
-		if(this.currentCallback != null) this.currentCallback();
-	},
-	
-	getOptions: function(postBodyContent) {
-  return options = {
-          asynchronous: true,
-            method: 'post',
-            postBody: postBodyContent,
-            onSuccess: this.onSuccess
-        };
-	},
-	
-applyHistory: function(history) {
-        for(var i=1;history[i] != undefined;i++) {
-            this.addToQueueBeginning(history[i]);
-        }
-        this.processLastOperationFromQueue(history[0].fileUrl);
-	},
-
-	addToQueueBeginning: function(historyEntry) {
-	    if(this.queue.length == 0) {
-            this.queue[0] = historyEntry;	    
-	    } else {
-		    for(var i=this.queue.length-1;i>=0;i--) {
-		        this.queue[i+1] = this.queue[i];  
-	    }
-		    this.queue[0] = historyEntry;
-		}
-	},
-	
-	processLastOperationFromQueue: function(file) {
-  		o = this.queue[this.queue.length-1];
-      	switch(o.operation) {
-           case 'resize':
-               ImageEditor.transformation.resize(o.additionalInfo.width,o.additionalInfo.height,function() {},true,file);
-           break;
-           case 'crop':
-               ImageEditor.transformation.crop(o.additionalInfo.top,o.additionalInfo.left,o.additionalInfo.width,o.additionalInfo.height,function() {},file);
-           break;
-          default:
-              var value = '';
-               var callback = function() {};
-              if(o.additionalInfo != undefined && o.additionalInfo.value != undefined) value = o.additionalInfo.value; 
-               if(o.callback != undefined) callback = o.callback;
-               ImageEditor.transformation.customRequest(o.operation,callback,file,value,false);
-           break;
-       }
-	},
-	
-	removeLastElementFromQueue: function() {
-	    this.queue = this.queue.slice(0,this.queue.length-1);
-}
-}
\ No newline at end of file
diff --git a/javascript/ImageEditor/Utils.js b/javascript/ImageEditor/Utils.js
deleted file mode 100644
index 7879a01d..00000000
--- a/javascript/ImageEditor/Utils.js
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * @author Mateusz
- */
-ImageEditor = {};
-ImageEditor.Point = {
-	initialize: function(x,y) {
-		this.x = x;
-		this.y = y;
-	}
-}
-
-ImageEditor.EventStack = {
-	lastEventElement: null,
-	getLastEventElement: function(){		
-		return ImageEditor.EventStack.lastEventElement;
-	},
-	
-	addEvent: function(event) {
-		ImageEditor.EventStack.lastEventElement = Event.element(event);
-	},
-	
-	clearStack: function() {
-		this.lastEventElement  = null;
-	}
-}
-
-ImageEditor.Positioning = {
-	addBehaviour: function(element) {
-		this.element = element;		
-		this.element.getTop = ImageEditor.Positioning.getTop.bind(this);
-		this.element.getLeft = ImageEditor.Positioning.getLeft.bind(this);
-		this.element.getWidth = ImageEditor.Positioning.getWidth.bind(this);
-		this.element.getHeight = ImageEditor.Positioning.getHeight.bind(this);
-		this.element.getParentLeft = ImageEditor.Positioning.getParentLeft.bind(this);
-		this.element.getParentTop = ImageEditor.Positioning.getParentTop.bind(this);
-		this.element.getParentHeight = ImageEditor.Positioning.getParentHeight.bind(this);
-		this.element.getParentWidth = ImageEditor.Positioning.getParentWidth.bind(this);
-		return this.element;
-	},
-	
-	getTop: function() {
-		return Position.positionedOffset(this.element)[1];
-	},
-	
-	getLeft: function() {
-		return parseInt(this.element.style.left);
-	},
-	
-	getWidth: function() {
-		return Element.getDimensions(this.element).width;
-	},
-	
-	getHeight: function() {
-		return Element.getDimensions(this.element).height;
-	}, 
-	
-	getParentLeft: function() {
-		var parentLeft = Position.cumulativeOffset(Position.offsetParent(this.element))[0];
-		return parentLeft;
-	},
-	
-	getParentTop: function() {
-		var parentTop = Position.cumulativeOffset(Position.offsetParent(this.element))[1];
-		return parentTop;
-	},
-	
-	getParentHeight: function() {
-		return Element.getDimensions(Position.offsetParent(this.element)).height;
-	},
-	
-	getParentWidth: function() {
-		return Element.getDimensions(Position.offsetParent(this.element)).width
-	}
-}
-
-ImageEditor.Random = {
-	string: function(length) {
-		var chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-		var string = "";
-		var i = 0;
-		for(x=0;x<length;x++) {
-			i = Math.floor(Math.random() * 57);
-			string += chars.charAt(i);
-		}	
-		return string;
-	}
-}
-
-ImageEditor.StatusMessage = {
-    initialize: function() {
-        this.statusMessage = ImageEditor.StatusMessage.statusMessage.bind(this);
-        window.frameElement.statusMessage = window.top.statusMessage;
-        var s1 = $('statusMessage');
-        var s2 = window.top.document.getElementById('statusMessage');
-        s1.showMessage = s2.showMessage;
-        s1.clearMessage = s2.clearMessage;
-        s1.fade = s2.fade;
-        s1.afterFade = s2.afterFade;
-        this.statusMessageContainer = s1;
-    },
-    
-    statusMessage: function(msg, type, clearManually) {
-        window.frameElement.statusMessage(msg, type, clearManually,this.statusMessageContainer);
-    } 
-}   
-Event.observe(window,'load',function(e) {ImageEditor.statusMessageWrapper = new ImageEditor.StatusMessage.initialize();});
\ No newline at end of file
diff --git a/lang/en_US.php b/lang/en_US.php
index fd7d1f20..518283c2 100755
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -270,28 +270,6 @@ $lang['en_US']['GroupImportForm']['Help2'] = '<div class="advanced">
 $lang['en_US']['GroupImportForm']['ResultCreated'] = 'Created %d groups';
 $lang['en_US']['GroupImportForm']['ResultDeleted'] = 'Deleted %d groups';
 $lang['en_US']['GroupImportForm']['ResultUpdated'] = 'Updated %d groups';
-$lang['en_US']['ImageEditor.ss']['ACTIONS'] = 'actions';
-$lang['en_US']['ImageEditor.ss']['ADJUST'] = 'adjust';
-$lang['en_US']['ImageEditor.ss']['APPLY'] = 'apply';
-$lang['en_US']['ImageEditor.ss']['BLUR'] = 'blur';
-$lang['en_US']['ImageEditor.ss']['BRIGHTNESS'] = 'brightness';
-$lang['en_US']['ImageEditor.ss']['CANCEL'] = 'cancel';
-$lang['en_US']['ImageEditor.ss']['CONTRAST'] = 'contrast';
-$lang['en_US']['ImageEditor.ss']['CROP'] = 'crop';
-$lang['en_US']['ImageEditor.ss']['CURRENTACTION'] = 'current&nbsp;action';
-$lang['en_US']['ImageEditor.ss']['EDITFUNCTIONS'] = 'edit&nbsp;functions';
-$lang['en_US']['ImageEditor.ss']['EFFECTS'] = 'effects';
-$lang['en_US']['ImageEditor.ss']['EXIT'] = 'exit';
-$lang['en_US']['ImageEditor.ss']['GAMMA'] = 'gamma';
-$lang['en_US']['ImageEditor.ss']['GREYSCALE'] = 'greyscale';
-$lang['en_US']['ImageEditor.ss']['HEIGHT'] = 'height';
-$lang['en_US']['ImageEditor.ss']['REDO'] = 'redo';
-$lang['en_US']['ImageEditor.ss']['ROT'] = 'rotate';
-$lang['en_US']['ImageEditor.ss']['SAVE'] = 'save&nbsp;image';
-$lang['en_US']['ImageEditor.ss']['SEPIA'] = 'sepia';
-$lang['en_US']['ImageEditor.ss']['UNDO'] = 'undo';
-$lang['en_US']['ImageEditor.ss']['UNTITLED'] = 'Untitled Document';
-$lang['en_US']['ImageEditor.ss']['WIDTH'] = 'width';
 $lang['en_US']['LeftAndMain']['CANT_REORGANISE'] = 'You do not have permission to rearange the site tree. Your change was not saved.';
 $lang['en_US']['LeftAndMain']['CHANGEDURL'] = '  Changed URL to \'%s\'';
 $lang['en_US']['LeftAndMain']['HELP'] = array(
diff --git a/templates/ImageEditor.ss b/templates/ImageEditor.ss
deleted file mode 100644
index 6475e936..00000000
--- a/templates/ImageEditor.ss
+++ /dev/null
@@ -1,191 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" debug=true>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-		<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
-        <% base_tag %>
-        <title><% _t('UNTITLED','Untitled Document') %></title>
-        <meta http-equiv="imagetoolbar" content="no">
-    </head>
-    <body id="body" class="$CSSClasses" onload="ImageEditor.imageEditor = new ImageEditor.Main.initialize('$fileToEdit');">
-        <div id="Loading" style="background: #FFF url(cms/images/loading.gif) 50% 50% no-repeat; position: absolute;z-index: 100000;height: 100%;width: 100%;margin: 0;padding: 0;z-index: 100000;position: absolute;">Loading...</div>
-        <div id="Main">
-            <script type="text/javascript">
-            </script>
-            <div id="MenuBar">
-                <div id="TopLeft"></div>
-                <div id="TopRight"></div>
-                <div id="Filename">
-                    <p>$fileToEditOnlyName</p>
-                </div>
-                <div id="Actions">
-                    <a id="SaveButton" href="#a">
-                        <div id="SaveIcon">
-                        </div>
-                        <p id="SaveText" class="menuText">
-                            <% _t('SAVE','save&nbsp;image') %>
-                        </p>
-                    </a>
-                    <a id="ExitButton" href="#a">
-                        <div id="ExitIcon">
-                        </div>
-                        <p id="ExitText" class="menuText">
-                            <% _t('EXIT', 'exit') %>
-                        </p>
-                    </a>
-                    <a id="UndoButton" href="#a">
-                        <div id="UndoIcon">
-                        </div>
-                        <p id="UndoText" class="menuText">
-                            <% _t('UNDO','undo') %>
-                        </p>
-                    </a>
-                    <a id="RedoButton" href="#a">
-                        <div id="RedoIcon">
-                        </div>
-                        <p id="RedoText" class="menuText">
-                            <% _t('REDO','redo') %>
-                        </p>
-                    </a>
-                    <p id="ActionsDescription" class="menuText">
-                        <% _t('ACTIONS', 'actions') %>
-                    </p>    
-                </div>
-				<div id="Effects">
-					<a id="GreyscaleButton" href="#a">
-						<div id="GreyscaleIcon"></div>
-						<p id="GreyscaleText" class="menuText">
-							<% _t('GREYSCALE','greyscale') %>
-						</p>
-					</a>
-					<a id="SepiaButton" href="#a">
-						<div id="SepiaIcon"></div>
-						<p id="SepiaText" class="menuText">
-							<% _t('SEPIA','sepia') %>
-						</p>
-				 	</a>
-					<a id="BlurButton" href="#a">
-				 		<div id="BlurIcon"></div>
-						<p id="BlurText" class="menuText">
-							<% _t('BLUR','blur') %>
-						</p>
-					</a>
-					<a id="AdjustButton" href="#a">
-						<div id="AdjustIcon"></div>
-						<p id="AdjustText" class="menuText">
-							<% _t('ADJUST','adjust') %>
-						</p>                        
-					</a>
-					<div id="AdjustMenu">
-						<div id="AdjustMenuContrastSlider">
-							<div id="AdjustMenuContrastSliderTrack" class="sliderTrack">
-								<div id="AdjustMenuContrastSliderTrackHandler" class="sliderTrackHandler">
-								</div>
-							</div>
-						</div> 
-						<p id="AdjustMenuConstrastDescription" class="menuText effectDescription">
-							<% _t('CONTRAST','contrast') %>
-						</p>
-						<div id="AdjustMenuBrightnessSlider">
-							<div id="AdjustMenuBrightnessSliderTrack" class="sliderTrack">
-								<div id="AdjustMenuBrightnessSliderTrackHandler" class="sliderTrackHandler">
-								</div>
-							</div>
-						</div>
-						<p id="AdjustMenuBrightnessDescription" class="menuText effectDescription">
-							<% _t('BRIGHTNESS','brightness') %>
-						</p>
-						<div id="AdjustMenuGammaSlider">
-							<div id="AdjustMenuGammaSliderTrack" class="sliderTrack">
-								<div id="AdjustMenuGammaSliderTrackHandler" class="sliderTrackHandler">
-								</div>
-							</div>
-						</div>
-						<p id="AdjustMenuGammaDescription" class="menuText effectDescription">
-							<% _t('GAMMA','gamma') %>
-						</p>
-						<p id="AdjustMenuDescription" class="menuText">
-							<% _t('ADJUST','adjust') %>
-						</p>    
-					</div>
-					<p id="EffectsDescription" class="menuText">
-						<% _t('EFFECTS','effects') %>
-				 	</p>    
-				</div>
-                <div id="Functions">
-                    <a id="RotateButton" href="#a">
-                        <div id="RotateIcon">
-                        </div>
-                        <p id="RotateText" class="menuText">
-                            <% _t('ROT','rotate') %>
-                        </p>
-                    </a>
-                    <a id="CropButton" href="#a">
-                        <div id="CropIcon"></div>                    
-                        <p id="CropText" class="menuText">
-                            <% _t('CROP','crop') %>
-                        </p>
-                    </a>
-                    <div id="ImageSize">
-                        <p id="ImageWidthLabel" class="menuText"><% _t('WIDTH','width') %></p>
-                        <p id="ImageHeightLabel" class="menuText"><% _t('HEIGHT','height') %></p>
-                        <p id="ImageWidth" class="menuText"></p>
-                        <p id="ImageHeight" class="menuText"></p>
-                    </div>
-                    <p id="FunctionsDescription" class="menuText">
-                        <% _t('EDITFUNCTIONS', 'edit&nbsp;functions') %>
-                    </p>    
-                </div>
-
-                <div id="CurrentAction">
-                    <a id="CancelButton" href="#a">
-                        <div id="CancelIcon">
-                        </div>
-                        <p id="CancelText" class="menuText">
-                            <% _t('CANCEL','cancel') %>
-                        </p>
-                    </a>
-                    <a id="ApplyButton" href="#a">
-                        <div id="ApplyIcon">
-                        </div>
-                        <p id="ApplyText" class="menuText">
-                            <% _t('APPLY', 'apply') %>
-                        </p>
-                    </a>
-                    <p id="CurrentActionDescription" class="menuText">
-                        <% _t('CURRENTACTION', 'current&nbsp;action') %>
-                    </p>  
-                </div>                
-            </div>              
-            <div id="TopRuler"></div>
-            <div id="LeftRuler"></div>
-            <div id="imageEditorContainer">             
-                <div id="imageContainer">
-                    <div id="leftGreyBox" class="greyBox"></div>
-                    <div id="rightGreyBox" class="greyBox"></div>
-                    <div id="upperGreyBox" class="greyBox"></div>
-                    <div id="lowerGreyBox" class="greyBox"></div>   
-                    <img id="image" src="#" alt=""/>
-                    <div id="cropBox"></div>
-                    <div id="loadingIndicatorContainer">
-                        <img id="loadingIndicator" alt="" src="cms/images/ImageEditor/indicator.gif">
-                    </div>  
-                </div>
-            </div>
-        </div>
-        <div id="fakeImgContainer">
-            <img id="fakeImg" src="#" alt=""/>
-        </div>
-        <div id="loadingIndicatorContainer2">
-            <img id="loadingIndicator2" alt="" src="cms/images/ImageEditor/indicator.gif">
-        </div>
-        <p id="statusMessage" style="visibility:hidden"></p>
-        <script type="text/javascript">
-            if(window.onload) old_onload = window.onload;
-            window.onload = function() {
-                Element.hide($('Loading'));
-                old_onload();
-            };
-        </script>
-    </body> 
-</html>
\ No newline at end of file

From d5f5e1466e4b8adeb2277ba83acec90994b147fa Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 20 May 2010 07:28:10 +0000
Subject: [PATCH 391/483] MINOR Removed jquery.livequery as a Requirement from
 LeftAndMain.php, its only necessary in SecurityAdmin for MemberImportForm.js
 now.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105267 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php   | 2 --
 code/SecurityAdmin.php | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 96d6afc3..2fa501a5 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -200,7 +200,6 @@ class LeftAndMain extends Controller {
 		Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
 		Requirements::javascript(SAPPHIRE_DIR . '/javascript/jquery_improvements.js');
 		Requirements::javascript(THIRDPARTY_DIR . '/behaviour/behaviour.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js');
 		Requirements::javascript(SAPPHIRE_DIR . '/javascript/core/jquery.ondemand.js');
 		Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js');
 		Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.js');
@@ -257,7 +256,6 @@ class LeftAndMain extends Controller {
 				THIRDPARTY_DIR . '/behaviour/behaviour.js',
 				SAPPHIRE_DIR . '/javascript/prototype_improvements.js',
 				THIRDPARTY_DIR .'/jquery/jquery.js',
-				THIRDPARTY_DIR .'/jquery-livequery/jquery.livequery.js',
 				THIRDPARTY_DIR . '/jquery-effen/jquery.fn.js',
 				SAPPHIRE_DIR . '/javascript/core/jquery.ondemand.js',
 				SAPPHIRE_DIR . '/javascript/jquery_improvements.js',
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index d94e555b..a6f86b5b 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -42,6 +42,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 
 		Requirements::javascript(CMS_DIR . '/javascript/hover.js');
 		Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/controls.js");
+		Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js');
 
 		// needed for MemberTableField (Requirements not determined before Ajax-Call)
 		Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang');

From 5d5cc70a69b804e7ee94cbbfe6afddc678053c94 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 20 May 2010 07:28:11 +0000
Subject: [PATCH 392/483] ENHANCEMENT Abbreviating comment text display in
 CommentAdmin to first 150 characters

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105268 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CommentAdmin.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/CommentAdmin.php b/code/CommentAdmin.php
index fe0d0994..2ccea3fa 100644
--- a/code/CommentAdmin.php
+++ b/code/CommentAdmin.php
@@ -86,7 +86,8 @@ class CommentAdmin extends LeftAndMain {
 		$table = new CommentTableField($this, "Comments", "PageComment", $section, $tableFields, $popupFields, array($filter), 'Created DESC');
 		$table->setParentClass(false);
 		$table->setFieldCasting(array(
-			'Created' => 'SSDatetime->Full'
+			'Created' => 'SSDatetime->Full',
+			'Comment' => array('HTMLText->LimitCharacters', 150)
 		));
 
 		$fields = new FieldSet(

From 4182cd470928db4f0ce833682877a68060ede943 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 20 May 2010 07:28:12 +0000
Subject: [PATCH 393/483] ENHANCEMENT Showing 20 comments in tabular view for
 CommentAdmin (and making the setting configurable via
 CommentAdmin::set_comments_per_page())

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105269 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CommentAdmin.php      | 36 +++++++++++++++++++++++++++++-------
 code/CommentTableField.php |  1 -
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/code/CommentAdmin.php b/code/CommentAdmin.php
index 2ccea3fa..97c95767 100644
--- a/code/CommentAdmin.php
+++ b/code/CommentAdmin.php
@@ -22,6 +22,12 @@ class CommentAdmin extends LeftAndMain {
 		'EditForm',
 		'unmoderated'
 	);
+	
+	/**
+	 * the number of comments per page for the {@see CommentTable} in this admin
+	 * defaulted 20.
+	 */
+	static $comments_per_page = '20';
 
 	public function init() {
 		parent::init();
@@ -89,15 +95,13 @@ class CommentAdmin extends LeftAndMain {
 			'Created' => 'SSDatetime->Full',
 			'Comment' => array('HTMLText->LimitCharacters', 150)
 		));
+		
+		$table->setPageSize(self::get_comments_per_page());
 
 		$fields = new FieldSet(
-			new TabSet(	'Root',
-				new Tab(_t('CommentAdmin.COMMENTS', 'Comments'),
-					new LiteralField("Title", $title),
-					$idField,
-					$table
-				)
-			)
+			new LiteralField("Title", $title),
+			$idField,
+			$table
 		);
 
 		$actions = new FieldSet();
@@ -295,6 +299,24 @@ JS;
 	function NumSpam() {
 		return DB::query("SELECT COUNT(*) FROM \"PageComment\" WHERE \"IsSpam\"=1")->value();
 	}
+	
+	/**
+	 * Set CommentAdmin::comments_per_page
+	 * @param $num int
+	 */
+	
+	function set_comments_per_page($num){
+		self::$comments_per_page = $num;
+	}
+	
+	/**
+	 * Get CommentAdmin::comments_per_page
+	 * @return int
+	 */
+	
+	function get_comments_per_page(){
+		return self::$comments_per_page;
+	}
 }
 
 ?>
diff --git a/code/CommentTableField.php b/code/CommentTableField.php
index f9bf395e..cf0d6c56 100644
--- a/code/CommentTableField.php
+++ b/code/CommentTableField.php
@@ -16,7 +16,6 @@ class CommentTableField extends ComplexTableField {
 		parent::__construct($controller, $name, $sourceClass, $fieldList, $detailFormFields, $sourceFilter, $sourceSort, $sourceJoin);
 		
 		$this->Markable = true;
-		$this->setPageSize(15);
 		
 		// search
 		$search = isset($_REQUEST['CommentSearch']) ? Convert::raw2sql($_REQUEST['CommentSearch']) : null;

From 694a47f245ce0e828607b647cfcf4741fc7623df Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 20 May 2010 07:28:12 +0000
Subject: [PATCH 394/483] MINOR missing slash / from Requirements::css()
 parameter

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105270 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CommentAdmin.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/code/CommentAdmin.php b/code/CommentAdmin.php
index 97c95767..8e49430f 100644
--- a/code/CommentAdmin.php
+++ b/code/CommentAdmin.php
@@ -24,8 +24,7 @@ class CommentAdmin extends LeftAndMain {
 	);
 	
 	/**
-	 * the number of comments per page for the {@see CommentTable} in this admin
-	 * defaulted 20.
+	 * @var int The number of comments per page for the {@link CommentTable} in this admin.
 	 */
 	static $comments_per_page = '20';
 
@@ -33,7 +32,7 @@ class CommentAdmin extends LeftAndMain {
 		parent::init();
 
 		Requirements::javascript(CMS_DIR . '/javascript/CommentAdmin_right.js');
-		Requirements::css(CMS_DIR . 'css/CommentAdmin.css');
+		Requirements::css(CMS_DIR . '/css/CommentAdmin.css');
 	}
 
 	public function showtable($params) {
@@ -301,19 +300,15 @@ JS;
 	}
 	
 	/**
-	 * Set CommentAdmin::comments_per_page
 	 * @param $num int
-	 */
-	
+	 */	
 	function set_comments_per_page($num){
 		self::$comments_per_page = $num;
 	}
 	
 	/**
-	 * Get CommentAdmin::comments_per_page
 	 * @return int
 	 */
-	
 	function get_comments_per_page(){
 		return self::$comments_per_page;
 	}

From 166d6f421f500be64bb8c5c2ec456cfe12f9ba70 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 20 May 2010 07:28:13 +0000
Subject: [PATCH 395/483] ENHANCEMENT 'Select all' and 'Select none' checkboxes
 for CommentTableField for easier batch handling of comments, improved its
 styling in CommentAdmin

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105271 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CommentTableField.php              |  6 +++++
 css/CommentAdmin.css                    | 30 ++++++++++++++++++++++++-
 templates/Includes/CommentTableField.ss | 11 ++++++---
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/code/CommentTableField.php b/code/CommentTableField.php
index cf0d6c56..4cf4c2a4 100644
--- a/code/CommentTableField.php
+++ b/code/CommentTableField.php
@@ -17,6 +17,12 @@ class CommentTableField extends ComplexTableField {
 		
 		$this->Markable = true;
 		
+		// Note: These keys have special behaviour associated through TableListField.js
+		$this->selectOptions = array(
+			'all' => _t('TableListField.ALL', 'All'),
+			'none' => _t('TableListField.NONE', 'None')
+		);
+		
 		// search
 		$search = isset($_REQUEST['CommentSearch']) ? Convert::raw2sql($_REQUEST['CommentSearch']) : null;
 		if(!empty($_REQUEST['CommentSearch'])) {
diff --git a/css/CommentAdmin.css b/css/CommentAdmin.css
index 7ed6f8f9..4060f6d0 100644
--- a/css/CommentAdmin.css
+++ b/css/CommentAdmin.css
@@ -1,3 +1,30 @@
+#Form_EditForm{
+	overflow: scroll;
+}
+
+	#Form_EditForm table{
+		width: 100%;
+	}
+
+		#Form_EditForm table td{
+			word-wrap:break-word !important;
+		}
+		
+		#Form_EditForm table td.Comment{
+			width: 32%;
+		}
+		
+		#Form_EditForm table td.URL{
+			width: 18%;
+		}
+		
+		#Form_EditForm table td.Page{
+			width: 20%;
+		}
+
+/* The following is not used anywhere, we should delete it. Because this file has not been
+included in the template due to a bug since 29/09/08 (r63175), and we can't find a HTML element with the id 'CommentList'
+
 #CommentList {
 	padding: 0;
 	margin: 0;
@@ -13,4 +40,5 @@
 	margin-top: 3px;
 	font-size: 80%;
 	font-style: italic;
-}
\ No newline at end of file
+}
+*/
\ No newline at end of file
diff --git a/templates/Includes/CommentTableField.ss b/templates/Includes/CommentTableField.ss
index 8f939bbd..4e2757e2 100644
--- a/templates/Includes/CommentTableField.ss
+++ b/templates/Includes/CommentTableField.ss
@@ -2,7 +2,12 @@
 	<div class="CommentFilter filterBox">
 		$SearchForm
 	</div>
-	<% include TableListField_PageControls %>
+	<% if Print %><% else %>
+		<% if Markable %>
+			<% include TableListField_SelectControls %>
+		<% end_if %>
+		<% include TableListField_PageControls %>
+	<% end_if %>
 	<table class="data">
 		<thead>
 			<tr>
@@ -39,9 +44,9 @@
 			<% if Items %>
 			<% control Items %>
 				<tr id="record-$Parent.id-$ID"<% if HighlightClasses %> class="$HighlightClasses"<% end_if %>>
-					<% if Markable %><td width="18" class="markingcheckbox">$MarkingCheckbox</td><% end_if %>
+					<% if Markable %><td width="18" class="$SelectionTags">$MarkingCheckbox</td><% end_if %>
 					<% control Fields %>
-					<td>$Value</td>
+					<td class="$Title">$Value</td>
 					<% end_control %>
 					<% if Can(edit) %>
 						<td width="18"><a class="popuplink editlink" href="$EditLink" target="_blank"><img src="cms/images/edit.gif" alt="<% _t('EDIT', 'edit') %>" /></a></td>

From 13995d710a069b7c5d17ac4965074c90f3c1c3d8 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 20 May 2010 07:28:13 +0000
Subject: [PATCH 396/483] MINOR Fixed _t() call in PageCommentInterface.ss

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105272 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 templates/PageCommentInterface.ss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/PageCommentInterface.ss b/templates/PageCommentInterface.ss
index f4b124bb..377f346c 100755
--- a/templates/PageCommentInterface.ss
+++ b/templates/PageCommentInterface.ss
@@ -55,7 +55,7 @@
 	</div>
 	<% if DeleteAllLink %>
 		<p id="DeleteComments"><a href="$DeleteAllLink">
-			<% _t('PageCommentInterface.DELETEALLCOMMENTS','Delete all comments on this page' %>
+			<% _t('PageCommentInterface.DELETEALLCOMMENTS','Delete all comments on this page') %>
 		</a></p>
 	<% end_if %>
 	<p id="CommentsRSSFeed">

From fa0bf8c5714eed3304cb79626e3708517a54eff0 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 20 May 2010 07:28:14 +0000
Subject: [PATCH 397/483] MINOR Updated TableListField sublcass template to
 work with new TableListField->SelectOptions() setting

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105273 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 templates/Includes/AssetTableField.ss  | 3 +++
 templates/Includes/MemberTableField.ss | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/templates/Includes/AssetTableField.ss b/templates/Includes/AssetTableField.ss
index 136b95ad..6d20f59c 100755
--- a/templates/Includes/AssetTableField.ss
+++ b/templates/Includes/AssetTableField.ss
@@ -2,6 +2,9 @@
 	<div class="FileFilter filterBox">
 		$SearchForm
 	</div>
+	<% if Markable %>
+		<% include TableListField_SelectOptions %>
+	<% end_if %>
 	<% include TableListField_PageControls %>
 	<table class="data">
 		<thead>
diff --git a/templates/Includes/MemberTableField.ss b/templates/Includes/MemberTableField.ss
index 434077ae..b2b42cea 100755
--- a/templates/Includes/MemberTableField.ss
+++ b/templates/Includes/MemberTableField.ss
@@ -3,6 +3,9 @@
 		$SearchForm
 	</div>
 	<div id="MemberList"> 
+		<% if Markable %>
+			<% include TableListField_SelectOptions %>
+		<% end_if %>
 		<% include TableListField_PageControls %>
 		<table class="data">
 			<thead>

From 383358fa052da86ae318b61b9a47abdf49a06565 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 20 May 2010 20:24:48 +0000
Subject: [PATCH 398/483] MINOR Translations

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105277 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CommentTableField.php | 4 ++--
 lang/en_US.php             | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/CommentTableField.php b/code/CommentTableField.php
index 4cf4c2a4..f9aaf3ba 100644
--- a/code/CommentTableField.php
+++ b/code/CommentTableField.php
@@ -19,8 +19,8 @@ class CommentTableField extends ComplexTableField {
 		
 		// Note: These keys have special behaviour associated through TableListField.js
 		$this->selectOptions = array(
-			'all' => _t('TableListField.ALL', 'All'),
-			'none' => _t('TableListField.NONE', 'None')
+			'all' => _t('CommentTableField.SELECTALL', 'All'),
+			'none' => _t('CommentTableField.SELECTNONE', 'None')
 		);
 		
 		// search
diff --git a/lang/en_US.php b/lang/en_US.php
index 518283c2..909aa9ff 100755
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -216,7 +216,6 @@ $lang['en_US']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Approved Comments';
 $lang['en_US']['CommentAdmin']['AUTHOR'] = 'Author';
 $lang['en_US']['CommentAdmin']['COMMENT'] = 'Comment';
 $lang['en_US']['CommentAdmin']['COMMENTERURL'] = 'URL';
-$lang['en_US']['CommentAdmin']['COMMENTS'] = 'Comments';
 $lang['en_US']['CommentAdmin']['COMMENTSAWAITINGMODERATION'] = 'Comments Awaiting Moderation';
 $lang['en_US']['CommentAdmin']['DATEPOSTED'] = 'Date Posted';
 $lang['en_US']['CommentAdmin']['DELETE'] = 'Delete';
@@ -437,6 +436,7 @@ $lang['en_US']['PageComment']['SINGULARNAME'] = array(
 	'Singular name of the object, used in dropdowns and to generally identify a single object in the interface'
 );
 $lang['en_US']['PageCommentInterface']['COMMENTERURL'] = 'Your website URL';
+$lang['en_US']['PageCommentInterface']['DELETEALLCOMMENTS'] = 'Delete all comments on this page';
 $lang['en_US']['PageCommentInterface']['POST'] = 'Post';
 $lang['en_US']['PageCommentInterface']['SPAMQUESTION'] = 'Spam protection question: %s';
 $lang['en_US']['PageCommentInterface']['YOURCOMMENT'] = 'Comments';
@@ -540,6 +540,8 @@ $lang['en_US']['StaticExporter']['BASEURL'] = 'Base URL';
 $lang['en_US']['StaticExporter']['EXPORTTO'] = 'Export to that folder';
 $lang['en_US']['StaticExporter']['FOLDEREXPORT'] = 'Folder to export to';
 $lang['en_US']['StaticExporter']['NAME'] = 'Static exporter';
+$lang['en_US']['TableListField']['ALL'] = 'All';
+$lang['en_US']['TableListField']['NONE'] = 'None';
 $lang['en_US']['TableListField.ss']['NOITEMSFOUND'] = 'No items found';
 $lang['en_US']['TableListField.ss']['SORTASC'] = 'Sort in ascending order';
 $lang['en_US']['TableListField.ss']['SORTDESC'] = 'Sort in descending order';

From c7fc13c9feca224a6e1189bb7af697b3016dfdb6 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 20 May 2010 21:28:09 +0000
Subject: [PATCH 399/483] MINOR Using ASSETS_DIR constant in StaticPublisher
 (fixes #5619)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105281 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/staticpublisher/StaticPublisher.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/staticpublisher/StaticPublisher.php b/code/staticpublisher/StaticPublisher.php
index 20a4da57..92235800 100644
--- a/code/staticpublisher/StaticPublisher.php
+++ b/code/staticpublisher/StaticPublisher.php
@@ -136,7 +136,7 @@ abstract class StaticPublisher extends DataObjectDecorator {
 			$matches = $xContent->xpath($xlink);
 			if($matches) foreach($matches as $item) {
 				$url = $item . '';
-				if($assetsOnly && substr($url,0,7) != 'assets/') continue;
+				if($assetsOnly && substr($url,0,7) != ASSETS_DIR . '/') continue;
 
 				$urls[] = $url;
 			}

From 1b6741e08ddcb7810e5dcd430927508104b5cdca Mon Sep 17 00:00:00 2001
From: Carlos Barberis <carlos@silverstripe.com>
Date: Mon, 24 May 2010 22:23:33 +0000
Subject: [PATCH 400/483] BUGFIX: avoid adding loading class to TinyMCE add
 link, image, flash buttons

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105505 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/ModelAdmin.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/javascript/ModelAdmin.js b/javascript/ModelAdmin.js
index 7c08bcff..0cf7f702 100644
--- a/javascript/ModelAdmin.js
+++ b/javascript/ModelAdmin.js
@@ -58,9 +58,10 @@ $(document).ready(function() {
 	/*
 	 * Highlight buttons on click
 	 */
-	$('input[type=submit]').live('click', function() {
+	$('#form_actions_right input[type=submit], #left input[type=submit]').live('click', function() {
 	    $(this).addClass('loading');
 	});
+
 	
 	$('input[name=action_search]').live('click', function() {
 		$('#contentPanel').fn('closeRightPanel');
@@ -134,7 +135,7 @@ $(document).ready(function() {
 		$('#contentPanel').fn('closeRightPanel');
 		// @todo TinyMCE coupling
 		tinymce_removeAll();
-
+		
 		$('#ModelAdminPanel').fn('startHistory', $(this).attr('action'), $(this).formToArray());
 	    $('#ModelAdminPanel').load($(this).attr('action'), $(this).formToArray(), standardStatusHandler(function(result) {
 			if(!this.future || !this.future.length) {
@@ -152,6 +153,7 @@ $(document).ready(function() {
     		$('input[type=submit]', $form).removeClass('loading');
 	    }, 
 	    // Failure handler - we should still remove loading indicator
+	
 	    function () {
     		$('input[type=submit]', $form).removeClass('loading');
 	    }));

From 18f402968a5c13bddbc0094b74e61d96de547a4e Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Tue, 25 May 2010 02:08:17 +0000
Subject: [PATCH 401/483] BUGFIX: if moderation on comments is enabled then
 redirect the user back down to the comment section to view the message rather
 than trying to direct to selector which doesnt exist

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105514 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/PageCommentInterface.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index c4228a40..467c1bae 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -343,17 +343,19 @@ class PageCommentInterface_Form extends Form {
 			if($comment->NeedsModeration){
 				$this->sessionMessage($moderationMsg, 'good');
 			}
-			// since it is not ajax redirect user down to their comment since it has been posted
-			// get the pages url off the comments parent ID.
+			
 			if($comment->ParentID) {
 				$page = DataObject::get_by_id("Page", $comment->ParentID);
 				if($page) {
-					// Redirect to the actual post on the page.
-					return Director::redirect($page->Link() . '#PageComment_' . $comment->ID);
+					// if it needs moderation then it won't appear in the list. Therefore
+					// we need to link to the comment holder rather than the individual comment
+					$url = ($comment->NeedsModeration) ? $page->Link() . '#PageComments_holder' : $page->Link() . '#PageComment_' . $comment->ID;
+					
+					return Director::redirect($url);
 				}
 			}
-
-			return Director::redirectBack(); // worst case, just go back to the page
+			
+			return Director::redirectBack();
 		}
 	}
 }

From df869f9da738a50047ad14b85d58d106f406a44d Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 25 May 2010 20:26:13 +0000
Subject: [PATCH 402/483] BUGFIX Can't set width or height on MemberTableField
 popup (fixes #5625, thanks smurkas)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105665 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 templates/Includes/MemberTableField.ss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/Includes/MemberTableField.ss b/templates/Includes/MemberTableField.ss
index b2b42cea..709ac4cd 100755
--- a/templates/Includes/MemberTableField.ss
+++ b/templates/Includes/MemberTableField.ss
@@ -30,6 +30,8 @@
 				<tr style="display: none;">
 					<% if Markable %><td width="18">&nbsp;</td><% end_if %>
 					<td colspan="$ItemCount">
+						<input type="hidden" id="{$id}_PopupHeight" value="$PopupHeight" disabled="disabled"/>
+						<input type="hidden" id="{$id}_PopupWidth" value="$PopupWidth" disabled="disabled"/>
 						<a class="popuplink addlink" href="$AddLink" alt="add"><img src="cms/images/add.gif" alt="add" /></a><a class="popuplink addlink" href="$AddLink" alt="add"><% _t('ADDNEW','Add new',50,'Followed by a member type') %> $Title</a>
 					</td>
 					<% if Can(show) %><td width="18">&nbsp;</td><% end_if %>

From 6efa5a8554fb166c5be6e2b126aebdd138268ef5 Mon Sep 17 00:00:00 2001
From: Carlos Barberis <carlos@silverstripe.com>
Date: Wed, 26 May 2010 22:32:04 +0000
Subject: [PATCH 403/483] BUGFIX: validate file in import from CSV form MINOR:
 Clear DB checkbox unchecked by default ENHANCEMENT: Ability to hide form by
 className or for the whole ModelAdmin

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105732 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ModelAdmin.php | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index b94293d1..99009a23 100755
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -94,6 +94,13 @@ abstract class ModelAdmin extends LeftAndMain {
 	 * @var string
 	 */
 	private $currentModel = false;
+	
+	/**
+	 * Change this variable if you don't want the Import from CSV form to appear. 
+	 * This variable can be a boolean or an array.
+	 * If array, you can list className you want the form to appear on. i.e. array('myClassOne','myClasstwo') 
+	 */
+	public $showImportForm = true;
 		
 	/**
 	 * List of all {@link DataObject}s which can be imported through
@@ -310,6 +317,8 @@ class ModelAdmin_CollectionController extends Controller {
 	public $parentController;
 	protected $modelClass;
 	
+	public $showImportForm = null;
+	
 	static $url_handlers = array(
 		'$Action' => 'handleActionOrID'
 	);
@@ -436,6 +445,14 @@ class ModelAdmin_CollectionController extends Controller {
 		return $form;
 	}
 	
+	/**
+	 * Checks if a CSV import form should be generated by a className criteria or in general for ModelAdmin.
+	 */
+	function showImportForm() {
+		if($this->showImportForm === null) return $this->parentController->showImportForm;
+		else return $this->showImportForm;
+	}
+	
 	/**
 	 * Generate a CSV import form for a single {@link DataObject} subclass.
 	 *
@@ -443,6 +460,8 @@ class ModelAdmin_CollectionController extends Controller {
 	 */
 	public function ImportForm() {
 		$modelName = $this->modelClass;
+		// check if a import form should be generated
+		if(!$this->showImportForm() || (is_array($this->showImportForm()) && !in_array($modelName,$this->showImportForm()))) return false;
 		$importers = $this->parentController->getModelImporters();
 		if(!$importers || !isset($importers[$modelName])) return false;
 		
@@ -472,7 +491,7 @@ class ModelAdmin_CollectionController extends Controller {
 		))->renderWith('ModelAdmin_ImportSpec');
 		
 		$fields->push(new LiteralField("SpecFor{$modelName}", $specHTML));
-		$fields->push(new CheckboxField('EmptyBeforeImport', 'Clear Database before import', true)); 
+		$fields->push(new CheckboxField('EmptyBeforeImport', 'Clear Database before import', false)); 
 		
 		$actions = new FieldSet(
 			new FormAction('import', _t('ModelAdmin.IMPORT', 'Import from CSV'))
@@ -504,24 +523,27 @@ class ModelAdmin_CollectionController extends Controller {
 	 * @param SS_HTTPRequest $request
 	 */
 	function import($data, $form, $request) {
+		
 		$modelName = $data['ClassName'];
+		
+		if(!$this->showImportForm() || (is_array($this->showImportForm()) && !in_array($modelName,$this->showImportForm()))) return false;
 		$importers = $this->parentController->getModelImporters();
 		$importerClass = $importers[$modelName];
 		
 		$loader = new $importerClass($data['ClassName']);
 		
 		// File wasn't properly uploaded, show a reminder to the user
-		if(empty($_FILES['_CsvFile']['tmp_name'])) {
+		if(empty($_FILES['_CsvFile']['tmp_name']) || $_FILES['_CsvFile']['type'] != 'text/csv' || file_get_contents($_FILES['_CsvFile']['tmp_name']) == '') {
 			$form->sessionMessage(_t('ModelAdmin.NOCSVFILE', 'Please browse for a CSV file to import'), 'good');
 			Director::redirectBack();
 			return false;
 		}
 
-		if (!empty($data['EmptyBeforeImport']) && $data['EmptyBeforeImport']) { //clear database before import 
+		if (!empty($data['EmptyBeforeImport']) && $data['EmptyBeforeImport']) { //clear database before import 	
 			$loader->deleteExistingRecords = true;
 		}
 		$results = $loader->load($_FILES['_CsvFile']['tmp_name']);
-		
+
 		$message = '';
 		if($results->CreatedCount()) $message .= sprintf(
 			_t('ModelAdmin.IMPORTEDRECORDS', "Imported %s records."), 

From fac64e9aa5d60aedf912bc90fb1cf660f40e4386 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Fri, 28 May 2010 02:27:50 +0000
Subject: [PATCH 404/483] BUGFIX: fixed incorrect include path

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105833 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 templates/Includes/CommentTableField.ss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/Includes/CommentTableField.ss b/templates/Includes/CommentTableField.ss
index 4e2757e2..1292166d 100644
--- a/templates/Includes/CommentTableField.ss
+++ b/templates/Includes/CommentTableField.ss
@@ -4,7 +4,7 @@
 	</div>
 	<% if Print %><% else %>
 		<% if Markable %>
-			<% include TableListField_SelectControls %>
+			<% include TableListField_SelectOptions %>
 		<% end_if %>
 		<% include TableListField_PageControls %>
 	<% end_if %>

From 58a92cf456d132be6fc40de4d9110712812d6e29 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Fri, 28 May 2010 02:42:39 +0000
Subject: [PATCH 405/483] BUGFIX: fixed select all link using incorrect
 function

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105868 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CommentAdmin.php                   | 5 ++++-
 templates/Includes/CommentTableField.ss | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/CommentAdmin.php b/code/CommentAdmin.php
index 8e49430f..faab7df8 100644
--- a/code/CommentAdmin.php
+++ b/code/CommentAdmin.php
@@ -89,6 +89,7 @@ class CommentAdmin extends LeftAndMain {
 
 		$idField = new HiddenField('ID', '', $section);
 		$table = new CommentTableField($this, "Comments", "PageComment", $section, $tableFields, $popupFields, array($filter), 'Created DESC');
+		
 		$table->setParentClass(false);
 		$table->setFieldCasting(array(
 			'Created' => 'SSDatetime->Full',
@@ -96,7 +97,9 @@ class CommentAdmin extends LeftAndMain {
 		));
 		
 		$table->setPageSize(self::get_comments_per_page());
-
+		$table->addSelectOptions(array('all'=>'All', 'none'=>'None'));
+		$table->Markable = true;
+		
 		$fields = new FieldSet(
 			new LiteralField("Title", $title),
 			$idField,
diff --git a/templates/Includes/CommentTableField.ss b/templates/Includes/CommentTableField.ss
index 1292166d..bed0f8f2 100644
--- a/templates/Includes/CommentTableField.ss
+++ b/templates/Includes/CommentTableField.ss
@@ -44,7 +44,7 @@
 			<% if Items %>
 			<% control Items %>
 				<tr id="record-$Parent.id-$ID"<% if HighlightClasses %> class="$HighlightClasses"<% end_if %>>
-					<% if Markable %><td width="18" class="$SelectionTags">$MarkingCheckbox</td><% end_if %>
+					<% if Markable %><td width="18" class="$SelectOptionClasses">$MarkingCheckbox</td><% end_if %>
 					<% control Fields %>
 					<td class="$Title">$Value</td>
 					<% end_control %>

From 47ac736d505015fdf82709876fdd0dd5de96a0d6 Mon Sep 17 00:00:00 2001
From: Andreas Piening <andreas@silverstripe.com>
Date: Tue, 1 Jun 2010 04:40:45 +0000
Subject: [PATCH 406/483] MINOR: add text/plain to the list of accepted mime
 types

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105985 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ModelAdmin.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index 99009a23..6f33ae6f 100755
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -533,7 +533,11 @@ class ModelAdmin_CollectionController extends Controller {
 		$loader = new $importerClass($data['ClassName']);
 		
 		// File wasn't properly uploaded, show a reminder to the user
-		if(empty($_FILES['_CsvFile']['tmp_name']) || $_FILES['_CsvFile']['type'] != 'text/csv' || file_get_contents($_FILES['_CsvFile']['tmp_name']) == '') {
+		if(
+			empty($_FILES['_CsvFile']['tmp_name']) ||
+			array_search($_FILES['_CsvFile']['type'], array('text/csv', 'text/plain')) === false ||
+			file_get_contents($_FILES['_CsvFile']['tmp_name']) == ''
+		) {
 			$form->sessionMessage(_t('ModelAdmin.NOCSVFILE', 'Please browse for a CSV file to import'), 'good');
 			Director::redirectBack();
 			return false;

From 9bf0b7a6ba1c75229e47ab579bc2958085608743 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 2 Jun 2010 06:49:00 +0000
Subject: [PATCH 407/483] MINOR: Added test for #5657

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106081 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/CMSMainTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/CMSMainTest.php b/tests/CMSMainTest.php
index 81249472..74ebb6dd 100644
--- a/tests/CMSMainTest.php
+++ b/tests/CMSMainTest.php
@@ -47,6 +47,11 @@ class CMSMainTest extends FunctionalTest {
 			$this->assertContains('setNodeTitle(1, \'Page 1\');', $response->getBody());
 			$this->assertContains('setNodeTitle(2, \'Page 2\');', $response->getBody());
 		}
+
+		// Get the latest version of Page 1 
+		$latestID = DB::query('select max("Version") from "Page_versions" where "RecordID"=1')->value(); 
+		$dsCount = DB::query('select count("Version") from "Page_versions" where "RecordID"=1 and "Version"=' . $latestID)->value(); 
+		$this->assertEquals(1, $dsCount, "Published page has no duplicate version records: it has " . $dsCount . " for version " . $latestID); 
 		
 		$this->session()->clear('loggedInAs');
 		

From 5b3ef295d92d8ce78d6c2a1b6942e4ca7a269107 Mon Sep 17 00:00:00 2001
From: Mark Stephens <mark@silverstripe.com>
Date: Wed, 2 Jun 2010 22:17:53 +0000
Subject: [PATCH 408/483] BUGFIX: image search was not honouring the selected
 folder, so could only search in root folder

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106086 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/ThumbnailStripField.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/javascript/ThumbnailStripField.js b/javascript/ThumbnailStripField.js
index e8ea7554..fd222356 100755
--- a/javascript/ThumbnailStripField.js
+++ b/javascript/ThumbnailStripField.js
@@ -34,9 +34,11 @@ ThumbnailStripField.prototype = {
 					
 					timeout = setTimeout(function() {
 						var searchText = searchField.value;
-						
-						$('Flash').ajaxGetFiles(null, searchText);
-						$('FolderImages').ajaxGetFiles(null, searchText);
+						var folderID = null;
+						if (parentField && parentField.inputTag) 
+							folderID = parentField.inputTag.value
+						$('Flash').ajaxGetFiles(folderID, searchText);
+						$('FolderImages').ajaxGetFiles(folderID, searchText);
 					}, 500);
 				});
 			}

From faa17fd2cee9a893c4ec6e03f0f2da920ec42f2c Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 2 Jun 2010 23:01:41 +0000
Subject: [PATCH 409/483] MINOR: Fixed test that required a separate Page
 table.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106090 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/CMSMainTest.php | 11 ++++++-----
 tests/CMSMainTest.yml |  7 ++++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/tests/CMSMainTest.php b/tests/CMSMainTest.php
index 74ebb6dd..fe46b9a9 100644
--- a/tests/CMSMainTest.php
+++ b/tests/CMSMainTest.php
@@ -36,7 +36,7 @@ class CMSMainTest extends FunctionalTest {
 		$response = Director::test("admin/cms/publishall", array('confirm' => 1), $this->session());
 		
 		$this->assertContains(
-			sprintf(_t('CMSMain.PUBPAGES',"Done: Published %d pages"), 7), 
+			sprintf(_t('CMSMain.PUBPAGES',"Done: Published %d pages"), 8), 
 			$response->getBody()
 		);
 		
@@ -48,9 +48,10 @@ class CMSMainTest extends FunctionalTest {
 			$this->assertContains('setNodeTitle(2, \'Page 2\');', $response->getBody());
 		}
 
-		// Get the latest version of Page 1 
-		$latestID = DB::query('select max("Version") from "Page_versions" where "RecordID"=1')->value(); 
-		$dsCount = DB::query('select count("Version") from "Page_versions" where "RecordID"=1 and "Version"=' . $latestID)->value(); 
+		// Get the latest version of the redirector page 
+		$pageID = $this->idFromFixture('RedirectorPage', 'page5');
+		$latestID = DB::query('select max("Version") from "RedirectorPage_versions" where "RecordID"=' . $pageID)->value(); 
+		$dsCount = DB::query('select count("Version") from "RedirectorPage_versions" where "RecordID"=' . $pageID . ' and "Version"=' . $latestID)->value(); 
 		$this->assertEquals(1, $dsCount, "Published page has no duplicate version records: it has " . $dsCount . " for version " . $latestID); 
 		
 		$this->session()->clear('loggedInAs');
@@ -206,4 +207,4 @@ class CMSMainTest extends FunctionalTest {
 		// TODO Logout
 		$this->session()->inst_set('loggedInAs', NULL);
 	}
-}
+}
\ No newline at end of file
diff --git a/tests/CMSMainTest.yml b/tests/CMSMainTest.yml
index 1c4d9f64..87409f25 100644
--- a/tests/CMSMainTest.yml
+++ b/tests/CMSMainTest.yml
@@ -77,4 +77,9 @@ PageComment:
         Name: Me
         Comment: I like this comment
         NeedsModeration: 1
-        EmailAddress: me@test.co.nz
\ No newline at end of file
+        EmailAddress: me@test.co.nz
+RedirectorPage:
+   page5:
+      Title: Page 5
+      RedirectionType: External
+      ExternalURL: http://www.google.com
\ No newline at end of file

From 6d74db77ffed8066a7bcdae863b9161e87d3773a Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 2 Jun 2010 23:17:09 +0000
Subject: [PATCH 410/483] BUGFIX Setting 'ID' field on CMSMain->RootForm() so
 it can work with formfields that require it (fixes #5671, thanks ajshort)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106096 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 96e5c984..d4eb1586 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -513,6 +513,9 @@ JS;
 		if(Object::has_extension('SiteConfig',"Translatable")){ 
 			$fields->push(new HiddenField('Locale','', $siteConfig->Locale ));       
 		} 
+		
+		$fields->push(new HiddenField('ID', '', $siteConfig->ID)); 
+		
 		$form = new Form($this, "EditForm", $fields, $siteConfig->getCMSActions());
 		$form->loadDataFrom($siteConfig);
 		

From 1730d01cc8262d02e5d9e88c3b130ea5a3836cdb Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 3 Jun 2010 01:12:26 +0000
Subject: [PATCH 411/483] BUGFIX: Open help in a new tab.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106121 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/LeftAndMain.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index 674a2012..2a341504 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -103,7 +103,7 @@ Behaviour.register({
 		}
 	},
 
-	'#Menu-help' : {
+	'#Menu-Help' : {
 		onclick : function() {
 			var w = window.open(this.getElementsByTagName('a')[0].href, 'help');
 			w.focus();

From 8b8234745320592ffae0cf6bd3dc3f9d59179124 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 3 Jun 2010 01:12:27 +0000
Subject: [PATCH 412/483] BUGFIX: Fixed caching of homepage.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106122 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/staticpublisher/FilesystemPublisher.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/staticpublisher/FilesystemPublisher.php b/code/staticpublisher/FilesystemPublisher.php
index 27ed61da..68a17705 100644
--- a/code/staticpublisher/FilesystemPublisher.php
+++ b/code/staticpublisher/FilesystemPublisher.php
@@ -181,6 +181,7 @@ class FilesystemPublisher extends StaticPublisher {
 
 			Requirements::clear();
 			
+			if($url == "") $url = "/";
 			if(Director::is_relative_url($url)) $url = Director::absoluteURL($url);
 			$response = Director::test(str_replace('+', ' ', $url));
 			

From af428a9bf2fac23f939662f3457c4a2fe3c868be Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Thu, 3 Jun 2010 23:48:47 +0000
Subject: [PATCH 413/483] FEATURE: Enable switch between legacy image search
 and new version

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106178 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ThumbnailStripField.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/code/ThumbnailStripField.php b/code/ThumbnailStripField.php
index 93347c18..993a01b9 100755
--- a/code/ThumbnailStripField.php
+++ b/code/ThumbnailStripField.php
@@ -9,6 +9,15 @@
 class ThumbnailStripField extends FormField {
 	protected $parentField;
 	protected $updateMethod;
+
+	protected static $use_legacy_image_search = false;
+
+	public static function set_use_legacy_image_search($enable) {
+	    self::$use_legacy_image_search = $enable;
+	}
+	public static function get_use_legacy_image_search() {
+	    return self::$use_legacy_image_search;
+	}
 	
 	function __construct($name, $parentField, $updateMethod = "getimages") {
 		$this->parentField = $parentField;
@@ -52,9 +61,13 @@ class ThumbnailStripField extends FormField {
 			$images = DataObject::get('Image', $whereSQL, 'Title');
 			
 		} else {
-			$whereSQL = "\"ParentID\" = 0";
+			if (!self::$use_legacy_image_search) {
+			    $whereSQL = "\"ParentID\" = 0 AND ";
+			} else {
+			    $whereSQL = '';
+			}
 			if($searchText) {
-				$whereSQL .= " AND \"Filename\" LIKE '%$searchText%'";
+				$whereSQL .= " \"Filename\" LIKE '%$searchText%'";
 			}
 			
 			$images = DataObject::get('Image', $whereSQL, 'Title');

From b20a69dd04b2639eef4a2b21b8ba82bfd1cb857e Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Thu, 3 Jun 2010 23:59:53 +0000
Subject: [PATCH 414/483] MINOR: Add comments for ThumbnailStripField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106180 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ThumbnailStripField.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/code/ThumbnailStripField.php b/code/ThumbnailStripField.php
index 993a01b9..0481f030 100755
--- a/code/ThumbnailStripField.php
+++ b/code/ThumbnailStripField.php
@@ -10,11 +10,28 @@ class ThumbnailStripField extends FormField {
 	protected $parentField;
 	protected $updateMethod;
 
+	/**
+	 * If this is enabled, then ommitting a folderID when calling getimages will search ALL folders.
+	 * This is the legacy behaviour.
+	 *
+	 * The new behaviour is to only search the root folder if a folderID is ommitted.
+	 *
+	 * @var boolean
+	 */
 	protected static $use_legacy_image_search = false;
 
+	/**
+	 * setter for ThumbnailStripField::use_legacy_image_search
+	 * @param boolean $enable
+	 */
 	public static function set_use_legacy_image_search($enable) {
 	    self::$use_legacy_image_search = $enable;
 	}
+	
+	/**
+	 * getter for ThumbnailStripField::use_legacy_image_search
+	 * @return boolean
+	 */
 	public static function get_use_legacy_image_search() {
 	    return self::$use_legacy_image_search;
 	}
@@ -42,6 +59,8 @@ class ThumbnailStripField extends FormField {
 	/**
 	 * Populate the Thumbnail strip field, by looking for a folder, 
 	 * and the descendants of this folder.
+	 *
+	 * @see ThumbnailStripField::use_legacy_image_search
 	 */
 	function getimages() {
 		$result = '';

From 53646b3187465bdb51bfb02f3222c63aa27f6cfc Mon Sep 17 00:00:00 2001
From: Saophalkun Ponlu <phalkunz@silverstripe.com>
Date: Fri, 4 Jun 2010 00:28:29 +0000
Subject: [PATCH 415/483] BUGFIX: fix query error when image search doesn't use
 legacy search

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106183 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ThumbnailStripField.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/ThumbnailStripField.php b/code/ThumbnailStripField.php
index 0481f030..97141e7e 100755
--- a/code/ThumbnailStripField.php
+++ b/code/ThumbnailStripField.php
@@ -81,11 +81,13 @@ class ThumbnailStripField extends FormField {
 			
 		} else {
 			if (!self::$use_legacy_image_search) {
-			    $whereSQL = "\"ParentID\" = 0 AND ";
+			    $whereSQL = "\"ParentID\" = 0";
 			} else {
 			    $whereSQL = '';
 			}
+			
 			if($searchText) {
+				if (!empty($whereSQL)) $whereSQL .= " AND";
 				$whereSQL .= " \"Filename\" LIKE '%$searchText%'";
 			}
 			

From 3877eae0352d279326faff4d29492c1eb186c64f Mon Sep 17 00:00:00 2001
From: Saophalkun Ponlu <phalkunz@silverstripe.com>
Date: Fri, 4 Jun 2010 02:14:10 +0000
Subject: [PATCH 416/483] ENHANCEMENT: Prevent image search queries all images
 in the site initially when the page is loaded

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106194 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ThumbnailStripField.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/ThumbnailStripField.php b/code/ThumbnailStripField.php
index 97141e7e..4bf98e48 100755
--- a/code/ThumbnailStripField.php
+++ b/code/ThumbnailStripField.php
@@ -84,6 +84,9 @@ class ThumbnailStripField extends FormField {
 			    $whereSQL = "\"ParentID\" = 0";
 			} else {
 			    $whereSQL = '';
+
+				// Prevent image search queries all images in the site initially when the page is loaded
+				if(empty($searchText)) $whereSQL = "\"ParentID\" = 0";
 			}
 			
 			if($searchText) {
@@ -122,7 +125,8 @@ class ThumbnailStripField extends FormField {
 				}
 			}
 			$result .= '</ul>';
-		} else {
+		} 
+		else {
 			if($folder) {
 				$result = '<h2>' . _t('ThumbnailStripField.NOFOLDERIMAGESFOUND', 'No images found in') . ' ' . $folder->Title . '</h2>';
 			} else {

From a010ab82a35aedec87f6dd8c07fd74daf6b88f9b Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 8 Jun 2010 06:47:54 +0000
Subject: [PATCH 417/483] MINOR Made CMSMainTest more resilient against
 database ID changes (Postgres doesn't have auto-increment resets across tests
 at the moment)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106248 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/CMSMainTest.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/CMSMainTest.php b/tests/CMSMainTest.php
index fe46b9a9..603e2ce9 100644
--- a/tests/CMSMainTest.php
+++ b/tests/CMSMainTest.php
@@ -31,6 +31,8 @@ class CMSMainTest extends FunctionalTest {
 	 * @todo Test the results of a publication better
 	 */
 	function testPublish() {
+		$page1 = $this->objFromFixture('Page', "page1");
+		$page2 = $this->objFromFixture('Page', "page2");
 		$this->session()->inst_set('loggedInAs', $this->idFromFixture('Member', 'admin'));
 		
 		$response = Director::test("admin/cms/publishall", array('confirm' => 1), $this->session());
@@ -42,10 +44,10 @@ class CMSMainTest extends FunctionalTest {
 		
 		// Some modules (e.g., cmsworkflow) will remove this action
 		if(isset(CMSBatchActionHandler::$batch_actions['publish'])) {
-			$response = Director::test("admin/cms/batchactions/publish", array('csvIDs' => '1,2', 'ajax' => 1), $this->session());
+			$response = Director::test("admin/cms/batchactions/publish", array('csvIDs' => implode(',', array($page1->ID, $page2->ID)), 'ajax' => 1), $this->session());
 	
-			$this->assertContains('setNodeTitle(1, \'Page 1\');', $response->getBody());
-			$this->assertContains('setNodeTitle(2, \'Page 2\');', $response->getBody());
+			$this->assertContains(sprintf('setNodeTitle(%d, \'Page 1\');', $page1->ID), $response->getBody());
+			$this->assertContains(sprintf('setNodeTitle(%d, \'Page 2\');', $page2->ID), $response->getBody());
 		}
 
 		// Get the latest version of the redirector page 

From 2845529234eec4a75b669b4e8f8fb54a9b59ea21 Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Thu, 10 Jun 2010 06:40:40 +0000
Subject: [PATCH 418/483] BUGFIX: Apply AJShort's patch to fix SiteConfig (trac
 5671)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106351 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index d4eb1586..740b160e 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -48,6 +48,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		'restore',
 		'revert',
 		'rollback',
+		'RootForm',
 		'sidereport',
 		'submit',
 		'unpublish',
@@ -516,7 +517,8 @@ JS;
 		
 		$fields->push(new HiddenField('ID', '', $siteConfig->ID)); 
 		
-		$form = new Form($this, "EditForm", $fields, $siteConfig->getCMSActions());
+		$form = new Form($this, 'RootForm', $fields, $siteConfig->getCMSActions());
+		$form->setHTMLID('Form_EditForm');
 		$form->loadDataFrom($siteConfig);
 		
 		$this->extend('updateEditForm', $form);

From 0fe83d226489eaa936ed939e0b6d5688e1e7724c Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Thu, 10 Jun 2010 22:04:22 +0000
Subject: [PATCH 419/483] BUGFIX: re-enable broken link notification using
 BackLinkTracking() (this was broken since r101127

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106360 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index eb8bcee2..2e06b73e 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -421,7 +421,9 @@ HTML;
 		if($fileList != "''") {
 			$files = DataObject::get("File", "\"File\".\"ID\" IN ($fileList)");
 			if($files) {
+				$brokenPages = array();
 				foreach($files as $file) {
+					$brokenPages = array_merge($brokenPages, $file->BackLinkTracking()->toArray());
 					if($file instanceof Image) {
 						$file->deleteFormattedImages();
 					}
@@ -431,13 +433,12 @@ HTML;
 					$file->delete();
 					$numFiles++;
 				}
-				if($brokenPages = Notifications::getItems('BrokenLink')) {
+				if($brokenPages) {
 					$brokenPageList = "  ". _t('AssetAdmin.NOWBROKEN', 'These pages now have broken links:') . '</ul>';
 					foreach($brokenPages as $brokenPage) {
 						$brokenPageList .= "<li style=&quot;font-size: 65%&quot;>" . $brokenPage->Breadcrumbs(3, true) . '</li>';
 					}
 					$brokenPageList .= '</ul>';
-					Notifications::notifyByEmail("BrokenLink", "Page_BrokenLinkEmail");
 				} else {
 					$brokenPageList = '';
 				}

From 5c84e5b0f13e4449e89a852b8a43deed1a041f1f Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 18 Jun 2010 04:24:00 +0000
Subject: [PATCH 420/483] MINOR Removed trailing slash in BackURL, fixed error
 message sentence structure in PageCommentInterface.ss (fixes #5520)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106694 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 templates/PageCommentInterface.ss | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/templates/PageCommentInterface.ss b/templates/PageCommentInterface.ss
index 377f346c..483acc20 100755
--- a/templates/PageCommentInterface.ss
+++ b/templates/PageCommentInterface.ss
@@ -5,9 +5,8 @@
 		<% if CanPostComment %>
 			$PostCommentForm
 		<% else %>
-			<p><% _t('COMMENTLOGINERROR', 'You cannot post comments until you have logged in') %>,
-				<% if PostingRequiresPermission %><% _t('COMMENTPERMISSIONERROR', 'and that you have an appropriate permission level') %><% end_if %>. 
-				<a href="Security/login?BackURL={$Page.Link}/" title="Login to post a comment"><% _t('COMMENTPOSTLOGIN', 'Login Here') %></a>.
+			<p><% _t('COMMENTLOGINERROR', 'You cannot post comments until you have logged in') %><% if PostingRequiresPermission %>,<% _t('COMMENTPERMISSIONERROR', 'and that you have an appropriate permission level') %><% end_if %>. 
+				<a href="Security/login?BackURL={$Page.Link}" title="Login to post a comment"><% _t('COMMENTPOSTLOGIN', 'Login Here') %></a>.
 			</p>
 		<% end_if %>
 	<% else %>

From fec50572e9b46a273e1598bc90dab4a0fcdaf6f2 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Sat, 26 Jun 2010 00:45:48 +0000
Subject: [PATCH 421/483] ENHANCEMENT: throw user error when not passing
 correctly formatted array rather than simply passing

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107088 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tasks/RebuildStaticCacheTask.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tasks/RebuildStaticCacheTask.php b/tasks/RebuildStaticCacheTask.php
index 6d1df6eb..3b5dba7b 100644
--- a/tasks/RebuildStaticCacheTask.php
+++ b/tasks/RebuildStaticCacheTask.php
@@ -38,11 +38,16 @@ class RebuildStaticCacheTask extends Controller {
 	 * @param array $urls The URLs of pages to re-fetch and cache.
 	 */
 	function rebuildCache($urls, $removeAll = true) {
-		if(!is_array($urls)) return; // $urls must be an array
+
+		if(!is_array($urls)) {
+			// $urls must be an array	
+			user_error("Rebuild cache must be passed an array of urls. Make sure your allPagesToCache function returns an array", E_USER_ERROR);
+			return;
+		}; 
 		
 		if(!Director::is_cli()) echo "<pre>\n";
 		echo "Rebuilding cache.\nNOTE: Please ensure that this page ends with 'Done!' - if not, then something may have gone wrong.\n\n";
-		
+
 		$page = singleton('Page');
 		$cacheBaseDir = $page->getDestDir();
 		

From 66ae6d0c8226ad9fd34da8242cd23fd87c0ad412 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Sat, 26 Jun 2010 05:17:48 +0000
Subject: [PATCH 422/483] BUGFIX: check the $removeAll var before removing
 cache files. PATCH via ajshort (#5672)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107095 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tasks/RebuildStaticCacheTask.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tasks/RebuildStaticCacheTask.php b/tasks/RebuildStaticCacheTask.php
index 3b5dba7b..557363d0 100644
--- a/tasks/RebuildStaticCacheTask.php
+++ b/tasks/RebuildStaticCacheTask.php
@@ -35,7 +35,9 @@ class RebuildStaticCacheTask extends Controller {
 	
 	/**
 	 * Rebuilds the static cache for the pages passed through via $urls
+	 *
 	 * @param array $urls The URLs of pages to re-fetch and cache.
+	 * @param bool $removeAll Remove all stale cache files (default TRUE).
 	 */
 	function rebuildCache($urls, $removeAll = true) {
 
@@ -82,7 +84,7 @@ class RebuildStaticCacheTask extends Controller {
 
 		$urls = array_slice($urls, $start, $count);
 
-		if(!isset($_GET['urls']) && $start == 0 && file_exists("../cache")) {
+		if($removeAll && !isset($_GET['urls']) && $start == 0 && file_exists("../cache")) {
 			echo "Removing stale cache files... \n";
 			flush();
 			if (FilesystemPublisher::$domain_based_caching) {

From 87341f9498cef58f8f00f886fc4aedd0efaf6912 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Wed, 30 Jun 2010 01:29:42 +0000
Subject: [PATCH 423/483] MINOR Code formatting fix for setting Member locale
 in LeftAndMain::init()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107305 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 2fa501a5..43d86f53 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -101,9 +101,9 @@ class LeftAndMain extends Controller {
 		
 		// set language
 		$member = Member::currentUser();
-		if(!empty($member->Locale)) {
-			i18n::set_locale($member->Locale);
-		}
+		if(!empty($member->Locale)) i18n::set_locale($member->Locale);
+		if(!empty($member->DateFormat)) i18n::set_date_format($member->DateFormat);
+		if(!empty($member->TimeFormat)) i18n::set_time_format($member->TimeFormat);
 		
 		// can't be done in cms/_config.php as locale is not set yet
 		CMSMenu::add_link(

From e6aeb9421784e900d9d79125dd0ebcef1e6e8edd Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Wed, 30 Jun 2010 01:30:48 +0000
Subject: [PATCH 424/483] MINOR Reverted r107305

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107307 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 43d86f53..2fa501a5 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -101,9 +101,9 @@ class LeftAndMain extends Controller {
 		
 		// set language
 		$member = Member::currentUser();
-		if(!empty($member->Locale)) i18n::set_locale($member->Locale);
-		if(!empty($member->DateFormat)) i18n::set_date_format($member->DateFormat);
-		if(!empty($member->TimeFormat)) i18n::set_time_format($member->TimeFormat);
+		if(!empty($member->Locale)) {
+			i18n::set_locale($member->Locale);
+		}
 		
 		// can't be done in cms/_config.php as locale is not set yet
 		CMSMenu::add_link(

From 255aa5d0f5c322bcf531a173e4f231881e4c32c7 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Wed, 30 Jun 2010 05:04:09 +0000
Subject: [PATCH 425/483] ENHANCEMENT #5352 CMS now uses the user's preferred
 date and time formatting in DateField and TimeField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107327 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 2fa501a5..43d86f53 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -101,9 +101,9 @@ class LeftAndMain extends Controller {
 		
 		// set language
 		$member = Member::currentUser();
-		if(!empty($member->Locale)) {
-			i18n::set_locale($member->Locale);
-		}
+		if(!empty($member->Locale)) i18n::set_locale($member->Locale);
+		if(!empty($member->DateFormat)) i18n::set_date_format($member->DateFormat);
+		if(!empty($member->TimeFormat)) i18n::set_time_format($member->TimeFormat);
 		
 		// can't be done in cms/_config.php as locale is not set yet
 		CMSMenu::add_link(

From 862b9823d1d9784a5132acd81fef8d0a3978f197 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 2 Jul 2010 04:54:57 +0000
Subject: [PATCH 426/483] MINOR Fixed DatetimeField display in cms MINOR
 Removed obsolete .calendardate styles from cms_right.css

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107442 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/cms_right.css | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/css/cms_right.css b/css/cms_right.css
index aade65e1..cbd65e09 100644
--- a/css/cms_right.css
+++ b/css/cms_right.css
@@ -29,9 +29,7 @@
 	.right form .text,
 	.right form .field span.readonly,
 	.right form .field span.readonly i,
-	.right form div.TableListField table i,
-	.right form .calendardate input,
-	.right form .dropdowntime input {
+	.right form div.TableListField table i {
 		font-size: 12px;
 	}
 		.right form .field span.readonly {
@@ -81,12 +79,16 @@
 			.right form .countrydropdown select option {
 				font-size: 12px;
 			}
+			
 	.right form .field .middleColumn {
 		display: block;
 		background: #e9e9e9;
 		padding: 3px;
 		width: 97%;
 	}
+		.right form .field .middleColumn .middleColumn {
+			padding: 0;
+		}
 	.right form .field.image .middleColumn,
 	.right form .field.simpleimagefield_disabled .middleColumn {
 		padding-bottom:0;
@@ -117,6 +119,21 @@
 	width: 96%;
 }
 
+.right form .datetime .date, 
+.right form .datetime .time {
+	float: left;
+	clear: none;
+	width: auto;
+}		
+
+	.right form .datetime .middleColumn {
+		width: auto;
+	}
+
+	.right form .datetime .date input, 
+	.right form .datetime .time input{
+		width: auto;
+	}
 
 .right form textarea,
 .right form input.text,
@@ -209,13 +226,6 @@
 	width: auto;
 }
 
-#right form .calendardate, .calendardate {
-	position: relative;
-}
-#right form .calendardate input, .calendardate input {
-	width: 8em;
-}
-
 #SiteTreeFilterDate {
 	width: 68px;
 }

From b505c5540a726c9101982e418b7e31e6cc856add Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 6 Jul 2010 00:53:33 +0000
Subject: [PATCH 427/483] MINOR Removed debug code in MemberTableField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107525 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberTableField.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index 89b5bd88..139aa541 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -355,7 +355,6 @@ class MemberTableField extends ComplexTableField {
 			$form->saveInto($childData);
 			$childData->write();
 		} catch(ValidationException $e) {
-			var_dump($e->getResult());
 			$form->sessionMessage($e->getResult()->message(), 'bad');
 			return Director::redirectBack();
 		}

From 8c43535225c5872334de56ffa87454679b54885d Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 11 Jul 2010 10:46:12 +0000
Subject: [PATCH 428/483] MINOR Moved class-specific documentation from
 doc.silverstripe.org back into class-level PHPDoc

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107726 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMenu.php        |  7 +++++--
 code/StaticExporter.php | 12 ++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/code/CMSMenu.php b/code/CMSMenu.php
index 4a5b5e1e..785e8d91 100644
--- a/code/CMSMenu.php
+++ b/code/CMSMenu.php
@@ -1,7 +1,10 @@
 <?php
 /**
- * The object manages the main CMS menu.
- * See {@link LeftAndMain::init()} for example usage.
+ * The object manages the main CMS menu. See {@link LeftAndMain::init()} for example usage.
+ * 
+ * The menu will be automatically populated with menu items for subclasses of {@link LeftAndMain}. 
+ * That is, for each class in the CMS that creates an administration panel, a CMS menu item will be created. 
+ * The default configuration will also include a 'help' link to the SilverStripe user documentation.
  * 
  * @package cms
  * @subpackage content
diff --git a/code/StaticExporter.php b/code/StaticExporter.php
index 0316a5b9..47c6bc5a 100755
--- a/code/StaticExporter.php
+++ b/code/StaticExporter.php
@@ -4,8 +4,16 @@
  * It creates a huge number of folders each containing an index.html file.
  * This preserves the URL naming format.
  * 
- * Requirements: Unix Filesystem supporting symlinking.
- * Doesn't work on Windows.
+ * Requirements: Unix Filesystem supporting symlinking. Doesn't work on Windows.
+ * 
+ * <b>Usage</b>
+ * 
+ * The exporter can only be invoked through a URL. Usage on commandline (through [sake](sake)) is not possible at the moment, as we're sending a file to the browser for download.
+ * 
+ * <pre>http://localhost/StaticExporter/export</pre>
+ * 
+ * Specify a custom baseurl in case you want to deploy the static HTML pages on a different host:
+ * <pre>http://localhost/StaticExporter/export?baseurl=http://example.com</pre>
  * 
  * @see StaticPublisher
  * 

From 3ef552d539c498bbb704b1b333b411ddd6612739 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 12 Jul 2010 06:45:11 +0000
Subject: [PATCH 429/483] MINOR Disabled 'showcalendar' option on
 CMSMain->SiteTreeFilterDateField() - it causes the CMS to load jQuery UI
 javascript just for this (rarely used field). To be re-enabled once we work
 with jQuery UI on a broader scale.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107784 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 740b160e..00e74877 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -223,7 +223,12 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 	}
 		public function SiteTreeFilterDateField() {
 			$dateField = new DateField('SiteTreeFilterDate');
-			$dateField->setConfig('showcalendar', true);
+			
+			// TODO Enabling this means we load jQuery UI by default in the CMS,
+			// which is a pretty big performance hit in 2.4 (where the library isn't used for other parts
+			// of the interface).
+			// $dateField->setConfig('showcalendar', true);
+			
 			return $dateField->Field();
 		}
 		public function SiteTreeFilterPageTypeField() {

From fe44a59fde0a5cafc53abfef51838f58e9261668 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Mon, 12 Jul 2010 23:26:48 +0000
Subject: [PATCH 430/483] BUGFIX Styling fixes for
 DateField/TimeField/DatetimeField in the CMS

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107812 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/cms_right.css | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/css/cms_right.css b/css/cms_right.css
index cbd65e09..d25e278a 100644
--- a/css/cms_right.css
+++ b/css/cms_right.css
@@ -119,19 +119,32 @@
 	width: 96%;
 }
 
-.right form .datetime .date, 
+.time .timeIcon,
+.datetime .timeIcon {
+	margin-left: 2px;
+}
+
+.right form .date input.month,
+.right form .date input.day,
+.right form .date input.year {
+	width: auto;
+}
+
+.right form .datetime .clear {
+	clear: both;
+}
+
+.right form .datetime .date,
 .right form .datetime .time {
 	float: left;
 	clear: none;
 	width: auto;
-}		
-
-	.right form .datetime .middleColumn {
+}
+	.right form .datetime .middleColumn .middleColumn {
 		width: auto;
 	}
-
-	.right form .datetime .date input, 
-	.right form .datetime .time input{
+	.right form .datetime .date input,
+	.right form .datetime .time input {
 		width: auto;
 	}
 

From 6e19dfd4351a60ba4b256c0fe259db5e8a02c412 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 14 Jul 2010 02:51:10 +0000
Subject: [PATCH 431/483] ENHANCEMENT Added Latvian (Latvia) translation to cms
 (thanks Kristaps and Andris!)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107875 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 lang/lv_LV.php | 539 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 539 insertions(+)
 create mode 100644 lang/lv_LV.php

diff --git a/lang/lv_LV.php b/lang/lv_LV.php
new file mode 100644
index 00000000..4f3fed4a
--- /dev/null
+++ b/lang/lv_LV.php
@@ -0,0 +1,539 @@
+<?php
+
+/**
+ * Latvian (Latvia) language pack
+ * @package cms
+ * @subpackage i18n
+ */
+
+i18n::include_locale_file('cms', 'en_US');
+
+global $lang;
+
+if(array_key_exists('lv_LV', $lang) && is_array($lang['lv_LV'])) {
+	$lang['lv_LV'] = array_merge($lang['en_US'], $lang['lv_LV']);
+} else {
+	$lang['lv_LV'] = $lang['en_US'];
+}
+
+$lang['lv_LV']['']['CHOOSEPAGE'] = 'Please choose an item from the left.';
+$lang['lv_LV']['AssetAdmin']['CHOOSEFILE'] = 'Izvēlaties failu:';
+$lang['lv_LV']['AssetAdmin']['DELETEDX'] = 'Tika dzēsti %s faili. %s';
+$lang['lv_LV']['AssetAdmin']['FILESREADY'] = 'Faili, kas pieejami augšupielādei';
+$lang['lv_LV']['AssetAdmin']['FOLDERDELETED'] = 'mape dzēsta.';
+$lang['lv_LV']['AssetAdmin']['FOLDERSDELETED'] = 'mapes dzēstas.';
+$lang['lv_LV']['AssetAdmin']['MENUTITLE'] = 'Faili un Attēli';
+$lang['lv_LV']['AssetAdmin']['MENUTITLE'] = 'Faili un Attēli';
+$lang['lv_LV']['AssetAdmin']['MOVEDX'] = 'Pārvietoti %s faili';
+$lang['lv_LV']['AssetAdmin']['NEWFOLDER'] = 'JaunaMape';
+$lang['lv_LV']['AssetAdmin']['NOTEMP'] = 'Nav izveidota pagaidu mape augšupielādēm. Lūdzu php.ini failā uzstādiet upload_tmp_dir vērtību. ';
+$lang['lv_LV']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'Nekas netika augšupielādēts';
+$lang['lv_LV']['AssetAdmin']['NOWBROKEN'] = 'Sekojošām lapām tagad ir bojātas saites:';
+$lang['lv_LV']['AssetAdmin']['NOWBROKEN2'] = 'To īpašniekiem ir informēti nosūtot e-pasta vēstules un tie salabos šīs lapas.';
+$lang['lv_LV']['AssetAdmin']['SAVEDFILE'] = 'Fails %s saglabāts';
+$lang['lv_LV']['AssetAdmin']['SAVEFOLDERNAME'] = 'Saglaāt mapes nosaukumu';
+$lang['lv_LV']['AssetAdmin']['THUMBSDELETED'] = 'Dzēsti %s neizmantoti sīktēli.';
+$lang['lv_LV']['AssetAdmin']['UPLOAD'] = 'Augšupielādēt zemāk redzamos failus';
+$lang['lv_LV']['AssetAdmin']['UPLOADEDX'] = 'Faili %s tika augšupielādēti';
+$lang['lv_LV']['AssetAdmin_left.ss']['CREATE'] = 'Izveidot';
+$lang['lv_LV']['AssetAdmin_left.ss']['DELETE'] = 'Dzēst';
+$lang['lv_LV']['AssetAdmin_left.ss']['DELFOLDERS'] = 'Dzēst izvēlētās mapes';
+$lang['lv_LV']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Atļaut pārkārtošanu ar vilkt un nomest paņēmienu';
+$lang['lv_LV']['AssetAdmin_left.ss']['FILESYSTEMSYNC'] = 'Meklēt jaunus failus';
+$lang['lv_LV']['AssetAdmin_left.ss']['FILESYSTEMSYNC_DESC'] = 'SilverStripe uztur atsevišķu datubāzi ar failiem un attēliem, kas glabājas assets/ mapē. Ja assets/ mapei ir pievienoti faili ārpus SilverStripe saskarnes, piemēram, izmantojot FTP klientu, tad klikšķinat uz šīs pogas, lai atjaunotu datubāzi.';
+$lang['lv_LV']['AssetAdmin_left.ss']['FOLDERS'] = 'Mape';
+$lang['lv_LV']['AssetAdmin_left.ss']['GO'] = 'Doties';
+$lang['lv_LV']['AssetAdmin_left.ss']['SELECTTODEL'] = 'Izvēlaties mapes, kuras jūs gribat izdzēst un tad klikšķiet uz pogas, kas atrodas zemāk';
+$lang['lv_LV']['AssetAdmin_left.ss']['TOREORG'] = 'Lai pārorganizētu jūsu folderus, velciet tos apkārt kā vien vēlaties.';
+$lang['lv_LV']['AssetAdmin_right.ss']['CHOOSEPAGE'] = 'Lūdzu izvēlaties lapu no kreisās puses.';
+$lang['lv_LV']['AssetAdmin_right.ss']['WELCOME'] = 'Laipni lūgti';
+$lang['lv_LV']['AssetAdmin_uploadiframe.ss']['PERMFAILED'] = 'Jums nav tiesību ielādēt failus šajā direktorijā.';
+$lang['lv_LV']['AssetAdmin_uploadiframe.ss']['TITLE'] = 'Attēlu augšupielādes iframe rāmis';
+$lang['lv_LV']['AssetTableField']['CAPTION'] = 'Virsraksts';
+$lang['lv_LV']['AssetTableField']['CREATED'] = 'Pirmoreiz augšupielādēts';
+$lang['lv_LV']['AssetTableField']['DIM'] = 'Dimensijas';
+$lang['lv_LV']['AssetTableField']['DIMLIMT'] = 'Ierobežot izmērus izlēcošajā logā';
+$lang['lv_LV']['AssetTableField']['FILENAME'] = 'FailaNosaukums';
+$lang['lv_LV']['AssetTableField']['GALLERYOPTIONS'] = 'Galerijas iestatījumi';
+$lang['lv_LV']['AssetTableField']['IMAGE'] = 'Attēls';
+$lang['lv_LV']['AssetTableField']['ISFLASH'] = 'Ir Flash dokuments';
+$lang['lv_LV']['AssetTableField']['LASTEDIT'] = 'Pēdējoreiz labots';
+$lang['lv_LV']['AssetTableField']['MAIN'] = 'Galvenais';
+$lang['lv_LV']['AssetTableField']['NOLINKS'] = 'Fails nav piesaistīts nevienai no lapām.';
+$lang['lv_LV']['AssetTableField']['OWNER'] = 'Īpašnieks';
+$lang['lv_LV']['AssetTableField']['PAGESLINKING'] = 'Failam ir piesaistītas sekojošas lapas:';
+$lang['lv_LV']['AssetTableField']['POPUPHEIGHT'] = 'Izlēcošā loga augstums';
+$lang['lv_LV']['AssetTableField']['POPUPWIDTH'] = 'Izlēcošā loga platums';
+$lang['lv_LV']['AssetTableField']['SIZE'] = 'Izmērs';
+$lang['lv_LV']['AssetTableField.ss']['DELFILE'] = 'Dzēst šo failu';
+$lang['lv_LV']['AssetTableField.ss']['DRAGTOFOLDER'] = 'Lai pārvietotu failu, velciet uz mapi pa kreisi.';
+$lang['lv_LV']['AssetTableField.ss']['EDIT'] = 'Labot palīgfailu';
+$lang['lv_LV']['AssetTableField.ss']['SHOW'] = 'Rādīt palīgfailu';
+$lang['lv_LV']['AssetTableField']['SWFFILEOPTIONS'] = 'SWF faila iestatījumi';
+$lang['lv_LV']['AssetTableField']['TITLE'] = 'Virsraksts';
+$lang['lv_LV']['AssetTableField']['TYPE'] = 'Tips';
+$lang['lv_LV']['AssetTableField']['URL'] = 'URL';
+$lang['lv_LV']['BrokenLinksReport']['BROKENLINKS'] = 'Bojāto saišu atskaite';
+$lang['lv_LV']['BrokenLinksReport']['CheckSiteDropdownDraft'] = 'Melnrakstu vietne';
+$lang['lv_LV']['BrokenLinksReport']['CheckSiteDropdownPublished'] = 'Publiskā vietne';
+$lang['lv_LV']['BrokenLinksReport']['ColumnDateLastModified'] = 'Pēdējoreiz rediģēts';
+$lang['lv_LV']['BrokenLinksReport']['ColumnDateLastPublished'] = 'Pēdējoreiz publicēts';
+$lang['lv_LV']['BrokenLinksReport']['ColumnProblemType'] = 'Problēmas tips';
+$lang['lv_LV']['BrokenLinksReport']['ColumnURL'] = 'URL';
+$lang['lv_LV']['BrokenLinksReport']['HasBrokenFile'] = 'satur bojātu failu';
+$lang['lv_LV']['BrokenLinksReport']['HasBrokenLink'] = 'satur bojātu saiti';
+$lang['lv_LV']['BrokenLinksReport']['HasBrokenLinkAndFile'] = 'satur bojātu saiti un failu';
+$lang['lv_LV']['BrokenLinksReport']['HoverTitleEditPage'] = 'Labot lapu';
+$lang['lv_LV']['BrokenLinksReport']['ReasonDropdown'] = 'Pārbaudīt problēmu';
+$lang['lv_LV']['BrokenLinksReport']['ReasonDropdownBROKENFILE'] = 'Bojāts fails';
+$lang['lv_LV']['BrokenLinksReport']['ReasonDropdownBROKENLINK'] = 'Bojāta saite';
+$lang['lv_LV']['BrokenLinksReport']['ReasonDropdownRPBROKENLINK'] = 'Novirzīšanas lapa, kas norāda uz neeksistējošu lapu';
+$lang['lv_LV']['BrokenLinksReport']['ReasonDropdownVPBROKENLINK'] = 'Virtuālā lapa, kas norāda uz neeksistējošu lapu';
+$lang['lv_LV']['BrokenLinksReport']['RedirectorNonExistent'] = 'Novirzīšanas lapa, kas norāda uz neeksistējošu lapu';
+$lang['lv_LV']['BrokenLinksReport']['VirtualPageNonExistent'] = 'Virtuālā lapa, kas norāda uz neeksistējošu lapu';
+$lang['lv_LV']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = 'Dzēstas %d lapas no melnrakstu vietnes, %d kļūdas';
+$lang['lv_LV']['CMSBatchActions']['DELETED_PAGES'] = 'Dzēstas %d lapas no publicētās vietnes, %d kļūdas';
+$lang['lv_LV']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Dzēst no melnrakstu vietnes';
+$lang['lv_LV']['CMSBatchActions']['DELETE_PAGES'] = 'Dzēst no publicētās vietnes';
+$lang['lv_LV']['CMSBatchActions']['DELETING_DRAFT_PAGES'] = 'Tieks dzēstas izvēlētās lapas no melnrakstu vietnes';
+$lang['lv_LV']['CMSBatchActions']['DELETING_PAGES'] = 'Tiek dzēstas izvēlētās lapas no publicētās vietnes';
+$lang['lv_LV']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Publicētas %d lapas, %d kļūdas';
+$lang['lv_LV']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Tiek publicētas lapas';
+$lang['lv_LV']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publicēt';
+$lang['lv_LV']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'Nepublicētas %d lapas';
+$lang['lv_LV']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'Tiek atpublicētas lapas';
+$lang['lv_LV']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'Nepublicēt';
+$lang['lv_LV']['CMSMain']['ACCESS'] = 'Piekļuve sadaļai \'%s\'';
+$lang['lv_LV']['CMSMain']['ACCESSALLINTERFACES'] = 'Piekļuve visām CMS sadaļām';
+$lang['lv_LV']['CMSMain']['ACCESSALLINTERFACESHELP'] = 'Atceļ vēl specifiskākas piekļuves iestatījumus.';
+$lang['lv_LV']['CMSMain']['ACCESS_HELP'] = 'Atļaut sadaļas, kas satur lapu koka struktūru un saturu, apskati.  Skatīt un labot tiesības var ar noteiktām nolaižamajām izvēlnēm, kā arī aī "Satura tiesības" sadaļā.';
+$lang['lv_LV']['CMSMain']['CANCEL'] = 'Atcelt';
+$lang['lv_LV']['CMSMain']['CHOOSEREPORT'] = '(Izvēlaties atskaiti)';
+$lang['lv_LV']['CMSMain']['COMPARINGV'] = 'Versiju %s un %s salīdzināšana';
+$lang['lv_LV']['CMSMain']['COPYPUBTOSTAGE'] = 'Vai jūs tiešām vēlaties kopēt publicēto saturu uz melnrakstu vietni?';
+$lang['lv_LV']['CMSMain']['DELETE'] = 'Dzēst no melnraksta vietnes';
+$lang['lv_LV']['CMSMain']['DESCREMOVED'] = 'un %s pēcteči';
+$lang['lv_LV']['CMSMain']['EMAIL'] = 'E-pasts';
+$lang['lv_LV']['CMSMain']['GO'] = 'Aiziet';
+$lang['lv_LV']['CMSMain']['MENUTITLE'] = 'Vietnes saturs';
+$lang['lv_LV']['CMSMain']['MENUTITLE'] = 'Vietnes saturs';
+$lang['lv_LV']['CMSMain']['MENUTITLEOPT'] = 'Navigācijas nosaukums';
+$lang['lv_LV']['CMSMain']['METADESCOPT'] = 'Apraksts';
+$lang['lv_LV']['CMSMain']['METAKEYWORDSOPT'] = 'Atslēgvārdi';
+$lang['lv_LV']['CMSMain']['NEW'] = 'Jauns';
+$lang['lv_LV']['CMSMain']['NOCONTENT'] = 'nav satura';
+$lang['lv_LV']['CMSMain']['NOTHINGASSIGNED'] = 'Jums nav nekas piešķirts';
+$lang['lv_LV']['CMSMain']['NOWAITINGON'] = 'Jūs uz nevienu negaidat.';
+$lang['lv_LV']['CMSMain']['NOWBROKEN'] = 'Sekojošām lapām tagad ir bojātas saites:';
+$lang['lv_LV']['CMSMain']['NOWBROKEN2'] = 'To īpašniekiem ir nosūtītas e-pastsa vēstules un tie salabos šīs lapas.';
+$lang['lv_LV']['CMSMain']['OK'] = 'Labi';
+$lang['lv_LV']['CMSMain']['PAGEDEL'] = '%d lapa izdzēsta';
+$lang['lv_LV']['CMSMain']['PAGENOTEXISTS'] = 'Šī lapa neeksistē';
+$lang['lv_LV']['CMSMain']['PAGEPUB'] = 'Publicēta %d lapa';
+$lang['lv_LV']['CMSMain']['PAGESDEL'] = '%d lapas izdzēstas';
+$lang['lv_LV']['CMSMain']['PAGESPUB'] = 'Publicētas %d lapas';
+$lang['lv_LV']['CMSMain']['PAGETYPEOPT'] = 'Lapas Tips';
+$lang['lv_LV']['CMSMain']['PRINT'] = 'Printēt';
+$lang['lv_LV']['CMSMain']['PUBALLCONFIRM'] = 'Pārveidojam saturu "live" statusā, lūdzu publicējiet visas vietnes lapas ';
+$lang['lv_LV']['CMSMain']['PUBALLFUN'] = '"Publicēt Visu" funkcionalitāte';
+$lang['lv_LV']['CMSMain']['PUBALLFUN2'] = 'Nospiežot šo pogu tiks veikta līdzvērtīga darbība kā atverot katru lapu un nospiežot "publicēt". Šo darbību ir paredzēts izmantot pēc apjomīgiem satura labojumiem, piemēram, brīdī kad vietne pirmo reizi tika izveidota.';
+$lang['lv_LV']['CMSMain']['PUBPAGES'] = 'Pabeigts: Publicētas %d lapas';
+$lang['lv_LV']['CMSMain']['REMOVED'] = 'Dzēsti \'%s\'%s no publiskās vietnes';
+$lang['lv_LV']['CMSMain']['REMOVEDFD'] = 'Izņemts no melnrakstu vietnes';
+$lang['lv_LV']['CMSMain']['REMOVEDPAGE'] = '\'%s\' tika izņemts no publicētās vietnes';
+$lang['lv_LV']['CMSMain']['REMOVEDPAGEFROMDRAFT'] = 'Izņemt \'%s\' no melnrakstu vietnes';
+$lang['lv_LV']['CMSMain']['REPORT'] = 'Atskaite';
+$lang['lv_LV']['CMSMain']['RESTORED'] = '\'%s\' tika veiksmīgi atjaunots';
+$lang['lv_LV']['CMSMain']['ROLLBACK'] = 'Veikt atriti uz šo versiju';
+$lang['lv_LV']['CMSMain']['ROLLEDBACKPUB'] = 'Veikta atrite uz publicēto versiju. Jaunās versijas numurs ir #%d';
+$lang['lv_LV']['CMSMain']['ROLLEDBACKVERSION'] = 'Veikta atrite uz versiju #%d. Jaunās versijas numurs #%d';
+$lang['lv_LV']['CMSMain']['SAVE'] = 'Saglabāt';
+$lang['lv_LV']['CMSMain']['SENTTO'] = 'Nosūtīts apstiprināšanai saņēmējam %s %s';
+$lang['lv_LV']['CMSMain']['STATUSOPT'] = 'Statuss';
+$lang['lv_LV']['CMSMain']['TITLEOPT'] = 'Virsraksts';
+$lang['lv_LV']['CMSMain']['TOTALPAGES'] = 'Kopējais lapu skaits:';
+$lang['lv_LV']['CMSMain']['VERSIONSNOPAGE'] = 'Nevar atrast lapu #%d';
+$lang['lv_LV']['CMSMain']['VIEWING'] = 'Jūs apskatat versiju #%s, izveidoja %s %s';
+$lang['lv_LV']['CMSMain']['VISITRESTORE'] = 'apmeklēt atjaunošanas lapu/(ID)';
+$lang['lv_LV']['CMSMain']['WAITINGON'] = 'Jums ir jāgaida uz citiem cilvēkiem, lai strādātu ar sekojošajām <b>%d</b> lapām.';
+$lang['lv_LV']['CMSMain']['WORKTODO'] = 'Jums ir palicis nepabeigts darbs šajās <b>%d</b> lapās.';
+$lang['lv_LV']['CMSMain_dialog.ss']['BUTTONNOTFOUND'] = 'Pogas nosaukumus nav atrasts';
+$lang['lv_LV']['CMSMain_dialog.ss']['NOLINKED'] = 'Nevar atrast window.linkedObject objektu, lai nosūtītu pogas klikšķa notikumu atpakaļ uz galveno logu.';
+$lang['lv_LV']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'Pievienots melnraksta vietnei un netika vēl publicēts';
+$lang['lv_LV']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Pievienot kritēriju';
+$lang['lv_LV']['CMSMain_left.ss']['BATCHACTIONS'] = 'Partijas Darbības';
+$lang['lv_LV']['CMSMain_left.ss']['CHANGED'] = 'mainīts';
+$lang['lv_LV']['CMSMain_left.ss']['CLEAR'] = 'Notīrīt';
+$lang['lv_LV']['CMSMain_left.ss']['CLEARTITLE'] = 'Notīrīt meklēšanas rezultātus un aplūkot visus visus ierakstus';
+$lang['lv_LV']['CMSMain_left.ss']['CLOSEBOX'] = 'uzklikšķiniet, lai aizvērtu šo lodziņu';
+$lang['lv_LV']['CMSMain_left.ss']['COMPAREMODE'] = 'Salīdzināšanas režīms ( no zemāk  redzamajām versijām atzīmējat 2)';
+$lang['lv_LV']['CMSMain_left.ss']['CREATE'] = 'Izveidot';
+$lang['lv_LV']['CMSMain_left.ss']['DEL'] = 'izdzēsts';
+$lang['lv_LV']['CMSMain_left.ss']['DELETECONFIRM'] = 'Izdzēst izvēlētās lapas';
+$lang['lv_LV']['CMSMain_left.ss']['DELETEDSTILLLIVE'] = 'Izdzēsts no melnraksta lapas, taču vēljoprojām ir pieejama publiskajā vietnē';
+$lang['lv_LV']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Tika labots melnraksta vietnē un nav vēl publicēts';
+$lang['lv_LV']['CMSMain_left.ss']['EDITEDSINCE'] = 'Labots kopš';
+$lang['lv_LV']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Atļaut pārkārtošanu ar vilkt un nomest paņēmienu';
+$lang['lv_LV']['CMSMain_left.ss']['GO'] = 'Aiziet';
+$lang['lv_LV']['CMSMain_left.ss']['HIDDEN'] = 'paslēpts';
+$lang['lv_LV']['CMSMain_left.ss']['KEY'] = 'Atslēga:';
+$lang['lv_LV']['CMSMain_left.ss']['NEW'] = 'jauns';
+$lang['lv_LV']['CMSMain_left.ss']['NOTINMENU'] = 'Izņemts no navigācijas izvēlnes';
+$lang['lv_LV']['CMSMain_left.ss']['OPENBOX'] = 'uzklikšiniet, lai atvērtu šo lodziņu';
+$lang['lv_LV']['CMSMain_left.ss']['PAGEVERSIONH'] = 'Lapu versiju vēsture';
+$lang['lv_LV']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publicēt izvēlētās lapas';
+$lang['lv_LV']['CMSMain_left.ss']['SEARCH'] = 'Meklēšana';
+$lang['lv_LV']['CMSMain_left.ss']['SEARCHTITLE'] = 'Meklēt URL, Virsrakstu, Izvēlnes virsrakstu un Satura laukos';
+$lang['lv_LV']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Izvēlaties lapas, kuras jūs vēlaties mainīt un tad klišķinat veicamās darbības:';
+$lang['lv_LV']['CMSMain_left.ss']['SHOWITEMS'] = 'Rādīt:';
+$lang['lv_LV']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Rādīt tikai izmainītās lapas';
+$lang['lv_LV']['CMSMain_left.ss']['SHOWUNPUB'] = 'Rādīt nepublicētās versijas';
+$lang['lv_LV']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Vietnes saturs un struktūra';
+$lang['lv_LV']['CMSMain_left.ss']['SITEREPORTS'] = 'Vietnes atskaites';
+$lang['lv_LV']['CMSMain_right.ss']['ANYMESSAGE'] = 'Vai jūs vēlaties nodot ziņojumu redaktoram?';
+$lang['lv_LV']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Izvēlaties lūdzu no kreisās puses lapu.';
+$lang['lv_LV']['CMSMain_right.ss']['LOADING'] = 'notiek ielāde...';
+$lang['lv_LV']['CMSMain_right.ss']['MESSAGE'] = 'Ziņojums';
+$lang['lv_LV']['CMSMain_right.ss']['SENDTO'] = 'Sūtīt uz';
+$lang['lv_LV']['CMSMain_right.ss']['STATUS'] = 'Statuss';
+$lang['lv_LV']['CMSMain_right.ss']['SUBMIT'] = 'Iesniegt apstiprināšanai';
+$lang['lv_LV']['CMSMain_right.ss']['WELCOMETO'] = 'Laipni lūgti';
+$lang['lv_LV']['CMSMain_versions.ss']['AUTHOR'] = 'Autors';
+$lang['lv_LV']['CMSMain_versions.ss']['NOTPUB'] = 'Nav publicēts';
+$lang['lv_LV']['CMSMain_versions.ss']['PUBR'] = 'Publicētājs';
+$lang['lv_LV']['CMSMain_versions.ss']['UNKNOWN'] = 'Nezināms';
+$lang['lv_LV']['CMSMain_versions.ss']['WHEN'] = 'Kad';
+$lang['lv_LV']['CMSSiteTreeFilter']['ALL'] = 'Visi ieraksti';
+$lang['lv_LV']['CMSSiteTreeFilter']['DELETEDPAGES'] = 'Visas lapas, ieskaitot dzēstās';
+$lang['lv_LV']['CommentAdmin']['ACCEPT'] = 'Pieņemt';
+$lang['lv_LV']['CommentAdmin']['APPROVED'] = 'Pieņemti %s komentāri.';
+$lang['lv_LV']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Apstiprinātie komentāri';
+$lang['lv_LV']['CommentAdmin']['AUTHOR'] = 'Autors';
+$lang['lv_LV']['CommentAdmin']['COMMENT'] = 'Komentārs';
+$lang['lv_LV']['CommentAdmin']['COMMENTERURL'] = 'URL';
+$lang['lv_LV']['CommentAdmin']['COMMENTS'] = 'Komentāri';
+$lang['lv_LV']['CommentAdmin']['COMMENTSAWAITINGMODERATION'] = 'Komentāri, kas gaida apstiprinājumu';
+$lang['lv_LV']['CommentAdmin']['DATEPOSTED'] = 'Publicēšanas datums';
+$lang['lv_LV']['CommentAdmin']['DELETE'] = 'Dzēst';
+$lang['lv_LV']['CommentAdmin']['DELETEALL'] = 'Dzēst visu';
+$lang['lv_LV']['CommentAdmin']['DELETED'] = 'Dzēst %s komentārus.';
+$lang['lv_LV']['CommentAdmin']['MARKASNOTSPAM'] = 'Atzīmēt kā "nav spams"';
+$lang['lv_LV']['CommentAdmin']['MARKEDNOTSPAM'] = '%s komentāri atzīmēti kā "nav spams".';
+$lang['lv_LV']['CommentAdmin']['MARKEDSPAM'] = '%s komentāri atzīmēti kā spams.';
+$lang['lv_LV']['CommentAdmin']['MENUTITLE'] = 'Komentāri';
+$lang['lv_LV']['CommentAdmin']['MENUTITLE'] = 'Komentāri';
+$lang['lv_LV']['CommentAdmin']['NAME'] = 'Vārds';
+$lang['lv_LV']['CommentAdmin']['PAGE'] = 'Lapa';
+$lang['lv_LV']['CommentAdmin']['SPAM'] = 'Spams';
+$lang['lv_LV']['CommentAdmin']['SPAMMARKED'] = 'Atzīmēt kā spamu';
+$lang['lv_LV']['CommentAdmin_left.ss']['COMMENTS'] = 'Komentāri';
+$lang['lv_LV']['CommentAdmin_right.ss']['WELCOME1'] = 'Laipni lūgti';
+$lang['lv_LV']['CommentAdmin_right.ss']['WELCOME2'] = 'komentāru pārvaldība. Lūdzu izvēlaties mapi no koka kreisajā pusē.';
+$lang['lv_LV']['CommentAdmin_SiteTree.ss']['APPROVED'] = 'Apstiprināts';
+$lang['lv_LV']['CommentAdmin_SiteTree.ss']['AWAITMODERATION'] = 'Gaida Apstiprinājumu';
+$lang['lv_LV']['CommentAdmin_SiteTree.ss']['COMMENTS'] = 'Komentāri';
+$lang['lv_LV']['CommentAdmin_SiteTree.ss']['SPAM'] = 'Spams';
+$lang['lv_LV']['CommentList.ss']['CREATEDW'] = 'Komentāri tiek dzēsti kad vien tiek veikta kāda no \'darbplūsmas darbībām\' - Publicēt, Atteikt, Iesniegt';
+$lang['lv_LV']['CommentList.ss']['NOCOM'] = 'Šajā lapā nav komentāru.';
+$lang['lv_LV']['CommentTableField']['FILTER'] = 'Filtrs';
+$lang['lv_LV']['CommentTableField']['SEARCH'] = 'Meklēt';
+$lang['lv_LV']['CommentTableField.ss']['APPROVE'] = 'apstiprināt';
+$lang['lv_LV']['CommentTableField.ss']['APPROVECOMMENT'] = 'Apstiprināt šo komentāru';
+$lang['lv_LV']['CommentTableField.ss']['DELETE'] = 'dzēst';
+$lang['lv_LV']['CommentTableField.ss']['DELETEROW'] = 'Dzēst šo rindu';
+$lang['lv_LV']['CommentTableField.ss']['EDIT'] = 'labot';
+$lang['lv_LV']['CommentTableField.ss']['HAM'] = 'Kļūdaini uzskatīts spams';
+$lang['lv_LV']['CommentTableField.ss']['MARKASSPAM'] = 'Atzīmēt šo komentāru kā spamu';
+$lang['lv_LV']['CommentTableField.ss']['MARKNOSPAM'] = 'Atzīmēt šo komentāru kā spamu';
+$lang['lv_LV']['CommentTableField.ss']['NOITEMSFOUND'] = 'Netika atrasts neviens ieraksts';
+$lang['lv_LV']['CommentTableField.ss']['SPAM'] = 'spams';
+$lang['lv_LV']['ComplexTableField']['CLOSEPOPUP'] = 'Aizvērt izlēcošo logu';
+$lang['lv_LV']['ComplexTableField']['SUCCESSADD'] = 'Pievienots %s %s %s';
+$lang['lv_LV']['Group']['IMPORTTABTITLE'] = 'Imports';
+$lang['lv_LV']['Group']['RolesAddEditLink'] = 'Pievienot/labot lomas';
+$lang['lv_LV']['GroupImportForm']['Help1'] = '<p>Importēt vienu vai vairākas grupas <em>CSV</em> formatā (komatatdalītas vērtības). <small><a href="#" class="toggle-advanced">Rādīt paplašinātu pielietojumu</a></small></p>';
+$lang['lv_LV']['GroupImportForm']['Help2'] = '<div class="advanced">
+<h4>Paplašināts pielietojums</h4>
+<ul>
+<li>Atļautās kolonnas: <em>%s</em></li>
+<li>Katra no esošajām grupām tiek atlasīta pēc tās unikālā <em>Koda</em> vērtības, un tiek atjaunota ar jauno vērtību no importētā faila.</li>
+<li>Grupu hierarhijas<em>VecākaKods</em> kolonna.</li>
+<li>Piekļuves tiesību kodi var tikt piekārtoti<em>PermissionCode</em> kolonnā. Esošie piekļuves tiesību kodi netiks dzēsti.</li>
+</ul>
+</div>';
+$lang['lv_LV']['GroupImportForm']['ResultCreated'] = 'Izveidotas %d grupas';
+$lang['lv_LV']['GroupImportForm']['ResultDeleted'] = 'Dzēstas %d grupas';
+$lang['lv_LV']['GroupImportForm']['ResultUpdated'] = 'Atjauninātas %d grupas';
+$lang['lv_LV']['ImageEditor.ss']['ACTIONS'] = 'darbības';
+$lang['lv_LV']['ImageEditor.ss']['ADJUST'] = 'koriģēt';
+$lang['lv_LV']['ImageEditor.ss']['APPLY'] = 'pielietot';
+$lang['lv_LV']['ImageEditor.ss']['BLUR'] = 'aizmiglot';
+$lang['lv_LV']['ImageEditor.ss']['BRIGHTNESS'] = 'spilgtums';
+$lang['lv_LV']['ImageEditor.ss']['CANCEL'] = 'atcelt';
+$lang['lv_LV']['ImageEditor.ss']['CONTRAST'] = 'kontrasts';
+$lang['lv_LV']['ImageEditor.ss']['CROP'] = 'apgriezt';
+$lang['lv_LV']['ImageEditor.ss']['CURRENTACTION'] = 'pašreizējā&nbsp;darbība';
+$lang['lv_LV']['ImageEditor.ss']['EDITFUNCTIONS'] = 'labot&nbsp;funkcijas';
+$lang['lv_LV']['ImageEditor.ss']['EFFECTS'] = 'efekti';
+$lang['lv_LV']['ImageEditor.ss']['EXIT'] = 'iziet';
+$lang['lv_LV']['ImageEditor.ss']['GAMMA'] = 'gamma';
+$lang['lv_LV']['ImageEditor.ss']['GREYSCALE'] = 'pelēkotoņi';
+$lang['lv_LV']['ImageEditor.ss']['HEIGHT'] = 'augstums';
+$lang['lv_LV']['ImageEditor.ss']['REDO'] = 'atcelt atsaukšanu';
+$lang['lv_LV']['ImageEditor.ss']['ROT'] = 'pagriezt';
+$lang['lv_LV']['ImageEditor.ss']['SAVE'] = 'saglabāt&nbsp;attēlu';
+$lang['lv_LV']['ImageEditor.ss']['SEPIA'] = 'sēpija';
+$lang['lv_LV']['ImageEditor.ss']['UNDO'] = 'atsaukt';
+$lang['lv_LV']['ImageEditor.ss']['UNTITLED'] = 'Nenosaukts dokuments';
+$lang['lv_LV']['ImageEditor.ss']['WIDTH'] = 'platums';
+$lang['lv_LV']['LeftAndMain']['CANT_REORGANISE'] = 'Jums nav piekļuves tiesības, lai pārkārtotu vietnes koku. Jūs izmaiņas netika saglabātas.';
+$lang['lv_LV']['LeftAndMain']['CHANGEDURL'] = 'URL izmainīts uz \'%s\'';
+$lang['lv_LV']['LeftAndMain']['COMMENTS'] = 'Komentāri';
+$lang['lv_LV']['LeftAndMain']['FILESIMAGES'] = 'Faili un Attēli';
+$lang['lv_LV']['LeftAndMain']['HELP'] = 'Palīdzība';
+$lang['lv_LV']['LeftAndMain']['PAGETYPE'] = 'Lapas tips:';
+$lang['lv_LV']['LeftAndMain']['PERMAGAIN'] = 'Jūs esat atteicies no CMS. Ja jūs vēlaties vēlreiz pieteikties, tad ievadiet zemāk savu lietotājvārdu un paroli.';
+$lang['lv_LV']['LeftAndMain']['PERMALREADY'] = 'Atvaino, bet tev nav piekļuves tiesību šai CMS daļai. Ja jūs vēlaties autorizēties kā kāds cits, tad to var izdarīt zemāk';
+$lang['lv_LV']['LeftAndMain']['PERMDEFAULT'] = 'Lai piekļūtu CMS, lūdzu izvēlieties autentificēšanas metodi un ievadiet savus akreditācijas datus.';
+$lang['lv_LV']['LeftAndMain']['PLEASESAVE'] = 'Lūdzu saglabājiet lapu: Šo lapu nav iespējams atjaunot, jo tā vēl nav saglabāta.';
+$lang['lv_LV']['LeftAndMain']['REPORTS'] = 'Atskaites';
+$lang['lv_LV']['LeftAndMain']['REQUESTERROR'] = 'Pieprasījuma kļūda';
+$lang['lv_LV']['LeftAndMain']['SAVED'] = 'saglabāts';
+$lang['lv_LV']['LeftAndMain']['SAVEDUP'] = 'Saglabāts';
+$lang['lv_LV']['LeftAndMain']['SECURITY'] = 'Drošība';
+$lang['lv_LV']['LeftAndMain']['SITECONTENT'] = 'Vietnes saturs';
+$lang['lv_LV']['LeftAndMain']['SITECONTENTLEFT'] = 'Vietnes saturs';
+$lang['lv_LV']['LeftAndMain.ss']['APPVERSIONTEXT1'] = 'Šī ir';
+$lang['lv_LV']['LeftAndMain.ss']['APPVERSIONTEXT2'] = 'versija, kas patlaban ir uzstādīta, tehniski tā ir CVS repozitorija atzars';
+$lang['lv_LV']['LeftAndMain.ss']['ARCHS'] = 'Arhivētā vietne';
+$lang['lv_LV']['LeftAndMain.ss']['DRAFTS'] = 'Melnraksta vietne';
+$lang['lv_LV']['LeftAndMain.ss']['EDIT'] = 'Labot';
+$lang['lv_LV']['LeftAndMain.ss']['EDITINCMS'] = 'Labot šo lapu CMS sistēmā';
+$lang['lv_LV']['LeftAndMain.ss']['EDITPROFILE'] = 'Profils';
+$lang['lv_LV']['LeftAndMain.ss']['LOADING'] = 'Ielādē...';
+$lang['lv_LV']['LeftAndMain.ss']['LOGGEDINAS'] = 'Pieslēdzies kā';
+$lang['lv_LV']['LeftAndMain.ss']['LOGOUT'] = 'Atslēgties';
+$lang['lv_LV']['LeftAndMain.ss']['PUBLIS'] = 'Publicētā vietne';
+$lang['lv_LV']['LeftAndMain.ss']['REQUIREJS'] = 'CMS darbībai jums ir nepieciešams aktivizēt JavaScript';
+$lang['lv_LV']['LeftAndMain.ss']['SSWEB'] = 'Silverstripe vietne';
+$lang['lv_LV']['LeftAndMain.ss']['VIEWINDRAFT'] = 'Skatīt lapu melnrakstu vietnē';
+$lang['lv_LV']['LeftAndMain.ss']['VIEWINPUBLISHED'] = 'Skatīt lapu publicētajā vietnē';
+$lang['lv_LV']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Lapas skats:';
+$lang['lv_LV']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' veiksmīgi tika publicēts.';
+$lang['lv_LV']['LeftAndMain']['STATUSTO'] = 'Statuss izmainīts uz \'%s\' ';
+$lang['lv_LV']['LeftAndMain']['TREESITECONTENT'] = 'Vietnes saturs';
+$lang['lv_LV']['LeftAndMain_right.ss']['WELCOMETO'] = 'Laipni lūgti';
+$lang['lv_LV']['MathSpamProtection']['EIGHT'] = 'astoņi';
+$lang['lv_LV']['MathSpamProtection']['EIGHTEEN'] = 'astoņpadsmit';
+$lang['lv_LV']['MathSpamProtection']['ELEVEN'] = 'vienpadsmit';
+$lang['lv_LV']['MathSpamProtection']['FIFTEEN'] = 'piecpadsmit';
+$lang['lv_LV']['MathSpamProtection']['FIVE'] = 'pieci';
+$lang['lv_LV']['MathSpamProtection']['FOUR'] = 'četri';
+$lang['lv_LV']['MathSpamProtection']['FOURTEEN'] = 'četrpadsmit';
+$lang['lv_LV']['MathSpamProtection']['NINE'] = 'deviņi';
+$lang['lv_LV']['MathSpamProtection']['ONE'] = 'viens';
+$lang['lv_LV']['MathSpamProtection']['SEVEN'] = 'septiņi';
+$lang['lv_LV']['MathSpamProtection']['SEVENTEEN'] = 'septiņpadsmit';
+$lang['lv_LV']['MathSpamProtection']['SIX'] = 'seši';
+$lang['lv_LV']['MathSpamProtection']['SIXTEEN'] = 'sešpadsmit';
+$lang['lv_LV']['MathSpamProtection']['TEN'] = 'desmit';
+$lang['lv_LV']['MathSpamProtection']['THIRTEEN'] = 'trīspadsmit';
+$lang['lv_LV']['MathSpamProtection']['THREE'] = 'trīs';
+$lang['lv_LV']['MathSpamProtection']['TWELVE'] = 'divpadsmit';
+$lang['lv_LV']['MathSpamProtection']['TWO'] = 'divi';
+$lang['lv_LV']['MathSpamProtection']['WHATIS'] = 'Cik ir %s pluss %s?';
+$lang['lv_LV']['MathSpamProtection']['ZERO'] = 'nulle';
+$lang['lv_LV']['MemberImportForm']['Help1'] = '<p>Importēt lietotājus <em>CSV formātā</em> (komatatdalītas vērtības). <small><a href="#" class="toggle-advanced">Rādīt uzlabotu pielietojumu</a></small></p>';
+$lang['lv_LV']['MemberImportForm']['Help2'] = '<div class="advanced">
+<h4>Paplašināts pielietojums</h4>
+<ul>
+<li>Atļautās kolonnas: <em>%s</em></li>
+<li>Katra no esošajiem lietotājiem tiek atlasīts pēc tā unikālā <em>Koda</em> vērtības, un tiek atjaunots ar jauno vērtību no importētā faila.</li>
+<li>Grupas var tikt piekārtotas kolonnā <em>Grupas</em>. Grupas tiek identificētas pēc to  parametra <em>Kods</em>, Vairākas grupas var tikt atdalītas ar komatu. Esošās grupas lietotāju tiesības netiks dzēstas.</li>
+</ul>
+</div>';
+$lang['lv_LV']['MemberImportForm']['ResultCreated'] = 'Izveidoti %d lietotāji';
+$lang['lv_LV']['MemberImportForm']['ResultDeleted'] = 'Dzēsti %d lietotāji';
+$lang['lv_LV']['MemberImportForm']['ResultNone'] = 'Nav izmaiņas';
+$lang['lv_LV']['MemberImportForm']['ResultUpdated'] = 'Atjaunināti %d lietotāji';
+$lang['lv_LV']['MemberList.ss']['FILTER'] = 'Filtrēt';
+$lang['lv_LV']['MemberList_PageControls.ss']['DISPLAYING'] = 'Attēlo';
+$lang['lv_LV']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'lietotāji';
+$lang['lv_LV']['MemberList_PageControls.ss']['LASTMEMBERS'] = 'lietotāji';
+$lang['lv_LV']['MemberList_PageControls.ss']['NEXTMEMBERS'] = 'lietotāji';
+$lang['lv_LV']['MemberList_PageControls.ss']['OF'] = 'no';
+$lang['lv_LV']['MemberList_PageControls.ss']['PREVIOUSMEMBERS'] = 'lietotāji';
+$lang['lv_LV']['MemberList_PageControls.ss']['TO'] = 'līdz/uz';
+$lang['lv_LV']['MemberList_PageControls.ss']['VIEWFIRST'] = 'Skatīt pirmo';
+$lang['lv_LV']['MemberList_PageControls.ss']['VIEWLAST'] = 'Skatīt pēdējo';
+$lang['lv_LV']['MemberList_PageControls.ss']['VIEWNEXT'] = 'Skatīt nākamo';
+$lang['lv_LV']['MemberList_PageControls.ss']['VIEWPREVIOUS'] = 'Skatīt iepriekšējo';
+$lang['lv_LV']['MemberList_Table.ss']['EMAIL'] = 'E-pasta adrese';
+$lang['lv_LV']['MemberList_Table.ss']['FN'] = 'Vārds';
+$lang['lv_LV']['MemberList_Table.ss']['PASSWD'] = 'Parole';
+$lang['lv_LV']['MemberList_Table.ss']['SN'] = 'Uzvārds';
+$lang['lv_LV']['MemberTableField']['ADD'] = 'Pievienot';
+$lang['lv_LV']['MemberTableField']['ADDEDTOGROUP'] = 'Lietotājs pievienots grupai';
+$lang['lv_LV']['MemberTableField']['ADDINGFIELD'] = 'Pievienošana neizdevās';
+$lang['lv_LV']['MemberTableField']['ANYGROUP'] = 'Jebkura grupa';
+$lang['lv_LV']['MemberTableField']['ASC'] = 'Augošā secībā';
+$lang['lv_LV']['MemberTableField']['DeleteTitleText'] = 'Izdzēst no šīs grupas';
+$lang['lv_LV']['MemberTableField']['DeleteTitleTextDatabase'] = 'Izdzēst no datubāzes un visām grupām';
+$lang['lv_LV']['MemberTableField']['DESC'] = 'Dilstošā secībā';
+$lang['lv_LV']['MemberTableField']['EMAIL'] = 'E-pasts';
+$lang['lv_LV']['MemberTableField']['ERRORADDINGUSER'] = 'Atgadījusies kļūda pievienojot lietotāju grupai: %s';
+$lang['lv_LV']['MemberTableField']['FILTER'] = 'Filtrēt';
+$lang['lv_LV']['MemberTableField']['FILTERBYGROUP'] = 'Filtrēt pēc grupas';
+$lang['lv_LV']['MemberTableField']['FIRSTNAME'] = 'Vārds';
+$lang['lv_LV']['MemberTableField']['ORDERBY'] = 'Kārtot pēc';
+$lang['lv_LV']['MemberTableField']['SEARCH'] = 'Meklēt';
+$lang['lv_LV']['MemberTableField.ss']['ADDNEW'] = 'Pievienot jaunu';
+$lang['lv_LV']['MemberTableField.ss']['DELETEMEMBER'] = 'Dzēst šo lietotāju';
+$lang['lv_LV']['MemberTableField.ss']['EDITMEMBER'] = 'Labot šo lietotāju';
+$lang['lv_LV']['MemberTableField.ss']['NOITEMSFOUND'] = 'Neviens ieraksts nav atrasts';
+$lang['lv_LV']['MemberTableField.ss']['SHOWMEMBER'] = 'Rādīt šo lietotāju';
+$lang['lv_LV']['MemberTableField']['SURNAME'] = 'Uzvārds';
+$lang['lv_LV']['ModelAdmin']['ADDBUTTON'] = 'Pievienot';
+$lang['lv_LV']['ModelAdmin']['ADDFORM'] = 'Lai datubāzei pievienotu %s, aizpildiet šo formu. ';
+$lang['lv_LV']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Izvēlēties rezultātu kolonnas...';
+$lang['lv_LV']['ModelAdmin']['CLEAR_SEARCH'] = 'Notīrīt meklēšanas filtru';
+$lang['lv_LV']['ModelAdmin']['CREATEBUTTON'] = 'Izveidot \'%s\'';
+$lang['lv_LV']['ModelAdmin']['DELETE'] = 'Dzēst';
+$lang['lv_LV']['ModelAdmin']['DELETEDRECORDS'] = 'Dzēsti %s ieraksti.';
+$lang['lv_LV']['ModelAdmin']['FOUNDRESULTS'] = 'Atrasti %s jūsu meklēšanas pieprasījumam atbilstoši ieraksti';
+$lang['lv_LV']['ModelAdmin']['GOBACK'] = 'Atpakaļ';
+$lang['lv_LV']['ModelAdmin']['GOFORWARD'] = 'Uz priekšu';
+$lang['lv_LV']['ModelAdmin']['IMPORT'] = 'Importēt no CSV';
+$lang['lv_LV']['ModelAdmin']['IMPORTEDRECORDS'] = 'Importēti %s ieraksti.';
+$lang['lv_LV']['ModelAdmin']['ITEMNOTFOUND'] = 'Nevaru atrast šo ierakstu';
+$lang['lv_LV']['ModelAdmin']['LOADEDFOREDITING'] = '\'%s\' ielādēts labošanai.';
+$lang['lv_LV']['ModelAdmin']['NOCSVFILE'] = 'Lūdzu izvēlaties CSV failu, kuru importēt';
+$lang['lv_LV']['ModelAdmin']['NOIMPORT'] = 'Nav ko importēt';
+$lang['lv_LV']['ModelAdmin']['NORESULTS'] = 'Nekas netika atrasts';
+$lang['lv_LV']['ModelAdmin']['SAVE'] = 'Saglabāt';
+$lang['lv_LV']['ModelAdmin']['SEARCHFOR'] = 'Meklēt';
+$lang['lv_LV']['ModelAdmin']['SEARCHRESULTS'] = 'Meklēšanas rezultāti';
+$lang['lv_LV']['ModelAdmin']['SELECTALL'] = 'izvēlēties visus';
+$lang['lv_LV']['ModelAdmin']['SELECTNONE'] = 'neizvēlēties nevienu';
+$lang['lv_LV']['ModelAdmin']['UPDATEDRECORDS'] = 'Atjaunoti %s ieraksti.';
+$lang['lv_LV']['ModelAdmin_ImportSpec.ss']['IMPORTSPECFIELDS'] = 'Darubāzes kolonnas';
+$lang['lv_LV']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Rādīt %s specifikāciju';
+$lang['lv_LV']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Relācijas';
+$lang['lv_LV']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = '%s specifikācija';
+$lang['lv_LV']['ModelAdmin_left.ss']['ADDLISTING'] = 'Pievienot';
+$lang['lv_LV']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Importēt';
+$lang['lv_LV']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Meklēt';
+$lang['lv_LV']['ModelAdmin_right.ss']['WELCOME1'] = 'Laipni lūgti %s. Lūdzu izvēlaties vienu no ierakstiem, kas atrodas darbību rūtī pa kreisi.';
+$lang['lv_LV']['ModelSidebar.ss']['ADDLISTING'] = 'Pievienot';
+$lang['lv_LV']['ModelSidebar.ss']['IMPORT_TAB_HEADER'] = 'Importēt';
+$lang['lv_LV']['ModelSidebar.ss']['SEARCHLISTINGS'] = 'Meklēt';
+$lang['lv_LV']['PageComment']['Comment'] = 'Komentārs';
+$lang['lv_LV']['PageComment']['COMMENTBY'] = '\'%s\' komentārs par %s';
+$lang['lv_LV']['PageComment']['IsSpam'] = 'Spams?';
+$lang['lv_LV']['PageComment']['Name'] = 'Autora vārds';
+$lang['lv_LV']['PageComment']['NeedsModeration'] = 'Vai nepieciešams apstiprinājums?';
+$lang['lv_LV']['PageComment']['PLURALNAME'] = 'Lapas komentāri';
+$lang['lv_LV']['PageComment']['SINGULARNAME'] = 'Lapas saturs';
+$lang['lv_LV']['PageCommentInterface']['COMMENTERURL'] = 'Jūsu mājaslapas URL';
+$lang['lv_LV']['PageCommentInterface']['POST'] = 'Raksts';
+$lang['lv_LV']['PageCommentInterface']['SPAMQUESTION'] = 'Spama aizsardzības jautājums: %s';
+$lang['lv_LV']['PageCommentInterface.ss']['COMMENTLOGINERROR'] = 'Jūs nevarat pievienot komentārus kamēr neesat pieslēgušies sistēmai';
+$lang['lv_LV']['PageCommentInterface.ss']['COMMENTPERMISSIONERROR'] = 'un kamēr jums nav atbilstoša piekļuves tiesību līmeņa';
+$lang['lv_LV']['PageCommentInterface.ss']['COMMENTPOSTLOGIN'] = 'PIeslēgties šeit';
+$lang['lv_LV']['PageCommentInterface.ss']['COMMENTS'] = 'Komentāri';
+$lang['lv_LV']['PageCommentInterface.ss']['COMMENTSDISABLED'] = 'Komentāru pievienošana ir atslēgta';
+$lang['lv_LV']['PageCommentInterface.ss']['NEXT'] = 'nākošais';
+$lang['lv_LV']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'Šajā lapā neviens vēl nav atstājis savu komentāru';
+$lang['lv_LV']['PageCommentInterface.ss']['POSTCOM'] = 'Pievieno savu komentāru';
+$lang['lv_LV']['PageCommentInterface.ss']['PREV'] = 'iepriekšējais';
+$lang['lv_LV']['PageCommentInterface.ss']['RSSFEEDALLCOMMENTS'] = 'RSS barotne visiem komentāriem';
+$lang['lv_LV']['PageCommentInterface.ss']['RSSFEEDCOMMENTS'] = 'Šīs lapas komentāru RSS barotne';
+$lang['lv_LV']['PageCommentInterface.ss']['RSSVIEWALLCOMMENTS'] = 'Skatīt visus komentārus';
+$lang['lv_LV']['PageCommentInterface']['YOURCOMMENT'] = 'Komentāri';
+$lang['lv_LV']['PageCommentInterface']['YOURNAME'] = 'Jūsu vārds';
+$lang['lv_LV']['PageCommentInterface_Controller']['SPAMQUESTION'] = 'Spama aizsardzības jautājums: %s';
+$lang['lv_LV']['PageCommentInterface_Form']['AWAITINGMODERATION'] = 'Jūsu komentārs tika iesniegts un gaida apstiprinājumu.';
+$lang['lv_LV']['PageCommentInterface_Form']['MSGYOUPOSTED'] = 'Ziņa, kuru publicējāt bija:';
+$lang['lv_LV']['PageCommentInterface_Form']['SPAMDETECTED'] = 'Konstatēts Spams!!';
+$lang['lv_LV']['PageCommentInterface_singlecomment.ss']['APPROVE'] = 'apstiprināt šo komentāru';
+$lang['lv_LV']['PageCommentInterface_singlecomment.ss']['ISNTSPAM'] = 'šis komentārs nav spams';
+$lang['lv_LV']['PageCommentInterface_singlecomment.ss']['ISSPAM'] = 'šis komentārs ir spams';
+$lang['lv_LV']['PageCommentInterface_singlecomment.ss']['PBY'] = 'Publicējis';
+$lang['lv_LV']['PageCommentInterface_singlecomment.ss']['REMCOM'] = 'dzēst šo komentāru';
+$lang['lv_LV']['Permission']['CMS_ACCESS_CATEGORY'] = 'CMS Piekļuve';
+$lang['lv_LV']['Permissions']['PERMISSIONS_CATEGORY'] = 'Lomas un piekļuves tiesības';
+$lang['lv_LV']['ReportAdmin']['MENUTITLE'] = 'Atskaites';
+$lang['lv_LV']['ReportAdmin_left.ss']['REPORTS'] = 'Atskaites';
+$lang['lv_LV']['ReportAdmin_right.ss']['WELCOME1'] = 'Laipni lūgti';
+$lang['lv_LV']['ReportAdmin_right.ss']['WELCOME2'] = 'atskaišu sadaļā. Lūdzu izvēlieties konkrētu atskaiti, kas atrodas pa kreisi.';
+$lang['lv_LV']['ReportAdmin_SiteTree.ss']['REPORTS'] = 'Atskaites';
+$lang['lv_LV']['SecurityAdmin']['ACCESS_HELP'] = 'Atļaut skatīt, pievienot un labot lietotājus, kā arī pievienot tiem piekļuves tiesības un lomas.';
+$lang['lv_LV']['SecurityAdmin']['ADDMEMBER'] = 'Pievienot lietotāju';
+$lang['lv_LV']['SecurityAdmin']['APPLY_ROLES'] = 'Piemērot grupām lomas';
+$lang['lv_LV']['SecurityAdmin']['APPLY_ROLES_HELP'] = 'Iespēja labot grupai piekārtotās lomas. Nepieciešamas piekļuves tiesības \'Drošība\' sadaļai. ';
+$lang['lv_LV']['SecurityAdmin']['EDITPERMISSIONS'] = 'Pārvaldīt grupu tiesības';
+$lang['lv_LV']['SecurityAdmin']['EDITPERMISSIONS_HELP'] = 'Iespēja labot grupas piekļuves tiesības un IP adreses. Nepieciešamas piekļuves tiesības \'Drošība\' sadaļai. ';
+$lang['lv_LV']['SecurityAdmin']['MemberListCaution'] = 'Brīdinājums: Izņemot lietotājus no šī saraksta, tie tiks dzēsti no visām grupām un datubāzes';
+$lang['lv_LV']['SecurityAdmin']['MENUTITLE'] = 'Drošība';
+$lang['lv_LV']['SecurityAdmin']['MENUTITLE'] = 'Drošība';
+$lang['lv_LV']['SecurityAdmin']['NEWGROUP'] = 'Jauna grupa';
+$lang['lv_LV']['SecurityAdmin']['SAVE'] = 'Saglabāt';
+$lang['lv_LV']['SecurityAdmin']['SGROUPS'] = 'Drošības grupas';
+$lang['lv_LV']['SecurityAdmin']['TABIMPORT'] = 'Imports';
+$lang['lv_LV']['SecurityAdmin']['TABROLES'] = 'Lomas';
+$lang['lv_LV']['SecurityAdmin_left.ss']['CREATE'] = 'Izveidot';
+$lang['lv_LV']['SecurityAdmin_left.ss']['DEL'] = 'Dzēst';
+$lang['lv_LV']['SecurityAdmin_left.ss']['DELGROUPS'] = 'Dzēst izvēlētās grupas';
+$lang['lv_LV']['SecurityAdmin_left.ss']['ENABLEDRAGGING'] = 'Atļaut pārkārtošanu ar vilkt un nomest paņēmienu';
+$lang['lv_LV']['SecurityAdmin_left.ss']['GO'] = 'Aiziet';
+$lang['lv_LV']['SecurityAdmin_left.ss']['SECGROUPS'] = 'Drošības grupas';
+$lang['lv_LV']['SecurityAdmin_left.ss']['SELECT'] = 'Izvēlaties lapas, kuras jūs vēlaties dzēst un tad klikšķiniet uz pogas, kas atrodas zemāk';
+$lang['lv_LV']['SecurityAdmin_left.ss']['TOREORG'] = 'Lai pārkārtotu jūsu vietni, velciet lapas visapkārt kā vien vēlaties.';
+$lang['lv_LV']['SecurityAdmin_MemberImportForm']['BtnImport'] = 'Importēt';
+$lang['lv_LV']['SecurityAdmin_MemberImportForm']['FileFieldLabel'] = 'CSV fails <small>(Atļautie paplašinājumi: *.csv)</small>';
+$lang['lv_LV']['SecurityAdmin_right.ss']['WELCOME1'] = 'Laipni lūgti';
+$lang['lv_LV']['SecurityAdmin_right.ss']['WELCOME2'] = 'drošības administrēšanas sadaļā. Lūdzu izvēlieties kādu grupu, kas atrodas pa kreisi. ';
+$lang['lv_LV']['SideReport']['BROKENFILES'] = 'Lapas ar bojātiem failiem';
+$lang['lv_LV']['SideReport']['BROKENLINKS'] = 'Labas ar bojātām saitēm';
+$lang['lv_LV']['SideReport']['BrokenLinksGroupTitle'] = 'Bojāto saišu atskaites';
+$lang['lv_LV']['SideReport']['BROKENREDIRECTORPAGES'] = 'NovirzītājLapas, kas norāda uz dzēstajām lapām';
+$lang['lv_LV']['SideReport']['BROKENVIRTUALPAGES'] = 'VirtuālāsLapas, kas norāda uz dzēstajām lapām';
+$lang['lv_LV']['SideReport']['ContentGroupTitle'] = 'Satura atskaites';
+$lang['lv_LV']['SideReport']['EMPTYPAGES'] = 'Tukšās lapas';
+$lang['lv_LV']['SideReport']['LAST2WEEKS'] = 'Lapas, kas rediģētas pēdējo 2 nedēļu laikā';
+$lang['lv_LV']['SideReport']['OtherGroupTitle'] = 'Citi';
+$lang['lv_LV']['SideReport']['ParameterLiveCheckbox'] = 'Pārbaudīt publisko vietni';
+$lang['lv_LV']['SideReport']['REPEMPTY'] = 'Atskaite %s ir tukša.';
+$lang['lv_LV']['SideReport']['TODO'] = 'Lapas ar Darbu Saraksta ierakstiem';
+$lang['lv_LV']['StaticExporter']['BASEURL'] = 'Bāzes URL';
+$lang['lv_LV']['StaticExporter']['EXPORTTO'] = 'Eksportēt uz to mapi';
+$lang['lv_LV']['StaticExporter']['FOLDEREXPORT'] = 'Mape, uz kuru eksportēt';
+$lang['lv_LV']['StaticExporter']['NAME'] = 'Statiskais eksportētājs';
+$lang['lv_LV']['TableListField.ss']['NOITEMSFOUND'] = 'Nav atrasts neviens ieraksts';
+$lang['lv_LV']['TableListField.ss']['SORTASC'] = 'Kārtot augošā secībā';
+$lang['lv_LV']['TableListField.ss']['SORTDESC'] = 'Kārtot dilstošā secībā';
+$lang['lv_LV']['TableListField_PageControls.ss']['DISPLAYING'] = 'Parādīt';
+$lang['lv_LV']['TableListField_PageControls.ss']['OF'] = 'no';
+$lang['lv_LV']['TableListField_PageControls.ss']['TO'] = 'uz';
+$lang['lv_LV']['TableListField_PageControls.ss']['VIEWFIRST'] = 'Skatīt pirmo';
+$lang['lv_LV']['TableListField_PageControls.ss']['VIEWLAST'] = 'Skatīt pēdējo';
+$lang['lv_LV']['TableListField_PageControls.ss']['VIEWNEXT'] = 'Skatīt nākamo';
+$lang['lv_LV']['TableListField_PageControls.ss']['VIEWPREVIOUS'] = 'Skatīt iepriekšējo';
+$lang['lv_LV']['ThumbnailStripField']['NOFLASHFOUND'] = 'Netika atrasts neviens flash fails';
+$lang['lv_LV']['ThumbnailStripField']['NOFOLDERFLASHFOUND'] = 'Netika atrasts neviens flash fails direktorijā';
+$lang['lv_LV']['ThumbnailStripField']['NOFOLDERIMAGESFOUND'] = 'Netika atrasts neviens attēls direktorijā';
+$lang['lv_LV']['ThumbnailStripField']['NOIMAGESFOUND'] = 'Neviens attēls netika atrasts';
+$lang['lv_LV']['ThumbnailStripField.ss']['CHOOSEFOLDER'] = '(Izvēlietites mapi vai lietojiet meklētāju augstāk)';
+$lang['lv_LV']['ViewArchivedEmail.ss']['CANACCESS'] = 'Jūs varat piekļūt arhivētajai vietnei no šīs saites:';
+$lang['lv_LV']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Jums tiek lūgts aplūkot mūsu vietnes saturu';
+$lang['lv_LV']['WaitingOn.ss']['ATO'] = 'piesaistīts';
+$lang['lv_LV']['WidgetAreaEditor.ss']['AVAILABLE'] = 'Pieejamie sīkrīki';
+$lang['lv_LV']['WidgetAreaEditor.ss']['AVAILWIDGETS'] = 'Lai izmantotu sīkrīku klikšķiniet uz tā nosaukuma.';
+$lang['lv_LV']['WidgetAreaEditor.ss']['INUSE'] = 'Šobrīd izmantotie sīkrīki';
+$lang['lv_LV']['WidgetAreaEditor.ss']['NOAVAIL'] = 'Šobrīd nav pieejams neviens sīkrīks';
+$lang['lv_LV']['WidgetAreaEditor.ss']['TOADD'] = 'Lai pievienotu sīkrīkus, velciet tos šeit no laukuma kreisajā pusē.';
+$lang['lv_LV']['WidgetAreaEditor.ss']['TOSORT'] = 'Lai sakārtotu šajā lapā šobrīd izmantotos logrīkus, velciet tos uz augšu un leju. ';
+$lang['lv_LV']['WidgetDescription.ss']['CLICKTOADDWIDGET'] = 'Klikšķiniet, lai pievienotu logrīku';
+$lang['lv_LV']['WidgetEditor.ss']['DELETE'] = 'Dzēst';
+
+?>
\ No newline at end of file

From 43cee9f50460b11814bbdae0800e9f88b0794a94 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 14 Jul 2010 02:51:11 +0000
Subject: [PATCH 432/483] MINOR Updated translations

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107876 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 lang/cs_CZ.php |  20 +++++----
 lang/de_DE.php |  97 +++++++++++++++++++++++++++++++++++++++++++
 lang/en_GB.php |  30 +++++++-------
 lang/eo_XX.php | 110 +++++++++++++++++++++++++++++++++++++++++++++++--
 lang/fi_FI.php |   1 +
 lang/it_IT.php |  29 +++++++++++++
 lang/ja_JP.php |   4 ++
 lang/pl_PL.php | 107 ++++++++++++++++++++++++++++++++++++++++++++---
 lang/ru_RU.php |  15 ++++++-
 lang/sk_SK.php |   4 ++
 10 files changed, 383 insertions(+), 34 deletions(-)

diff --git a/lang/cs_CZ.php b/lang/cs_CZ.php
index 975668cf..f81c9bf6 100644
--- a/lang/cs_CZ.php
+++ b/lang/cs_CZ.php
@@ -38,9 +38,9 @@ $lang['cs_CZ']['AssetAdmin']['UPLOADEDX'] = 'Nahráno %s souborů';
 $lang['cs_CZ']['AssetAdmin_left.ss']['CREATE'] = 'Vytvořit';
 $lang['cs_CZ']['AssetAdmin_left.ss']['DELETE'] = 'Smazat';
 $lang['cs_CZ']['AssetAdmin_left.ss']['DELFOLDERS'] = 'Smazat vybrané složky';
-$lang['cs_CZ']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Povolit přeřazení &quot;táhni a pusť&quot;';
+$lang['cs_CZ']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Povolit přesuny &quot;táhni a pusť&quot;';
 $lang['cs_CZ']['AssetAdmin_left.ss']['FILESYSTEMSYNC'] = 'Hledat nové soubory';
-$lang['cs_CZ']['AssetAdmin_left.ss']['FILESYSTEMSYNC_DESC'] = 'SilverStripe udržuje svoji vlastní databázi souborů &amp; obrázků uložených ve vašem assets/ adresáři. Klikněte na tlačítko k obnovení této databáze, když jsou soubory přidány do assets/ adresáře mimo SilverStripe, například, když jste soubory nahráliif přes FTP.';
+$lang['cs_CZ']['AssetAdmin_left.ss']['FILESYSTEMSYNC_DESC'] = 'SilverStripe udržuje svoji vlastní databázi souborů a obrázků uložených ve vašem assets/ adresáři. Klikněte na tlačítko k obnovení této databáze, když jsou soubory přidány do assets/ adresáře mimo SilverStripe, například, když jste soubory nahráli přes FTP.';
 $lang['cs_CZ']['AssetAdmin_left.ss']['FOLDERS'] = 'Složky';
 $lang['cs_CZ']['AssetAdmin_left.ss']['GO'] = 'Proveď';
 $lang['cs_CZ']['AssetAdmin_left.ss']['SELECTTODEL'] = 'Vyberte složky, které chcete smazat. Pak klikněte na tlačítko níže';
@@ -55,7 +55,7 @@ $lang['cs_CZ']['AssetTableField']['DIM'] = 'Rozměry';
 $lang['cs_CZ']['AssetTableField']['DIMLIMT'] = 'Omezit velikost popup okna';
 $lang['cs_CZ']['AssetTableField']['FILENAME'] = 'Název souboru';
 $lang['cs_CZ']['AssetTableField']['GALLERYOPTIONS'] = 'Nastavení galerie';
-$lang['cs_CZ']['AssetTableField']['IMAGE'] = 'Obrazek';
+$lang['cs_CZ']['AssetTableField']['IMAGE'] = 'Obrázek';
 $lang['cs_CZ']['AssetTableField']['ISFLASH'] = 'Je dokument typu Flash';
 $lang['cs_CZ']['AssetTableField']['LASTEDIT'] = 'Naposledy změněno';
 $lang['cs_CZ']['AssetTableField']['MAIN'] = 'Hlavni';
@@ -171,7 +171,7 @@ $lang['cs_CZ']['CMSMain_left.ss']['DELETECONFIRM'] = 'Smazat vybrané stránky';
 $lang['cs_CZ']['CMSMain_left.ss']['DELETEDSTILLLIVE'] = 'Smazáno z konceptů, ale stále na stránkách';
 $lang['cs_CZ']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Upraveno v konceptech, ale ještě nezveřejněno';
 $lang['cs_CZ']['CMSMain_left.ss']['EDITEDSINCE'] = 'Naposledy upraveno';
-$lang['cs_CZ']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Povolit přesuny drag a drop';
+$lang['cs_CZ']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Povolit přesuny &quot;táhni a pusť&quot;';
 $lang['cs_CZ']['CMSMain_left.ss']['GO'] = 'Proveď';
 $lang['cs_CZ']['CMSMain_left.ss']['HIDDEN'] = 'skrytý';
 $lang['cs_CZ']['CMSMain_left.ss']['KEY'] = 'Klíč:';
@@ -181,8 +181,8 @@ $lang['cs_CZ']['CMSMain_left.ss']['OPENBOX'] = 'klikněte pro otevření tohoto
 $lang['cs_CZ']['CMSMain_left.ss']['PAGEVERSIONH'] = 'Historie verzí stránky';
 $lang['cs_CZ']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Zveřejnit vybrané stránky';
 $lang['cs_CZ']['CMSMain_left.ss']['SEARCH'] = 'Hledat';
-$lang['cs_CZ']['CMSMain_left.ss']['SEARCHTITLE'] = 'Prohledávat URL, Titulky, Titulky Menu, &amp; Obsah';
-$lang['cs_CZ']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Vyberte stránky, které chcete změnit &amp; pak klikněte na akci:';
+$lang['cs_CZ']['CMSMain_left.ss']['SEARCHTITLE'] = 'Prohledávat URL, Titulky, Titulky Menu, a Obsah';
+$lang['cs_CZ']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Vyberte stránky, které chcete změnit a potom klikněte na akci:';
 $lang['cs_CZ']['CMSMain_left.ss']['SHOWITEMS'] = 'Ukázat:';
 $lang['cs_CZ']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Zobrazovat jen změněné stránky';
 $lang['cs_CZ']['CMSMain_left.ss']['SHOWUNPUB'] = 'Ukázat nezveřejněné verze';
@@ -249,6 +249,7 @@ $lang['cs_CZ']['ComplexTableField']['CLOSEPOPUP'] = 'Zavřít';
 $lang['cs_CZ']['ComplexTableField']['SUCCESSADD'] = 'Přidáno %s %s %s';
 $lang['cs_CZ']['Group']['IMPORTTABTITLE'] = 'Import';
 $lang['cs_CZ']['Group']['RolesAddEditLink'] = 'Přidat/editovat role';
+$lang['cs_CZ']['GroupImportForm']['Help1'] = '<p>Import jednu nebo více skupin v <em>CSV</em> formátu (čárkou-oddělené hodnoty). <small><a href="#" class="toggle-advanced">Ukázat rozšířené použití</a></small></p>';
 $lang['cs_CZ']['GroupImportForm']['ResultCreated'] = 'Vytvořeno %d skupin';
 $lang['cs_CZ']['GroupImportForm']['ResultDeleted'] = 'Smazáno %d skupin';
 $lang['cs_CZ']['GroupImportForm']['ResultUpdated'] = 'Aktualizováno %d skupin';
@@ -269,7 +270,7 @@ $lang['cs_CZ']['ImageEditor.ss']['GREYSCALE'] = 'šedá škála';
 $lang['cs_CZ']['ImageEditor.ss']['HEIGHT'] = 'výška';
 $lang['cs_CZ']['ImageEditor.ss']['REDO'] = 'znovu';
 $lang['cs_CZ']['ImageEditor.ss']['ROT'] = 'otočit';
-$lang['cs_CZ']['ImageEditor.ss']['SAVE'] = 'uložit&nbsp;obrázek';
+$lang['cs_CZ']['ImageEditor.ss']['SAVE'] = 'uložit obrázek';
 $lang['cs_CZ']['ImageEditor.ss']['SEPIA'] = 'sepia';
 $lang['cs_CZ']['ImageEditor.ss']['UNDO'] = 'zpět';
 $lang['cs_CZ']['ImageEditor.ss']['UNTITLED'] = 'Nepojmenovaný dokument';
@@ -277,7 +278,7 @@ $lang['cs_CZ']['ImageEditor.ss']['WIDTH'] = 'šířka';
 $lang['cs_CZ']['LeftAndMain']['CANT_REORGANISE'] = 'Nemáte oprávnění rearanžovat strukturu webu. Vaše změny nebyly uloženy.';
 $lang['cs_CZ']['LeftAndMain']['CHANGEDURL'] = 'URL změněno na \'%s\'';
 $lang['cs_CZ']['LeftAndMain']['COMMENTS'] = 'Komentáře';
-$lang['cs_CZ']['LeftAndMain']['FILESIMAGES'] = 'Soubory & Obrázky';
+$lang['cs_CZ']['LeftAndMain']['FILESIMAGES'] = 'Soubory a obrázky';
 $lang['cs_CZ']['LeftAndMain']['HELP'] = 'Nápověda';
 $lang['cs_CZ']['LeftAndMain']['PAGETYPE'] = 'Typ stránky:';
 $lang['cs_CZ']['LeftAndMain']['PERMAGAIN'] = 'Byli jste odhlášeni z CMS. Pokud se chcete znovu přihlásit, zadejte níže své uživatelské jméno a heslo.';
@@ -331,6 +332,7 @@ $lang['cs_CZ']['MathSpamProtection']['TWELVE'] = 'dvanáct';
 $lang['cs_CZ']['MathSpamProtection']['TWO'] = 'dvě';
 $lang['cs_CZ']['MathSpamProtection']['WHATIS'] = 'Kolik je %s plus %s?';
 $lang['cs_CZ']['MathSpamProtection']['ZERO'] = 'Nula';
+$lang['cs_CZ']['MemberImportForm']['Help1'] = '<p>Import členů v <em>CSV formátu</em> (čárkou-oddělené hodnoty). <small><a href="#" class="toggle-advanced">Ukázat rozšířené použití</a></small></p>';
 $lang['cs_CZ']['MemberImportForm']['ResultCreated'] = 'Vytvořeno %d členů';
 $lang['cs_CZ']['MemberImportForm']['ResultDeleted'] = 'Smazáno %d členů';
 $lang['cs_CZ']['MemberImportForm']['ResultNone'] = 'Žádné změny';
@@ -460,7 +462,7 @@ $lang['cs_CZ']['SecurityAdmin']['TABROLES'] = 'Role';
 $lang['cs_CZ']['SecurityAdmin_left.ss']['CREATE'] = 'Vytvořit';
 $lang['cs_CZ']['SecurityAdmin_left.ss']['DEL'] = 'Smazat';
 $lang['cs_CZ']['SecurityAdmin_left.ss']['DELGROUPS'] = 'Smazat vybrané skupiny';
-$lang['cs_CZ']['SecurityAdmin_left.ss']['ENABLEDRAGGING'] = 'Povolit přeřazení &quot;táhni a pusť&quot;';
+$lang['cs_CZ']['SecurityAdmin_left.ss']['ENABLEDRAGGING'] = 'Povolit přesuny &quot;táhni a pusť&quot;';
 $lang['cs_CZ']['SecurityAdmin_left.ss']['GO'] = 'Proveď';
 $lang['cs_CZ']['SecurityAdmin_left.ss']['SECGROUPS'] = 'Bezpečnostní skupiny';
 $lang['cs_CZ']['SecurityAdmin_left.ss']['SELECT'] = 'Vyberte stárnky, které chcete smazat. Pak klikněte na tlačítko níže';
diff --git a/lang/de_DE.php b/lang/de_DE.php
index 9e32ec9f..5e49ed03 100644
--- a/lang/de_DE.php
+++ b/lang/de_DE.php
@@ -16,6 +16,7 @@ if(array_key_exists('de_DE', $lang) && is_array($lang['de_DE'])) {
 	$lang['de_DE'] = $lang['en_US'];
 }
 
+$lang['de_DE']['']['CHOOSEPAGE'] = 'Bitte wählen Sie links einen Eintrag aus.';
 $lang['de_DE']['AssetAdmin']['CHOOSEFILE'] = 'Datei auswählen:';
 $lang['de_DE']['AssetAdmin']['DELETEDX'] = '%s Dateien gelöscht';
 $lang['de_DE']['AssetAdmin']['FILESREADY'] = 'Dateien bereit zum hochladen:';
@@ -72,8 +73,29 @@ $lang['de_DE']['AssetTableField']['SWFFILEOPTIONS'] = 'SWF Datei Optionen';
 $lang['de_DE']['AssetTableField']['TITLE'] = 'Titel';
 $lang['de_DE']['AssetTableField']['TYPE'] = 'Typ';
 $lang['de_DE']['AssetTableField']['URL'] = 'URL';
+$lang['de_DE']['BrokenLinksReport']['BROKENLINKS'] = 'Defekte Links';
+$lang['de_DE']['BrokenLinksReport']['CheckSiteDropdownDraft'] = 'Vorschau-Site';
+$lang['de_DE']['BrokenLinksReport']['CheckSiteDropdownPublished'] = 'Veröffentlichte Site';
+$lang['de_DE']['BrokenLinksReport']['ColumnDateLastModified'] = 'Zuletzt geändert';
+$lang['de_DE']['BrokenLinksReport']['ColumnDateLastPublished'] = 'Zuletzt veröffentlicht';
+$lang['de_DE']['BrokenLinksReport']['ColumnProblemType'] = 'Problemtyp';
+$lang['de_DE']['BrokenLinksReport']['ColumnURL'] = 'URL';
+$lang['de_DE']['BrokenLinksReport']['HasBrokenFile'] = 'Defekter Dateilink';
+$lang['de_DE']['BrokenLinksReport']['HasBrokenLink'] = 'Defekter Link';
+$lang['de_DE']['BrokenLinksReport']['HasBrokenLinkAndFile'] = 'Defekter Link und defekter Dateilink';
+$lang['de_DE']['BrokenLinksReport']['HoverTitleEditPage'] = 'Seite editieren';
+$lang['de_DE']['BrokenLinksReport']['ReasonDropdown'] = 'Zu überprüfendes Problem';
+$lang['de_DE']['BrokenLinksReport']['ReasonDropdownBROKENFILE'] = 'Defekter Dateilink';
+$lang['de_DE']['BrokenLinksReport']['ReasonDropdownBROKENLINK'] = 'Defekter Link';
+$lang['de_DE']['BrokenLinksReport']['ReasonDropdownRPBROKENLINK'] = 'Weiterleitungen, die auf eine nicht vorhandene Seite verweisen';
+$lang['de_DE']['BrokenLinksReport']['ReasonDropdownVPBROKENLINK'] = 'Virtuelle Seiten, die auf eine nicht vorhandene Seite verweisen';
+$lang['de_DE']['BrokenLinksReport']['RedirectorNonExistent'] = 'Weiterleitung, die auf eine nicht vorhandene Seite verweist';
+$lang['de_DE']['BrokenLinksReport']['VirtualPageNonExistent'] = 'Virtuelle Seite, die auf eine nicht vorhandene Seite verweist';
+$lang['de_DE']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = '%d Seiten von der Entwurfsansicht gelöscht, %d fehlgeschlagen';
 $lang['de_DE']['CMSBatchActions']['DELETED_PAGES'] = '%d Seiten von der veröffentlichten Site gelöscht.';
+$lang['de_DE']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Von der Entwurfsansicht löschen';
 $lang['de_DE']['CMSBatchActions']['DELETE_PAGES'] = 'Von veröffentlichter Site löschen';
+$lang['de_DE']['CMSBatchActions']['DELETING_DRAFT_PAGES'] = 'Lösche ausgewählte Seiten von der Entwurfsansicht';
 $lang['de_DE']['CMSBatchActions']['DELETING_PAGES'] = 'Ausgewählte Seiten werden von der veröffentlichten Site gelöscht.';
 $lang['de_DE']['CMSBatchActions']['PUBLISHED_PAGES'] = '%d Seiten veröffentlicht';
 $lang['de_DE']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Veröffentliche Seiten';
@@ -83,6 +105,8 @@ $lang['de_DE']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'Veröffentlichung wir
 $lang['de_DE']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'Veröffentlichung zurücknehmen';
 $lang['de_DE']['CMSMain']['ACCESS'] = 'Zugriff auf %s im CMS';
 $lang['de_DE']['CMSMain']['ACCESSALLINTERFACES'] = 'Zugriff auf alle CMS Schnittstellen';
+$lang['de_DE']['CMSMain']['ACCESSALLINTERFACESHELP'] = 'Hebt alle bereichspezifischen Berechtigungen auf.';
+$lang['de_DE']['CMSMain']['ACCESS_HELP'] = 'Seiteninhalt im CMS anzeigen. Anzeige- und Bearbeitungsberechtigungen können sowohl seitenspezifische als auch über die globalen Inhaltsberechtigungen gesetzt werden.';
 $lang['de_DE']['CMSMain']['CANCEL'] = 'Abbrechen';
 $lang['de_DE']['CMSMain']['CHOOSEREPORT'] = '(Report wählen)';
 $lang['de_DE']['CMSMain']['COMPARINGV'] = 'Sie vergleichen Versionen #%d und #%d';
@@ -139,6 +163,7 @@ $lang['de_DE']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'Als Entwurf gespeichert, noc
 $lang['de_DE']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Kriterien hinzufügen';
 $lang['de_DE']['CMSMain_left.ss']['BATCHACTIONS'] = 'Batch-Aktionen';
 $lang['de_DE']['CMSMain_left.ss']['CHANGED'] = 'geändert';
+$lang['de_DE']['CMSMain_left.ss']['CLEAR'] = 'leeren';
 $lang['de_DE']['CMSMain_left.ss']['CLEARTITLE'] = 'Suche löschen und alle Inhalte anzeigen';
 $lang['de_DE']['CMSMain_left.ss']['CLOSEBOX'] = 'Hier klicken, um Box zu schließen';
 $lang['de_DE']['CMSMain_left.ss']['COMPAREMODE'] = 'Vergleichsmodus (paarweise auswählen)';
@@ -160,6 +185,7 @@ $lang['de_DE']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Veröffentliche die marki
 $lang['de_DE']['CMSMain_left.ss']['SEARCH'] = 'Suche';
 $lang['de_DE']['CMSMain_left.ss']['SEARCHTITLE'] = 'Durchsuche URL, Titel, Menü Titel &amp; Inhalt';
 $lang['de_DE']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Markieren Sie die Seiten die Sie ändern möchten und wählen dann eine der Aktionen:';
+$lang['de_DE']['CMSMain_left.ss']['SHOWITEMS'] = 'Zeige:';
 $lang['de_DE']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Zeige nur veränderte Seiten';
 $lang['de_DE']['CMSMain_left.ss']['SHOWUNPUB'] = 'Zeige unveröffentlichte Versionen';
 $lang['de_DE']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Seitenbaum';
@@ -177,6 +203,8 @@ $lang['de_DE']['CMSMain_versions.ss']['NOTPUB'] = 'Nicht veröffentlicht';
 $lang['de_DE']['CMSMain_versions.ss']['PUBR'] = 'Veröffentlicher';
 $lang['de_DE']['CMSMain_versions.ss']['UNKNOWN'] = 'Unbekannt';
 $lang['de_DE']['CMSMain_versions.ss']['WHEN'] = 'Wann';
+$lang['de_DE']['CMSSiteTreeFilter']['ALL'] = 'Alle Seiten';
+$lang['de_DE']['CMSSiteTreeFilter']['DELETEDPAGES'] = 'Alle Seiten, einschließlich gelöschter';
 $lang['de_DE']['CommentAdmin']['ACCEPT'] = 'Akzeptiert';
 $lang['de_DE']['CommentAdmin']['APPROVED'] = '%s Kommentare akzeptiert.';
 $lang['de_DE']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Überprüfte Kommentare';
@@ -221,6 +249,21 @@ $lang['de_DE']['CommentTableField.ss']['NOITEMSFOUND'] = 'Keine Einträge gefund
 $lang['de_DE']['CommentTableField.ss']['SPAM'] = 'Spam';
 $lang['de_DE']['ComplexTableField']['CLOSEPOPUP'] = 'Popup schließen';
 $lang['de_DE']['ComplexTableField']['SUCCESSADD'] = 'Hinzugefügt %s %s %s';
+$lang['de_DE']['Group']['IMPORTTABTITLE'] = 'Import';
+$lang['de_DE']['Group']['RolesAddEditLink'] = 'Rollen hinzufügen/editieren';
+$lang['de_DE']['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>';
+$lang['de_DE']['GroupImportForm']['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>';
+$lang['de_DE']['GroupImportForm']['ResultCreated'] = '%d Gruppen erstellt';
+$lang['de_DE']['GroupImportForm']['ResultDeleted'] = '%d Gruppen gelöscht';
+$lang['de_DE']['GroupImportForm']['ResultUpdated'] = '%d Gruppen aktualisiert';
 $lang['de_DE']['ImageEditor.ss']['ACTIONS'] = 'Aktionen';
 $lang['de_DE']['ImageEditor.ss']['ADJUST'] = 'anpassen';
 $lang['de_DE']['ImageEditor.ss']['APPLY'] = 'Übernehmen';
@@ -279,11 +322,40 @@ $lang['de_DE']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Seitenansicht:';
 $lang['de_DE']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' erfolgreich veröffentlicht';
 $lang['de_DE']['LeftAndMain']['STATUSTO'] = 'Status geändert: \'%s\'';
 $lang['de_DE']['LeftAndMain']['TREESITECONTENT'] = 'Seiteninhalt';
+$lang['de_DE']['LeftAndMain_right.ss']['WELCOMETO'] = 'Willkommen zu';
+$lang['de_DE']['MathSpamProtection']['EIGHT'] = 'acht';
+$lang['de_DE']['MathSpamProtection']['EIGHTEEN'] = 'achtzehn';
+$lang['de_DE']['MathSpamProtection']['ELEVEN'] = 'elf';
+$lang['de_DE']['MathSpamProtection']['FIFTEEN'] = 'fünfzehn';
+$lang['de_DE']['MathSpamProtection']['FIVE'] = 'fünf';
+$lang['de_DE']['MathSpamProtection']['FOUR'] = 'vier';
+$lang['de_DE']['MathSpamProtection']['FOURTEEN'] = 'vierzehn';
+$lang['de_DE']['MathSpamProtection']['NINE'] = 'neun';
+$lang['de_DE']['MathSpamProtection']['ONE'] = 'ein';
+$lang['de_DE']['MathSpamProtection']['SEVEN'] = 'sieben';
+$lang['de_DE']['MathSpamProtection']['SEVENTEEN'] = 'siebzehn';
+$lang['de_DE']['MathSpamProtection']['SIX'] = 'sechs';
+$lang['de_DE']['MathSpamProtection']['SIXTEEN'] = 'sechzehn';
+$lang['de_DE']['MathSpamProtection']['TEN'] = 'zehn';
+$lang['de_DE']['MathSpamProtection']['THIRTEEN'] = 'dreizehn';
+$lang['de_DE']['MathSpamProtection']['THREE'] = 'drei';
 $lang['de_DE']['MathSpamProtection']['TWELVE'] = 'zwölf';
 $lang['de_DE']['MathSpamProtection']['TWO'] = 'zwei';
 $lang['de_DE']['MathSpamProtection']['WHATIS'] = 'Was gibt %s plus %s ?';
 $lang['de_DE']['MathSpamProtection']['ZERO'] = 'null';
+$lang['de_DE']['MemberImportForm']['Help1'] = '<p>Mitglieder im <em>CSV</em>-Format (kommaseparierte Werte) importieren. <small><a href="#" class="toggle-advanced">Erweiterte Nutzung</a></small></p>';
+$lang['de_DE']['MemberImportForm']['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>';
+$lang['de_DE']['MemberImportForm']['ResultCreated'] = '%d Mitglieder erstellt';
+$lang['de_DE']['MemberImportForm']['ResultDeleted'] = '%d Mitglieder gelöscht';
 $lang['de_DE']['MemberImportForm']['ResultNone'] = 'Keine Änderungen';
+$lang['de_DE']['MemberImportForm']['ResultUpdated'] = '%d Mitglieder aktualisiert';
 $lang['de_DE']['MemberList.ss']['FILTER'] = 'filtern';
 $lang['de_DE']['MemberList_PageControls.ss']['DISPLAYING'] = 'Anzeigen';
 $lang['de_DE']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'Mitglieder';
@@ -388,18 +460,27 @@ $lang['de_DE']['PageCommentInterface_singlecomment.ss']['ISNTSPAM'] = 'dieser Ko
 $lang['de_DE']['PageCommentInterface_singlecomment.ss']['ISSPAM'] = 'dieser Kommentar ist Spam';
 $lang['de_DE']['PageCommentInterface_singlecomment.ss']['PBY'] = 'Erstellt von';
 $lang['de_DE']['PageCommentInterface_singlecomment.ss']['REMCOM'] = 'entferne diesen Kommentar';
+$lang['de_DE']['Permission']['CMS_ACCESS_CATEGORY'] = 'CMS Zugriff';
+$lang['de_DE']['Permissions']['PERMISSIONS_CATEGORY'] = 'Rollen und Zugriffsberechtigungen';
 $lang['de_DE']['ReportAdmin']['MENUTITLE'] = 'Berichte';
 $lang['de_DE']['ReportAdmin_left.ss']['REPORTS'] = 'Berichte';
 $lang['de_DE']['ReportAdmin_right.ss']['WELCOME1'] = 'Willkommen bei der';
 $lang['de_DE']['ReportAdmin_right.ss']['WELCOME2'] = 'Berichtebereich. Bitte wählen Sie einen Bericht auf der linken Seite.';
 $lang['de_DE']['ReportAdmin_SiteTree.ss']['REPORTS'] = 'Berichte';
+$lang['de_DE']['SecurityAdmin']['ACCESS_HELP'] = 'Benutzer hinzufügen, anzeigen und editieren sowie diesen Berechtigungen und Rollen zuweisen.';
 $lang['de_DE']['SecurityAdmin']['ADDMEMBER'] = 'Mitglied hinzufügen';
+$lang['de_DE']['SecurityAdmin']['APPLY_ROLES'] = 'Rollen zu Gruppen zuweisen';
+$lang['de_DE']['SecurityAdmin']['APPLY_ROLES_HELP'] = 'Möglichkeit die Zuweisungen von Rollen zu Gruppen zu editieren. Erfordert Zugriff auf den Bereich "Sicherheit".';
 $lang['de_DE']['SecurityAdmin']['EDITPERMISSIONS'] = 'Bearbeiten der Rechte und IP-Adressen für jede Gruppe';
+$lang['de_DE']['SecurityAdmin']['EDITPERMISSIONS_HELP'] = 'Möglichkeit Berechtigungen und IP-Adressen einer Gruppen zu editieren. Erfordert Zugriff auf den Bereich "Sicherheit".';
+$lang['de_DE']['SecurityAdmin']['MemberListCaution'] = 'Achtung: Das Entfernen von Mitgliedern aus dieser Liste löscht diese auch aus der Datenbank sowie die entsprechenden Gruppenzuweisungen.';
 $lang['de_DE']['SecurityAdmin']['MENUTITLE'] = 'Sicherheit';
 $lang['de_DE']['SecurityAdmin']['MENUTITLE'] = 'Sicherheit';
 $lang['de_DE']['SecurityAdmin']['NEWGROUP'] = 'Neue Gruppe';
 $lang['de_DE']['SecurityAdmin']['SAVE'] = 'Speichern';
 $lang['de_DE']['SecurityAdmin']['SGROUPS'] = 'Sicherheitsgruppen';
+$lang['de_DE']['SecurityAdmin']['TABIMPORT'] = 'Import';
+$lang['de_DE']['SecurityAdmin']['TABROLES'] = 'Rollen';
 $lang['de_DE']['SecurityAdmin_left.ss']['CREATE'] = 'Erstellen';
 $lang['de_DE']['SecurityAdmin_left.ss']['DEL'] = 'Löschen';
 $lang['de_DE']['SecurityAdmin_left.ss']['DELGROUPS'] = 'Lösche die markierten Gruppen';
@@ -408,16 +489,29 @@ $lang['de_DE']['SecurityAdmin_left.ss']['GO'] = 'Los';
 $lang['de_DE']['SecurityAdmin_left.ss']['SECGROUPS'] = 'Sicherheitsgruppen';
 $lang['de_DE']['SecurityAdmin_left.ss']['SELECT'] = 'Markieren Sie die Seiten, die Sie löschen wollen und klicken Sie danach auf die Schaltfläche';
 $lang['de_DE']['SecurityAdmin_left.ss']['TOREORG'] = 'Um Ihre Seiten neu zu ordnen, ziehen Sie die Seiten an die gewünschte Stelle.';
+$lang['de_DE']['SecurityAdmin_MemberImportForm']['BtnImport'] = 'Import';
+$lang['de_DE']['SecurityAdmin_MemberImportForm']['FileFieldLabel'] = 'CSV Datei <small>(Erlaubte Dateierweiterung: *.csv)</small>';
 $lang['de_DE']['SecurityAdmin_right.ss']['WELCOME1'] = 'Willkommen bei dem';
 $lang['de_DE']['SecurityAdmin_right.ss']['WELCOME2'] = 'Sicherheitsadministrationsbereich. Bitte wählen Sie eine Gruppe auf der linken Seite.';
+$lang['de_DE']['SideReport']['BROKENFILES'] = 'Seiten mit defekten Links';
+$lang['de_DE']['SideReport']['BROKENLINKS'] = 'Seiten mit defekten Links';
+$lang['de_DE']['SideReport']['BrokenLinksGroupTitle'] = 'Defekte Links';
+$lang['de_DE']['SideReport']['BROKENREDIRECTORPAGES'] = 'Weiterleitungen, die auf gelöschte Seiten verweisen';
+$lang['de_DE']['SideReport']['BROKENVIRTUALPAGES'] = 'Virtuelle Seiten, die auf gelöschte Seiten verweisen';
+$lang['de_DE']['SideReport']['ContentGroupTitle'] = 'Inhaltsberichte';
 $lang['de_DE']['SideReport']['EMPTYPAGES'] = 'Leere Seiten';
 $lang['de_DE']['SideReport']['LAST2WEEKS'] = 'Seiten die in den letzten zwei Wochen hinzugefügt wurden';
+$lang['de_DE']['SideReport']['OtherGroupTitle'] = 'andere';
+$lang['de_DE']['SideReport']['ParameterLiveCheckbox'] = 'Veröffentlichte Seite überprüfen';
 $lang['de_DE']['SideReport']['REPEMPTY'] = 'Der %s -Bericht ist leer';
 $lang['de_DE']['SideReport']['TODO'] = 'zu tun';
 $lang['de_DE']['StaticExporter']['BASEURL'] = 'Ausgangs URL';
 $lang['de_DE']['StaticExporter']['EXPORTTO'] = 'Exportieren in diesen Ordner';
 $lang['de_DE']['StaticExporter']['FOLDEREXPORT'] = 'Ordner zum exportieren';
 $lang['de_DE']['StaticExporter']['NAME'] = 'statischer Exporter';
+$lang['de_DE']['TableListField.ss']['NOITEMSFOUND'] = 'Keine Einträge gefunden';
+$lang['de_DE']['TableListField.ss']['SORTASC'] = 'Aufsteigend sortieren';
+$lang['de_DE']['TableListField.ss']['SORTDESC'] = 'Absteigend sortieren';
 $lang['de_DE']['TableListField_PageControls.ss']['DISPLAYING'] = 'Zeige';
 $lang['de_DE']['TableListField_PageControls.ss']['OF'] = 'von';
 $lang['de_DE']['TableListField_PageControls.ss']['TO'] = 'bis';
@@ -434,9 +528,12 @@ $lang['de_DE']['ViewArchivedEmail.ss']['CANACCESS'] = 'Sie können unter folgend
 $lang['de_DE']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Sie haben darum gebeten, den Inhalt unserer Seite zu sehen, am';
 $lang['de_DE']['WaitingOn.ss']['ATO'] = 'zugewiesen an';
 $lang['de_DE']['WidgetAreaEditor.ss']['AVAILABLE'] = 'Verfügbare Widgets';
+$lang['de_DE']['WidgetAreaEditor.ss']['AVAILWIDGETS'] = 'Klicken Sie auf den Titel eines Widgets um diese für diese Seite zu verwenden.';
 $lang['de_DE']['WidgetAreaEditor.ss']['INUSE'] = 'Zur Zeit genutzte Widgets';
 $lang['de_DE']['WidgetAreaEditor.ss']['NOAVAIL'] = 'Zur Zeit sind keine Widgets verfügbar.';
 $lang['de_DE']['WidgetAreaEditor.ss']['TOADD'] = 'Um ein Widget hinzuzufügen, klicken Sie es an und ziehen es hier her.';
+$lang['de_DE']['WidgetAreaEditor.ss']['TOSORT'] = 'Bereits eingebundene Widgets können per Drag&Drap umsortiert werden.';
+$lang['de_DE']['WidgetDescription.ss']['CLICKTOADDWIDGET'] = 'Klick Sie hier um das Widget hinzuzufünge';
 $lang['de_DE']['WidgetEditor.ss']['DELETE'] = 'Gelöscht';
 
 ?>
\ No newline at end of file
diff --git a/lang/en_GB.php b/lang/en_GB.php
index 021e3c97..225aca1b 100644
--- a/lang/en_GB.php
+++ b/lang/en_GB.php
@@ -16,7 +16,7 @@ if(array_key_exists('en_GB', $lang) && is_array($lang['en_GB'])) {
 	$lang['en_GB'] = $lang['en_US'];
 }
 
-$lang['en_GB']['AssetAdmin']['CHOOSEFILE'] = 'Choose file ';
+$lang['en_GB']['AssetAdmin']['CHOOSEFILE'] = 'Choose file:';
 $lang['en_GB']['AssetAdmin']['DELETEDX'] = 'Deleted %s files.%s';
 $lang['en_GB']['AssetAdmin']['FILESREADY'] = 'Files ready to upload:';
 $lang['en_GB']['AssetAdmin']['FOLDERDELETED'] = 'folder deleted.';
@@ -31,7 +31,7 @@ $lang['en_GB']['AssetAdmin']['NOWBROKEN'] = 'The following pages now have broken
 $lang['en_GB']['AssetAdmin']['NOWBROKEN2'] = 'Their owners have been emailed and they will fix up those pages.';
 $lang['en_GB']['AssetAdmin']['SAVEDFILE'] = 'Saved file %s';
 $lang['en_GB']['AssetAdmin']['SAVEFOLDERNAME'] = 'Save folder name';
-$lang['en_GB']['AssetAdmin']['THUMBSDELETED'] = 'All unused thumbnails have been deleted';
+$lang['en_GB']['AssetAdmin']['THUMBSDELETED'] = '%s unused thumbnails have been deleted';
 $lang['en_GB']['AssetAdmin']['UPLOAD'] = 'Upload Files Listed Below';
 $lang['en_GB']['AssetAdmin']['UPLOADEDX'] = 'Uploaded %s files';
 $lang['en_GB']['AssetAdmin_left.ss']['CREATE'] = 'Create';
@@ -69,8 +69,8 @@ $lang['en_GB']['AssetTableField']['SWFFILEOPTIONS'] = 'SWF File Options';
 $lang['en_GB']['AssetTableField']['TITLE'] = 'Title';
 $lang['en_GB']['AssetTableField']['TYPE'] = 'Type';
 $lang['en_GB']['AssetTableField']['URL'] = 'URL';
-$lang['en_GB']['CMSMain']['ACCESS'] = 'Access to \'%s\' (%s)';
-$lang['en_GB']['CMSMain']['ACCESSALLINTERFACES'] = 'Access to all CMS interfaces';
+$lang['en_GB']['CMSMain']['ACCESS'] = 'Access to \'%s\' section';
+$lang['en_GB']['CMSMain']['ACCESSALLINTERFACES'] = 'Access to all CMS sections';
 $lang['en_GB']['CMSMain']['CANCEL'] = 'Cancel';
 $lang['en_GB']['CMSMain']['CHOOSEREPORT'] = '(Choose a report)';
 $lang['en_GB']['CMSMain']['COMPARINGV'] = 'Comparing versions %s and %s';
@@ -80,7 +80,7 @@ $lang['en_GB']['CMSMain']['DESCREMOVED'] = 'and %s descendants';
 $lang['en_GB']['CMSMain']['EMAIL'] = 'Email';
 $lang['en_GB']['CMSMain']['GO'] = 'Go';
 $lang['en_GB']['CMSMain']['MENUTITLE'] = 'Site Content';
-$lang['en_GB']['CMSMain']['MENUTITLE'] = 'Site Content';
+$lang['en_GB']['CMSMain']['MENUTITLE'] = 'Pages';
 $lang['en_GB']['CMSMain']['METADESCOPT'] = 'Description';
 $lang['en_GB']['CMSMain']['METAKEYWORDSOPT'] = 'Keywords';
 $lang['en_GB']['CMSMain']['NEW'] = 'New';
@@ -123,7 +123,7 @@ $lang['en_GB']['CMSMain']['WORKTODO'] = 'You have work to do on these <b>%d</b>
 $lang['en_GB']['CMSMain_dialog.ss']['BUTTONNOTFOUND'] = 'Couldn\'t find the button name';
 $lang['en_GB']['CMSMain_dialog.ss']['NOLINKED'] = 'Can\'t find window.linkedObject to send the button click back to the main window';
 $lang['en_GB']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'Added to the draft site and not published yet';
-$lang['en_GB']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Add Criteria...';
+$lang['en_GB']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Add Criteria';
 $lang['en_GB']['CMSMain_left.ss']['BATCHACTIONS'] = 'Batch Actions';
 $lang['en_GB']['CMSMain_left.ss']['CHANGED'] = 'changed';
 $lang['en_GB']['CMSMain_left.ss']['CLOSEBOX'] = 'click to close box';
@@ -146,7 +146,7 @@ $lang['en_GB']['CMSMain_left.ss']['SEARCHTITLE'] = 'Search through URL, Title, M
 $lang['en_GB']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Select the pages that you want to change &amp; then click an action:';
 $lang['en_GB']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Show only changed pages';
 $lang['en_GB']['CMSMain_left.ss']['SHOWUNPUB'] = 'Show unpublished versions';
-$lang['en_GB']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Site Content and Structure';
+$lang['en_GB']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Page Tree';
 $lang['en_GB']['CMSMain_left.ss']['SITEREPORTS'] = 'Site Reports';
 $lang['en_GB']['CMSMain_right.ss']['ANYMESSAGE'] = 'Do you have any message for your editor?';
 $lang['en_GB']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Please choose a page from the left.';
@@ -156,7 +156,7 @@ $lang['en_GB']['CMSMain_right.ss']['SENDTO'] = 'Send to';
 $lang['en_GB']['CMSMain_right.ss']['STATUS'] = 'Status';
 $lang['en_GB']['CMSMain_right.ss']['SUBMIT'] = 'Submit for approval';
 $lang['en_GB']['CMSMain_right.ss']['WELCOMETO'] = 'Welcome to';
-$lang['en_GB']['CMSMain_versions.ss']['AUTHOR'] = 'Author';
+$lang['en_GB']['CMSMain_versions.ss']['AUTHOR'] = 'User';
 $lang['en_GB']['CMSMain_versions.ss']['NOTPUB'] = 'Not published';
 $lang['en_GB']['CMSMain_versions.ss']['PUBR'] = 'Publisher';
 $lang['en_GB']['CMSMain_versions.ss']['UNKNOWN'] = 'Unknown';
@@ -234,7 +234,7 @@ $lang['en_GB']['LeftAndMain']['HELP'] = 'Help';
 $lang['en_GB']['LeftAndMain']['PAGETYPE'] = 'Page type:';
 $lang['en_GB']['LeftAndMain']['PERMAGAIN'] = 'You have been logged out of the CMS. If you would like to log in again, enter a username and password below.';
 $lang['en_GB']['LeftAndMain']['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';
-$lang['en_GB']['LeftAndMain']['PERMDEFAULT'] = 'Enter your email address and password to access the CMS.';
+$lang['en_GB']['LeftAndMain']['PERMDEFAULT'] = 'Please choose an authentication method and enter your credentials to access the CMS.';
 $lang['en_GB']['LeftAndMain']['PLEASESAVE'] = 'Please Save Page: This page could not be updated because it hasn\'t been saved yet.';
 $lang['en_GB']['LeftAndMain']['REPORTS'] = 'Reports';
 $lang['en_GB']['LeftAndMain']['REQUESTERROR'] = 'Error in request';
@@ -252,7 +252,7 @@ $lang['en_GB']['LeftAndMain.ss']['EDITINCMS'] = 'Edit this page in the CMS';
 $lang['en_GB']['LeftAndMain.ss']['EDITPROFILE'] = 'Profile';
 $lang['en_GB']['LeftAndMain.ss']['LOADING'] = 'Loading...';
 $lang['en_GB']['LeftAndMain.ss']['LOGGEDINAS'] = 'Logged in as';
-$lang['en_GB']['LeftAndMain.ss']['LOGOUT'] = 'log out';
+$lang['en_GB']['LeftAndMain.ss']['LOGOUT'] = 'Log out';
 $lang['en_GB']['LeftAndMain.ss']['PUBLIS'] = 'Published Site';
 $lang['en_GB']['LeftAndMain.ss']['REQUIREJS'] = 'The CMS requires that you have JavaScript enabled.';
 $lang['en_GB']['LeftAndMain.ss']['SSWEB'] = 'Silverstripe Website';
@@ -299,7 +299,7 @@ $lang['en_GB']['ModelAdmin']['ADDBUTTON'] = 'Add';
 $lang['en_GB']['ModelAdmin']['ADDFORM'] = 'Fill out this form to add a %s to the database.';
 $lang['en_GB']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Select result columns...';
 $lang['en_GB']['ModelAdmin']['CLEAR_SEARCH'] = 'Clear Search';
-$lang['en_GB']['ModelAdmin']['CREATEBUTTON'] = 'Creat \'%s\'';
+$lang['en_GB']['ModelAdmin']['CREATEBUTTON'] = 'Create \'%s\'';
 $lang['en_GB']['ModelAdmin']['DELETE'] = 'Delete';
 $lang['en_GB']['ModelAdmin']['DELETEDRECORDS'] = 'Deleted %s records.';
 $lang['en_GB']['ModelAdmin']['FOUNDRESULTS'] = 'Your search found %s matching items';
@@ -360,12 +360,12 @@ $lang['en_GB']['ReportAdmin_right.ss']['WELCOME1'] = 'Welcome to the';
 $lang['en_GB']['ReportAdmin_right.ss']['WELCOME2'] = 'reporting section. Please choose a specific report from the left.';
 $lang['en_GB']['ReportAdmin_SiteTree.ss']['REPORTS'] = 'Reports';
 $lang['en_GB']['SecurityAdmin']['ADDMEMBER'] = 'Add Member';
-$lang['en_GB']['SecurityAdmin']['EDITPERMISSIONS'] = 'Edit permissions and IP addresses on each group';
+$lang['en_GB']['SecurityAdmin']['EDITPERMISSIONS'] = 'Manage permissions for groups';
 $lang['en_GB']['SecurityAdmin']['MENUTITLE'] = 'Security';
 $lang['en_GB']['SecurityAdmin']['MENUTITLE'] = 'Security';
 $lang['en_GB']['SecurityAdmin']['NEWGROUP'] = 'New Group';
 $lang['en_GB']['SecurityAdmin']['SAVE'] = 'Save';
-$lang['en_GB']['SecurityAdmin']['SGROUPS'] = 'Security groups';
+$lang['en_GB']['SecurityAdmin']['SGROUPS'] = 'Security Groups';
 $lang['en_GB']['SecurityAdmin_left.ss']['CREATE'] = 'Create';
 $lang['en_GB']['SecurityAdmin_left.ss']['DEL'] = 'Delete';
 $lang['en_GB']['SecurityAdmin_left.ss']['DELGROUPS'] = 'Delete the selected groups';
@@ -376,10 +376,10 @@ $lang['en_GB']['SecurityAdmin_left.ss']['SELECT'] = 'Select the pages that you w
 $lang['en_GB']['SecurityAdmin_left.ss']['TOREORG'] = 'To reorganise your site, drag the pages around as desired.';
 $lang['en_GB']['SecurityAdmin_right.ss']['WELCOME1'] = 'Welcome to the';
 $lang['en_GB']['SecurityAdmin_right.ss']['WELCOME2'] = 'security administration section. Please choose a group from the left.';
-$lang['en_GB']['SideReport']['EMPTYPAGES'] = 'Empty pages';
+$lang['en_GB']['SideReport']['EMPTYPAGES'] = 'Pages with no content';
 $lang['en_GB']['SideReport']['LAST2WEEKS'] = 'Pages edited in the last 2 weeks';
 $lang['en_GB']['SideReport']['REPEMPTY'] = 'The %s report is empty.';
-$lang['en_GB']['SideReport']['TODO'] = 'To do';
+$lang['en_GB']['SideReport']['TODO'] = 'Pages with To Do items';
 $lang['en_GB']['StaticExporter']['BASEURL'] = 'Base URL';
 $lang['en_GB']['StaticExporter']['EXPORTTO'] = 'Export to that folder';
 $lang['en_GB']['StaticExporter']['FOLDEREXPORT'] = 'Folder to export to';
diff --git a/lang/eo_XX.php b/lang/eo_XX.php
index e1693b51..4c9b0d1b 100644
--- a/lang/eo_XX.php
+++ b/lang/eo_XX.php
@@ -16,6 +16,7 @@ if(array_key_exists('eo_XX', $lang) && is_array($lang['eo_XX'])) {
 	$lang['eo_XX'] = $lang['en_US'];
 }
 
+$lang['eo_XX']['']['CHOOSEPAGE'] = 'Bonvolu elekti eron maldekstre';
 $lang['eo_XX']['AssetAdmin']['CHOOSEFILE'] = 'Elekti dosieron:';
 $lang['eo_XX']['AssetAdmin']['DELETEDX'] = 'Forigis %s dosierojn.%s';
 $lang['eo_XX']['AssetAdmin']['FILESREADY'] = 'Dosieroj pretaj por alŝutiĝi:';
@@ -72,8 +73,29 @@ $lang['eo_XX']['AssetTableField']['SWFFILEOPTIONS'] = 'Agordoj de SWF-dosieroj';
 $lang['eo_XX']['AssetTableField']['TITLE'] = 'Titolo';
 $lang['eo_XX']['AssetTableField']['TYPE'] = 'Tipo';
 $lang['eo_XX']['AssetTableField']['URL'] = 'URL';
+$lang['eo_XX']['BrokenLinksReport']['BROKENLINKS'] = 'Raporto pri rompitaj ligiloj';
+$lang['eo_XX']['BrokenLinksReport']['CheckSiteDropdownDraft'] = 'Malneta retejo';
+$lang['eo_XX']['BrokenLinksReport']['CheckSiteDropdownPublished'] = 'Publika retejo';
+$lang['eo_XX']['BrokenLinksReport']['ColumnDateLastModified'] = 'Dato de lasta modifo';
+$lang['eo_XX']['BrokenLinksReport']['ColumnDateLastPublished'] = 'Dato de lasta publikigo';
+$lang['eo_XX']['BrokenLinksReport']['ColumnProblemType'] = 'Problemtipo';
+$lang['eo_XX']['BrokenLinksReport']['ColumnURL'] = 'URL';
+$lang['eo_XX']['BrokenLinksReport']['HasBrokenFile'] = 'havas rompitan dosieron';
+$lang['eo_XX']['BrokenLinksReport']['HasBrokenLink'] = 'havas rompitan ligilon';
+$lang['eo_XX']['BrokenLinksReport']['HasBrokenLinkAndFile'] = 'havas rompitan ligilon kaj dosieron';
+$lang['eo_XX']['BrokenLinksReport']['HoverTitleEditPage'] = 'Redakti paĝon';
+$lang['eo_XX']['BrokenLinksReport']['ReasonDropdown'] = 'Problemo kontrolota';
+$lang['eo_XX']['BrokenLinksReport']['ReasonDropdownBROKENFILE'] = 'Rompita dosiero';
+$lang['eo_XX']['BrokenLinksReport']['ReasonDropdownBROKENLINK'] = 'Rompita ligilo';
+$lang['eo_XX']['BrokenLinksReport']['ReasonDropdownRPBROKENLINK'] = 'Alidirekta paĝo direktanta al neekzistanta paĝo';
+$lang['eo_XX']['BrokenLinksReport']['ReasonDropdownVPBROKENLINK'] = 'Virtuala paĝo direktanta al neekzistanta paĝo';
+$lang['eo_XX']['BrokenLinksReport']['RedirectorNonExistent'] = 'alidirekta paĝo direktanta al neekzistanta paĝo';
+$lang['eo_XX']['BrokenLinksReport']['VirtualPageNonExistent'] = 'virtuala paĝo direktanta al neekzistanta paĝo';
+$lang['eo_XX']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = 'Forigis %d paĝojn el la malneta retejo; %d malsukcesis';
 $lang['eo_XX']['CMSBatchActions']['DELETED_PAGES'] = 'Forigis %d paĝojn el la publikigita retejo';
+$lang['eo_XX']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Forigi el malneta retejo';
 $lang['eo_XX']['CMSBatchActions']['DELETE_PAGES'] = 'Forigi el publikigita retejo.';
+$lang['eo_XX']['CMSBatchActions']['DELETING_DRAFT_PAGES'] = 'Forigas elektitajn paĝojn el la malneta retejo';
 $lang['eo_XX']['CMSBatchActions']['DELETING_PAGES'] = 'Forigas elektitajn paĝojn el la publikigita retejo.';
 $lang['eo_XX']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Publikigis %d paĝojn';
 $lang['eo_XX']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Publikigas paĝojn';
@@ -81,8 +103,10 @@ $lang['eo_XX']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publikigi';
 $lang['eo_XX']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'Malpublikigis %d paĝojn';
 $lang['eo_XX']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'Malpublikigas paĝojn';
 $lang['eo_XX']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'Malpublikigi';
-$lang['eo_XX']['CMSMain']['ACCESS'] = 'Aliro al \'%s\' (%s)';
+$lang['eo_XX']['CMSMain']['ACCESS'] = 'Aliro al sekcio \'%s\'';
 $lang['eo_XX']['CMSMain']['ACCESSALLINTERFACES'] = 'Aliro al ĉiuj interfacoj de CMS';
+$lang['eo_XX']['CMSMain']['ACCESSALLINTERFACESHELP'] = 'Nuligas pli specifajn alirajn agordojn.';
+$lang['eo_XX']['CMSMain']['ACCESS_HELP'] = 'Permesi vidigi la sekcion kiu enhavas paĝarbon kaj enhavon. Vidigaj kaj redaktaj permesoj estas trakteblaj per paĝspecifaj fallistoj, kaj ankaŭ la apartaj "Enhavaj permesoj".';
 $lang['eo_XX']['CMSMain']['CANCEL'] = 'Rezigni';
 $lang['eo_XX']['CMSMain']['CHOOSEREPORT'] = '(Elektu raporton)';
 $lang['eo_XX']['CMSMain']['COMPARINGV'] = 'Vi komparas versiojn #%d kaj #%d';
@@ -92,7 +116,7 @@ $lang['eo_XX']['CMSMain']['DESCREMOVED'] = 'kaj %s posteuloj';
 $lang['eo_XX']['CMSMain']['EMAIL'] = 'Retpoŝto';
 $lang['eo_XX']['CMSMain']['GO'] = 'Ek';
 $lang['eo_XX']['CMSMain']['MENUTITLE'] = 'Enhavo de Retejo';
-$lang['eo_XX']['CMSMain']['MENUTITLE'] = 'Enhavo de Retejo';
+$lang['eo_XX']['CMSMain']['MENUTITLE'] = 'Paĝoj';
 $lang['eo_XX']['CMSMain']['MENUTITLEOPT'] = 'Naviga Etikedo';
 $lang['eo_XX']['CMSMain']['METADESCOPT'] = 'Priskribo';
 $lang['eo_XX']['CMSMain']['METAKEYWORDSOPT'] = 'Ŝlosilvortoj';
@@ -139,6 +163,7 @@ $lang['eo_XX']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'Enmetita en la projektan ret
 $lang['eo_XX']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Enmetu Kriteriojn...';
 $lang['eo_XX']['CMSMain_left.ss']['BATCHACTIONS'] = 'Staplaj Agoj';
 $lang['eo_XX']['CMSMain_left.ss']['CHANGED'] = 'ŝanĝita';
+$lang['eo_XX']['CMSMain_left.ss']['CLEAR'] = 'Vakigi';
 $lang['eo_XX']['CMSMain_left.ss']['CLEARTITLE'] = 'Vakigi la serĉon kaj vidigi ĉiujn erojn';
 $lang['eo_XX']['CMSMain_left.ss']['CLOSEBOX'] = 'alklaku por fermi kadron';
 $lang['eo_XX']['CMSMain_left.ss']['COMPAREMODE'] = 'Kompara reĝimo (alklaku je 2 malsupre)';
@@ -160,9 +185,10 @@ $lang['eo_XX']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Eldoni la elektitajn paĝ
 $lang['eo_XX']['CMSMain_left.ss']['SEARCH'] = 'Serĉi';
 $lang['eo_XX']['CMSMain_left.ss']['SEARCHTITLE'] = 'Serĉu tra URL, Titolo, Menua Titolo, kaj Enhavo';
 $lang['eo_XX']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Elektu la paĝojn ŝanĝotajn kaj alklaku agon:';
+$lang['eo_XX']['CMSMain_left.ss']['SHOWITEMS'] = 'Vidigi:';
 $lang['eo_XX']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Montru nur ŝanĝitajn paĝojn';
 $lang['eo_XX']['CMSMain_left.ss']['SHOWUNPUB'] = 'Montri nepublikigitajn versiojn';
-$lang['eo_XX']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Enhavo kaj Strukturo de Retejo ';
+$lang['eo_XX']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Paĝa arbo';
 $lang['eo_XX']['CMSMain_left.ss']['SITEREPORTS'] = 'Raportoj de Retejo';
 $lang['eo_XX']['CMSMain_right.ss']['ANYMESSAGE'] = 'Ĉu vi havas mesaĝon por via redaktoro?';
 $lang['eo_XX']['CMSMain_right.ss']['CHOOSEPAGE'] = 'Bonvolu elekti paĝon maldekstre.';
@@ -177,6 +203,8 @@ $lang['eo_XX']['CMSMain_versions.ss']['NOTPUB'] = 'Ne eldonita';
 $lang['eo_XX']['CMSMain_versions.ss']['PUBR'] = 'Eldonejo';
 $lang['eo_XX']['CMSMain_versions.ss']['UNKNOWN'] = 'Nekonata';
 $lang['eo_XX']['CMSMain_versions.ss']['WHEN'] = 'Kiam';
+$lang['eo_XX']['CMSSiteTreeFilter']['ALL'] = 'Ĉiuj eroj';
+$lang['eo_XX']['CMSSiteTreeFilter']['DELETEDPAGES'] = 'Ĉiuj paĝoj, inkluzive forigitajn';
 $lang['eo_XX']['CommentAdmin']['ACCEPT'] = 'Akcepti';
 $lang['eo_XX']['CommentAdmin']['APPROVED'] = 'Akceptis %s komentojn.';
 $lang['eo_XX']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Aprobitaj Komentoj';
@@ -221,6 +249,21 @@ $lang['eo_XX']['CommentTableField.ss']['NOITEMSFOUND'] = 'Ne trovis erojn';
 $lang['eo_XX']['CommentTableField.ss']['SPAM'] = 'spamo';
 $lang['eo_XX']['ComplexTableField']['CLOSEPOPUP'] = 'Fermi Ŝprucfenestron';
 $lang['eo_XX']['ComplexTableField']['SUCCESSADD'] = 'Enmetis %s %s %s';
+$lang['eo_XX']['Group']['IMPORTTABTITLE'] = 'Importi';
+$lang['eo_XX']['Group']['RolesAddEditLink'] = 'Aldoni/redakti rolojn';
+$lang['eo_XX']['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>';
+$lang['eo_XX']['GroupImportForm']['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>';
+$lang['eo_XX']['GroupImportForm']['ResultCreated'] = 'Kreis %d grupojn';
+$lang['eo_XX']['GroupImportForm']['ResultDeleted'] = 'Forigis %d grupojn';
+$lang['eo_XX']['GroupImportForm']['ResultUpdated'] = 'Aktualigis %d grupojn';
 $lang['eo_XX']['ImageEditor.ss']['ACTIONS'] = 'agoj';
 $lang['eo_XX']['ImageEditor.ss']['ADJUST'] = 'ĝustigi';
 $lang['eo_XX']['ImageEditor.ss']['APPLY'] = 'apliki';
@@ -279,6 +322,40 @@ $lang['eo_XX']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Paĝa vido:';
 $lang['eo_XX']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' sukcese publikigita';
 $lang['eo_XX']['LeftAndMain']['STATUSTO'] = 'Stato ŝanĝiĝis al \'%s\'';
 $lang['eo_XX']['LeftAndMain']['TREESITECONTENT'] = 'Enhavo de Retejo';
+$lang['eo_XX']['LeftAndMain_right.ss']['WELCOMETO'] = 'Bonvenon al';
+$lang['eo_XX']['MathSpamProtection']['EIGHT'] = 'ok';
+$lang['eo_XX']['MathSpamProtection']['EIGHTEEN'] = 'dekok';
+$lang['eo_XX']['MathSpamProtection']['ELEVEN'] = 'dekunu';
+$lang['eo_XX']['MathSpamProtection']['FIFTEEN'] = 'dekkvin';
+$lang['eo_XX']['MathSpamProtection']['FIVE'] = 'kvin';
+$lang['eo_XX']['MathSpamProtection']['FOUR'] = 'kvar';
+$lang['eo_XX']['MathSpamProtection']['FOURTEEN'] = 'dekkvar';
+$lang['eo_XX']['MathSpamProtection']['NINE'] = 'naŭ';
+$lang['eo_XX']['MathSpamProtection']['ONE'] = 'unu';
+$lang['eo_XX']['MathSpamProtection']['SEVEN'] = 'sep';
+$lang['eo_XX']['MathSpamProtection']['SEVENTEEN'] = 'deksep';
+$lang['eo_XX']['MathSpamProtection']['SIX'] = 'ses';
+$lang['eo_XX']['MathSpamProtection']['SIXTEEN'] = 'dekses';
+$lang['eo_XX']['MathSpamProtection']['TEN'] = 'dek';
+$lang['eo_XX']['MathSpamProtection']['THIRTEEN'] = 'dektri';
+$lang['eo_XX']['MathSpamProtection']['THREE'] = 'tri';
+$lang['eo_XX']['MathSpamProtection']['TWELVE'] = 'dekdu';
+$lang['eo_XX']['MathSpamProtection']['TWO'] = 'du';
+$lang['eo_XX']['MathSpamProtection']['WHATIS'] = 'Kiom estas %s plus %s?';
+$lang['eo_XX']['MathSpamProtection']['ZERO'] = 'nul';
+$lang['eo_XX']['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>';
+$lang['eo_XX']['MemberImportForm']['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>';
+$lang['eo_XX']['MemberImportForm']['ResultCreated'] = 'Kreis %d membrojn';
+$lang['eo_XX']['MemberImportForm']['ResultDeleted'] = 'Forigis %d membrojn';
+$lang['eo_XX']['MemberImportForm']['ResultNone'] = 'Neniu ŝanĝo';
+$lang['eo_XX']['MemberImportForm']['ResultUpdated'] = 'Aktualigis %d membrojn';
 $lang['eo_XX']['MemberList.ss']['FILTER'] = 'Filtrilo';
 $lang['eo_XX']['MemberList_PageControls.ss']['DISPLAYING'] = 'Vidigi';
 $lang['eo_XX']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'membroj';
@@ -300,6 +377,8 @@ $lang['eo_XX']['MemberTableField']['ADDEDTOGROUP'] = 'Enmetis membron en grupon'
 $lang['eo_XX']['MemberTableField']['ADDINGFIELD'] = 'Malsukcesis aldoni';
 $lang['eo_XX']['MemberTableField']['ANYGROUP'] = 'Ajna grupo';
 $lang['eo_XX']['MemberTableField']['ASC'] = 'Kreske';
+$lang['eo_XX']['MemberTableField']['DeleteTitleText'] = 'Forigi el ĉi tiu grupo';
+$lang['eo_XX']['MemberTableField']['DeleteTitleTextDatabase'] = 'Forigi el datumbazo kaj ĉiuj grupoj';
 $lang['eo_XX']['MemberTableField']['DESC'] = 'Malkreske';
 $lang['eo_XX']['MemberTableField']['EMAIL'] = 'Retpoŝto';
 $lang['eo_XX']['MemberTableField']['ERRORADDINGUSER'] = 'Eraro okazis aldonante la uzanton al la grupo: %s';
@@ -381,18 +460,27 @@ $lang['eo_XX']['PageCommentInterface_singlecomment.ss']['ISNTSPAM'] = 'ĉi tiu k
 $lang['eo_XX']['PageCommentInterface_singlecomment.ss']['ISSPAM'] = 'ĉi tiu komento estas spamo';
 $lang['eo_XX']['PageCommentInterface_singlecomment.ss']['PBY'] = 'Sendita de';
 $lang['eo_XX']['PageCommentInterface_singlecomment.ss']['REMCOM'] = 'forigu ĉi tiun komenton';
+$lang['eo_XX']['Permission']['CMS_ACCESS_CATEGORY'] = 'CMS-aliro';
+$lang['eo_XX']['Permissions']['PERMISSIONS_CATEGORY'] = 'Roloj kaj aliraj permesoj';
 $lang['eo_XX']['ReportAdmin']['MENUTITLE'] = 'Raportoj';
 $lang['eo_XX']['ReportAdmin_left.ss']['REPORTS'] = 'Raportoj';
 $lang['eo_XX']['ReportAdmin_right.ss']['WELCOME1'] = 'Bonvenon al la';
 $lang['eo_XX']['ReportAdmin_right.ss']['WELCOME2'] = 'raporta sekcio. Bonvolu elekti specifan raporton maldekstre.';
 $lang['eo_XX']['ReportAdmin_SiteTree.ss']['REPORTS'] = 'Raportoj';
+$lang['eo_XX']['SecurityAdmin']['ACCESS_HELP'] = 'Permesi vidigi, enmeti kaj redakti uzantojn, aldone al agordi permesojn kaj rolojn al ili.';
 $lang['eo_XX']['SecurityAdmin']['ADDMEMBER'] = 'Enmeti Membron';
+$lang['eo_XX']['SecurityAdmin']['APPLY_ROLES'] = 'Apliki roloj al grupoj';
+$lang['eo_XX']['SecurityAdmin']['APPLY_ROLES_HELP'] = 'Eblo redakti la rolojn agorditajn al grupo. Bezonas la permesilon "Aliro al sekcio \'Sekureco\'"';
 $lang['eo_XX']['SecurityAdmin']['EDITPERMISSIONS'] = 'Agordi permesojn kaj IP-adresojn ĉe ĉiu grupo';
+$lang['eo_XX']['SecurityAdmin']['EDITPERMISSIONS_HELP'] = 'Eblo redakti Permesojn kaj IP-adresojn por grupo. Bezonas la permesilon "Aliro al sekcio \'Sekureco\'"';
+$lang['eo_XX']['SecurityAdmin']['MemberListCaution'] = 'Averto: forigi membrojn el ĉi tiu listo forigos ilin el ĉiuj grupoj kaj la datumbazo.';
 $lang['eo_XX']['SecurityAdmin']['MENUTITLE'] = 'Sekureco';
 $lang['eo_XX']['SecurityAdmin']['MENUTITLE'] = 'Sekureco';
 $lang['eo_XX']['SecurityAdmin']['NEWGROUP'] = 'Nova Grupo';
 $lang['eo_XX']['SecurityAdmin']['SAVE'] = 'Konservi';
 $lang['eo_XX']['SecurityAdmin']['SGROUPS'] = 'Grupoj de sekureco';
+$lang['eo_XX']['SecurityAdmin']['TABIMPORT'] = 'Importi';
+$lang['eo_XX']['SecurityAdmin']['TABROLES'] = 'Roloj';
 $lang['eo_XX']['SecurityAdmin_left.ss']['CREATE'] = 'Krei';
 $lang['eo_XX']['SecurityAdmin_left.ss']['DEL'] = 'Forigi';
 $lang['eo_XX']['SecurityAdmin_left.ss']['DELGROUPS'] = 'Forigu la elektitajn grupojn';
@@ -401,16 +489,29 @@ $lang['eo_XX']['SecurityAdmin_left.ss']['GO'] = 'Ek';
 $lang['eo_XX']['SecurityAdmin_left.ss']['SECGROUPS'] = 'Sekurecaj Grupoj';
 $lang['eo_XX']['SecurityAdmin_left.ss']['SELECT'] = 'Elektu la paĝojn forigotajn kaj poste alklaku la butonon sube';
 $lang['eo_XX']['SecurityAdmin_left.ss']['TOREORG'] = 'Por reorganizi vian retejon, ŝovu la paĝojn laŭ deziro.';
+$lang['eo_XX']['SecurityAdmin_MemberImportForm']['BtnImport'] = 'Importi';
+$lang['eo_XX']['SecurityAdmin_MemberImportForm']['FileFieldLabel'] = 'CSV-dosiero <small>(Permesitaj sufiksoj: *.csv)</small>';
 $lang['eo_XX']['SecurityAdmin_right.ss']['WELCOME1'] = 'Bonvenon al la';
 $lang['eo_XX']['SecurityAdmin_right.ss']['WELCOME2'] = 'sekcio por mastrumi sekurecon. Bonvolu elekti grupon maldekstre.';
+$lang['eo_XX']['SideReport']['BROKENFILES'] = 'Paĝoj kun rompitaj dosieroj';
+$lang['eo_XX']['SideReport']['BROKENLINKS'] = 'Paĝoj kun rompitaj ligiloj';
+$lang['eo_XX']['SideReport']['BrokenLinksGroupTitle'] = 'Raporto pri rompitaj ligiloj';
+$lang['eo_XX']['SideReport']['BROKENREDIRECTORPAGES'] = 'RedirektoPaĝoj indikantaj forigitajn paĝojn';
+$lang['eo_XX']['SideReport']['BROKENVIRTUALPAGES'] = 'VirtualajPaĝoj indikantaj forigitajn paĝojn';
+$lang['eo_XX']['SideReport']['ContentGroupTitle'] = 'Raporto pri enhavo';
 $lang['eo_XX']['SideReport']['EMPTYPAGES'] = 'Malplenaj paĝoj';
 $lang['eo_XX']['SideReport']['LAST2WEEKS'] = 'Paĝoj redaktitaj dum la lastaj 2 semajnoj';
+$lang['eo_XX']['SideReport']['OtherGroupTitle'] = 'Alia';
+$lang['eo_XX']['SideReport']['ParameterLiveCheckbox'] = 'Kontroli publikan retejon';
 $lang['eo_XX']['SideReport']['REPEMPTY'] = 'La raporto %s estas malplena.';
 $lang['eo_XX']['SideReport']['TODO'] = 'Farota';
 $lang['eo_XX']['StaticExporter']['BASEURL'] = 'Baza URL';
 $lang['eo_XX']['StaticExporter']['EXPORTTO'] = 'Eksporti al tiu dosierujo';
 $lang['eo_XX']['StaticExporter']['FOLDEREXPORT'] = 'Dosierujo al kiu eksporti';
 $lang['eo_XX']['StaticExporter']['NAME'] = 'Statika eksportilo';
+$lang['eo_XX']['TableListField.ss']['NOITEMSFOUND'] = 'Ne trovis eron';
+$lang['eo_XX']['TableListField.ss']['SORTASC'] = 'Ordigi kreskante';
+$lang['eo_XX']['TableListField.ss']['SORTDESC'] = 'Ordigi malkreskante';
 $lang['eo_XX']['TableListField_PageControls.ss']['DISPLAYING'] = 'Vidigas';
 $lang['eo_XX']['TableListField_PageControls.ss']['OF'] = 'de';
 $lang['eo_XX']['TableListField_PageControls.ss']['TO'] = 'al';
@@ -427,9 +528,12 @@ $lang['eo_XX']['ViewArchivedEmail.ss']['CANACCESS'] = 'Vi povas aliri la enarkiv
 $lang['eo_XX']['ViewArchivedEmail.ss']['HAVEASKED'] = 'Vi petis vidi la enhavon de nia retejo je';
 $lang['eo_XX']['WaitingOn.ss']['ATO'] = 'taksita al';
 $lang['eo_XX']['WidgetAreaEditor.ss']['AVAILABLE'] = 'Disponeblaj Fenestraĵoj';
+$lang['eo_XX']['WidgetAreaEditor.ss']['AVAILWIDGETS'] = 'Alklaku fenestraĵan titolon sube por uzi ĝin en ĉi tiu paĝo.';
 $lang['eo_XX']['WidgetAreaEditor.ss']['INUSE'] = 'Fenestraĵoj nun uzataj';
 $lang['eo_XX']['WidgetAreaEditor.ss']['NOAVAIL'] = 'Neniu fenestraĵo estas disponebla.';
 $lang['eo_XX']['WidgetAreaEditor.ss']['TOADD'] = 'Por enmeti fenestraĵojn, ŝovu ilin ĉi tien el la maldekstra zono.';
+$lang['eo_XX']['WidgetAreaEditor.ss']['TOSORT'] = 'Por ordigi aktuale uzatajn fenestraĵojn en ĉi tiu paĝo, ŝovu ilin supren kaj malsupren.';
+$lang['eo_XX']['WidgetDescription.ss']['CLICKTOADDWIDGET'] = 'Alklaku por aldoni ĉi tiun fenestraĵon';
 $lang['eo_XX']['WidgetEditor.ss']['DELETE'] = 'Forigi';
 
 ?>
\ No newline at end of file
diff --git a/lang/fi_FI.php b/lang/fi_FI.php
index d6bb1d29..05c285f3 100644
--- a/lang/fi_FI.php
+++ b/lang/fi_FI.php
@@ -238,6 +238,7 @@ $lang['fi_FI']['LeftAndMain.ss']['SSWEB'] = 'Silverstripe-verkkosivusto';
 $lang['fi_FI']['LeftAndMain.ss']['VIEWINDRAFT'] = 'Näytä tämä sivu luonnossivustolla';
 $lang['fi_FI']['LeftAndMain.ss']['VIEWINPUBLISHED'] = 'Näytä tämä sivu julkaistulla sivustolla';
 $lang['fi_FI']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Sivun katselu:';
+$lang['fi_FI']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = '\'%s\' julkaistiin onnistuneesti';
 $lang['fi_FI']['LeftAndMain']['STATUSTO'] = 'Tila vaihdettiin tilaksi %s';
 $lang['fi_FI']['LeftAndMain']['TREESITECONTENT'] = 'Sivuston sisältö';
 $lang['fi_FI']['MemberList.ss']['FILTER'] = 'Suodata';
diff --git a/lang/it_IT.php b/lang/it_IT.php
index e0f288e0..6e3ff997 100644
--- a/lang/it_IT.php
+++ b/lang/it_IT.php
@@ -38,6 +38,8 @@ $lang['it_IT']['AssetAdmin_left.ss']['CREATE'] = 'Crea';
 $lang['it_IT']['AssetAdmin_left.ss']['DELETE'] = 'Cancella';
 $lang['it_IT']['AssetAdmin_left.ss']['DELFOLDERS'] = 'Cancella le cartelle selezionate';
 $lang['it_IT']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Permetti di riordinare con drag &amp; drop';
+$lang['it_IT']['AssetAdmin_left.ss']['FILESYSTEMSYNC'] = 'Controllo nuovi files';
+$lang['it_IT']['AssetAdmin_left.ss']['FILESYSTEMSYNC_DESC'] = 'SilverStripe mantiene i propri database di file &amp; immagini contenuti nella cartella assets/. Clicca questo tasto per aggiornare questi database, se questi files sono stati aggiunti fuori da SilverStripe alla cartella assets/, per esempio caricati attraverso FTP.';
 $lang['it_IT']['AssetAdmin_left.ss']['FOLDERS'] = 'Cartelle';
 $lang['it_IT']['AssetAdmin_left.ss']['GO'] = 'Vai';
 $lang['it_IT']['AssetAdmin_left.ss']['SELECTTODEL'] = 'Seleziona le cartelle che vuoi rimuovere e clicca sul pulsante qui sotto';
@@ -45,6 +47,7 @@ $lang['it_IT']['AssetAdmin_left.ss']['TOREORG'] = 'Per riorganizzare le tue cart
 $lang['it_IT']['AssetAdmin_right.ss']['CHOOSEPAGE'] = 'Per favore scegli una pagina sulla sinistra.';
 $lang['it_IT']['AssetAdmin_right.ss']['WELCOME'] = 'Benvenuto su';
 $lang['it_IT']['AssetAdmin_uploadiframe.ss']['PERMFAILED'] = 'Non hai i permessi per caricare file in questa cartella.';
+$lang['it_IT']['AssetAdmin_uploadiframe.ss']['TITLE'] = 'Iframe caricamento immagine';
 $lang['it_IT']['AssetTableField']['CAPTION'] = 'Didascalia';
 $lang['it_IT']['AssetTableField']['CREATED'] = 'Primo inserito';
 $lang['it_IT']['AssetTableField']['DIM'] = 'Dimensioni';
@@ -69,6 +72,15 @@ $lang['it_IT']['AssetTableField']['SWFFILEOPTIONS'] = 'Opzioni file SWF';
 $lang['it_IT']['AssetTableField']['TITLE'] = 'Titolo';
 $lang['it_IT']['AssetTableField']['TYPE'] = 'Tipo';
 $lang['it_IT']['AssetTableField']['URL'] = 'URL';
+$lang['it_IT']['CMSBatchActions']['DELETED_PAGES'] = 'Eliminate %d pagine dal sito pubblicato, %d non a buon fine';
+$lang['it_IT']['CMSBatchActions']['DELETE_PAGES'] = 'Eliminato dal sito pubblicato';
+$lang['it_IT']['CMSBatchActions']['DELETING_PAGES'] = 'Sto eliminando le pagine selezionate dal sito pubblicato';
+$lang['it_IT']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Pubblicate %d pagine, %d non a buon fine';
+$lang['it_IT']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Sto pubblicando le pagine';
+$lang['it_IT']['CMSBatchActions']['PUBLISH_PAGES'] = 'Pubblica';
+$lang['it_IT']['CMSBatchActions']['UNPUBLISHED_PAGES'] = '%d pagine non pubblicate';
+$lang['it_IT']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'Annullo pubblicazione pagine';
+$lang['it_IT']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'Pubblicazione annullata';
 $lang['it_IT']['CMSMain']['ACCESS'] = 'Accedi a %s nel CMS';
 $lang['it_IT']['CMSMain']['ACCESSALLINTERFACES'] = 'Accesso a tutte le interfaccia CMS';
 $lang['it_IT']['CMSMain']['CANCEL'] = 'Cancella';
@@ -81,6 +93,7 @@ $lang['it_IT']['CMSMain']['EMAIL'] = 'Email';
 $lang['it_IT']['CMSMain']['GO'] = 'Vai';
 $lang['it_IT']['CMSMain']['MENUTITLE'] = 'Contenuto del sito';
 $lang['it_IT']['CMSMain']['MENUTITLE'] = 'Contenuto del sito';
+$lang['it_IT']['CMSMain']['MENUTITLEOPT'] = 'Etichetta di navigazione';
 $lang['it_IT']['CMSMain']['METADESCOPT'] = 'Descrizione';
 $lang['it_IT']['CMSMain']['METAKEYWORDSOPT'] = 'Parole chiavi';
 $lang['it_IT']['CMSMain']['NEW'] = 'Nuova';
@@ -113,6 +126,7 @@ $lang['it_IT']['CMSMain']['ROLLEDBACKVERSION'] = 'Ripristinata la versione #%d.
 $lang['it_IT']['CMSMain']['SAVE'] = 'Salva';
 $lang['it_IT']['CMSMain']['SENTTO'] = 'Inviato a %s %s per l\'approvazione.';
 $lang['it_IT']['CMSMain']['STATUSOPT'] = 'Stato';
+$lang['it_IT']['CMSMain']['TITLEOPT'] = 'Titolo';
 $lang['it_IT']['CMSMain']['TOTALPAGES'] = 'Pagine totali:';
 $lang['it_IT']['CMSMain']['VERSIONSNOPAGE'] = 'Impossibile trovare la pagina #%d';
 $lang['it_IT']['CMSMain']['VIEWING'] = 'Stai visualizzando la versione #%d, creata %s';
@@ -125,6 +139,7 @@ $lang['it_IT']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'Aggiunto al sito bozza e non
 $lang['it_IT']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Aggiungi criterio...';
 $lang['it_IT']['CMSMain_left.ss']['BATCHACTIONS'] = 'Azioni di massa';
 $lang['it_IT']['CMSMain_left.ss']['CHANGED'] = 'modificato';
+$lang['it_IT']['CMSMain_left.ss']['CLEARTITLE'] = 'Pulisci la ricerca e vedi tutti gli elementi';
 $lang['it_IT']['CMSMain_left.ss']['CLOSEBOX'] = 'clicca per chiudere il box';
 $lang['it_IT']['CMSMain_left.ss']['COMPAREMODE'] = 'Modalità confronto';
 $lang['it_IT']['CMSMain_left.ss']['CREATE'] = 'Crea';
@@ -135,8 +150,10 @@ $lang['it_IT']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Modificato nel sito bozza e
 $lang['it_IT']['CMSMain_left.ss']['EDITEDSINCE'] = 'Modificato dal';
 $lang['it_IT']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Consenti l\'ordinamento utilizzando il drag &amp; drop';
 $lang['it_IT']['CMSMain_left.ss']['GO'] = 'Vai';
+$lang['it_IT']['CMSMain_left.ss']['HIDDEN'] = 'nascosto';
 $lang['it_IT']['CMSMain_left.ss']['KEY'] = 'Chiave:';
 $lang['it_IT']['CMSMain_left.ss']['NEW'] = 'nuovo';
+$lang['it_IT']['CMSMain_left.ss']['NOTINMENU'] = 'Togli dai menu di navigazione';
 $lang['it_IT']['CMSMain_left.ss']['OPENBOX'] = 'clicca per aprire questo box';
 $lang['it_IT']['CMSMain_left.ss']['PAGEVERSIONH'] = 'Cronologia delle modifiche';
 $lang['it_IT']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Pubblica le pagine selezionate';
@@ -165,6 +182,7 @@ $lang['it_IT']['CommentAdmin']['APPROVED'] = 'Accettati %s commenti.';
 $lang['it_IT']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Commenti approvati';
 $lang['it_IT']['CommentAdmin']['AUTHOR'] = 'Autore';
 $lang['it_IT']['CommentAdmin']['COMMENT'] = 'Commento';
+$lang['it_IT']['CommentAdmin']['COMMENTERURL'] = 'URL';
 $lang['it_IT']['CommentAdmin']['COMMENTS'] = 'Commenti';
 $lang['it_IT']['CommentAdmin']['COMMENTSAWAITINGMODERATION'] = 'Commenti in attesa di approvazione';
 $lang['it_IT']['CommentAdmin']['DATEPOSTED'] = 'Data Invio';
@@ -225,6 +243,7 @@ $lang['it_IT']['ImageEditor.ss']['SEPIA'] = 'seppia';
 $lang['it_IT']['ImageEditor.ss']['UNDO'] = 'annulla';
 $lang['it_IT']['ImageEditor.ss']['UNTITLED'] = 'Documento senza titolo';
 $lang['it_IT']['ImageEditor.ss']['WIDTH'] = 'larghezza';
+$lang['it_IT']['LeftAndMain']['CANT_REORGANISE'] = 'Non hai il permesso di modificare la struttura del sito. Le modifiche non sono state salvate.';
 $lang['it_IT']['LeftAndMain']['CHANGEDURL'] = 'Cambiato URL in \'%s\'';
 $lang['it_IT']['LeftAndMain']['COMMENTS'] = 'Commenti';
 $lang['it_IT']['LeftAndMain']['FILESIMAGES'] = 'File & immagini';
@@ -285,6 +304,7 @@ $lang['it_IT']['MemberTableField']['DeleteTitleText'] = 'Cancella da questo grup
 $lang['it_IT']['MemberTableField']['DeleteTitleTextDatabase'] = 'Cancella dal database e da tutti i gruppi';
 $lang['it_IT']['MemberTableField']['DESC'] = 'Discendente';
 $lang['it_IT']['MemberTableField']['EMAIL'] = 'Email';
+$lang['it_IT']['MemberTableField']['ERRORADDINGUSER'] = 'Si è verificato un errore nell\'aggiungere l\'utente al gruppo: %s';
 $lang['it_IT']['MemberTableField']['FILTER'] = 'Filtro';
 $lang['it_IT']['MemberTableField']['FILTERBYGROUP'] = 'Filtra per gruppo';
 $lang['it_IT']['MemberTableField']['FIRSTNAME'] = 'Nome';
@@ -293,6 +313,7 @@ $lang['it_IT']['MemberTableField']['SEARCH'] = 'Cerca';
 $lang['it_IT']['MemberTableField.ss']['ADDNEW'] = 'Inserisci nuovo';
 $lang['it_IT']['MemberTableField.ss']['DELETEMEMBER'] = 'Cancella questo membro';
 $lang['it_IT']['MemberTableField.ss']['EDITMEMBER'] = 'Modifica questo membro';
+$lang['it_IT']['MemberTableField.ss']['NOITEMSFOUND'] = 'Nessun elemento trovato';
 $lang['it_IT']['MemberTableField.ss']['SHOWMEMBER'] = 'Visualizza questo membro';
 $lang['it_IT']['MemberTableField']['SURNAME'] = 'Cognome';
 $lang['it_IT']['ModelAdmin']['ADDBUTTON'] = 'Aggiungi';
@@ -313,6 +334,7 @@ $lang['it_IT']['ModelAdmin']['NOCSVFILE'] = 'Cerca un file CSV da importare';
 $lang['it_IT']['ModelAdmin']['NOIMPORT'] = 'Nulla da importare.';
 $lang['it_IT']['ModelAdmin']['NORESULTS'] = 'La tua ricerca non ha prodotto nessun risultato';
 $lang['it_IT']['ModelAdmin']['SAVE'] = 'Salva';
+$lang['it_IT']['ModelAdmin']['SEARCHFOR'] = 'Cerca per:';
 $lang['it_IT']['ModelAdmin']['SEARCHRESULTS'] = 'Risultati della Ricerca';
 $lang['it_IT']['ModelAdmin']['SELECTALL'] = 'seleziona tutti';
 $lang['it_IT']['ModelAdmin']['SELECTNONE'] = 'de-seleziona';
@@ -325,6 +347,9 @@ $lang['it_IT']['ModelAdmin_left.ss']['ADDLISTING'] = 'Aggiungi Gruppo';
 $lang['it_IT']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Importa';
 $lang['it_IT']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Ricerca Gruppi';
 $lang['it_IT']['ModelAdmin_right.ss']['WELCOME1'] = 'Benvenuto a %s. Seleziona una delle voci nel riquadro di sinistra.';
+$lang['it_IT']['ModelSidebar.ss']['ADDLISTING'] = 'Aggiungi';
+$lang['it_IT']['ModelSidebar.ss']['IMPORT_TAB_HEADER'] = 'Importa';
+$lang['it_IT']['ModelSidebar.ss']['SEARCHLISTINGS'] = 'Cerca';
 $lang['it_IT']['PageComment']['Comment'] = 'Commento';
 $lang['it_IT']['PageComment']['COMMENTBY'] = 'Commento da \'%s\' su %s';
 $lang['it_IT']['PageComment']['IsSpam'] = 'Spam?';
@@ -335,7 +360,11 @@ $lang['it_IT']['PageComment']['SINGULARNAME'] = 'Commento alla pagina';
 $lang['it_IT']['PageCommentInterface']['COMMENTERURL'] = 'URL del tuo sito';
 $lang['it_IT']['PageCommentInterface']['POST'] = 'Invia';
 $lang['it_IT']['PageCommentInterface']['SPAMQUESTION'] = 'Domanda di protezione anti-spam: %s';
+$lang['it_IT']['PageCommentInterface.ss']['COMMENTLOGINERROR'] = 'Non puoi inviare commenti fino a che non sei loggato';
+$lang['it_IT']['PageCommentInterface.ss']['COMMENTPERMISSIONERROR'] = 'e che tu abbia un appropriato livello di permesso';
+$lang['it_IT']['PageCommentInterface.ss']['COMMENTPOSTLOGIN'] = 'Entra qui';
 $lang['it_IT']['PageCommentInterface.ss']['COMMENTS'] = 'Commenti';
+$lang['it_IT']['PageCommentInterface.ss']['COMMENTSDISABLED'] = 'L\'invio di commenti è stato disabilitato';
 $lang['it_IT']['PageCommentInterface.ss']['NEXT'] = 'prossimo';
 $lang['it_IT']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'Nessuno ha aggiunto ancora un commento in questa pagina.';
 $lang['it_IT']['PageCommentInterface.ss']['POSTCOM'] = 'Inserisci il tuo commento';
diff --git a/lang/ja_JP.php b/lang/ja_JP.php
index 6bf32e21..ecafb32c 100644
--- a/lang/ja_JP.php
+++ b/lang/ja_JP.php
@@ -38,6 +38,8 @@ $lang['ja_JP']['AssetAdmin_left.ss']['CREATE'] = '作成';
 $lang['ja_JP']['AssetAdmin_left.ss']['DELETE'] = '削除';
 $lang['ja_JP']['AssetAdmin_left.ss']['DELFOLDERS'] = '選択したフォルダを削除します';
 $lang['ja_JP']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'ドラッグ &amp; ドロップを有効にする';
+$lang['ja_JP']['AssetAdmin_left.ss']['FILESYSTEMSYNC'] = '新しいファイルを検索';
+$lang['ja_JP']['AssetAdmin_left.ss']['FILESYSTEMSYNC_DESC'] = 'SilverStripeはファイルや画像のデータベースを、assets/ フォルダ内で管理します。FTP経由でファイルをアップロードした場合など、SilverStripeの外からassets/ フォルダにファイルを追加した場合は、このボタンをクリックしてデータベースをアップデートしてください。';
 $lang['ja_JP']['AssetAdmin_left.ss']['FOLDERS'] = 'フォルダ';
 $lang['ja_JP']['AssetAdmin_left.ss']['GO'] = 'GO';
 $lang['ja_JP']['AssetAdmin_left.ss']['SELECTTODEL'] = '削除したいフォルダを選択して、ボタンを押してください。';
@@ -166,6 +168,7 @@ $lang['ja_JP']['CommentAdmin']['APPROVED'] = ' %s のコメントを受け入れ
 $lang['ja_JP']['CommentAdmin']['APPROVEDCOMMENTS'] = '承認されたコメント';
 $lang['ja_JP']['CommentAdmin']['AUTHOR'] = '著者';
 $lang['ja_JP']['CommentAdmin']['COMMENT'] = 'コメント';
+$lang['ja_JP']['CommentAdmin']['COMMENTERURL'] = 'URL';
 $lang['ja_JP']['CommentAdmin']['COMMENTS'] = 'コメント';
 $lang['ja_JP']['CommentAdmin']['COMMENTSAWAITINGMODERATION'] = '承認待ちのコメント';
 $lang['ja_JP']['CommentAdmin']['DATEPOSTED'] = '投稿日';
@@ -283,6 +286,7 @@ $lang['ja_JP']['MemberTableField']['ADDINGFIELD'] = '領域を追加していま
 $lang['ja_JP']['MemberTableField']['ANYGROUP'] = 'いずれかのグループ';
 $lang['ja_JP']['MemberTableField']['ASC'] = '昇順';
 $lang['ja_JP']['MemberTableField']['DeleteTitleText'] = 'このグループから削除する';
+$lang['ja_JP']['MemberTableField']['DeleteTitleTextDatabase'] = 'データベースおよび全てのグループから削除する';
 $lang['ja_JP']['MemberTableField']['DESC'] = '降順';
 $lang['ja_JP']['MemberTableField']['EMAIL'] = 'メールアドレス';
 $lang['ja_JP']['MemberTableField']['FILTER'] = 'フィルター';
diff --git a/lang/pl_PL.php b/lang/pl_PL.php
index 446f1c91..ffc511fd 100644
--- a/lang/pl_PL.php
+++ b/lang/pl_PL.php
@@ -16,6 +16,7 @@ if(array_key_exists('pl_PL', $lang) && is_array($lang['pl_PL'])) {
 	$lang['pl_PL'] = $lang['en_US'];
 }
 
+$lang['pl_PL']['']['CHOOSEPAGE'] = 'Proszę wybrać element znajdujący się z lewej strony.';
 $lang['pl_PL']['AssetAdmin']['CHOOSEFILE'] = 'Wybierz plik';
 $lang['pl_PL']['AssetAdmin']['DELETEDX'] = 'Usunięto %s plików. %s';
 $lang['pl_PL']['AssetAdmin']['FILESREADY'] = 'Pliki gotowe do wgrania';
@@ -38,8 +39,10 @@ $lang['pl_PL']['AssetAdmin_left.ss']['CREATE'] = 'Stwórz';
 $lang['pl_PL']['AssetAdmin_left.ss']['DELETE'] = 'Usuń ...';
 $lang['pl_PL']['AssetAdmin_left.ss']['DELFOLDERS'] = 'Usuń zaznaczone foldery';
 $lang['pl_PL']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Zezwól na przeciąganie elementów';
+$lang['pl_PL']['AssetAdmin_left.ss']['FILESYSTEMSYNC'] = 'Rozejrzyj się za nowymi plikami';
+$lang['pl_PL']['AssetAdmin_left.ss']['FILESYSTEMSYNC_DESC'] = 'SilverStripe utrzymuje własną baze danych plików przechowywanych w katalogu assets/ . Kliknij na ten przycisk aby dodać do tej bazy danych informację o plikach dodanych do katalogu assets/ przez inne programy, jak np. FTP';
 $lang['pl_PL']['AssetAdmin_left.ss']['FOLDERS'] = 'Foldery';
-$lang['pl_PL']['AssetAdmin_left.ss']['GO'] = 'Idź';
+$lang['pl_PL']['AssetAdmin_left.ss']['GO'] = 'Ok';
 $lang['pl_PL']['AssetAdmin_left.ss']['SELECTTODEL'] = 'Wybierz foldery, które chcesz usunąć i kliknij przycisk poniżej';
 $lang['pl_PL']['AssetAdmin_left.ss']['TOREORG'] = 'Aby zreorganizować twoje foldery, przenieś je w wybrane miejsca';
 $lang['pl_PL']['AssetAdmin_right.ss']['CHOOSEPAGE'] = 'Proszę wybrać stronę po lewej';
@@ -69,8 +72,37 @@ $lang['pl_PL']['AssetTableField']['SWFFILEOPTIONS'] = 'Opcje Pliku SWF';
 $lang['pl_PL']['AssetTableField']['TITLE'] = 'Tytuł';
 $lang['pl_PL']['AssetTableField']['TYPE'] = 'Rodzaj';
 $lang['pl_PL']['AssetTableField']['URL'] = 'URL';
+$lang['pl_PL']['BrokenLinksReport']['BROKENLINKS'] = 'Raport uszkodzonych linków';
+$lang['pl_PL']['BrokenLinksReport']['CheckSiteDropdownDraft'] = 'Strona nieopublikowana';
+$lang['pl_PL']['BrokenLinksReport']['CheckSiteDropdownPublished'] = 'Opublikowana Strona';
+$lang['pl_PL']['BrokenLinksReport']['ColumnDateLastModified'] = 'Ostatnia modyfikacja';
+$lang['pl_PL']['BrokenLinksReport']['ColumnDateLastPublished'] = 'Ostatnia publikacja';
+$lang['pl_PL']['BrokenLinksReport']['ColumnProblemType'] = 'Typ problemu';
+$lang['pl_PL']['BrokenLinksReport']['ColumnURL'] = 'Adres internetowy';
+$lang['pl_PL']['BrokenLinksReport']['HasBrokenFile'] = 'ma uszkodzony plik';
+$lang['pl_PL']['BrokenLinksReport']['HasBrokenLink'] = 'ma uszkodzony link';
+$lang['pl_PL']['BrokenLinksReport']['HasBrokenLinkAndFile'] = 'ma uszkodzone plik i link';
+$lang['pl_PL']['BrokenLinksReport']['HoverTitleEditPage'] = 'Edytuj stronę';
+$lang['pl_PL']['BrokenLinksReport']['ReasonDropdown'] = 'Problem do sprawdzenia';
+$lang['pl_PL']['BrokenLinksReport']['ReasonDropdownBROKENFILE'] = 'Uszkodzony plik';
+$lang['pl_PL']['BrokenLinksReport']['ReasonDropdownBROKENLINK'] = 'Uszkodzony link';
+$lang['pl_PL']['BrokenLinksReport']['ReasonDropdownRPBROKENLINK'] = 'Odnośnik wskazuje na nieistniejącą stronę';
+$lang['pl_PL']['BrokenLinksReport']['ReasonDropdownVPBROKENLINK'] = 'Strona wirtualna odnosi się do nieistniejącej strony';
+$lang['pl_PL']['BrokenLinksReport']['VirtualPageNonExistent'] = 'strona wirtualna odnosi się do nieistniejącej strony';
+$lang['pl_PL']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = 'Usunięto %d stron z wersji roboczej serwisu, %d nieudanych usunięć';
+$lang['pl_PL']['CMSBatchActions']['DELETED_PAGES'] = 'Usunięto %d stron z opublikowanej wersji serwisu, %d nieudanych usunięć';
+$lang['pl_PL']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Usuń z wersji roboczej serwisu';
+$lang['pl_PL']['CMSBatchActions']['DELETE_PAGES'] = 'Usuń z wersji opublikowanej serwisu';
+$lang['pl_PL']['CMSBatchActions']['DELETING_DRAFT_PAGES'] = 'Usuwanie wybranych stron  z wersji roboczej serwisu';
+$lang['pl_PL']['CMSBatchActions']['DELETING_PAGES'] = 'Usuwanie wybranych stron z wersji opublikowanej serwisu';
+$lang['pl_PL']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Opublikowano %d stron, %d nieudanych publikacji';
+$lang['pl_PL']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Publikowanie stron';
 $lang['pl_PL']['CMSBatchActions']['PUBLISH_PAGES'] = 'Opublikuj';
-$lang['pl_PL']['CMSMain']['ACCESS'] = 'Dostęp do %s w CMSie';
+$lang['pl_PL']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'Nieopublikowane strony';
+$lang['pl_PL']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'Wycofywanie publikacji stron';
+$lang['pl_PL']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'Wycofaj publikację stron';
+$lang['pl_PL']['CMSMain']['ACCESS'] = 'Dostęp do sekcji \'%s\'';
+$lang['pl_PL']['CMSMain']['ACCESSALLINTERFACESHELP'] = 'Nadpisuje dokładniejsze ustawienia dostępu.';
 $lang['pl_PL']['CMSMain']['CANCEL'] = 'Anuluj';
 $lang['pl_PL']['CMSMain']['CHOOSEREPORT'] = '(Wybierz raport)';
 $lang['pl_PL']['CMSMain']['COMPARINGV'] = 'Porównaj wersję #%d i #%d';
@@ -78,7 +110,7 @@ $lang['pl_PL']['CMSMain']['COPYPUBTOSTAGE'] = 'Naprawdę chcesz skopiować publi
 $lang['pl_PL']['CMSMain']['DELETE'] = 'Usuń ze strony roboczej';
 $lang['pl_PL']['CMSMain']['DESCREMOVED'] = 'i %s potomków';
 $lang['pl_PL']['CMSMain']['EMAIL'] = 'E-mail';
-$lang['pl_PL']['CMSMain']['GO'] = 'Idź';
+$lang['pl_PL']['CMSMain']['GO'] = 'Ok';
 $lang['pl_PL']['CMSMain']['MENUTITLE'] = 'Zawartość strony';
 $lang['pl_PL']['CMSMain']['MENUTITLE'] = 'Zawartość Strony';
 $lang['pl_PL']['CMSMain']['METADESCOPT'] = 'Opis';
@@ -116,7 +148,7 @@ $lang['pl_PL']['CMSMain']['STATUSOPT'] = 'Status';
 $lang['pl_PL']['CMSMain']['TITLEOPT'] = 'Tytuł';
 $lang['pl_PL']['CMSMain']['TOTALPAGES'] = 'W sumie stron:';
 $lang['pl_PL']['CMSMain']['VERSIONSNOPAGE'] = 'Nie można znaleźć strony #%d';
-$lang['pl_PL']['CMSMain']['VIEWING'] = 'Oglądasz wersję #%d, stworzoną %s';
+$lang['pl_PL']['CMSMain']['VIEWING'] = 'Oglądasz wersję #%s, stworzoną %s przez %s';
 $lang['pl_PL']['CMSMain']['VISITRESTORE'] = 'zobacz restorepage/(ID)';
 $lang['pl_PL']['CMSMain']['WAITINGON'] = 'Poczekaj na innych ludzi pracujących nad tymi <b>%</b> stronami';
 $lang['pl_PL']['CMSMain']['WORKTODO'] = 'Pracujesz na tych <b>%</b> stronach';
@@ -124,8 +156,10 @@ $lang['pl_PL']['CMSMain_dialog.ss']['BUTTONNOTFOUND'] = 'Nie znaleziono nazwy pr
 $lang['pl_PL']['CMSMain_dialog.ss']['NOLINKED'] = 'Nie odnaleziono window.linkedObject aby wysłać sygnał przyciśnięcia przycisku z powrotem do głównego okna';
 $lang['pl_PL']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'Dodałeś do oczekujących i jeszcze nie opublikowanych stron';
 $lang['pl_PL']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Dodaj kryterium ...';
-$lang['pl_PL']['CMSMain_left.ss']['BATCHACTIONS'] = 'Akcja pliku';
+$lang['pl_PL']['CMSMain_left.ss']['BATCHACTIONS'] = 'Wykonaj na wielu';
 $lang['pl_PL']['CMSMain_left.ss']['CHANGED'] = 'zmienione';
+$lang['pl_PL']['CMSMain_left.ss']['CLEAR'] = 'Wyczyść';
+$lang['pl_PL']['CMSMain_left.ss']['CLEARTITLE'] = 'Wyczyść wyniki wyszukiwania i wyświetl wszystkie elementy';
 $lang['pl_PL']['CMSMain_left.ss']['CLOSEBOX'] = 'kliknij aby zamknąć';
 $lang['pl_PL']['CMSMain_left.ss']['COMPAREMODE'] = 'Tryb porównania (wybierz 2 poniżej)';
 $lang['pl_PL']['CMSMain_left.ss']['CREATE'] = 'Stwórz';
@@ -135,7 +169,7 @@ $lang['pl_PL']['CMSMain_left.ss']['DELETEDSTILLLIVE'] = 'Usunąłeś z oczekują
 $lang['pl_PL']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Zmieniłeś oczekującą stronę ale jeszcze nie opublikowałeś ';
 $lang['pl_PL']['CMSMain_left.ss']['EDITEDSINCE'] = 'Edytowane od';
 $lang['pl_PL']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Zezwól na zmianę przenieś i puść ';
-$lang['pl_PL']['CMSMain_left.ss']['GO'] = 'idź';
+$lang['pl_PL']['CMSMain_left.ss']['GO'] = 'Ok';
 $lang['pl_PL']['CMSMain_left.ss']['HIDDEN'] = 'ukryte';
 $lang['pl_PL']['CMSMain_left.ss']['KEY'] = 'Klucz:';
 $lang['pl_PL']['CMSMain_left.ss']['NEW'] = 'nowy';
@@ -146,6 +180,7 @@ $lang['pl_PL']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publikuj zaznaczone stron
 $lang['pl_PL']['CMSMain_left.ss']['SEARCH'] = 'Szukaj';
 $lang['pl_PL']['CMSMain_left.ss']['SEARCHTITLE'] = 'Szukaj przez URL, Tytuł, Tytuł Menu i Zawartość';
 $lang['pl_PL']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Zaznacz strony które chcesz zmienić i kliknij polecenie: ';
+$lang['pl_PL']['CMSMain_left.ss']['SHOWITEMS'] = 'Pokaż:';
 $lang['pl_PL']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Pokaż tylko zmienione strony';
 $lang['pl_PL']['CMSMain_left.ss']['SHOWUNPUB'] = 'pokaż nieopublikowane wersje';
 $lang['pl_PL']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Zawartość i struktura strony';
@@ -163,11 +198,14 @@ $lang['pl_PL']['CMSMain_versions.ss']['NOTPUB'] = 'Nie opublikowany';
 $lang['pl_PL']['CMSMain_versions.ss']['PUBR'] = 'Publikujący';
 $lang['pl_PL']['CMSMain_versions.ss']['UNKNOWN'] = 'Nieznany';
 $lang['pl_PL']['CMSMain_versions.ss']['WHEN'] = 'Kiedy';
+$lang['pl_PL']['CMSSiteTreeFilter']['ALL'] = 'Wszystko';
+$lang['pl_PL']['CMSSiteTreeFilter']['DELETEDPAGES'] = 'Wszystkie strony, także te usunięte';
 $lang['pl_PL']['CommentAdmin']['ACCEPT'] = 'Akceptuj';
 $lang['pl_PL']['CommentAdmin']['APPROVED'] = 'Zaakceptowano %s komentarzy.';
 $lang['pl_PL']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Zaakceptowane Komentarze';
 $lang['pl_PL']['CommentAdmin']['AUTHOR'] = 'Autor';
 $lang['pl_PL']['CommentAdmin']['COMMENT'] = 'Komentarz';
+$lang['pl_PL']['CommentAdmin']['COMMENTERURL'] = 'Adres internetowy';
 $lang['pl_PL']['CommentAdmin']['COMMENTS'] = 'Komentarze';
 $lang['pl_PL']['CommentAdmin']['COMMENTSAWAITINGMODERATION'] = 'Komentarze oczekujące na moderację';
 $lang['pl_PL']['CommentAdmin']['DATEPOSTED'] = 'Data Wysłania';
@@ -206,7 +244,13 @@ $lang['pl_PL']['CommentTableField.ss']['NOITEMSFOUND'] = 'Nie znaleziono żadnyc
 $lang['pl_PL']['CommentTableField.ss']['SPAM'] = 'spam';
 $lang['pl_PL']['ComplexTableField']['CLOSEPOPUP'] = 'Zamknij Okienko';
 $lang['pl_PL']['ComplexTableField']['SUCCESSADD'] = 'Dodano %s %s %s';
+$lang['pl_PL']['Group']['IMPORTTABTITLE'] = 'Importuj';
+$lang['pl_PL']['Group']['RolesAddEditLink'] = 'Dodaj/edytuj role';
+$lang['pl_PL']['GroupImportForm']['ResultCreated'] = 'Utworzono %d grup';
+$lang['pl_PL']['GroupImportForm']['ResultDeleted'] = 'Usunięto %d grup';
+$lang['pl_PL']['GroupImportForm']['ResultUpdated'] = 'Zaktualizowano %d grup';
 $lang['pl_PL']['ImageEditor.ss']['ACTIONS'] = 'akcje';
+$lang['pl_PL']['ImageEditor.ss']['ADJUST'] = 'dostosuj';
 $lang['pl_PL']['ImageEditor.ss']['APPLY'] = 'zastosuj';
 $lang['pl_PL']['ImageEditor.ss']['BRIGHTNESS'] = 'jasność';
 $lang['pl_PL']['ImageEditor.ss']['CANCEL'] = 'skasuj';
@@ -226,6 +270,7 @@ $lang['pl_PL']['ImageEditor.ss']['SEPIA'] = 'sepia';
 $lang['pl_PL']['ImageEditor.ss']['UNDO'] = 'cofnij ';
 $lang['pl_PL']['ImageEditor.ss']['UNTITLED'] = 'Nienazwany dokument';
 $lang['pl_PL']['ImageEditor.ss']['WIDTH'] = 'szerokość';
+$lang['pl_PL']['LeftAndMain']['CANT_REORGANISE'] = 'Nie masz uprawnień do zmiany drzewa witryny. Twoje zmiany nie zostaną zapisane.';
 $lang['pl_PL']['LeftAndMain']['CHANGEDURL'] = 'Zmieniony URL to \'%s\'';
 $lang['pl_PL']['LeftAndMain']['COMMENTS'] = 'Komentarze';
 $lang['pl_PL']['LeftAndMain']['FILESIMAGES'] = 'Pliki i Obrazy';
@@ -261,6 +306,31 @@ $lang['pl_PL']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Widok strony:';
 $lang['pl_PL']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = 'Opublikowano \'%s\' poprawnie';
 $lang['pl_PL']['LeftAndMain']['STATUSTO'] = 'Status zmieniony na \'%s\'';
 $lang['pl_PL']['LeftAndMain']['TREESITECONTENT'] = 'Zawartość strony';
+$lang['pl_PL']['LeftAndMain_right.ss']['WELCOMETO'] = 'Witamy na ';
+$lang['pl_PL']['MathSpamProtection']['EIGHT'] = 'osiem';
+$lang['pl_PL']['MathSpamProtection']['EIGHTEEN'] = 'osiemnaście';
+$lang['pl_PL']['MathSpamProtection']['ELEVEN'] = 'jedenaście';
+$lang['pl_PL']['MathSpamProtection']['FIFTEEN'] = 'piętnaście';
+$lang['pl_PL']['MathSpamProtection']['FIVE'] = 'pięć';
+$lang['pl_PL']['MathSpamProtection']['FOUR'] = 'cztery';
+$lang['pl_PL']['MathSpamProtection']['FOURTEEN'] = 'czternaście';
+$lang['pl_PL']['MathSpamProtection']['NINE'] = 'dziewięć';
+$lang['pl_PL']['MathSpamProtection']['ONE'] = 'jeden';
+$lang['pl_PL']['MathSpamProtection']['SEVEN'] = 'siedem';
+$lang['pl_PL']['MathSpamProtection']['SEVENTEEN'] = 'siedemnaście';
+$lang['pl_PL']['MathSpamProtection']['SIX'] = 'sześć';
+$lang['pl_PL']['MathSpamProtection']['SIXTEEN'] = 'szesnaście';
+$lang['pl_PL']['MathSpamProtection']['TEN'] = 'dziesięć';
+$lang['pl_PL']['MathSpamProtection']['THIRTEEN'] = 'trzynaście';
+$lang['pl_PL']['MathSpamProtection']['THREE'] = 'trzy';
+$lang['pl_PL']['MathSpamProtection']['TWELVE'] = 'dwanaście';
+$lang['pl_PL']['MathSpamProtection']['TWO'] = 'dwa';
+$lang['pl_PL']['MathSpamProtection']['WHATIS'] = 'Ile wynosi %s plus %s?';
+$lang['pl_PL']['MathSpamProtection']['ZERO'] = 'zero';
+$lang['pl_PL']['MemberImportForm']['ResultCreated'] = 'Utworzono %d użytkowników';
+$lang['pl_PL']['MemberImportForm']['ResultDeleted'] = 'Usunięto %d użytkowników';
+$lang['pl_PL']['MemberImportForm']['ResultNone'] = 'Bez zmian';
+$lang['pl_PL']['MemberImportForm']['ResultUpdated'] = 'Uaktualniono %d użytkowników';
 $lang['pl_PL']['MemberList.ss']['FILTER'] = 'Filtr';
 $lang['pl_PL']['MemberList_PageControls.ss']['DISPLAYING'] = 'Wyświetlono';
 $lang['pl_PL']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'użytkownicy';
@@ -284,6 +354,7 @@ $lang['pl_PL']['MemberTableField']['ANYGROUP'] = 'Dowolna grupa';
 $lang['pl_PL']['MemberTableField']['ASC'] = 'Rosąco';
 $lang['pl_PL']['MemberTableField']['DESC'] = 'Malejąco';
 $lang['pl_PL']['MemberTableField']['EMAIL'] = 'E-mail';
+$lang['pl_PL']['MemberTableField']['ERRORADDINGUSER'] = 'Wystąpił błąd w trakcie dodawania użytkownika do grupy: %s';
 $lang['pl_PL']['MemberTableField']['FILTER'] = 'Filtr';
 $lang['pl_PL']['MemberTableField']['FILTERBYGROUP'] = 'Filtruj wg grupy';
 $lang['pl_PL']['MemberTableField']['FIRSTNAME'] = 'Imię';
@@ -292,6 +363,7 @@ $lang['pl_PL']['MemberTableField']['SEARCH'] = 'Szukaj';
 $lang['pl_PL']['MemberTableField.ss']['ADDNEW'] = 'Dodaj nowość';
 $lang['pl_PL']['MemberTableField.ss']['DELETEMEMBER'] = 'Usuń tego użytkownika';
 $lang['pl_PL']['MemberTableField.ss']['EDITMEMBER'] = 'Edytuj tego użytkownika';
+$lang['pl_PL']['MemberTableField.ss']['NOITEMSFOUND'] = 'Nie znaleziono elementów.';
 $lang['pl_PL']['MemberTableField.ss']['SHOWMEMBER'] = 'Pokaż tego użytkownika';
 $lang['pl_PL']['MemberTableField']['SURNAME'] = 'Nazwisko';
 $lang['pl_PL']['ModelAdmin']['ADDBUTTON'] = 'Dodaj';
@@ -312,6 +384,7 @@ $lang['pl_PL']['ModelAdmin']['NOCSVFILE'] = 'Wybierz plik CSV do zaimportowania'
 $lang['pl_PL']['ModelAdmin']['NOIMPORT'] = 'Nie ma niczego do zaimportowania';
 $lang['pl_PL']['ModelAdmin']['NORESULTS'] = 'Twoje wyszukiwanie nie zwróciło żadnych wyników';
 $lang['pl_PL']['ModelAdmin']['SAVE'] = 'Zapisz';
+$lang['pl_PL']['ModelAdmin']['SEARCHFOR'] = 'Szukaj dla:';
 $lang['pl_PL']['ModelAdmin']['SEARCHRESULTS'] = 'Wyniki wyszukiwania';
 $lang['pl_PL']['ModelAdmin']['SELECTALL'] = 'wybierz wszystko';
 $lang['pl_PL']['ModelAdmin']['SELECTNONE'] = 'odznacz wszystko';
@@ -337,7 +410,11 @@ $lang['pl_PL']['PageComment']['SINGULARNAME'] = 'Komentarz do strony';
 $lang['pl_PL']['PageCommentInterface']['COMMENTERURL'] = 'Adres URL strony';
 $lang['pl_PL']['PageCommentInterface']['POST'] = 'Post';
 $lang['pl_PL']['PageCommentInterface']['SPAMQUESTION'] = 'Pytanie anty-spamowe: %s';
+$lang['pl_PL']['PageCommentInterface.ss']['COMMENTLOGINERROR'] = 'Nie możesz pisać komentarzy zanim się nie zalogujesz.';
+$lang['pl_PL']['PageCommentInterface.ss']['COMMENTPERMISSIONERROR'] = 'oraz że posiadasz odpowiedni poziom uprawnień';
+$lang['pl_PL']['PageCommentInterface.ss']['COMMENTPOSTLOGIN'] = 'Logowanie tutaj';
 $lang['pl_PL']['PageCommentInterface.ss']['COMMENTS'] = 'Komentarze';
+$lang['pl_PL']['PageCommentInterface.ss']['COMMENTSDISABLED'] = 'Umieszczanie komentarzy zostało wyłączone.';
 $lang['pl_PL']['PageCommentInterface.ss']['NEXT'] = 'następny';
 $lang['pl_PL']['PageCommentInterface.ss']['NOCOMMENTSYET'] = 'Nikt nie skomentował jeszcze tej strony';
 $lang['pl_PL']['PageCommentInterface.ss']['POSTCOM'] = 'Dodaj komentarz';
@@ -356,18 +433,25 @@ $lang['pl_PL']['PageCommentInterface_singlecomment.ss']['ISNTSPAM'] = 'ten komen
 $lang['pl_PL']['PageCommentInterface_singlecomment.ss']['ISSPAM'] = 'ten komentarz jest spamem';
 $lang['pl_PL']['PageCommentInterface_singlecomment.ss']['PBY'] = 'Dodane przez';
 $lang['pl_PL']['PageCommentInterface_singlecomment.ss']['REMCOM'] = 'zmień ten komentarz';
+$lang['pl_PL']['Permission']['CMS_ACCESS_CATEGORY'] = 'Dostęp CMS';
+$lang['pl_PL']['Permissions']['PERMISSIONS_CATEGORY'] = 'Uprawnienia ról i dostępu';
 $lang['pl_PL']['ReportAdmin']['MENUTITLE'] = 'Raporty';
 $lang['pl_PL']['ReportAdmin_left.ss']['REPORTS'] = 'Raporty';
 $lang['pl_PL']['ReportAdmin_right.ss']['WELCOME1'] = 'Witamy w';
 $lang['pl_PL']['ReportAdmin_right.ss']['WELCOME2'] = 'Sekcja raportów. Proszę wybrać jeden z raportów po lewej';
 $lang['pl_PL']['ReportAdmin_SiteTree.ss']['REPORTS'] = 'Raporty';
+$lang['pl_PL']['SecurityAdmin']['ACCESS_HELP'] = 'Zezwól na oglądanie, dodawanie i edycję użytkowników, jak i na dodawanie do nich uprawnień i ról.';
 $lang['pl_PL']['SecurityAdmin']['ADDMEMBER'] = 'Dodaj użytkownika';
+$lang['pl_PL']['SecurityAdmin']['APPLY_ROLES'] = 'Zatwierdź role dla grupy';
+$lang['pl_PL']['SecurityAdmin']['APPLY_ROLES_HELP'] = 'Zdolność edycji ról przypisanych do grup. Wymaga uprawnienia "Dostęp do sekcji \'Bezpieczeństwo\' "';
 $lang['pl_PL']['SecurityAdmin']['EDITPERMISSIONS'] = 'Edytuj zezwolenia i adresy IP dla każdej z grup';
 $lang['pl_PL']['SecurityAdmin']['MENUTITLE'] = 'Bezpieczeństwo';
 $lang['pl_PL']['SecurityAdmin']['MENUTITLE'] = 'Bezpieczeństwo';
 $lang['pl_PL']['SecurityAdmin']['NEWGROUP'] = 'Nowa grupa';
 $lang['pl_PL']['SecurityAdmin']['SAVE'] = 'Zapisz';
 $lang['pl_PL']['SecurityAdmin']['SGROUPS'] = 'Grupa bezpieczeństwa';
+$lang['pl_PL']['SecurityAdmin']['TABIMPORT'] = 'Import';
+$lang['pl_PL']['SecurityAdmin']['TABROLES'] = 'Role';
 $lang['pl_PL']['SecurityAdmin_left.ss']['CREATE'] = 'Stwórz';
 $lang['pl_PL']['SecurityAdmin_left.ss']['DEL'] = 'Usuń ...';
 $lang['pl_PL']['SecurityAdmin_left.ss']['DELGROUPS'] = 'Usuń zaznaczone grupy';
@@ -376,16 +460,27 @@ $lang['pl_PL']['SecurityAdmin_left.ss']['GO'] = 'Idź';
 $lang['pl_PL']['SecurityAdmin_left.ss']['SECGROUPS'] = 'Grupa bezpieczeństwa';
 $lang['pl_PL']['SecurityAdmin_left.ss']['SELECT'] = 'Zaznacz strony które chcesz usunąć i kliknij przycisk poniżej';
 $lang['pl_PL']['SecurityAdmin_left.ss']['TOREORG'] = 'Aby zmienić układ witryny, przeciągnij strony w odpowiadające Ci miejsca.';
+$lang['pl_PL']['SecurityAdmin_MemberImportForm']['BtnImport'] = 'Import';
 $lang['pl_PL']['SecurityAdmin_right.ss']['WELCOME1'] = 'Witamy w';
 $lang['pl_PL']['SecurityAdmin_right.ss']['WELCOME2'] = 'Sekcja administracji bezpieczeństwem. Proszę wybrać jedną z grup po lewej';
+$lang['pl_PL']['SideReport']['BROKENFILES'] = 'Strony z uszkodzonymi plikami';
+$lang['pl_PL']['SideReport']['BROKENLINKS'] = 'Strony z uszkodzonymi linkami';
+$lang['pl_PL']['SideReport']['BrokenLinksGroupTitle'] = 'Raport uszkodzonych linków';
+$lang['pl_PL']['SideReport']['BROKENVIRTUALPAGES'] = 'Strony wirtualne odnoszą się do usuniętych stron';
+$lang['pl_PL']['SideReport']['ContentGroupTitle'] = 'Raport treści';
 $lang['pl_PL']['SideReport']['EMPTYPAGES'] = 'Puste strony';
 $lang['pl_PL']['SideReport']['LAST2WEEKS'] = 'Strony zmienione w ostatnich 2 tygodniach';
+$lang['pl_PL']['SideReport']['OtherGroupTitle'] = 'Inne';
+$lang['pl_PL']['SideReport']['ParameterLiveCheckbox'] = 'Sprawdź stronę online';
 $lang['pl_PL']['SideReport']['REPEMPTY'] = '%s raport jest pusty';
 $lang['pl_PL']['SideReport']['TODO'] = 'Do zrobienia';
 $lang['pl_PL']['StaticExporter']['BASEURL'] = 'Podstawowy URL';
 $lang['pl_PL']['StaticExporter']['EXPORTTO'] = 'Eksportuj do tego folderu';
 $lang['pl_PL']['StaticExporter']['FOLDEREXPORT'] = 'Folder przeniesiony do';
 $lang['pl_PL']['StaticExporter']['NAME'] = 'Statyczny eksport';
+$lang['pl_PL']['TableListField.ss']['NOITEMSFOUND'] = 'Nie znaleziono elementów';
+$lang['pl_PL']['TableListField.ss']['SORTASC'] = 'Posortuj w porządku rosnącym';
+$lang['pl_PL']['TableListField.ss']['SORTDESC'] = 'Posortuj w porządku malejącym';
 $lang['pl_PL']['TableListField_PageControls.ss']['DISPLAYING'] = 'Wyświetlane';
 $lang['pl_PL']['TableListField_PageControls.ss']['OF'] = 'z';
 $lang['pl_PL']['TableListField_PageControls.ss']['TO'] = 'do';
diff --git a/lang/ru_RU.php b/lang/ru_RU.php
index aebf4916..44017398 100644
--- a/lang/ru_RU.php
+++ b/lang/ru_RU.php
@@ -69,6 +69,7 @@ $lang['ru_RU']['AssetTableField']['SWFFILEOPTIONS'] = 'Настройки фай
 $lang['ru_RU']['AssetTableField']['TITLE'] = 'Название';
 $lang['ru_RU']['AssetTableField']['TYPE'] = 'Тип';
 $lang['ru_RU']['AssetTableField']['URL'] = 'URL';
+$lang['ru_RU']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Удалить из чернового сайта';
 $lang['ru_RU']['CMSMain']['ACCESS'] = 'Доступ к %s в Системе';
 $lang['ru_RU']['CMSMain']['ACCESSALLINTERFACES'] = 'Доступ ко всему интерфейсу CMS';
 $lang['ru_RU']['CMSMain']['CANCEL'] = 'Отмена';
@@ -133,7 +134,7 @@ $lang['ru_RU']['CMSMain_left.ss']['DELETECONFIRM'] = 'Удалить выбра
 $lang['ru_RU']['CMSMain_left.ss']['DELETEDSTILLLIVE'] = 'Удалено с чернового сайта, но еще опубликовано на рабочем сайте';
 $lang['ru_RU']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Отредактировано на черновом сайте и еще не опубликовано';
 $lang['ru_RU']['CMSMain_left.ss']['EDITEDSINCE'] = 'Изменения с';
-$lang['ru_RU']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Разрешить перетаскивание мышкой';
+$lang['ru_RU']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Разрешить перетаскивание';
 $lang['ru_RU']['CMSMain_left.ss']['GO'] = 'Перейти';
 $lang['ru_RU']['CMSMain_left.ss']['KEY'] = 'Ключ:';
 $lang['ru_RU']['CMSMain_left.ss']['NEW'] = 'новое';
@@ -162,6 +163,7 @@ $lang['ru_RU']['CMSMain_versions.ss']['PUBR'] = 'Публикация';
 $lang['ru_RU']['CMSMain_versions.ss']['UNKNOWN'] = 'Неизвестный';
 $lang['ru_RU']['CMSMain_versions.ss']['WHEN'] = 'Когда';
 $lang['ru_RU']['CMSSiteTreeFilter']['ALL'] = 'Все элементы';
+$lang['ru_RU']['CMSSiteTreeFilter']['DELETEDPAGES'] = 'Все страницы, включая удаленные';
 $lang['ru_RU']['CommentAdmin']['ACCEPT'] = 'Принять';
 $lang['ru_RU']['CommentAdmin']['APPROVED'] = 'Принято %s комментариев. ';
 $lang['ru_RU']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Одобренные комментарии';
@@ -205,6 +207,8 @@ $lang['ru_RU']['CommentTableField.ss']['NOITEMSFOUND'] = 'Ничего не на
 $lang['ru_RU']['CommentTableField.ss']['SPAM'] = 'спам';
 $lang['ru_RU']['ComplexTableField']['CLOSEPOPUP'] = 'Закрыть всплывающее окно';
 $lang['ru_RU']['ComplexTableField']['SUCCESSADD'] = 'Добавленно %s %s %';
+$lang['ru_RU']['Group']['IMPORTTABTITLE'] = 'Импортировать';
+$lang['ru_RU']['Group']['RolesAddEditLink'] = 'Добавить/редактировать роли';
 $lang['ru_RU']['ImageEditor.ss']['ACTIONS'] = 'действия';
 $lang['ru_RU']['ImageEditor.ss']['ADJUST'] = 'настройка';
 $lang['ru_RU']['ImageEditor.ss']['APPLY'] = 'применить';
@@ -262,6 +266,7 @@ $lang['ru_RU']['LeftAndMain.ss']['VIEWPAGEIN'] = 'Вид страниц:';
 $lang['ru_RU']['LeftAndMain']['STATUSPUBLISHEDSUCCESS'] = 'Запись \'%s\' опубликована';
 $lang['ru_RU']['LeftAndMain']['STATUSTO'] = 'Статус изменен на \'%s\'';
 $lang['ru_RU']['LeftAndMain']['TREESITECONTENT'] = 'Содержимое сайта';
+$lang['ru_RU']['LeftAndMain_right.ss']['WELCOMETO'] = 'Добро пожаловать на ';
 $lang['ru_RU']['MemberList.ss']['FILTER'] = 'Фильтр';
 $lang['ru_RU']['MemberList_PageControls.ss']['DISPLAYING'] = 'Показано';
 $lang['ru_RU']['MemberList_PageControls.ss']['FIRSTMEMBERS'] = 'участников';
@@ -283,6 +288,7 @@ $lang['ru_RU']['MemberTableField']['ADDEDTOGROUP'] = 'Участник, доба
 $lang['ru_RU']['MemberTableField']['ADDINGFIELD'] = 'Не удалось добавить';
 $lang['ru_RU']['MemberTableField']['ANYGROUP'] = 'Любая группа';
 $lang['ru_RU']['MemberTableField']['ASC'] = 'По возрастанию';
+$lang['ru_RU']['MemberTableField']['DeleteTitleText'] = 'Удалить из этой группы';
 $lang['ru_RU']['MemberTableField']['DESC'] = 'По убыванию';
 $lang['ru_RU']['MemberTableField']['EMAIL'] = 'Email';
 $lang['ru_RU']['MemberTableField']['FILTER'] = 'Фильтр';
@@ -376,14 +382,21 @@ $lang['ru_RU']['SecurityAdmin_left.ss']['SELECT'] = 'Выберите групп
 $lang['ru_RU']['SecurityAdmin_left.ss']['TOREORG'] = 'Для упорядочения страниц, перетаскивайте их мышкой.';
 $lang['ru_RU']['SecurityAdmin_right.ss']['WELCOME1'] = 'Добро пожаловать в';
 $lang['ru_RU']['SecurityAdmin_right.ss']['WELCOME2'] = 'раздел управления правами доступа. Пожалуйста, выберите группу слева.';
+$lang['ru_RU']['SideReport']['BROKENFILES'] = 'Страницы с ошибочными файлами';
+$lang['ru_RU']['SideReport']['BROKENLINKS'] = 'Страницы с ошибочными ссылками';
+$lang['ru_RU']['SideReport']['BrokenLinksGroupTitle'] = 'Отчет об ошибочных ссылках';
 $lang['ru_RU']['SideReport']['EMPTYPAGES'] = 'Пустые страницы';
 $lang['ru_RU']['SideReport']['LAST2WEEKS'] = 'Страницы, редактированные последние 2 недели';
+$lang['ru_RU']['SideReport']['OtherGroupTitle'] = 'Другие';
 $lang['ru_RU']['SideReport']['REPEMPTY'] = 'Отчет %s пуст.';
 $lang['ru_RU']['SideReport']['TODO'] = 'Запланировано';
 $lang['ru_RU']['StaticExporter']['BASEURL'] = 'Базовый URL';
 $lang['ru_RU']['StaticExporter']['EXPORTTO'] = 'Экспорт в эту папку';
 $lang['ru_RU']['StaticExporter']['FOLDEREXPORT'] = 'Папка для экспорта';
 $lang['ru_RU']['StaticExporter']['NAME'] = 'Статический экспорт';
+$lang['ru_RU']['TableListField.ss']['NOITEMSFOUND'] = 'Элементы не найдены';
+$lang['ru_RU']['TableListField.ss']['SORTASC'] = 'По возрастанию';
+$lang['ru_RU']['TableListField.ss']['SORTDESC'] = 'По убыванию';
 $lang['ru_RU']['TableListField_PageControls.ss']['DISPLAYING'] = 'Отображение';
 $lang['ru_RU']['TableListField_PageControls.ss']['OF'] = ' ';
 $lang['ru_RU']['TableListField_PageControls.ss']['TO'] = ' ';
diff --git a/lang/sk_SK.php b/lang/sk_SK.php
index e885c123..b002946b 100644
--- a/lang/sk_SK.php
+++ b/lang/sk_SK.php
@@ -105,6 +105,7 @@ $lang['sk_SK']['CMSBatchActions']['UNPUBLISHING_PAGES'] = 'Od-publikovávam stra
 $lang['sk_SK']['CMSBatchActions']['UNPUBLISH_PAGES'] = 'Od-publikovať';
 $lang['sk_SK']['CMSMain']['ACCESS'] = 'Prístup do \'%s\' sekcie';
 $lang['sk_SK']['CMSMain']['ACCESSALLINTERFACES'] = 'Prebije bližsie špecifikované prúistupové nastavenia.';
+$lang['sk_SK']['CMSMain']['ACCESSALLINTERFACESHELP'] = 'Prepisuje viac špecifických  nastavení prístupu.';
 $lang['sk_SK']['CMSMain']['ACCESS_HELP'] = 'Povoliť prezeranie sekcie obshujúcej štruktúru a obsah webu. Právomoci na prezeranie a úpravu môžu byť nastavené cez menu pre samostanú stránku tak isto ako jednotlivé právomoci pre obsah.';
 $lang['sk_SK']['CMSMain']['CANCEL'] = 'Zrušiť';
 $lang['sk_SK']['CMSMain']['CHOOSEREPORT'] = '(Vyberte správu)';
@@ -185,6 +186,7 @@ $lang['sk_SK']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publikovať vybrané str
 $lang['sk_SK']['CMSMain_left.ss']['SEARCH'] = 'Hľadať';
 $lang['sk_SK']['CMSMain_left.ss']['SEARCHTITLE'] = 'Hľadať v URL, titulkoch, položkách menu, &amp; v obsahu';
 $lang['sk_SK']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Vyberte stránky, ktoré chcete zmeniť a potom kliknite na akciu';
+$lang['sk_SK']['CMSMain_left.ss']['SHOWITEMS'] = 'Zobraziť:';
 $lang['sk_SK']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Ukázať len zmenené stránky';
 $lang['sk_SK']['CMSMain_left.ss']['SHOWUNPUB'] = 'Ukázať nepublikované verzie';
 $lang['sk_SK']['CMSMain_left.ss']['SITECONTENT TITLE'] = 'Obsah a štruktúra webu';
@@ -202,6 +204,8 @@ $lang['sk_SK']['CMSMain_versions.ss']['NOTPUB'] = 'Nepublikované';
 $lang['sk_SK']['CMSMain_versions.ss']['PUBR'] = 'Vydavateľ';
 $lang['sk_SK']['CMSMain_versions.ss']['UNKNOWN'] = 'Neznámy';
 $lang['sk_SK']['CMSMain_versions.ss']['WHEN'] = 'Kedy';
+$lang['sk_SK']['CMSSiteTreeFilter']['ALL'] = 'Všetky položky';
+$lang['sk_SK']['CMSSiteTreeFilter']['DELETEDPAGES'] = 'Všetky stránky vrátane zmazaných';
 $lang['sk_SK']['CommentAdmin']['ACCEPT'] = 'Potvrdiť';
 $lang['sk_SK']['CommentAdmin']['APPROVED'] = 'Prijatých %s príspevkov.';
 $lang['sk_SK']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Schválené príspevky';

From 7325d3249725dd694d64808e13a4244ad4752cde Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 15 Jul 2010 22:52:42 +0000
Subject: [PATCH 433/483] BUGFIX: Don't allow direct access to PHP files in cms
 module.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108028 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 .htaccess | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .htaccess

diff --git a/.htaccess b/.htaccess
new file mode 100644
index 00000000..e03b4650
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,3 @@
+<Files *.php>
+	Deny from all
+</Files>
\ No newline at end of file

From dd70fcd5be86768b982a190b495e6a0298868df0 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 19 Jul 2010 02:16:21 +0000
Subject: [PATCH 434/483] BUGFIX AssetAdmin->doUpload() shows JS alert *before*
 triggering a page reload, as this seems to mess up TinyMCE in Firefox on
 subsequent page loads (fixes #5838)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108096 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 2e06b73e..accdac9e 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -311,10 +311,10 @@ JS
 			/* Names: $sFileNames */
 			
 			var form = parent.document.getElementById('Form_EditForm');
-			form.getPageFromServer(form.elements.ID.value);
 			parent.statusMessage("{$statusMessage}","{$status}");
 			$jsErrors
 			parent.document.getElementById('sitetree').getTreeNodeByIdx( "{$folder->ID}" ).getElementsByTagName('a')[0].className += ' contents';
+			form.getPageFromServer(form.elements.ID.value);
 			</script>
 HTML;
 	}

From 473347dcfe72df2dc88e7036e10c2345ba5ff181 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 19 Jul 2010 03:29:05 +0000
Subject: [PATCH 435/483] BUGFIX Fixing default group selection in 'add member'
 dialog (in MemberTableField) (fixes #5836)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108099 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberTableField.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index 139aa541..5cd78acb 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -332,7 +332,9 @@ class MemberTableField extends ComplexTableField {
 		// Set default groups - also implemented in MemberTableField_Popup::__construct()
 		if($this->group) {
 			$groupsField = $form->Fields()->dataFieldByName('Groups');
-			if($groupsField) $groupsField->setValue($this->group->ID);
+			// TODO Needs to be a string value (not int) because of TreeMultiselectField->getItems(),
+			// see http://open.silverstripe.org/ticket/5836
+			if($groupsField) $groupsField->setValue((string)$this->group->ID);
 		}
 		
 		return $form;

From 57ebfb9b24e9f33bad45ccaeb692164b4491882a Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 20 Jul 2010 04:48:38 +0000
Subject: [PATCH 436/483] MINOR Disallowing more potentially active file
 extensions in cms/.htaccess

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108206 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 .htaccess | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.htaccess b/.htaccess
index e03b4650..fad44ccd 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,3 +1,3 @@
-<Files *.php>
+<FilesMatch "\.(php|php3|php4|php5|phtml|inc)$">
 	Deny from all
-</Files>
\ No newline at end of file
+</FilesMatch>
\ No newline at end of file

From 43c568ef12f3d7596a85346d126170e1029664c9 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Tue, 20 Jul 2010 23:51:53 +0000
Subject: [PATCH 437/483] MINOR Removed unncessary end PHP tag from
 cms/_config.php

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108246 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 _config.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/_config.php b/_config.php
index bb0e26f7..abec1fa3 100644
--- a/_config.php
+++ b/_config.php
@@ -51,6 +51,3 @@ SS_Report::register("SideReport", "SideReport_RecentlyEdited");
 SS_Report::register("SideReport", "SideReport_ToDo");
 if (class_exists('SubsiteReportWrapper')) SS_Report::register('ReportAdmin', 'SubsiteReportWrapper("BrokenLinksReport")',-20);
 else SS_Report::register('ReportAdmin', 'BrokenLinksReport',-20);
-
-
-?>

From 2e25aa2bdfa30097850cc6ec22c5974d8921a92c Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Fri, 23 Jul 2010 03:35:37 +0000
Subject: [PATCH 438/483] BUGFIX #5852 Missing translation for SecurityAdmin
 save button causes it to have no text, should default to english "Save"

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108407 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SecurityAdmin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index a6f86b5b..bc69a293 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -317,7 +317,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 			$fields->push($groupIDField = new HiddenField('GroupID'));
 
 			$actions = new FieldSet();
-			$actions->push(new FormAction('savemember', _t('SecurityAdmin.SAVE')));
+			$actions->push(new FormAction('savemember', _t('SecurityAdmin.SAVE', 'Save')));
 
 			$form = new Form($this, 'MemberForm', $fields, $actions);
 			if($record) $form->loadDataFrom($record);

From 155a04578de9cfc629bf864a81a492c8cf32add5 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 25 Jul 2010 21:00:15 +0000
Subject: [PATCH 439/483] BUGFIX Checking for existence of $('SwitchView')
 (fixes #5282)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108436 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/LeftAndMain_right.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/LeftAndMain_right.js b/javascript/LeftAndMain_right.js
index f2383e07..c13775a2 100755
--- a/javascript/LeftAndMain_right.js
+++ b/javascript/LeftAndMain_right.js
@@ -25,7 +25,7 @@ CMSForm.prototype = {
 		ajaxActionsAtTop(this.id, 'form_actions_' + this.formName, this.formName);
 		
 		// Update the nav items down the bottom
-		if($('AjaxSwitchView')) {
+		if($('SwitchView') && $('AjaxSwitchView')) {
 			$('SwitchView').innerHTML = $('AjaxSwitchView').innerHTML;
 			$('AjaxSwitchView').innerHTML = '';
 			Behaviour.apply('SwitchView'); // This is needed so calendar still works

From 95a917e04d6af1cb863278afa54cc50c71ab949f Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 25 Jul 2010 22:16:01 +0000
Subject: [PATCH 440/483] MINOR Translations in CMSMain_left.ss

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108442 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 lang/en_US.php                     | 7 +++++--
 templates/Includes/CMSMain_left.ss | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lang/en_US.php b/lang/en_US.php
index 909aa9ff..9c1eb5e4 100755
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -180,6 +180,8 @@ $lang['en_US']['CMSMain_left.ss']['ENABLEDRAGGING'] = array(
 	'Allow drag &amp; drop reordering',
 	PR_HIGH
 );
+$lang['en_US']['CMSMain_left.ss']['FILTERLABELPAGETYPE'] = 'Page type';
+$lang['en_US']['CMSMain_left.ss']['FILTERLABELTEXT'] = 'Text';
 $lang['en_US']['CMSMain_left.ss']['GO'] = 'Go';
 $lang['en_US']['CMSMain_left.ss']['HIDDEN'] = 'hidden';
 $lang['en_US']['CMSMain_left.ss']['KEY'] = 'Key:';
@@ -242,6 +244,8 @@ $lang['en_US']['CommentAdmin_right.ss']['WELCOME1'] = 'Welcome to the';
 $lang['en_US']['CommentAdmin_right.ss']['WELCOME2'] = 'comment management. Please select a folder in the tree on the left.';
 $lang['en_US']['CommentTableField']['FILTER'] = 'Filter';
 $lang['en_US']['CommentTableField']['SEARCH'] = 'Search';
+$lang['en_US']['CommentTableField']['SELECTALL'] = 'All';
+$lang['en_US']['CommentTableField']['SELECTNONE'] = 'None';
 $lang['en_US']['CommentTableField.ss']['APPROVE'] = 'approve';
 $lang['en_US']['CommentTableField.ss']['APPROVECOMMENT'] = 'Approve this comment';
 $lang['en_US']['CommentTableField.ss']['DELETE'] = 'delete';
@@ -540,8 +544,7 @@ $lang['en_US']['StaticExporter']['BASEURL'] = 'Base URL';
 $lang['en_US']['StaticExporter']['EXPORTTO'] = 'Export to that folder';
 $lang['en_US']['StaticExporter']['FOLDEREXPORT'] = 'Folder to export to';
 $lang['en_US']['StaticExporter']['NAME'] = 'Static exporter';
-$lang['en_US']['TableListField']['ALL'] = 'All';
-$lang['en_US']['TableListField']['NONE'] = 'None';
+$lang['en_US']['TableListField']['SELECT'] = 'Select:';
 $lang['en_US']['TableListField.ss']['NOITEMSFOUND'] = 'No items found';
 $lang['en_US']['TableListField.ss']['SORTASC'] = 'Sort in ascending order';
 $lang['en_US']['TableListField.ss']['SORTDESC'] = 'Sort in descending order';
diff --git a/templates/Includes/CMSMain_left.ss b/templates/Includes/CMSMain_left.ss
index 4dc93cff..a6a38a61 100755
--- a/templates/Includes/CMSMain_left.ss
+++ b/templates/Includes/CMSMain_left.ss
@@ -29,7 +29,7 @@
 					<input type="hidden" id="SiteTreeIsFiltered" value="0" />
 					
 					<div id="SearchBox">
-						<div class="SearchCriteria">Text:</div>
+						<div class="SearchCriteria"><% _t('FILTERLABELTEXT', 'Text') %>:</div>
 						<input type="text" id="SiteTreeSearchTerm" class='SearchCriteria' name="SiteTreeSearchTerm" />
 					</div>
 					
@@ -38,7 +38,7 @@
 						<div id="InputSiteTreeFilterDate">$SiteTreeFilterDateField</div>
 					</div>
 					<div id='ContainerSiteTreeFilterClassName' class='SearchCriteriaContainer' style="display:none">
-						<div id="TextSiteTreeFilterClassName" class="SearchCriteria">Page type: </div>
+						<div id="TextSiteTreeFilterClassName" class="SearchCriteria"><% _t('FILTERLABELPAGETYPE', 'Page type') %>: </div>
 						<div id="InputSiteTreeFilterClassName">$SiteTreeFilterPageTypeField</div>
 					</div>
 
@@ -53,7 +53,7 @@
 						<select id="SiteTreeFilterAddCriteria">
 							<option value=""><% _t('ADDSEARCHCRITERIA','Add Criteria') %></option>
 							<option value="SiteTreeFilterDate"><% _t('EDITEDSINCE','Edited Since') %></option>
-							<option value="SiteTreeFilterClassName">Page type</option>
+							<option value="SiteTreeFilterClassName"><% _t('FILTERLABELPAGETYPE', 'Page type') %></option>
 							<% control SiteTreeFilterOptions %>
 		        				<option value="$Column">$Title</option>
 							<% end_control %>

From 229760a1e170d91cdc6f02406f70fefa8f6c49ad Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Tue, 27 Jul 2010 04:26:06 +0000
Subject: [PATCH 441/483] MINOR: Add some documentation to LeftAndMain_right.js

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108559 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/LeftAndMain_right.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/javascript/LeftAndMain_right.js b/javascript/LeftAndMain_right.js
index c13775a2..ac58846a 100755
--- a/javascript/LeftAndMain_right.js
+++ b/javascript/LeftAndMain_right.js
@@ -151,6 +151,9 @@ CMSForm.prototype = {
 	 * Save the contens of the form, by submitting it and resetting is changed checker
 	 * on success.
 	 *
+         * @param ifChanged boolean     if true, only save changed fields
+         * @param callAfter function (optional) callback function to run after the AJAX request.
+         * @param action string   (optional, default is 'save') action to call via AJAX.
 	 * @param publish boolean (optional) whether to publish in addition to saving
 	 */
 	save: function(ifChanged, callAfter, action, publish) {

From 31a9271c85be73e301a85a2ee98130c166ec90a6 Mon Sep 17 00:00:00 2001
From: Julian Seidenberg <julian@silverstripe.com>
Date: Wed, 4 Aug 2010 02:57:38 +0000
Subject: [PATCH 442/483] BUGFIX: CSVBulkLoader import method now no longer
 requires files to end in '.csv'. Some projects want to import files in CSV
 format, but not of csv file type.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108887 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ModelAdmin.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index 6f33ae6f..59d2f18c 100755
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -523,19 +523,18 @@ class ModelAdmin_CollectionController extends Controller {
 	 * @param SS_HTTPRequest $request
 	 */
 	function import($data, $form, $request) {
-		
+
 		$modelName = $data['ClassName'];
-		
+
 		if(!$this->showImportForm() || (is_array($this->showImportForm()) && !in_array($modelName,$this->showImportForm()))) return false;
 		$importers = $this->parentController->getModelImporters();
 		$importerClass = $importers[$modelName];
-		
+
 		$loader = new $importerClass($data['ClassName']);
-		
+
 		// File wasn't properly uploaded, show a reminder to the user
 		if(
 			empty($_FILES['_CsvFile']['tmp_name']) ||
-			array_search($_FILES['_CsvFile']['type'], array('text/csv', 'text/plain')) === false ||
 			file_get_contents($_FILES['_CsvFile']['tmp_name']) == ''
 		) {
 			$form->sessionMessage(_t('ModelAdmin.NOCSVFILE', 'Please browse for a CSV file to import'), 'good');
@@ -543,14 +542,14 @@ class ModelAdmin_CollectionController extends Controller {
 			return false;
 		}
 
-		if (!empty($data['EmptyBeforeImport']) && $data['EmptyBeforeImport']) { //clear database before import 	
+		if (!empty($data['EmptyBeforeImport']) && $data['EmptyBeforeImport']) { //clear database before import
 			$loader->deleteExistingRecords = true;
 		}
 		$results = $loader->load($_FILES['_CsvFile']['tmp_name']);
 
 		$message = '';
 		if($results->CreatedCount()) $message .= sprintf(
-			_t('ModelAdmin.IMPORTEDRECORDS', "Imported %s records."), 
+			_t('ModelAdmin.IMPORTEDRECORDS', "Imported %s records."),
 			$results->CreatedCount()
 		);
 		if($results->UpdatedCount()) $message .= sprintf(
@@ -562,11 +561,12 @@ class ModelAdmin_CollectionController extends Controller {
 			$results->DeletedCount()
 		);
 		if(!$results->CreatedCount() && !$results->UpdatedCount()) $message .= _t('ModelAdmin.NOIMPORT', "Nothing to import");
-		
+
 		$form->sessionMessage($message, 'good');
 		Director::redirectBack();
 	}
 	
+	
 	/**
 	 * Return the columns available in the column selection field.
 	 * Overload this to make other columns available

From 1aaa4b069bc9fd1bcaa7af4b02339082e63e9040 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sat, 4 Sep 2010 23:12:56 +0000
Subject: [PATCH 443/483] MINOR German translations for cms javascript (#5921,
 thanks bartlomiej)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@110435 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/lang/de_DE.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/javascript/lang/de_DE.js b/javascript/lang/de_DE.js
index a6a788ea..9abf9fbc 100644
--- a/javascript/lang/de_DE.js
+++ b/javascript/lang/de_DE.js
@@ -22,6 +22,9 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 		'ModelAdmin.SAVED': "Gespeichert",
 		'ModelAdmin.REALLYDELETE': "Wirklich löschen?",
 		'ModelAdmin.DELETED': "Gelöscht",
-		'LeftAndMain.PAGEWASDELETED': "Diese Seite wurde gelöscht."
+		'ModelAdmin.VALIDATIONERROR': "Validationsfehler",
+		'LeftAndMain.PAGEWASDELETED': "Diese Seite wurde gelöscht.",
+		'LeftAndMain.CONFIRMUNSAVED': "Sind Sie sicher, dasß Sie die Seite verlassen möchten?\n\nWARNUNG: Ihre Änderungen werden nicht gespeichert.\n\nDrücken Sie \"OK\" um fortzufahren, oder \"Abbrechen\" um auf dieser Seite zu bleiben.",
+		'WidgetAreaEditor.TOOMANY': 'Sie haben die maximale Anzahl an Widgets in diesem Bereich erreicht.'
 	});
 }
\ No newline at end of file

From c134b8e020b671ba25be62eff56a67b00d12457a Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Sun, 5 Sep 2010 02:32:07 +0000
Subject: [PATCH 444/483] BUGFIX #5811 Fixed default selection of root node
 when CMS first opened (no currentPage set in session)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@110439 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 00e74877..a139b1af 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -515,17 +515,15 @@ JS;
 	 */
 	function RootForm() {
 		$siteConfig = SiteConfig::current_site_config();
-		$fields = $siteConfig->getCMSFields(); 
-		if(Object::has_extension('SiteConfig',"Translatable")){ 
-			$fields->push(new HiddenField('Locale','', $siteConfig->Locale ));       
-		} 
-		
-		$fields->push(new HiddenField('ID', '', $siteConfig->ID)); 
-		
+		$fields = $siteConfig->getCMSFields();
+		if(Object::has_extension('SiteConfig',"Translatable")) {
+			$fields->push(new HiddenField('Locale','', $siteConfig->Locale));
+		}
+
 		$form = new Form($this, 'RootForm', $fields, $siteConfig->getCMSActions());
 		$form->setHTMLID('Form_EditForm');
 		$form->loadDataFrom($siteConfig);
-		
+
 		$this->extend('updateEditForm', $form);
 
 		return $form;

From 51fee3fe459d94277e0a85060c821c227badbf17 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 16 Sep 2010 05:21:42 +0000
Subject: [PATCH 445/483] BUGFIX Don't suggest members in
 SecurityAdmin->autocomplete() that the current user doesn't have rights to
 edit (fixes #5651)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@110858 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SecurityAdmin.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index bc69a293..8d00e0be 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -283,7 +283,9 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		if($matches) {
 			$result .= "<ul>";
 			foreach($matches as $match) {
-				if(!$match->canView()) continue;
+				// If the current user doesnt have permissions on the target user,
+				// he's not allowed to add it to a group either: Don't include it in the suggestions.
+				if(!$match->canView() || !$match->canEdit()) continue;
 
 				$data = $match->FirstName;
 				$data .= ",$match->Surname";

From 01373cf4afe48b4e4285175cbc7a58a16f196476 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 16 Sep 2010 05:22:23 +0000
Subject: [PATCH 446/483] BUGFIX Disallow addition of members to groups with
 MemberTableField->addtogroup() when the editing member doesn't have
 permissions on the added member

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@110859 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberTableField.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index 5cd78acb..0b515743 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -176,6 +176,8 @@ class MemberTableField extends ComplexTableField {
 				$className, 
 				sprintf('"%s" = \'%s\'', $identifierField, $data[$identifierField])
 			);
+			
+			if($record && !$record->canEdit()) return $this->httpError('401');
 		} 
 			
 		// Fall back to creating a new record

From f969eeedc35042d577f635061c547013e827c5fc Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 21 Sep 2010 20:29:21 +0000
Subject: [PATCH 447/483] MINOR Removing MemberImportFormTest, breaks PHPUnit
 test run, and doesnt have any assertions

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111053 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/MemberImportFormTest.php | 21 ---------------------
 tests/MemberImportFormTest.yml |  3 ---
 2 files changed, 24 deletions(-)
 delete mode 100644 tests/MemberImportFormTest.php
 delete mode 100644 tests/MemberImportFormTest.yml

diff --git a/tests/MemberImportFormTest.php b/tests/MemberImportFormTest.php
deleted file mode 100644
index 4426a951..00000000
--- a/tests/MemberImportFormTest.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * @package cms
- * @subpackage tests
- */
-class MemberImportFormTest extends SapphireTest {
-	
-	function testLoad() {
-		$form = new MemberImportForm(
-			new Controller(),
-			'Form'
-		);
-		$data = array(
-			'CsvFile' => array(
-				'tmp_name' => 'cms/tests/MemberImportFormTest.yml'
-			)
-		);
-		$form->doImport($data, $form);
-	}
-	
-}
\ No newline at end of file
diff --git a/tests/MemberImportFormTest.yml b/tests/MemberImportFormTest.yml
deleted file mode 100644
index 94463f79..00000000
--- a/tests/MemberImportFormTest.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-FirstName,Surname,Email,Password,PasswordEncryption,Salt,PasswordExpiry,Groups
-author1_first,author1_last,author1@test.com,21bb196c4d488023cb4e4b9df5f687c9a4d40172,sha1_v2.4,c23a94a878aa825cee69136bfd6185a874bc68801257978194,,existinggroup
-author2_first,author2_last,author2@test.com,069b6b22dcaded75c045b7e5ceb5d1dd743f9cac,sha1_v2.4,7e8ea602668b5631bac4baaf7174f9966b6d34571257978210,,"existinggroup,newgroup"
\ No newline at end of file

From 798c1d173adc2e06e6c22e8e1080af7fd98113f6 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sat, 25 Sep 2010 00:35:49 +0000
Subject: [PATCH 448/483] MINOR Ensuring SiteTreeAccess.js is properly minified
 in live mode

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111224 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 43d86f53..7a8983c4 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -298,6 +298,7 @@ class LeftAndMain extends Controller {
 				THIRDPARTY_DIR . '/calendar/calendar.js',
 				THIRDPARTY_DIR . '/calendar/lang/calendar-en.js',
 				THIRDPARTY_DIR . '/calendar/calendar-setup.js',
+				CMS_DIR . "/javascript/SitetreeAccess.js",
 			)
 		);
 

From 2ec69aa597c7b48b694aa047a4a9cbc1832ab015 Mon Sep 17 00:00:00 2001
From: Saophalkun Ponlu <phalkunz@silverstripe.com>
Date: Mon, 27 Sep 2010 04:32:37 +0000
Subject: [PATCH 449/483] MINOR: Add translation correction for Czech and add
 Slovakian translation in cms and sapphire (js). Thanks to @Pike

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111262 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/lang/cs_CZ.js | 12 ++++++------
 javascript/lang/sk_SK.js | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 javascript/lang/sk_SK.js

diff --git a/javascript/lang/cs_CZ.js b/javascript/lang/cs_CZ.js
index a08f12d4..5db2f63d 100644
--- a/javascript/lang/cs_CZ.js
+++ b/javascript/lang/cs_CZ.js
@@ -2,12 +2,12 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
 	ss.i18n.addDictionary('cs_CZ', {
-		'CMSMAIN.WARNINGSAVEPAGESBEFOREADDING' : "Musíte stránku uložit před přidáním další podstránky",
+		'CMSMAIN.WARNINGSAVEPAGESBEFOREADDING' : "Před přidáním další podstránky, musíte stránku uložit",
 		'CMSMAIN.CANTADDCHILDREN' : "Nemůžete přidat potomky do vybraného uzlu",
 		'CMSMAIN.ERRORADDINGPAGE' : 'Chyba při přidání stránky',
-		'CMSMAIN.FILTEREDTREE' : 'Filtrovaná struktúra k zobrazení pouze zmeněných stránek',
-		'CMSMAIN.ERRORFILTERPAGES' : 'Nemožné filtrovat struktúru k zobrazení pouze zmeněných stránek<br />%s',
-		'CMSMAIN.ERRORUNFILTER' : 'Nemožné filtrovat struktúru webu<br />%s',
+		'CMSMAIN.FILTEREDTREE' : 'Filtrovaná struktura k zobrazení pouze zmeněných stránek',
+		'CMSMAIN.ERRORFILTERPAGES' : 'Není možno filtrovat strukturu k zobrazení pouze zmeněných stránek<br />%s',
+		'CMSMAIN.ERRORUNFILTER' : 'Není možno filtrovat strukturu webu<br />%s',
 		'CMSMAIN.ERRORUNFILTER' : 'Nefiltrovaná struktura',
 		'CMSMAIN.PUBLISHINGPAGES' : 'Zveřejňování stránek...',
 		'CMSMAIN.SELECTONEPAGE' : "Prosím, vyberte nejméně 1 stránku.",
@@ -17,12 +17,12 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 		'CMSMAIN.ERRORDELETINGPAGES': 'Chyba při mazání stránek',
 		'CMSMAIN.PUBLISHING' : 'Zveřejňování...',
 		'CMSMAIN.RESTORING': 'Obnovování...',
-		'CMSMAIN.ERRORREVERTING': 'Chybar převádění na živý obsah',
+		'CMSMAIN.ERRORREVERTING': 'Chyba převádění na živý obsah',
 		'CMSMAIN.SAVING' : 'ukládání...',
 		'ModelAdmin.SAVED': "Uloženo",
 		'ModelAdmin.REALLYDELETE': "Skutečně chcete smazat?",
 		'ModelAdmin.DELETED': "Smazáno",
-		'LeftAndMain.PAGEWASDELETED': "Tato stránka byla smazána. K editaci stránky, ji vyberte vlevo.",
+		'LeftAndMain.PAGEWASDELETED': "Tato stránka byla smazána. Pro editaci stránky, vyberte ji vlevo.",
 		'LeftAndMain.CONFIRMUNSAVED': "Určitě chcete opustit navigaci z této stránky?\n\nUPOZORNĚNÍ: Vaše změny nebyly uloženy.\n\nStlačte OK pro pokračovat, nebo Cancel, zůstanete na této stránce."
 	});
 }
\ No newline at end of file
diff --git a/javascript/lang/sk_SK.js b/javascript/lang/sk_SK.js
new file mode 100644
index 00000000..e5e2a68c
--- /dev/null
+++ b/javascript/lang/sk_SK.js
@@ -0,0 +1,28 @@
+if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
+	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
+} else {
+	ss.i18n.addDictionary('sk_SK', {
+		'CMSMAIN.WARNINGSAVEPAGESBEFOREADDING' : "Pred pridaním ďalšej podstránky, musíte stránku uložiť",
+		'CMSMAIN.CANTADDCHILDREN' : "Nemôžete pridať potomkov do vybratého uzla",
+		'CMSMAIN.ERRORADDINGPAGE' : 'Chyba pri pridaní stránky',
+		'CMSMAIN.FILTEREDTREE' : 'Filtrovaná štruktúra k zobrazeniu iba zmenených stránok',
+		'CMSMAIN.ERRORFILTERPAGES' : 'Nie je možné filtrovať štruktúru k zobrazeniu iba zmenených stránok<br />%s',
+		'CMSMAIN.ERRORUNFILTER' : 'Nie je možné filtrovať štruktúru webu<br />%s',
+		'CMSMAIN.ERRORUNFILTER' : 'Nefiltrovaná štruktúra',
+		'CMSMAIN.PUBLISHINGPAGES' : 'Zverejňovanie stránok...',
+		'CMSMAIN.SELECTONEPAGE' : "Prosím, vyberte najmenej 1 stránku.",
+		'CMSMAIN.ERRORPUBLISHING' : 'Chyba pri zverejňovaní stránok',
+		'CMSMAIN.REALLYDELETEPAGES' : "Skutočne chcete zmazať %s označené stránky?",
+		'CMSMAIN.DELETINGPAGES' : 'Mazanie stránok...',
+		'CMSMAIN.ERRORDELETINGPAGES': 'Chyba pri mazaní stránok',
+		'CMSMAIN.PUBLISHING' : 'Zverejňovanie...',
+		'CMSMAIN.RESTORING': 'Obnovovanie...',
+		'CMSMAIN.ERRORREVERTING': 'Chyba prevádzania na živý obsah',
+		'CMSMAIN.SAVING' : 'ukladanie...',
+		'ModelAdmin.SAVED': "Uložené",
+		'ModelAdmin.REALLYDELETE': "Skutočně chcete zmazať?",
+		'ModelAdmin.DELETED': "Zmazané",
+		'LeftAndMain.PAGEWASDELETED': "Táto stránka bola zmazaná. Pre editáciu stránky, vyberte ju vľavo.",
+		'LeftAndMain.CONFIRMUNSAVED': "Určite chcete opustiť navigáciu z tejto stránky?\n\nUPOZORNENIE: Vaše zmeny neboli uložené.\n\nStlačte OK pre pokračovať, alebo Cancel, ostanete na teto stránke."
+	});
+}
\ No newline at end of file

From b76b6f61d22e4366c6283ee376c17d6dd4a053b6 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Thu, 30 Sep 2010 22:09:15 +0000
Subject: [PATCH 450/483] ENHANCEMENT: simple extend hook for PageCommentForms.
 Temporary measure till #6053 is implemented

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111443 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/PageCommentInterface.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index 467c1bae..0eb9e123 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -221,6 +221,8 @@ class PageCommentInterface extends RequestHandler {
 			"CommenterURL" => Cookie::get("PageCommentInterface_CommenterURL")	
 		));
 		
+		$this->extend('updatePageCommentForm', $form);
+		
 		return $form;
 	}
 	

From 4cc09f2a39c696d54c363bb7e1d37799da63059d Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Thu, 30 Sep 2010 22:31:01 +0000
Subject: [PATCH 451/483] ENHANCEMENT: allow PageCommentForm to store all users
 data, rather than hardcoding the fields

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111449 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/PageCommentInterface.php | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index 0eb9e123..57f33dd8 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -214,15 +214,14 @@ class PageCommentInterface extends RequestHandler {
 			Requirements::javascript(CMS_DIR . '/javascript/PageCommentInterface.js');
 		}
 		
-		// Load the data from Session
-		$form->loadDataFrom(array(
-			"Name" => Cookie::get("PageCommentInterface_Name"),
-			"Comment" => Cookie::get("PageCommentInterface_Comment"),
-			"CommenterURL" => Cookie::get("PageCommentInterface_CommenterURL")	
-		));
-		
 		$this->extend('updatePageCommentForm', $form);
 		
+		// Load the users data from a cookie
+		if($cookie = Cookie::get("PageCommentInterface_Data")) {
+			Debug::show(unserialize($cookie));
+			$form->loadDataFrom(unserialize($cookie));
+		}
+
 		return $form;
 	}
 	
@@ -269,11 +268,10 @@ class PageCommentInterface extends RequestHandler {
  */
 class PageCommentInterface_Form extends Form {
 	function postcomment($data) {
-		// Spam filtering
-		Cookie::set("PageCommentInterface_Name", $data['Name']);
-		Cookie::set("PageCommentInterface_CommenterURL", $data['CommenterURL']);
-		Cookie::set("PageCommentInterface_Comment", $data['Comment']);
+		Debug::show($data);
+		Cookie::set("PageCommentInterface_Data", serialize($data));
 
+		// Spam filtering
 		if(SSAkismet::isEnabled()) {
 			try {
 				$akismet = new SSAkismet();
@@ -331,7 +329,8 @@ class PageCommentInterface_Form extends Form {
 		$comment->NeedsModeration = PageComment::moderationEnabled();
 		$comment->write();
 		
-		Cookie::set("PageCommentInterface_Comment", '');
+		unset($data['Comment']);
+		Cookie::set("PageCommentInterface_Data", serialize($data));
 		
 		$moderationMsg = _t('PageCommentInterface_Form.AWAITINGMODERATION', "Your comment has been submitted and is now awaiting moderation.");
 		

From 6bf7bd18198df07b0633995463c5cae55f784379 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Thu, 30 Sep 2010 22:31:56 +0000
Subject: [PATCH 452/483] MINOR: removed debug

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111450 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/PageCommentInterface.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index 57f33dd8..15815176 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -218,7 +218,6 @@ class PageCommentInterface extends RequestHandler {
 		
 		// Load the users data from a cookie
 		if($cookie = Cookie::get("PageCommentInterface_Data")) {
-			Debug::show(unserialize($cookie));
 			$form->loadDataFrom(unserialize($cookie));
 		}
 

From a584a1f516a56bdf6946e1a6efa9f54bc15e4236 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Thu, 30 Sep 2010 22:36:59 +0000
Subject: [PATCH 453/483] BUGFIX: added validation to the page comment form
 Fixes #2782

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111452 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/PageCommentInterface.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index 15815176..454ce0a3 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -194,8 +194,7 @@ class PageCommentInterface extends RequestHandler {
 		$fields->push(new TextareaField("Comment", _t('PageCommentInterface.YOURCOMMENT', "Comments")));
 		
 		$form = new PageCommentInterface_Form($this, "PostCommentForm", $fields, new FieldSet(
-			new FormAction("postcomment", _t('PageCommentInterface.POST', 'Post'))
-		));
+			new FormAction("postcomment", _t('PageCommentInterface.POST', 'Post'))), new RequiredFields('Name', 'Comment'));
 		
 		// Set it so the user gets redirected back down to the form upon form fail
 		$form->setRedirectToFormOnValidationError(true);

From 55e245aca8c063d6cbbf4592b9d8b54ee9c25f95 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Thu, 30 Sep 2010 22:49:05 +0000
Subject: [PATCH 454/483] MINOR: removed debug

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111454 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/PageCommentInterface.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index 454ce0a3..ab769c88 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -266,7 +266,6 @@ class PageCommentInterface extends RequestHandler {
  */
 class PageCommentInterface_Form extends Form {
 	function postcomment($data) {
-		Debug::show($data);
 		Cookie::set("PageCommentInterface_Data", serialize($data));
 
 		// Spam filtering

From 9ccf28e254d239f798402701a7b366f7fcfd7dbf Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 3 Oct 2010 19:28:38 +0000
Subject: [PATCH 455/483] MINOR Fixed indentation in PageCommentInterface.js

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111497 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/PageCommentInterface.js | 89 +++++++++++++++---------------
 1 file changed, 44 insertions(+), 45 deletions(-)

diff --git a/javascript/PageCommentInterface.js b/javascript/PageCommentInterface.js
index 84248efa..534c8b34 100755
--- a/javascript/PageCommentInterface.js
+++ b/javascript/PageCommentInterface.js
@@ -62,40 +62,39 @@ PageCommentInterface.prototype = {
 			Ajax.SubmitForm(form, "action_postcomment", {
 				onSuccess : function(response) {
 					
-								// Create an Ajax request to regenerate the spam protection question
-			//need to check if there is actually a spam question to change first
-			if(form.elements.Math){
-				new Ajax.Request(document.getElementsByTagName('base')[0].href+'PageCommentInterface_Controller/newspamquestion', {
-					onSuccess: loadSpamQuestion,
-					onFailure: Ajax.Evaluator
-				});
-			}
-					
-						if(response.responseText != "spamprotectionfailed"){
-									__newComment.className ="even";
-							// Load the response into the new <li>
-							__newComment.innerHTML = response.responseText;
-							Behaviour.apply(__newComment);
-							
-							// Flash it using Scriptaculous
-							new Effect.Highlight(__newComment, { endcolor: '#e9e9e9' } );
-							if(response.responseText.match('<b>Spam detected!!</b>')) {
-								__newComment.className = 'spam';
-							}
-						
-						}else{
-							__newComment.innerHTML = "";
-							Behaviour.apply(__newComment);
-							message.style.display = '';
-							message.innerHTML = "You got the spam question wrong.";
-							
-						}
-						
-						
-					},
-					onFailure : function(response) {
-						alert(response.responseText);
+					// Create an Ajax request to regenerate the spam protection question
+					//need to check if there is actually a spam question to change first
+					if(form.elements.Math){
+						new Ajax.Request(document.getElementsByTagName('base')[0].href+'PageCommentInterface_Controller/newspamquestion', {
+							onSuccess: loadSpamQuestion,
+							onFailure: Ajax.Evaluator
+						});
 					}
+					
+					if(response.responseText != "spamprotectionfailed"){
+								__newComment.className ="even";
+						// Load the response into the new <li>
+						__newComment.innerHTML = response.responseText;
+						Behaviour.apply(__newComment);
+						
+						// Flash it using Scriptaculous
+						new Effect.Highlight(__newComment, { endcolor: '#e9e9e9' } );
+						if(response.responseText.match('<b>Spam detected!!</b>')) {
+							__newComment.className = 'spam';
+						}
+					
+					} else {
+						__newComment.innerHTML = "";
+						Behaviour.apply(__newComment);
+						message.style.display = '';
+						message.innerHTML = "You got the spam question wrong.";
+						
+					}
+					
+				},
+				onFailure : function(response) {
+					alert(response.responseText);
+				}
 			});
 		} else {
 			message.style.display = '';
@@ -115,20 +114,20 @@ PageCommentInterface.prototype = {
 		
 		new Ajax.Request(this.href + '?ajax=1', {
 			onSuccess : function(response) {
-					// Clear our wee status message
-					__comment.getElementsByTagName('span')[0].innerHTML = "Removing...";
+				// Clear our wee status message
+				__comment.getElementsByTagName('span')[0].innerHTML = "Removing...";
 
-					// Remove it using Scriptaculous
-					new Effect.Highlight(__comment, { 
-						startcolor: '#cc9999' , endcolor: '#e9e9e9', duration: 0.5,
-						afterFinish : function () { 
-							var commentList = __comment.parentNode;
-							commentList.removeChild(__comment);
-							if(!commentList.firstChild) {
-								$('CommentHolder').innerHTML = "<p id=\"NoComments\">No one has commented on this page yet.</p>";
-							}
+				// Remove it using Scriptaculous
+				new Effect.Highlight(__comment, { 
+					startcolor: '#cc9999' , endcolor: '#e9e9e9', duration: 0.5,
+					afterFinish : function () { 
+						var commentList = __comment.parentNode;
+						commentList.removeChild(__comment);
+						if(!commentList.firstChild) {
+							$('CommentHolder').innerHTML = "<p id=\"NoComments\">No one has commented on this page yet.</p>";
 						}
-					} );
+					}
+				} );
 			},
 			
 			onFailure : function(response) {

From 054a6d2270cdf2adf18cf0886cfb9f4eb21cab18 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 7 Oct 2010 05:45:18 +0000
Subject: [PATCH 456/483] MINOR Fixed SS_Datetime references in
 BrokenLinksReport and CommentAdmin (fixes #6063, thanks nicolaas)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111786 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CommentAdmin.php              | 2 +-
 code/reports/BrokenLinksReport.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/CommentAdmin.php b/code/CommentAdmin.php
index faab7df8..fb58529c 100644
--- a/code/CommentAdmin.php
+++ b/code/CommentAdmin.php
@@ -92,7 +92,7 @@ class CommentAdmin extends LeftAndMain {
 		
 		$table->setParentClass(false);
 		$table->setFieldCasting(array(
-			'Created' => 'SSDatetime->Full',
+			'Created' => 'SS_Datetime->Full',
 			'Comment' => array('HTMLText->LimitCharacters', 150)
 		));
 		
diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
index a4ed908b..96439bb4 100644
--- a/code/reports/BrokenLinksReport.php
+++ b/code/reports/BrokenLinksReport.php
@@ -90,7 +90,7 @@ class BrokenLinksReport extends SS_Report {
 			),
 			"LastEdited" => array(
 				"title" => $dateTitle,
-				'casting' => 'SSDatetime->Full'
+				'casting' => 'SS_Datetime->Full'
 			),
 			"BrokenReason" => array(
 				"title" => _t('BrokenLinksReport.ColumnProblemType', "Problem type")

From 75544392a2b7e537de3c8e7c3734e774b3488614 Mon Sep 17 00:00:00 2001
From: Jean-Fabien Barrios <jean@silverstripe.com>
Date: Fri, 8 Oct 2010 03:35:50 +0000
Subject: [PATCH 457/483] ENHANCEMENT: 6017 - Configurable help link

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111828 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 7a8983c4..39f87627 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -34,6 +34,8 @@ class LeftAndMain extends Controller {
 	
 	static $ForceReload;
 
+	static $help_link = 'http://userhelp.silverstripe.org';
+
 	static $allowed_actions = array(
 		'index',
 		'ajaxupdateparent',
@@ -109,7 +111,7 @@ class LeftAndMain extends Controller {
 		CMSMenu::add_link(
 			'Help', 
 			_t('LeftAndMain.HELP', 'Help', PR_HIGH, 'Menu title'), 
-			'http://userhelp.silverstripe.org'
+			self::$help_link
 		);
 		
 		// set reading lang

From ee4e74880328c0d2dfdc23cb33507fb31bfde7fc Mon Sep 17 00:00:00 2001
From: Saophalkun Ponlu <phalkunz@silverstripe.com>
Date: Mon, 11 Oct 2010 04:56:39 +0000
Subject: [PATCH 458/483] MINOR: Enable non-default language for tinyMCE,
 setting language in _config.php didn't work. Thanks for @christian

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111875 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 _config.php          | 1 -
 code/LeftAndMain.php | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/_config.php b/_config.php
index abec1fa3..0e1dcb8f 100644
--- a/_config.php
+++ b/_config.php
@@ -21,7 +21,6 @@ HtmlEditorConfig::get('cms')->setOptions(array(
 	'friendly_name' => 'Default CMS',
 	'priority' => '50',
 	'mode' => 'none',
-	'language' => i18n::get_tinymce_lang(),
 
 	'body_class' => 'typography',
 	'document_base_url' => Director::absoluteBaseURL(),
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 39f87627..fa2f07b5 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -162,6 +162,7 @@ class LeftAndMain extends Controller {
 		// Set default values in the config if missing.  These things can't be defined in the config
 		// file because insufficient information exists when that is being processed
 		$htmlEditorConfig = HtmlEditorConfig::get_active();
+		$htmlEditorConfig->setOption('language', i18n::get_tinymce_lang());
 		if(!$htmlEditorConfig->getOption('content_css')) {
 			$cssFiles = 'cms/css/editor.css';
 			

From 6c0a41f0c43aebd9c8a0b6cf8387e6917df9d282 Mon Sep 17 00:00:00 2001
From: Jean-Fabien Barrios <jean@silverstripe.com>
Date: Mon, 11 Oct 2010 19:31:07 +0000
Subject: [PATCH 459/483] Added doc for static help_link

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111879 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index fa2f07b5..c0f557ae 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -34,6 +34,10 @@ class LeftAndMain extends Controller {
 	
 	static $ForceReload;
 
+	/**
+	* The url used for the link in the Help tab in the backend
+	* Value can be overwritten if required in _config.php
+	*/
 	static $help_link = 'http://userhelp.silverstripe.org';
 
 	static $allowed_actions = array(

From 9cd40767f68859adb67db5228467eb107d9fc65d Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Mon, 11 Oct 2010 20:10:04 +0000
Subject: [PATCH 460/483] MINOR #6090 FilesystemPublisherTest now stores
 temporary files in assets, which is writable, instead of the webroot which
 almost never has write permissions

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111883 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/FilesystemPublisherTest.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/tests/FilesystemPublisherTest.php b/tests/FilesystemPublisherTest.php
index 001f3621..1407a3b9 100644
--- a/tests/FilesystemPublisherTest.php
+++ b/tests/FilesystemPublisherTest.php
@@ -14,7 +14,7 @@ class FilesystemPublisherTest extends SapphireTest {
 	function setUp() {
 		parent::setUp();
 		
-		Object::add_extension("SiteTree", "FilesystemPublisher('../FilesystemPublisherTest-static-folder/')");
+		Object::add_extension("SiteTree", "FilesystemPublisher('assets/FilesystemPublisherTest-static-folder/')");
 		SiteTree::$write_homepage_map = false;
 		
 		$this->orig['domain_based_caching'] = FilesystemPublisher::$domain_based_caching;
@@ -22,9 +22,23 @@ class FilesystemPublisherTest extends SapphireTest {
 	}
 	
 	function tearDown() {
-		Object::remove_extension("SiteTree", "FilesystemPublisher('../FilesystemPublisherTest-static-folder/')");
+		Object::remove_extension("SiteTree", "FilesystemPublisher('assets/FilesystemPublisherTest-static-folder/')");
 		SiteTree::$write_homepage_map = true;
 		
+		$basePath = '../assets/FilesystemPublisherTest-static-folder';
+		if(file_exists($basePath)) {
+			$dir = opendir($basePath);;
+			while($file = readdir($dir)) {
+				$path = Director::baseFolder() . '/assets/FilesystemPublisherTest-static-folder/' . $file;
+				if(is_dir($path)) continue;
+				else {
+					unlink($path);
+				}
+			}
+			closedir($dir);
+			rmdir($basePath);
+		}
+		
 		FilesystemPublisher::$domain_based_caching = $this->orig['domain_based_caching'];
 		
 		parent::tearDown();

From 602fcaa7b5529b80f2a3845f8675f8855284265f Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Mon, 11 Oct 2010 22:15:34 +0000
Subject: [PATCH 461/483] MINOR Use Filesystem::removeFolder() in
 FilesystemPublisherTest::tearDown() instead of specific code to handle this

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111899 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/FilesystemPublisherTest.php | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/tests/FilesystemPublisherTest.php b/tests/FilesystemPublisherTest.php
index 1407a3b9..ba98d235 100644
--- a/tests/FilesystemPublisherTest.php
+++ b/tests/FilesystemPublisherTest.php
@@ -22,26 +22,16 @@ class FilesystemPublisherTest extends SapphireTest {
 	}
 	
 	function tearDown() {
+		parent::tearDown();
+
 		Object::remove_extension("SiteTree", "FilesystemPublisher('assets/FilesystemPublisherTest-static-folder/')");
 		SiteTree::$write_homepage_map = true;
-		
-		$basePath = '../assets/FilesystemPublisherTest-static-folder';
-		if(file_exists($basePath)) {
-			$dir = opendir($basePath);;
-			while($file = readdir($dir)) {
-				$path = Director::baseFolder() . '/assets/FilesystemPublisherTest-static-folder/' . $file;
-				if(is_dir($path)) continue;
-				else {
-					unlink($path);
-				}
-			}
-			closedir($dir);
-			rmdir($basePath);
-		}
-		
+
 		FilesystemPublisher::$domain_based_caching = $this->orig['domain_based_caching'];
-		
-		parent::tearDown();
+
+		if(file_exists(BASE_PATH . '/assets/FilesystemPublisherTest-static-folder')) {
+			Filesystem::removeFolder(BASE_PATH . '/assets/FilesystemPublisherTest-static-folder');
+		}
 	}
 	
 	function testUrlsToPathsWithRelativeUrls() {

From c0f8b44f3fe2c09defd6dd24977158542725d03b Mon Sep 17 00:00:00 2001
From: Jean-Fabien Barrios <jean@silverstripe.com>
Date: Tue, 12 Oct 2010 00:31:59 +0000
Subject: [PATCH 462/483] ENHANCEMENT Added localisation for batch actions in
 javascript + translations

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111915 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/CMSMain_left.js |  2 +-
 javascript/lang/cs_CZ.js   |  1 +
 javascript/lang/de_DE.js   |  1 +
 javascript/lang/en_US.js   |  1 +
 javascript/lang/fr_FR.js   | 15 ++++++++-------
 javascript/lang/sk_SK.js   |  1 +
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js
index 8b1f2b7d..5c398660 100755
--- a/javascript/CMSMain_left.js
+++ b/javascript/CMSMain_left.js
@@ -556,7 +556,7 @@ publishpage.prototype = {
 				if (data.alert) {
 					if (!confirm(data.content)) return false;
 				} else {
-					if(!confirm("You have " + batchActionGlobals.count() + " pages selected.\n\nDo your really want to " + actionText.toLowerCase() + "?")) {
+					if(!confirm(ss.i18n.sprintf(ss.i18n._t('CMSMAIN.SELECTMOREPAGES'), batchActionGlobals.count()))) { 
 						return false;
 					}
 				}
diff --git a/javascript/lang/cs_CZ.js b/javascript/lang/cs_CZ.js
index 5db2f63d..55aec775 100644
--- a/javascript/lang/cs_CZ.js
+++ b/javascript/lang/cs_CZ.js
@@ -19,6 +19,7 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 		'CMSMAIN.RESTORING': 'Obnovování...',
 		'CMSMAIN.ERRORREVERTING': 'Chyba převádění na živý obsah',
 		'CMSMAIN.SAVING' : 'ukládání...',
+		'CMSMAIN.SELECTMOREPAGES' : "Máte vybráno %s stránek.\n\nSkutečně je chcete?",
 		'ModelAdmin.SAVED': "Uloženo",
 		'ModelAdmin.REALLYDELETE': "Skutečně chcete smazat?",
 		'ModelAdmin.DELETED': "Smazáno",
diff --git a/javascript/lang/de_DE.js b/javascript/lang/de_DE.js
index 9abf9fbc..250cf25e 100644
--- a/javascript/lang/de_DE.js
+++ b/javascript/lang/de_DE.js
@@ -19,6 +19,7 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 		'CMSMAIN.RESTORING': 'Wiederherstellen...',
 		'CMSMAIN.ERRORREVERTING': 'Fehler beim Wiederherstellen des Live-Inhaltes',
 		'CMSMAIN.SAVING' : 'Sichern...',
+		'CMSMAIN.SELECTMOREPAGES' : "Sie haben %s Seiten ausgewählt.\n\nWollen Sie wirklich diese Aktion durchführen?",
 		'ModelAdmin.SAVED': "Gespeichert",
 		'ModelAdmin.REALLYDELETE': "Wirklich löschen?",
 		'ModelAdmin.DELETED': "Gelöscht",
diff --git a/javascript/lang/en_US.js b/javascript/lang/en_US.js
index 9b0e6118..f5c855ab 100644
--- a/javascript/lang/en_US.js
+++ b/javascript/lang/en_US.js
@@ -19,6 +19,7 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 		'CMSMAIN.RESTORING': 'Restoring...',
 		'CMSMAIN.ERRORREVERTING': 'Error reverting to live content',
 		'CMSMAIN.SAVING' : 'saving...',
+		'CMSMAIN.SELECTMOREPAGES' : "You have %s pages selected.\n\nDo you really want to perform this action?",
 		'ModelAdmin.SAVED': "Saved",
 		'ModelAdmin.REALLYDELETE': "Do you really want to delete?",
 		'ModelAdmin.DELETED': "Deleted",
diff --git a/javascript/lang/fr_FR.js b/javascript/lang/fr_FR.js
index 07cd2743..d1d1eb35 100644
--- a/javascript/lang/fr_FR.js
+++ b/javascript/lang/fr_FR.js
@@ -2,11 +2,11 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	console.error('Class ss.i18n not defined');
 } else {
 	ss.i18n.addDictionary('fr_FR', {
-		'CMSMAIN.WARNINGSAVEPAGESBEFOREADDING' : "You devez sauvegarder la page avant d\'y ajouter des enfants",
+		'CMSMAIN.WARNINGSAVEPAGESBEFOREADDING' : "Vous devez sauvegarder la page avant d\'y ajouter des enfants",
 		'CMSMAIN.CANTADDCHILDREN' : "Vous ne pouvez pas ajouter des enfants au noeud sélectionné",
-		'CMSMAIN.ERRORADDINGPAGE' : 'Error lors de l\'ajout de la page',
-		'CMSMAIN.FILTEREDTREE' : 'Filtrer l\'arbre pour ne seulement afficher que les pages modifiés',
-		'CMSMAIN.ERRORFILTERPAGES' : 'Impossible de filtrer l\'arbre pour ne seulement afficher que les pages modifiés<br />%s',
+		'CMSMAIN.ERRORADDINGPAGE' : 'Erreur lors de l\'ajout de la page',
+		'CMSMAIN.FILTEREDTREE' : 'Filtrer l\'arbre pour n\'afficher que les pages modifiées',
+		'CMSMAIN.ERRORFILTERPAGES' : 'Impossible de filtrer l\'arbre pour n\'afficher que les pages modifiées<br />%s',
 		'CMSMAIN.ERRORUNFILTER' : 'Impossible d\'afficher l\'ensemble de l\'arbre du site<br />%s',
 		'CMSMAIN.ERRORUNFILTER' : 'Arbre non-filtré',
 		'CMSMAIN.PUBLISHINGPAGES' : 'Publication des pages...',
@@ -14,15 +14,16 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 		'CMSMAIN.ERRORPUBLISHING' : 'Erreur lors de la publication des pages',
 		'CMSMAIN.REALLYDELETEPAGES' : "Etes-vous sûr de vouloir supprimer les %s pages marquées ?",
 		'CMSMAIN.DELETINGPAGES' : 'Suppression des pages...',
-		'CMSMAIN.ERRORDELETINGPAGES': 'Error lors de la suppression des pages',
+		'CMSMAIN.ERRORDELETINGPAGES': 'Erreur lors de la suppression des pages',
 		'CMSMAIN.PUBLISHING' : 'Publication...',
 		'CMSMAIN.RESTORING': 'Restauration...',
 		'CMSMAIN.ERRORREVERTING': 'Erreur lors de la restauration vers le contenu Live',
 		'CMSMAIN.SAVING' : 'sauvegarde...',
+		'CMSMAIN.SELECTMOREPAGES' : "Vous avez %s pages sélectionnées.\n\nVoulez-vous vraiment effectuer cette action?", 
 		'ModelAdmin.SAVED': "Sauvegardé",
-		'ModelAdmin.REALLYDELETE': "Etes-vous sûr de vouloir supprimmer ?",
+		'ModelAdmin.REALLYDELETE': "Etes-vous sûr de vouloir supprimer ?",
 		'ModelAdmin.DELETED': "Supprimé",
 		'LeftAndMain.PAGEWASDELETED': "Cette page a été supprimée. Pour éditer cette page, veuillez la sélectionner à gauche.",
-		'LeftAndMain.CONFIRMUNSAVED': "Etes-vous sûr de vouloir qutter cette page ?\n\nATTENTION: Vos changements n'ont pas été sauvegardés.\n\nCliquez sur OK pour continuer, ou sur Annuler pour rester sur la page actuelle."
+		'LeftAndMain.CONFIRMUNSAVED': "Etes-vous sûr de vouloir quitter cette page ?\n\nATTENTION: Vos changements n'ont pas été sauvegardés.\n\nCliquez sur OK pour continuer, ou sur Annuler pour rester sur la page actuelle."
 	});
 }
\ No newline at end of file
diff --git a/javascript/lang/sk_SK.js b/javascript/lang/sk_SK.js
index e5e2a68c..c0d18fc2 100644
--- a/javascript/lang/sk_SK.js
+++ b/javascript/lang/sk_SK.js
@@ -19,6 +19,7 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 		'CMSMAIN.RESTORING': 'Obnovovanie...',
 		'CMSMAIN.ERRORREVERTING': 'Chyba prevádzania na živý obsah',
 		'CMSMAIN.SAVING' : 'ukladanie...',
+		'CMSMAIN.SELECTMOREPAGES' : "Máte vybraté %s stránok.\n\nSkutočne ich chcete?",
 		'ModelAdmin.SAVED': "Uložené",
 		'ModelAdmin.REALLYDELETE': "Skutočně chcete zmazať?",
 		'ModelAdmin.DELETED': "Zmazané",

From ba4da1fa6375f5651ae38c1ac53ad7f1616ce570 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 31 Oct 2010 02:22:15 +0000
Subject: [PATCH 463/483] MINOR Javascript translations in CMSMain_right.js
 (fixes #6142)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113248 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/CMSMain_right.js | 11 ++++++-----
 javascript/lang/en_US.js    |  5 ++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/javascript/CMSMain_right.js b/javascript/CMSMain_right.js
index 05954935..236c7b9a 100755
--- a/javascript/CMSMain_right.js
+++ b/javascript/CMSMain_right.js
@@ -35,11 +35,12 @@ function action_rollback_right() {
 	}
 	
 	if($('Form_EditForm').elements.Version && $('Form_EditForm').elements.Version.value) {
-		var message = "Do you really want to roll back to version #" 
-			+ $('Form_EditForm').elements.Version.value + " of this page?";
-			
+		var message = ss.i18n.sprintf(
+			ss.i18n._t('CMSMAIN.RollbackConfirmation'),
+			$('Form_EditForm').elements.Version.value
+		);
 	} else {
-		var message = "Do you really want to copy the published content to the stage site?";
+		var message = ss.i18n._t('CMSMAIN.CopyPublishedConfirmation');
 	}
 	
 	if(confirm(message)) {
@@ -91,7 +92,7 @@ Behaviour.register({
 Behaviour.register({
 	'select#Form_EditForm_ClassName' : {
 		onchange: function() {
-			alert('The page type will be updated after the page is saved');
+			alert(ss.i18n._t('CMSMAIN.PageTypeSaveAlert'));
 		}
 	},
 
diff --git a/javascript/lang/en_US.js b/javascript/lang/en_US.js
index f5c855ab..df6c3300 100644
--- a/javascript/lang/en_US.js
+++ b/javascript/lang/en_US.js
@@ -26,6 +26,9 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 		'ModelAdmin.VALIDATIONERROR': "Validation Error",
 		'LeftAndMain.PAGEWASDELETED': "This page was deleted.  To edit a page, select it from the left.",
 		'LeftAndMain.CONFIRMUNSAVED': "Are you sure you want to navigate away from this page?\n\nWARNING: Your changes have not been saved.\n\nPress OK to continue, or Cancel to stay on the current page.",
-		'WidgetAreaEditor.TOOMANY': 'Sorry, you have reached the maximum number of widgets in this area'
+		'WidgetAreaEditor.TOOMANY': 'Sorry, you have reached the maximum number of widgets in this area',
+		'CMSMAIN.RollbackConfirmation': 'Do you really want to roll back to version #%s of this page?',
+		'CMSMAIN.CopyPublishedConfirmation': 'Do you really want to copy the published content to the stage site?',
+		'CMSMAIN.PageTypeSaveAlert': 'The page type will be updated after the page is saved'
 	});
 }
\ No newline at end of file

From 0c177bcbca7ddc1ccf155f4f83ccc36a2bf1503f Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 1 Nov 2010 01:28:59 +0000
Subject: [PATCH 464/483] MINOR Removed unused MemberList templates (see
 MemberTableField)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113278 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 templates/Includes/MemberList_PageControls.ss | 17 --------
 templates/Includes/MemberList_Table.ss        | 42 -------------------
 templates/MemberList.ss                       | 17 --------
 3 files changed, 76 deletions(-)
 delete mode 100755 templates/Includes/MemberList_PageControls.ss
 delete mode 100755 templates/Includes/MemberList_Table.ss
 delete mode 100755 templates/MemberList.ss

diff --git a/templates/Includes/MemberList_PageControls.ss b/templates/Includes/MemberList_PageControls.ss
deleted file mode 100755
index ef0d57d1..00000000
--- a/templates/Includes/MemberList_PageControls.ss
+++ /dev/null
@@ -1,17 +0,0 @@
-<% if TotalCount %>
-<div class="PageControls">
-	<input name="MemberListStart" id="MemberListStart" type="hidden" value="$MemberListStart" />
-	<% if LastLink %><a class="Last" href="$LastLink" title="<% _t('VIEWLAST', 'View last') %> $PageSize <% _t('LASTMEMBERS', 'members') %>"><img src="cms/images/pagination/record-last.png" alt="View last $PageSize members" /></a>
-	<% else %><span class="Last"><img src="cms/images/pagination/record-last-g.png" alt="<% _t('VIEWLAST', 'View last') %> $PageSize <% _t('LASTMEMBERS', 'members') %>" /></span><% end_if %>
-	<% if FirstLink %><a class="First" href="$FirstLink" title="<% _t('VIEWFIRST', 'View first') %> $PageSize <% _t('FIRSTMEMBERS', 'members') %>"><img src="cms/images/pagination/record-first.png" alt="View first $PageSize members" /></a>
-	<% else %><span class="First"><img  src="cms/images/pagination/record-first-g.png" alt="<% _t('VIEWFIRST', 'View first') %> $PageSize <% _t('FIRSTMEMBERS', 'members') %>" /></span><% end_if %>
-	<% if PrevLink %><a class="Prev" href="$PrevLink" title="<% _t('VIEWPREVIOUS', 'View previous') %> $PageSize <% _t('PREVIOUSMEMBERS', 'members') %>"><img src="cms/images/pagination/record-prev.png" alt="<% _t('VIEWPREVIOUS', 'View previous') %> $PageSize <% _t('PREVIOUSMEMBERS', 'members') %>" /></a>
-	<% else %><img class="Prev" src="cms/images/pagination/record-prev-g.png" alt="<% _t('VIEWPREVIOUS', 'View previous') %> $PageSize <% _t('PREVIOUSMEMBERS', 'members') %>" /><% end_if %>
-	<span class="Count">
-		<% _t('DISPLAYING', 'Displaying') %> $FirstMember <% _t('TO', 'to') %> $LastMember <% _t('OF', 'of') %> $TotalMembers
-	</span>
-	<% if NextLink %><a class="Next" href="$NextLink" title="<% _t('VIEWNEXT', 'View next') %> $PageSize <% _t('NEXTMEMBERS', 'members') %>"><img src="cms/images/pagination/record-next.png" alt="<% _t('VIEWNEXT', 'View next') %> $PageSize <% _t('NEXTMEMBERS', 'members') %>" /></a>
-	<% else %><img class="Next" src="cms/images/pagination/record-next-g.png" alt="<% _t('VIEWNEXT', 'View next') %> $PageSize <% _t('NEXTMEMBERS', 'members') %>" /><% end_if %>
-	
-</div>
-<% end_if %>
\ No newline at end of file
diff --git a/templates/Includes/MemberList_Table.ss b/templates/Includes/MemberList_Table.ss
deleted file mode 100755
index e710a2e2..00000000
--- a/templates/Includes/MemberList_Table.ss
+++ /dev/null
@@ -1,42 +0,0 @@
-<% include MemberList_PageControls %>
-<table class="CMSList MemberList">
-	<thead>
-		<tr>
-		<td class="FirstName"><% _t('FN','First Name') %></td>
-		<td class="Surname"><% _t('SN','Surname') %></td>
-		<td class="Email"><% _t('EMAIL','Email Address') %></td>
-	<% if DontShowPassword %>
-	<% else %>
-		<td class="Password"><% _t('PASSWD','Password') %></td>
-	<% end_if %>
-		<td>&nbsp;</td>
-		</tr>
-	</thead>
-	
-	<tbody>
-	
-	<% if DontShowPassword %>
-		<% control Members %>
-		<tr id="member-$ID">
-		<td>$FirstName</td>
-		<td>$Surname</td>
-		<td>$Email</td>
-		<td><a class="deletelink" href="admin/security/removememberfromgroup/$GroupID/$ID"><img src="cms/images/delete.gif" alt="delete" /></a></td>
-		</tr>
-		<% end_control %>
-	<% else %>
-		<% control Members %>
-		<tr id="member-$ID">
-		<td>$FirstName</td>
-		<td>$Surname</td>
-		<td>$Email</td>
-		<td>$Password</td>
-		<td><a class="deletelink" href="admin/security/removememberfromgroup/$GroupID/$ID"><img src="cms/images/delete.gif" alt="delete" /></a></td>
-		</tr>
-		<% end_control %>
-	<% end_if %>
-	
-		
-		$AddRecordForm.AsTableRow
-	</tbody>
-</table>
\ No newline at end of file
diff --git a/templates/MemberList.ss b/templates/MemberList.ss
deleted file mode 100755
index dc524e7b..00000000
--- a/templates/MemberList.ss
+++ /dev/null
@@ -1,17 +0,0 @@
-<div id="MemberListField">
-	<div class="MemberListFilter">
-		<a class="showhide closed" href="#"><% _t('FILTER','Filter',50,'Filter as a verb') %></a>
-		<div id="MemberListFilterControls">
-			<input id="MemberListBaseGroupID" type="hidden" name="MemberListBaseGroup" value="$GroupID" />
-			<input id="MemberListDontShowPassword" type="hidden" name="MemberListDontShowPassword" value="$DontShowPassword" />
-			$SearchField
-			$OrderByField
-			$GroupFilter
-			<input id="MemberListFilterButton" type="submit" value="<% _t('FILTER') %>" name="filter" />
-		</div>
-	</div>
-	<div id="MemberList">
-	<% include MemberList_Table %>
-	</div>
-</div>
-

From f8fd60f02b1c1b3e2bda787fbb34d689484e5357 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 1 Nov 2010 01:28:59 +0000
Subject: [PATCH 465/483] MINOR Removed unused
 SecurityAdmin->removememberfromgroup() (see MemberTableField)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113279 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SecurityAdmin.php | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 8d00e0be..7b05f028 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -381,24 +381,6 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		return FormResponse::respond();
 	}
 
-	public function removememberfromgroup() {
-		$groupID = $this->urlParams['ID'];
-		$memberID = $this->urlParams['OtherID'];
-		if(is_numeric($groupID) && is_numeric($memberID)) {
-			$member = DataObject::get_by_id('Member', (int) $memberID);
-
-			if(!$member->canDelete()) return Security::permissionFailure($this);
-
-			$member->Groups()->remove((int)$groupID);
-
-			FormResponse::add("reloadMemberTableField();");
-		} else {
-			user_error("SecurityAdmin::removememberfromgroup: Bad parameters: Group=$groupID, Member=$memberID", E_USER_ERROR);
-		}
-
-		return FormResponse::respond();
-	}
-
 	/**
 	 * Return the entire site tree as a nested set of ULs.
 	 * @return string Unordered list HTML
@@ -429,7 +411,10 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		return $siteTree;
 	}
 
-	public function addgroup() {
+	public function addgroup($request) {
+		// Protect against CSRF on destructive action
+		if(!Form::get_security_token()->checkRequest($request)) return $this->httpError(400);
+		
 		if(!singleton($this->stat('tree_class'))->canCreate()) return Security::permissionFailure($this);
 		
 		$newGroup = Object::create($this->stat('tree_class'));

From b31cb6731e5b52633d34010a5610c5bef696141e Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 1 Nov 2010 01:29:00 +0000
Subject: [PATCH 466/483] MINOR Removed unused Security->addmember() (see
 MemberTableField and SecurityAdmin->addtogroup())

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113280 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php       |  1 -
 code/SecurityAdmin.php | 20 --------------------
 2 files changed, 21 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index a139b1af..fd98974a 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -27,7 +27,6 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 	static $subitem_class = "Member";
 	
 	static $allowed_actions = array(
-		'addmember',
 		'addpage',
 		'buildbrokenlinks',
 		'canceldraftchangesdialog',
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 7b05f028..a5510e96 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -18,7 +18,6 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 	
 	static $allowed_actions = array(
 		'addgroup',
-		'addmember',
 		'autocomplete',
 		'removememberfromgroup',
 		'savemember',
@@ -362,25 +361,6 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		return FormResponse::respond();
 	}
 
-	function addmember($className=null) {
-		$data = $_REQUEST;
-		unset($data['ID']);
-		if($className == null) $className = $this->stat('subitem_class');
-
-		if(!singleton($this->stat('subitem_class'))->canCreate()) return Security::permissionFailure($this);
-
-		$record = new $className();
-
-		$record->update($data);
-		$record->write();
-		
-		if($data['GroupID']) $record->Groups()->add((int)$data['GroupID']);
-
-		FormResponse::add("reloadMemberTableField();");
-
-		return FormResponse::respond();
-	}
-
 	/**
 	 * Return the entire site tree as a nested set of ULs.
 	 * @return string Unordered list HTML

From 4bc9a5aee85c731722b88a58c6eaaad04131140c Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 1 Nov 2010 01:29:00 +0000
Subject: [PATCH 467/483] MINOR Removed unused SecurityAdmin->MemberForm() and
 savemember() (see MemberTableField)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113281 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/SecurityAdmin.php          | 66 ---------------------------------
 javascript/LeftAndMain_right.js |  2 -
 2 files changed, 68 deletions(-)

diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index a5510e96..e57bf38d 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -22,7 +22,6 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		'removememberfromgroup',
 		'savemember',
 		'AddRecordForm',
-		'MemberForm',
 		'EditForm',
 		'MemberImportForm',
 		'memberimport',
@@ -296,71 +295,6 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		}
 	}
 
-	public function MemberForm() {
-		$id = $_REQUEST['ID'] ? $_REQUEST['ID'] : Session::get('currentMember');
-		if($id) return $this->getMemberForm($id);
-	}
-
-	public function getMemberForm($id) {
-		if($id && $id != 'new') $record = DataObject::get_by_id('Member', (int) $id);
-		if($record || $id == 'new') {
-			$fields = new FieldSet(
-				new HiddenField('MemberListBaseGroup', '', $this->currentPageID() )
-			);
-
-			if($extraFields = $record->getCMSFields()) {
-				foreach($extraFields as $extra) {
-					$fields->push( $extra );
-				}
-			}
-
-			$fields->push($idField = new HiddenField('ID'));
-			$fields->push($groupIDField = new HiddenField('GroupID'));
-
-			$actions = new FieldSet();
-			$actions->push(new FormAction('savemember', _t('SecurityAdmin.SAVE', 'Save')));
-
-			$form = new Form($this, 'MemberForm', $fields, $actions);
-			if($record) $form->loadDataFrom($record);
-
-			$idField->setValue($id);
-			$groupIDField->setValue($this->currentPageID());
-			
-			if($record && !$record->canEdit()) {
-				$readonlyFields = $form->Fields()->makeReadonly();
-				$form->setFields($readonlyFields);
-			}
-
-			return $form;
-		}
-	}
-
-	function savemember() {
-		$data = $_REQUEST;
-		$className = $this->stat('subitem_class');
-
-		$id = $_REQUEST['ID'];
-		if($id == 'new') $id = null;
-
-		if($id) {
-			$record = DataObject::get_by_id($className, $id);
-			if($record && !$record->canEdit()) return Security::permissionFailure($this);
-		} else {
-			if(!singleton($this->stat('subitem_class'))->canCreate()) return Security::permissionFailure($this);
-			$record = new $className();
-		}
-
-		$record->update($data);
-		$record->ID = $id;
-		$record->write();
-
-		$record->Groups()->add($data['GroupID']);
-
-		FormResponse::add("reloadMemberTableField();");
-
-		return FormResponse::respond();
-	}
-
 	/**
 	 * Return the entire site tree as a nested set of ULs.
 	 * @return string Unordered list HTML
diff --git a/javascript/LeftAndMain_right.js b/javascript/LeftAndMain_right.js
index ac58846a..d4ef031e 100755
--- a/javascript/LeftAndMain_right.js
+++ b/javascript/LeftAndMain_right.js
@@ -256,7 +256,6 @@ CMSRightForm.prototype = {
 		this.loadNewPage(response.responseText);
 		
 		var subform;
-		if(subform = $('Form_MemberForm')) subform.close();
 		if(subform = $('Form_SubForm')) subform.close();
 		
 		if(this.elements.ID) {
@@ -368,7 +367,6 @@ function autoSave(confirmation, callAfter) {
 	var __forms = []
 	if($('Form_EditForm')) __forms.push($('Form_EditForm'));
 	if($('Form_SubForm')) __forms.push($('Form_SubForm'));
-	if($('Form_MemberForm')) __forms.push($('Form_MemberForm'));
 	
 	var __somethingHasChanged = false;
 	var __callAfter = callAfter;

From bc3df654bd83e30fb7b4bcff285b408138058b03 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 1 Nov 2010 01:29:02 +0000
Subject: [PATCH 468/483] API CHANGE Fixed various controllers to enforce CSRF
 protection through Form_SecurityToken on GET actions that are not routed
 through Form->httpSubmission(): AssetAdmin, CMSBatchActionHandler, CMSMain,
 CommentTableField, LeftAndMain, MemberTableField, PageComment,
 PageComment_Controller

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113282 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php                      | 17 ++++--
 code/CMSBatchActionHandler.php           |  3 +
 code/CMSMain.php                         | 43 ++++++++++----
 code/CommentTableField.php               | 50 ++++++++++++++++
 code/LeftAndMain.php                     | 15 ++++-
 code/MemberTableField.php                | 19 ++++++-
 code/SecurityAdmin.php                   |  2 +-
 code/sitefeatures/PageComment.php        | 61 ++++++++++++++------
 javascript/AssetAdmin.js                 |  3 +-
 javascript/LeftAndMain_left.js           | 14 +++--
 javascript/TranslationTab.js             |  1 +
 templates/Includes/AssetAdmin_left.ss    |  1 +
 templates/Includes/AssetTableField.ss    |  2 +-
 templates/Includes/CMSMain_left.ss       |  1 +
 templates/Includes/SecurityAdmin_left.ss |  2 +
 tests/CMSMainTest.php                    | 26 +++++++--
 tests/CommentAdminTest.php               |  2 +-
 tests/MemberTableFieldTest.php           | 72 ++++++++++++++++++------
 tests/MemberTableFieldTest.yml           |  4 ++
 tests/PageCommentsTest.php               | 21 ++++---
 20 files changed, 285 insertions(+), 74 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index accdac9e..1437addf 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -558,7 +558,10 @@ JS;
 	/**
 	 * Add a new folder and return its details suitable for ajax.
 	 */
-	public function addfolder() {
+	public function addfolder($request) {
+		// Protect against CSRF on destructive action
+		if(!SecurityToken::inst()->checkRequest($request)) return $this->httpError(400);
+		
 		$parent = ($_REQUEST['ParentID'] && is_numeric($_REQUEST['ParentID'])) ? (int)$_REQUEST['ParentID'] : 0;
 		$name = (isset($_REQUEST['Name'])) ? basename($_REQUEST['Name']) : _t('AssetAdmin.NEWFOLDER',"NewFolder");
 		
@@ -626,7 +629,7 @@ JS;
 	/**
 	 * Delete a folder
 	 */
-	public function deletefolder() {
+	public function deletefolder($data, $ofmr) {
 		$ids = split(' *, *', $_REQUEST['csvIDs']);
 		
 		if(!$ids) return false;
@@ -655,7 +658,10 @@ JS;
 		return $script;
 	}
 	
-	public function removefile(){
+	public function removefile($request){
+		// Protect against CSRF on destructive action
+		if(!SecurityToken::inst()->checkRequest($request)) return $this->httpError(400);
+		
 		if($fileID = $this->urlParams['ID']) {
 			$file = DataObject::get_by_id('File', $fileID);
 			// Delete the temp verions of this file in assets/_resampled
@@ -700,7 +706,10 @@ JS;
 	 * Removes all unused thumbnails from the file store
 	 * and returns the status of the process to the user.
 	 */
-	public function deleteunusedthumbnails() {
+	public function deleteunusedthumbnails($request) {
+		// Protect against CSRF on destructive action
+		if(!SecurityToken::inst()->checkRequest($request)) return $this->httpError(400);
+		
 		$count = 0;
 		$thumbnails = $this->getUnusedThumbnails();
 		
diff --git a/code/CMSBatchActionHandler.php b/code/CMSBatchActionHandler.php
index ff53a0c5..5682b62b 100644
--- a/code/CMSBatchActionHandler.php
+++ b/code/CMSBatchActionHandler.php
@@ -53,6 +53,9 @@ class CMSBatchActionHandler extends RequestHandler {
 			Director::redirectBack();
 			return;
 		}
+		
+		// Protect against CSRF on destructive action
+		if(!SecurityToken::inst()->checkRequest($request)) return $this->httpError(400);
 
 		$actions = Object::get_static($this->class, 'batch_actions');
 		$actionClass = $actions[$request->param('BatchAction')];
diff --git a/code/CMSMain.php b/code/CMSMain.php
index fd98974a..d00145d2 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -532,7 +532,10 @@ JS;
 	// Data saving handlers
 
 
-	public function addpage() {
+	public function addpage($data, $form) {
+		// Protect against CSRF on destructive action
+		if(!SecurityToken::inst()->checkRequest($this->request)) return $this->httpError(400);
+		
 		$className = isset($_REQUEST['PageType']) ? $_REQUEST['PageType'] : "Page";
 		$parent = isset($_REQUEST['ParentID']) ? $_REQUEST['ParentID'] : 0;
 		$suffix = isset($_REQUEST['Suffix']) ? "-" . $_REQUEST['Suffix'] : null;
@@ -543,6 +546,7 @@ JS;
 		}
 
 		if(is_numeric($parent)) $parentObj = DataObject::get_by_id("SiteTree", $parent);
+		else $parentObj = null;
 		if(!$parentObj || !$parentObj->ID) $parent = 0;
 		
 		if($parentObj){
@@ -803,7 +807,7 @@ JS;
 	/**
 	 * Roll a page back to a previous version
 	 */
-	function rollback() {
+	function rollback($data, $form) {
 		if(isset($_REQUEST['Version']) && (bool)$_REQUEST['Version']) {
 			$this->extend('onBeforeRollback', $_REQUEST['ID']);
 			$record = $this->performRollback($_REQUEST['ID'], $_REQUEST['Version']);
@@ -814,7 +818,7 @@ JS;
 		}
 	}
 
-	function unpublish() {
+	function unpublish($data, $form) {
 		$SQL_id = Convert::raw2sql($_REQUEST['ID']);
 
 		$page = DataObject::get_by_id("SiteTree", $SQL_id);
@@ -1147,7 +1151,10 @@ JS;
 		return $form;
 	}
 
-	function buildbrokenlinks() {
+	function buildbrokenlinks($request) {
+		// Protect against CSRF on destructive action
+		if(!SecurityToken::inst()->checkRequest($request)) return $this->httpError(400);
+		
 		if($this->urlParams['ID']) {
 			$newPageSet[] = DataObject::get_by_id("Page", $this->urlParams['ID']);
 		} else {
@@ -1231,13 +1238,16 @@ JS;
 		echo '<p>' . _t('CMSMain.TOTALPAGES',"Total pages: ") . "$count</p>";
 	}
 
-	function publishall() {
+	function publishall($request) {
 		ini_set("memory_limit", -1);
 		ini_set('max_execution_time', 0);
 		
 		$response = "";
 
 		if(isset($this->requestParams['confirm'])) {
+			// Protect against CSRF on destructive action
+			if(!SecurityToken::inst()->checkRequest($request)) return $this->httpError(400);
+			
 			$start = 0;
 			$pages = DataObject::get("SiteTree", "", "", "", "$start,30");
 			$count = 0;
@@ -1263,14 +1273,16 @@ JS;
 			$response .= sprintf(_t('CMSMain.PUBPAGES',"Done: Published %d pages"), $count);
 
 		} else {
+			$token = SecurityToken::inst();
 			$response .= '<h1>' . _t('CMSMain.PUBALLFUN','"Publish All" functionality') . '</h1>
 				<p>' . _t('CMSMain.PUBALLFUN2', 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It\'s
 				intended to be used after there have been massive edits of the content, such as when the site was
 				first built.') . '</p>
 				<form method="post" action="publishall">
 					<input type="submit" name="confirm" value="'
-					. _t('CMSMain.PUBALLCONFIRM',"Please publish every page in the site, copying content stage to live",PR_LOW,'Confirmation button') .'" />
-				</form>';
+					. _t('CMSMain.PUBALLCONFIRM',"Please publish every page in the site, copying content stage to live",PR_LOW,'Confirmation button') .'" />'
+					. $token->getFormField()->FieldHolder() .
+				'</form>';
 		}
 		
 		return $response;
@@ -1279,7 +1291,7 @@ JS;
 	/**
 	 * Restore a completely deleted page from the SiteTree_versions table.
 	 */
-	function restore() {
+	function restore($data, $form) {
 		if(($id = $_REQUEST['ID']) && is_numeric($id)) {
 			$restoredPage = Versioned::get_latest_version("SiteTree", $id);
 			if($restoredPage) {
@@ -1299,7 +1311,10 @@ JS;
 		}
 	}
 
-	function duplicate() {
+	function duplicate($request) {
+		// Protect against CSRF on destructive action
+		if(!SecurityToken::inst()->checkRequest($request)) return $this->httpError(400);
+		
 		if(($id = $this->urlParams['ID']) && is_numeric($id)) {
 			$page = DataObject::get_by_id("SiteTree", $id);
 			if($page && (!$page->canEdit() || !$page->canCreate())) {
@@ -1320,7 +1335,10 @@ JS;
 		}
 	}
 
-	function duplicatewithchildren() {
+	function duplicatewithchildren($request) {
+		// Protect against CSRF on destructive action
+		if(!SecurityToken::inst()->checkRequest($request)) return $this->httpError(400);
+		
 		if(($id = $this->urlParams['ID']) && is_numeric($id)) {
 			$page = DataObject::get_by_id("SiteTree", $id);
 			if($page && (!$page->canEdit() || !$page->canCreate())) {
@@ -1340,7 +1358,10 @@ JS;
 	/**
 	 * Create a new translation from an existing item, switch to this language and reload the tree.
 	 */
-	function createtranslation () {
+	function createtranslation($request) {
+		// Protect against CSRF on destructive action
+		if(!SecurityToken::inst()->checkRequest($request)) return $this->httpError(400);
+		
 		$langCode = Convert::raw2sql($_REQUEST['newlang']);
 		$originalLangID = (int)$_REQUEST['ID'];
 
diff --git a/code/CommentTableField.php b/code/CommentTableField.php
index f9aaf3ba..5efa791e 100644
--- a/code/CommentTableField.php
+++ b/code/CommentTableField.php
@@ -85,6 +85,10 @@ class CommentTableField extends ComplexTableField {
 		
 		return $fieldContainer->FieldHolder();
 	}
+	
+	function handleItem($request) {
+		return new CommentTableField_ItemRequest($this, $request->param('ID'));
+	}
 }
 
 /**
@@ -93,6 +97,7 @@ class CommentTableField extends ComplexTableField {
  * @subpackage comments
  */
 class CommentTableField_Item extends ComplexTableField_Item {
+	
 	function HasSpamButton() {
 		return $this->parent()->HasSpamButton();
 	}
@@ -104,6 +109,51 @@ class CommentTableField_Item extends ComplexTableField_Item {
 	function HasHamButton() {
 		return $this->parent()->HasHamButton();
 	}
+	
+	/**
+	 * @return String
+	 */
+	function SpamLink() {
+		return Controller::join_links($this->Link(), "pagecommentaction", 'reportspam', $this->ID);
+	}
+	
+	/**
+	 * @return String
+	 */
+	function HamLink() {
+		return Controller::join_links($this->Link(), "pagecommentaction", 'reportham', $this->ID);
+	}
+	
+	/**
+	 * @return String
+	 */
+	function ApproveLink() {
+		return Controller::join_links($this->Link(), "pagecommentaction", 'approve', $this->ID);
+	}
 }
 
+/**
+ * @package cms
+ * @subpackage comments
+ */
+class CommentTableField_ItemRequest extends ComplexTableField_ItemRequest {
+	
+	static $url_handlers = array(
+		'pagecommentaction/$Action/$ID' => 'handlePageCommentAction',
+	);
+	
+	/**
+	 * @param SS_HTTPRequest $request
+	 * @return SS_HTTPResponse
+	 */
+	function handlePageCommentAction($request) {
+		$action = $request->param('Action');
+		$whitelist = array('approve', 'reportspam', 'reportham');
+		if(!in_array($action, $whitelist)) $this->httpError(403);
+		
+		$c = new PageComment_Controller($request);
+		$c->init();
+		return $c->$action($request);
+	}
+}
 ?>
\ No newline at end of file
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index c0f557ae..044b2528 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -869,7 +869,10 @@ JS;
 	/**
 	 * Ajax handler for updating the parent of a tree node
 	 */
-	public function ajaxupdateparent() {
+	public function ajaxupdateparent($request) {
+		// Protect against CSRF on destructive action
+		if(!SecurityToken::inst()->checkRequest($request)) return $this->httpError(400);
+		
 		$id = $_REQUEST['ID'];
 		$parentID = $_REQUEST['ParentID'];
 		if($parentID == 'root'){
@@ -918,7 +921,10 @@ JS;
 	 * $_GET[ID]: An array of node ids in the correct order
 	 * $_GET[MovedNodeID]: The node that actually got moved
 	 */
-	public function ajaxupdatesort() {
+	public function ajaxupdatesort($request) {
+		// Protect against CSRF on destructive action
+		if(!SecurityToken::inst()->checkRequest($request)) return $this->httpError(400);
+		
 		$className = $this->stat('tree_class');
 		$counter = 0;
 		$js = '';
@@ -965,7 +971,10 @@ JS;
 	/**
 	 * Delete a number of items
 	 */
-	public function deleteitems() {
+	public function deleteitems($request) {
+		// Protect against CSRF on destructive action
+		if(!SecurityToken::inst()->checkRequest($request)) return $this->httpError(400);
+		
 		$ids = split(' *, *', $_REQUEST['csvIDs']);
 
 		$script = "st = \$('sitetree'); \n";
diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index 0b515743..f6219bc5 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -131,7 +131,7 @@ class MemberTableField extends ComplexTableField {
 	}
 
 	function AddLink() {
-		return $this->Link() . '/add';
+		return Controller::join_links($this->Link(), 'add');
 	}
 
 	function SearchForm() {
@@ -159,6 +159,10 @@ class MemberTableField extends ComplexTableField {
 	 * Add existing member to group rather than creating a new member
 	 */
 	function addtogroup() {
+		// Protect against CSRF on destructive action
+		$token = $this->getForm()->getSecurityToken();
+		if(!$token->checkRequest($this->controller->getRequest())) return $this->httpError(400);
+
 		$data = $_REQUEST;
 		$groupID = (isset($data['ctf']['ID'])) ? $data['ctf']['ID'] : null;
 
@@ -229,6 +233,11 @@ class MemberTableField extends ComplexTableField {
 	 * Remove member from group rather than from the database
 	 */
 	function delete() {
+		// Protect against CSRF on destructive action
+		$token = $this->getForm()->getSecurityToken();
+		// TODO Not sure how this is called, using $_REQUEST to be on the safe side
+		if(!$token->check($_REQUEST['SecurityID'])) return $this->httpError(400);
+		
 		$groupID = Convert::raw2sql($_REQUEST['ctf']['ID']);
 		$memberID = Convert::raw2sql($_REQUEST['ctf']['childID']);
 		if(is_numeric($groupID) && is_numeric($memberID)) {
@@ -477,7 +486,7 @@ class MemberTableField_Item extends ComplexTableField_Item {
 
 	function Actions() {
 		$actions = parent::Actions();
-		
+
 		foreach($actions as $action) {
 			if($action->Name == 'delete') {
 				if($this->parent->getGroup()) {
@@ -510,7 +519,11 @@ class MemberTableField_ItemRequest extends ComplexTableField_ItemRequest {
 	/**
 	 * Deleting an item from a member table field should just remove that member from the group
 	 */
-	function delete() {
+	function delete($request) {
+		// Protect against CSRF on destructive action
+		$token = $this->ctf->getForm()->getSecurityToken();
+		if(!$token->checkRequest($request)) return $this->httpError('400');
+		
 		if($this->ctf->Can('delete') !== true) {
 			return false;
 		}
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index e57bf38d..03847567 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -327,7 +327,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 
 	public function addgroup($request) {
 		// Protect against CSRF on destructive action
-		if(!Form::get_security_token()->checkRequest($request)) return $this->httpError(400);
+		if(!SecurityToken::inst()->checkRequest($request)) return $this->httpError(400);
 		
 		if(!singleton($this->stat('tree_class'))->canCreate()) return Security::permissionFailure($this);
 		
diff --git a/code/sitefeatures/PageComment.php b/code/sitefeatures/PageComment.php
index f63dc9fe..49b94fbf 100755
--- a/code/sitefeatures/PageComment.php
+++ b/code/sitefeatures/PageComment.php
@@ -60,7 +60,10 @@ class PageComment extends DataObject {
 	}
 
 	function DeleteLink() {
-		return ($this->canDelete()) ? "PageComment_Controller/deletecomment/$this->ID" : false;
+		$token = SecurityToken::inst();
+		$link = $token->addToUrl("PageComment_Controller/deletecomment/$this->ID");
+		
+		return ($this->canDelete()) ? $link : false;
 	}
 	
 	function CommentTextWithLinks() {
@@ -70,15 +73,21 @@ class PageComment extends DataObject {
 	}
 	
 	function SpamLink() {
-		return ($this->canEdit() && !$this->IsSpam) ? "PageComment_Controller/reportspam/$this->ID" : false;
+		$token = SecurityToken::inst();
+		$link = $token->addToUrl("PageComment_Controller/reportspam/$this->ID");
+		return ($this->canEdit() && !$this->IsSpam) ? $link : false;
 	}
 	
 	function HamLink() {
-		return ($this->canEdit() && $this->IsSpam) ? "PageComment_Controller/reportham/$this->ID" : false;
+		$token = SecurityToken::inst();
+		$link = $token->addToUrl("PageComment_Controller/reportham/$this->ID");
+		return ($this->canEdit() && $this->IsSpam) ? $link : false;
 	}
 	
 	function ApproveLink() {
-		return ($this->canEdit() && $this->NeedsModeration) ? "PageComment_Controller/approve/$this->ID" : false;
+		$token = SecurityToken::inst();
+		$link = $token->addToUrl("PageComment_Controller/approve/$this->ID");
+		return ($this->canEdit() && $this->NeedsModeration) ? $link : false;
 	}
 	
 	function SpamClass() {
@@ -250,10 +259,14 @@ class PageComment_Controller extends Controller {
 	/**
 	 * Deletes all comments on the page referenced by the url param pageid
 	 */
-	function deleteallcomments() {
-		$pageId = $_REQUEST['pageid'];
+	function deleteallcomments($request) {
+		// Protect against CSRF on destructive action
+		$token = SecurityToken::inst();
+		if(!$token->checkRequest($request)) return $this->httpError(400);
+		
+		$pageId = $request->requestVar('pageid');
 		if(preg_match('/^\d+$/', $pageId)) {
-			$comments = DataObject::get("PageComment", "\"ParentID\" = $pageId");
+			$comments = DataObject::get("PageComment", sprintf("\"ParentID\" = %d", (int)$pageId));
 			if($comments) foreach($comments as $c) {
 				if($c->canDelete()) $c->delete();
 			}
@@ -266,8 +279,12 @@ class PageComment_Controller extends Controller {
 		}
 	}
 	
-	function deletecomment() {
-		$comment = DataObject::get_by_id("PageComment", $this->urlParams['ID']);
+	function deletecomment($request) {
+		// Protect against CSRF on destructive action
+		$token = SecurityToken::inst();
+		if(!$token->checkRequest($request)) return $this->httpError(400);
+		
+		$comment = DataObject::get_by_id("PageComment", $request->param('ID'));
 		if($comment && $comment->canDelete()) {
 			$comment->delete();
 		}
@@ -279,8 +296,12 @@ class PageComment_Controller extends Controller {
 		}
 	}
 	
-	function approve() {
-		$comment = DataObject::get_by_id("PageComment", $this->urlParams['ID']);
+	function approve($request) {
+		// Protect against CSRF on destructive action
+		$token = SecurityToken::inst();
+		if(!$token->checkRequest($request)) return $this->httpError(400);
+		
+		$comment = DataObject::get_by_id("PageComment", $request->param('ID'));
 
 		if($comment && $comment->canEdit()) {
 			$comment->NeedsModeration = false;
@@ -296,8 +317,12 @@ class PageComment_Controller extends Controller {
 		}
 	}
 	
-	function reportspam() {
-		$comment = DataObject::get_by_id("PageComment", $this->urlParams['ID']);
+	function reportspam($request) {
+		// Protect against CSRF on destructive action
+		$token = SecurityToken::inst();
+		if(!$token->checkRequest($request)) return $this->httpError(400);
+		
+		$comment = DataObject::get_by_id("PageComment", $request->param('ID'));
 		if($comment && $comment->canEdit()) {
 			// if spam protection module exists
 			if(class_exists('SpamProtectorManager')) {
@@ -334,8 +359,12 @@ class PageComment_Controller extends Controller {
 	/**
 	 * Report a Spam Comment as valid comment (not spam)
 	 */
-	function reportham() {
-		$comment = DataObject::get_by_id("PageComment", $this->urlParams['ID']);
+	function reportham($request) {
+		// Protect against CSRF on destructive action
+		$token = SecurityToken::inst();
+		if(!$token->checkRequest($request)) return $this->httpError(400);
+		
+		$comment = DataObject::get_by_id("PageComment", $request->param('ID'));
 		if($comment && $comment->canEdit()) {
 			// if spam protection module exists
 			if(class_exists('SpamProtectorManager')) {
@@ -365,4 +394,4 @@ class PageComment_Controller extends Controller {
 	
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/javascript/AssetAdmin.js b/javascript/AssetAdmin.js
index 4aecd46a..692604b2 100755
--- a/javascript/AssetAdmin.js
+++ b/javascript/AssetAdmin.js
@@ -524,7 +524,8 @@ Behaviour.register({
                 method: 'get',
                 onSuccess: function(t) {
                     eval(t.responseText);
-                }
+                },
+								parameters: {"SecurityID": ($('SecurityID')) ? $('SecurityID').value : null}
             };
             new Ajax.Request('admin/assets/deleteunusedthumbnails',options);
         }
diff --git a/javascript/LeftAndMain_left.js b/javascript/LeftAndMain_left.js
index fc660efd..44a6ce9d 100755
--- a/javascript/LeftAndMain_left.js
+++ b/javascript/LeftAndMain_left.js
@@ -281,8 +281,10 @@ TreeNodeAPI.prototype = {
 		if(this.parentTreeNode && this.parentTreeNode.getIdx) {
 			parentClause = "&parentID=" + this.parentTreeNode.getIdx();
 		}
+		var token = $$('input[name=SecurityID]')[0].value;
+		var url = baseHref() + 'admin/duplicate/' + this.getIdx() + '?ajax=1' + parentClause + '&SecurityID=' + token;
 
-		new Ajax.Request(baseHref() + 'admin/duplicate/' + this.getIdx() + '?ajax=1' + parentClause, {
+		new Ajax.Request(url, {
 			method : 'get',
 			onSuccess : Ajax.Evaluator,
 			onFailure : function(response) {
@@ -291,7 +293,9 @@ TreeNodeAPI.prototype = {
 		}); 
 	},
 	duplicatePageWithChildren: function() {  
-		new Ajax.Request(baseHref() + 'admin/duplicatewithchildren/' + this.getIdx() + '?ajax=1', {
+		var token = $$('input[name=SecurityID]')[0].value;
+		var url = baseHref() + 'admin/duplicatewithchildren/' + this.getIdx() + '?ajax=1&SecurityID=' + token;
+		new Ajax.Request(url, {
 			method : 'get',
 			onSuccess : Ajax.Evaluator,
 			onFailure : function(response) {
@@ -423,9 +427,10 @@ SiteTreeNode.prototype = {
 		if($('Form_EditForm').elements.ID) currentlyOpenPageID = $('Form_EditForm').elements.ID.value;
 
 		statusMessage(ss.i18n._t('CMSMAIN.SAVING'), '', true);
+		var token = $$('input[name=SecurityID]')[0].value;
 		new Ajax.Request(SiteTreeHandlers.parentChanged_url, {
 			method : 'post', 
-			postBody : 'ID=' + node.getIdx() + '&ParentID=' + newParent.getIdx() + '&CurrentlyOpenPageID=' + currentlyOpenPageID,
+			postBody : 'ID=' + node.getIdx() + '&ParentID=' + newParent.getIdx() + '&CurrentlyOpenPageID=' + currentlyOpenPageID + '&SecurityID=' + token,
 			onSuccess : Ajax.Evaluator,
 			onFailure : function(response) {
 				errorMessage('error saving parent', response);
@@ -466,9 +471,10 @@ SiteTreeNode.prototype = {
 		if($('Form_EditForm').elements.ID) currentlyOpenPageID = $('Form_EditForm').elements.ID.value;
 
 		if(parts) {
+			var token = $$('input[name=SecurityID]')[0].value;
 			new Ajax.Request(SiteTreeHandlers.orderChanged_url, {
 				method : 'post', 
-				postBody : parts.join('&') + '&CurrentlyOpenPageID=' + currentlyOpenPageID,
+				postBody : parts.join('&') + '&CurrentlyOpenPageID=' + currentlyOpenPageID + '&SecurityID=' + token,
 				onSuccess : function(response) {
 					movedNode.removeNodeClass('loading');
 					if( $('sitetree').selected && $('sitetree').selected[0]){
diff --git a/javascript/TranslationTab.js b/javascript/TranslationTab.js
index 3aff2269..a1aecfdb 100755
--- a/javascript/TranslationTab.js
+++ b/javascript/TranslationTab.js
@@ -9,6 +9,7 @@ Behaviour.register({
 				var url = baseHref() + 'admin/' + this.name.substring(7) + '?ID=' + $('Form_EditForm_ID').value + '&newlang=' +
 				$('Form_EditForm_NewTransLang').value + '&ajax=1';
 				url += "&locale=" + $('Form_EditForm_Locale').value;
+				url += "&SecurityID=" + $$('input[name=SecurityID]')[0].value;
 				
 				new Ajax.Request( url, {
 					onSuccess: Ajax.Evaluator,
diff --git a/templates/Includes/AssetAdmin_left.ss b/templates/Includes/AssetAdmin_left.ss
index 0060f144..47ff763d 100755
--- a/templates/Includes/AssetAdmin_left.ss
+++ b/templates/Includes/AssetAdmin_left.ss
@@ -13,6 +13,7 @@
 			<form class="actionparams" id="addpage_options" style="display: none" action="admin/assets/addfolder">
 				<div>
 				<input type="hidden" name="ParentID" />
+				<input type="hidden" name="SecurityID" value="$SecurityID" />
 				<input class="action" type="submit" value="<% _t('GO','Go') %>" />
 				</div>
 			</form>
diff --git a/templates/Includes/AssetTableField.ss b/templates/Includes/AssetTableField.ss
index 6d20f59c..f65947dd 100755
--- a/templates/Includes/AssetTableField.ss
+++ b/templates/Includes/AssetTableField.ss
@@ -42,7 +42,7 @@
 						<% end_if %>
 						<% if Can(delete) %>
 						<td width="18" class="action">
-							<a class="deletelink" href="admin/assets/removefile/$ID" title="<% _t('DELFILE', 'Delete this file') %>"><img src="cms/images/delete.gif" alt="<% _t('DELFILE', 'Delete this file') %>" title="<% _t('DELFILE','Delete this file') %>" /></a>
+							<a class="deletelink" href="admin/assets/removefile/$ID/?SecurityID=$SecurityID" title="<% _t('DELFILE', 'Delete this file') %>"><img src="cms/images/delete.gif" alt="<% _t('DELFILE', 'Delete this file') %>" title="<% _t('DELFILE','Delete this file') %>" /></a>
 						</td>
 						<% end_if %>
 					</tr>
diff --git a/templates/Includes/CMSMain_left.ss b/templates/Includes/CMSMain_left.ss
index a6a38a61..3545379a 100755
--- a/templates/Includes/CMSMain_left.ss
+++ b/templates/Includes/CMSMain_left.ss
@@ -72,6 +72,7 @@
 					<p><% _t('SELECTPAGESACTIONS','Select the pages that you want to change &amp; then click an action:') %></p>
 
 					<input type="hidden" name="csvIDs" />
+					<input type="hidden" name="SecurityID" value="$SecurityID" />
 					<div id="actionParams"></div>
 					<div>
 						<select id="choose_batch_action">
diff --git a/templates/Includes/SecurityAdmin_left.ss b/templates/Includes/SecurityAdmin_left.ss
index 938cbcd8..563780d0 100644
--- a/templates/Includes/SecurityAdmin_left.ss
+++ b/templates/Includes/SecurityAdmin_left.ss
@@ -8,6 +8,7 @@
 	<div style="clear:both;"></div>
 	<form class="actionparams" id="addgroup_options" style="display: none" action="admin/security/addgroup">
 		<input type="hidden" name="ParentID" />
+		<input type="hidden" name="SecurityID" value="$SecurityID" />
 		<input class="action" type="submit" value="<% _t('GO','Go') %>" />
 	</form>
 	
@@ -15,6 +16,7 @@
 		<p><% _t('SELECT','Select the pages that you want to delete and then click the button below') %></p>
 		
 		<input type="hidden" name="csvIDs" />
+		<input type="hidden" name="SecurityID" value="$SecurityID" />
 		<input type="submit" value="<% _t('DELGROUPS','Delete the selected groups') %>" class="action delete" />
 	</form>
 	
diff --git a/tests/CMSMainTest.php b/tests/CMSMainTest.php
index 603e2ce9..4736ee13 100644
--- a/tests/CMSMainTest.php
+++ b/tests/CMSMainTest.php
@@ -9,7 +9,7 @@ class CMSMainTest extends FunctionalTest {
 	protected $autoFollowRedirection = false;
 	
 	static protected $orig = array();
-	
+		
 	static function set_up_once() {
 		self::$orig['CMSBatchActionHandler_batch_actions'] = CMSBatchActionHandler::$batch_actions;
 		CMSBatchActionHandler::$batch_actions = array(
@@ -35,7 +35,7 @@ class CMSMainTest extends FunctionalTest {
 		$page2 = $this->objFromFixture('Page', "page2");
 		$this->session()->inst_set('loggedInAs', $this->idFromFixture('Member', 'admin'));
 		
-		$response = Director::test("admin/cms/publishall", array('confirm' => 1), $this->session());
+		$response = $this->get("admin/cms/publishall?confirm=1");
 		
 		$this->assertContains(
 			sprintf(_t('CMSMain.PUBPAGES',"Done: Published %d pages"), 8), 
@@ -44,7 +44,13 @@ class CMSMainTest extends FunctionalTest {
 		
 		// Some modules (e.g., cmsworkflow) will remove this action
 		if(isset(CMSBatchActionHandler::$batch_actions['publish'])) {
-			$response = Director::test("admin/cms/batchactions/publish", array('csvIDs' => implode(',', array($page1->ID, $page2->ID)), 'ajax' => 1), $this->session());
+			$response = $this->post(
+				"admin/cms/batchactions/publish", 
+				array(
+					'csvIDs' => implode(',', array($page1->ID, $page2->ID)), 
+					'ajax' => 1
+				)
+			);
 	
 			$this->assertContains(sprintf('setNodeTitle(%d, \'Page 1\');', $page1->ID), $response->getBody());
 			$this->assertContains(sprintf('setNodeTitle(%d, \'Page 2\');', $page2->ID), $response->getBody());
@@ -196,13 +202,23 @@ class CMSMainTest extends FunctionalTest {
 
 		// with insufficient permissions
 		$cmsUser->logIn();
-		$response = $this->post('admin/addpage', array('ParentID' => '0', 'PageType' => 'Page', 'Locale' => 'en_US'));
+		$response = $this->get('admin');
+		$response = $this->submitForm(
+			'Form_AddPageOptionsForm', 
+			null,
+			array('ParentID' => '0', 'PageType' => 'Page', 'Locale' => 'en_US')
+		);
 		// should redirect, which is a permission error
 		$this->assertEquals(403, $response->getStatusCode(), 'Add TopLevel page must fail for normal user');
 
 		// with correct permissions
 		$rootEditUser->logIn();
-		$response = $this->post('admin/addpage', array('ParentID' => '0', 'PageType' => 'Page', 'Locale' => 'en_US'));
+		$response = $this->get('admin');
+		$response = $this->submitForm(
+			'Form_AddPageOptionsForm', 
+			null,
+			array('ParentID' => '0', 'PageType' => 'Page', 'Locale' => 'en_US')
+		);
 		$this->assertEquals(302, $response->getStatusCode(), 'Must be a redirect on success');
 		$location=$response->getHeader('Location');
 		$this->assertContains('/show/',$location, 'Must redirect to /show/ the new page');
diff --git a/tests/CommentAdminTest.php b/tests/CommentAdminTest.php
index 9ec92e26..ecf6d68e 100644
--- a/tests/CommentAdminTest.php
+++ b/tests/CommentAdminTest.php
@@ -29,7 +29,7 @@ class CommentAdminTest extends FunctionalTest {
 		$comm = $this->objFromFixture('PageComment', 'Comment1');
 		$id = $comm->ID;
 		$this->logInWithPermission('CMS_ACCESS_CommentAdmin');
-		$result = $this->get("admin/comments/EditForm/field/Comments/item/$id/delete");
+		$response = $this->get("admin/comments/EditForm/field/Comments/item/$id/delete");
 		$checkComm = DataObject::get_by_id('PageComment',$id);
 
 		$this->assertFalse($checkComm);
diff --git a/tests/MemberTableFieldTest.php b/tests/MemberTableFieldTest.php
index 253d99c7..e5e9694b 100644
--- a/tests/MemberTableFieldTest.php
+++ b/tests/MemberTableFieldTest.php
@@ -1,7 +1,14 @@
 <?php
-class MemberTableFieldTest extends SapphireTest {
+/**
+ * @package cms
+ * @subpackage tests
+ */
+
+class MemberTableFieldTest extends FunctionalTest {
+	
 	static $fixture_file = 'cms/tests/MemberTableFieldTest.yml';
 	
+	
 	function testLimitsToMembersInGroup() {
 		$member1 = $this->objFromFixture('Member', 'member1');
 		$member2 = $this->objFromFixture('Member', 'member2');
@@ -54,14 +61,12 @@ class MemberTableFieldTest extends SapphireTest {
 		$member1 = $this->objFromFixture('Member', 'member1');
 		$group1 = $this->objFromFixture('Group', 'group1');
 		
-		$tf = new MemberTableField(
-			$this,
-			"Members",
-			$group1
-		);
-		$tfItem = new MemberTableField_ItemRequest($tf, $member1->ID);
-		$tfItem->delete();
-
+		$response = $this->get('MemberTableFieldTest_Controller');
+		$token = SecurityToken::inst();
+		$url = sprintf('MemberTableFieldTest_Controller/Form/field/Members/item/%d/delete/?usetestmanifest=1', $member1->ID);
+		$url = $token->addToUrl($url);
+		$response = $this->get($url);
+		
 		$group1->flushCache();
 		
 		$this->assertNotContains($member1->ID, $group1->Members()->column('ID'),
@@ -79,14 +84,12 @@ class MemberTableFieldTest extends SapphireTest {
 		$member1ID = $member1->ID;
 		$group1 = $this->objFromFixture('Group', 'group1');
 		
-		$tf = new MemberTableField(
-			$this,
-			"Members"
-			// no group assignment
-		);
-		$tfItem = new MemberTableField_ItemRequest($tf, $member1->ID);
-		$tfItem->delete();
-
+		$response = $this->get('MemberTableFieldTest_Controller');
+		$token = SecurityToken::inst();
+		$url = sprintf('MemberTableFieldTest_Controller/FormNoGroup/field/Members/item/%d/delete/?usetestmanifest=1', $member1->ID);
+		$url = $token->addToUrl($url);
+		$response = $this->get($url);
+		
 		$group1->flushCache();
 		
 		$this->assertNotContains($member1->ID, $group1->Members()->column('ID'),
@@ -98,4 +101,39 @@ class MemberTableFieldTest extends SapphireTest {
 			'Member record is removed from database'
 		);
 	}
+}
+
+class MemberTableFieldTest_Controller extends Controller implements TestOnly {
+	
+	protected $template = 'BlankPage';
+	
+	function Link($action = null) {
+		return Controller::join_links('MemberTableFieldTest_Controller', $action);
+	}
+	
+	function Form() {
+		$group1 = DataObject::get_one('Group', '"Code" = \'group1\'');
+		return new Form(
+			$this,
+			'FormNoGroup',
+			new FieldSet(new MemberTableField($this, "Members", $group1)),
+			new FieldSet(new FormAction('submit'))
+		);
+	}
+
+	function FormNoGroup() {
+		$tf = new MemberTableField(
+			$this,
+			"Members"
+			// no group
+		);
+		
+		return new Form(
+			$this,
+			'FormNoGroup',
+			new FieldSet(new MemberTableField($this, "Members")),
+			new FieldSet(new FormAction('submit'))
+		);
+	}
+	
 }
\ No newline at end of file
diff --git a/tests/MemberTableFieldTest.yml b/tests/MemberTableFieldTest.yml
index ee85785d..bc9785f2 100644
--- a/tests/MemberTableFieldTest.yml
+++ b/tests/MemberTableFieldTest.yml
@@ -1,13 +1,17 @@
 Group:
   admin:
     Title: Administrators
+    Code: admin
   group1:
     Title: Group1
+    Code: group1
   group1_child:
     Title: Group1 Child
     Parent: =>Group.group1
+    Code: group1_child
   group2:
     Title: Group2
+    Code: group2
 Member:
   admin:
     Email: admin@example.com
diff --git a/tests/PageCommentsTest.php b/tests/PageCommentsTest.php
index 4510a31f..dc708422 100644
--- a/tests/PageCommentsTest.php
+++ b/tests/PageCommentsTest.php
@@ -4,6 +4,8 @@ class PageCommentsTest extends FunctionalTest {
 	
 	static $fixture_file = 'cms/tests/PageCommentsTest.yml';
 	
+	static $use_draft_site = true;
+	
 	function testCanView() {
 		$visitor = $this->objFromFixture('Member', 'visitor');
 		$admin = $this->objFromFixture('Member', 'commentadmin');
@@ -51,8 +53,11 @@ class PageCommentsTest extends FunctionalTest {
 		
 		$firstComment = $this->objFromFixture('PageComment', 'firstComA');
 		$firstCommentID = $firstComment->ID;
-		Director::test($firstPage->RelativeLink(), null, $this->session());
-		Director::test('PageComment/deletecomment/'.$firstComment->ID, null, $this->session());
+		$response = $this->get($firstPage->RelativeLink());
+		$token = SecurityToken::inst();
+		$url = sprintf('PageComment/deletecomment/%d/', $firstComment->ID);
+		$url = $token->addToUrl($url);
+		$response = $this->get($url);
 		
 		$this->assertFalse(DataObject::get_by_id('PageComment', $firstCommentID));
 	}
@@ -62,11 +67,13 @@ class PageCommentsTest extends FunctionalTest {
 		$this->autoFollowRedirection = false;
 		$this->logInAs('commentadmin');
 		
-		Director::test('second-page', null, $this->session());
-		Director::test('PageComment/deleteallcomments?pageid='.$second->ID,
-			null, $this->session());
-		Director::test('second-page', null, $this->session());
-		
+		$response = $this->get($second->RelativeLink());
+		$token = SecurityToken::inst();
+		$url = sprintf('PageComment/deleteallcomments?pageid=%d', $second->ID);
+		$url = $token->addToUrl($url);
+		$response = $this->get($url);
+		$response = $this->get($second->RelativeLink());
+
 		$secondComments = DataObject::get('PageComment', '"ParentID" = '.$second->ID);
 		$this->assertNull($secondComments);
 		

From 6df2e7432398929f6a84cca9db1fe1e1bd4f27af Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 2 Nov 2010 19:22:50 +0000
Subject: [PATCH 469/483] MINOR Fixed regression from r113282 for changed
 SecurityToken API in CMSMain->publishall() (fixes #6159)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113360 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index d00145d2..b7d65d8e 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -1274,6 +1274,10 @@ JS;
 
 		} else {
 			$token = SecurityToken::inst();
+			$fields = new FieldSet();
+			$token->updateFieldSet($fields);
+			$tokenField = $fields->First();
+			$tokenHtml = ($tokenField) ? $tokenField->FieldHolder() : '';
 			$response .= '<h1>' . _t('CMSMain.PUBALLFUN','"Publish All" functionality') . '</h1>
 				<p>' . _t('CMSMain.PUBALLFUN2', 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It\'s
 				intended to be used after there have been massive edits of the content, such as when the site was
@@ -1281,7 +1285,7 @@ JS;
 				<form method="post" action="publishall">
 					<input type="submit" name="confirm" value="'
 					. _t('CMSMain.PUBALLCONFIRM',"Please publish every page in the site, copying content stage to live",PR_LOW,'Confirmation button') .'" />'
-					. $token->getFormField()->FieldHolder() .
+					. $tokenHtml .
 				'</form>';
 		}
 		

From c19aa2ce85a2f1bdc4ee30faa4635a0df2d4488c Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sat, 13 Nov 2010 01:30:55 +0000
Subject: [PATCH 470/483] MINOR Making some JavaScript strings in
 cms/javascript translatable, and updated their cs_CZ and sk_SK translations
 (fixes #6085, thanks Pike)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113689 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/AssetAdmin.js        | 10 +++++-----
 javascript/AssetTableField.js   |  4 ++--
 javascript/LeftAndMain.js       |  2 +-
 javascript/LeftAndMain_left.js  |  4 ++--
 javascript/LeftAndMain_right.js |  2 +-
 javascript/ReportAdmin_right.js |  2 +-
 javascript/lang/cs_CZ.js        |  4 +++-
 javascript/lang/en_US.js        |  9 ++++++++-
 javascript/lang/sk_SK.js        |  4 +++-
 9 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/javascript/AssetAdmin.js b/javascript/AssetAdmin.js
index 692604b2..144a2416 100755
--- a/javascript/AssetAdmin.js
+++ b/javascript/AssetAdmin.js
@@ -29,7 +29,7 @@ function action_upload_right(e) {
 		}.bind(this));
 		
 		if(values.length == 0) {
-			alert("Please select at least one file for uploading");
+			alert(ss.i18n._t('TABLEFIELD.SELECTUPLOAD', 'Please select at least one file for uploading.')); 
 			openTab("Root_Upload");
 		} else {
 			frames['AssetAdmin_upload'].document.getElementById('Form_UploadForm').submit();
@@ -70,7 +70,7 @@ MarkingPropertiesButton.prototype = {
 		}
 		
 		if(list == "") {
-			alert(this.noneCheckedError);
+			alert(ss.i18n._t('TABLEFIELD.SELECTDELETE', 'Please select some files to delete!')); 
 			return false;
 			
 		} else {
@@ -79,7 +79,7 @@ MarkingPropertiesButton.prototype = {
 		// If there is a confirmation message, show it before submitting
 		if('' != this.confirmMessage) {
 			// Only submit if OK button is clicked
-			if (confirm(this.confirmMessage)) {
+			if (confirm(ss.i18n._t('TABLEFIELD.CONFIRMDELETEV2', 'Do you really want to delete the marked files?'))) { 
 				$('Form_EditForm').save(false, null, this.action);
 			}
 		} else {
@@ -293,7 +293,7 @@ addfolder.prototype = {
 	},
 	
 	onclick : function() {
-		statusMessage('Creating new folder...');
+		statusMessage(ss.i18n._t('CMSMAIN.CREATINGFOLDER', 'Creating new folder...')); 
 		this.form_submit();
 /*		
 			if(treeactions.toggleSelection(this)) {
@@ -424,7 +424,7 @@ var deletefolder = {
 		if(csvIDs) {
 			$('Form_DeleteItemsForm').elements.csvIDs.value = csvIDs;
 			
-			statusMessage('deleting pages');
+			statusMessage(ss.i18n._t('CMSMAIN.DELETINGFOLDERS', 'Deleting folders...')); 
 
 			Ajax.SubmitForm('Form_DeleteItemsForm', null, {
 				onSuccess : deletefolder.submit_success,
diff --git a/javascript/AssetTableField.js b/javascript/AssetTableField.js
index 3040742b..e5a597f6 100644
--- a/javascript/AssetTableField.js
+++ b/javascript/AssetTableField.js
@@ -53,8 +53,8 @@ AssetTableField.prototype = {
 		if(linkCount) linkCount = linkCount.innerHTML;
 		
 		var confirmMessage = ss.i18n._t('TABLEFIELD.DELETECONFIRMMESSAGE', 'Are you sure you want to delete this record?');
-		if(linkCount) confirmMessage += '\nThere are ' + linkCount + ' page(s) that use this file, please review the list of pages on the Links tab of the file before continuing.';
-		
+		if(linkCount>0) confirmMessage += ss.i18n.sprintf(ss.i18n._t('TABLEFIELD.DELETECONFIRMMESSAGEV2','\nThere are %s page(s) that use this file, please review the list of pages on the Links tab of the file before continuing.'),linkCount);
+
 		// TODO ajaxErrorHandler and loading-image are dependent on cms, but formfield is in sapphire
 		var confirmed = confirm(confirmMessage);
 		if(confirmed)
diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index 2a341504..35d700cd 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -384,7 +384,7 @@ function ajaxLink(href) {
  * Load a URL into the given form
  */
 function ajaxLoadPage() {
-	statusMessage('loading...', 2, true);
+	statusMessage(ss.i18n._t('LOADING', 'loading...'),2,true);
 	new Ajax.Request(this.URL + '&ajax=1', {
 		method : 'get',
 		onSuccess : ajaxLoadPage_success.bind(this)
diff --git a/javascript/LeftAndMain_left.js b/javascript/LeftAndMain_left.js
index 44a6ce9d..ab278c2b 100755
--- a/javascript/LeftAndMain_left.js
+++ b/javascript/LeftAndMain_left.js
@@ -58,7 +58,7 @@ TreeAPI.prototype = {
 	},
 	
 	reload: function(options) {
-		this.innerHTML = 'Loading...';
+		this.innerHTML =  ss.i18n._t('LOADING', 'loading...'); 
 
 		var args = {ajax:1, ID:0};
 		if ($('LangSelector')) args.locale = $('LangSelector').value;
@@ -227,7 +227,7 @@ TreeNodeAPI.prototype = {
 	ajaxExpansion : function() {
 		this.addNodeClass('loading');
 		var ul = this.treeNodeHolder(false);
-		ul.innerHTML = 'loading...';
+		ul.innerHTML = ss.i18n._t('LOADING', 'loading...'); 
 		
 		// Any attempts to add children to this page should, in fact, cue them up for insertion later
 		ul.cuedNewNodes = [];
diff --git a/javascript/LeftAndMain_right.js b/javascript/LeftAndMain_right.js
index d4ef031e..69324397 100755
--- a/javascript/LeftAndMain_right.js
+++ b/javascript/LeftAndMain_right.js
@@ -309,7 +309,7 @@ CMSRightForm.prototype = {
 			  url += '&locale='+lang;
 			}
 
-			statusMessage("loading...");
+			statusMessage(ss.i18n._t('LOADING', 'loading...')); 
 			this.loadURLFromServer(url);
 		} else {
 			throw("getPageFromServer: Bad page ID: " + id);
diff --git a/javascript/ReportAdmin_right.js b/javascript/ReportAdmin_right.js
index 42879eb7..f477ad0f 100755
--- a/javascript/ReportAdmin_right.js
+++ b/javascript/ReportAdmin_right.js
@@ -28,7 +28,7 @@ Behaviour.register({
 				
 				if(treeNode) treeNode.addNodeClass('loading');
 				
-				statusMessage("loading...");
+				statusMessage(ss.i18n._t('LOADING', 'loading...')); 
 
 				var requestURL = 'admin/reports/show/' + id;
 				new Ajax.Request(requestURL, {
diff --git a/javascript/lang/cs_CZ.js b/javascript/lang/cs_CZ.js
index 55aec775..a915f502 100644
--- a/javascript/lang/cs_CZ.js
+++ b/javascript/lang/cs_CZ.js
@@ -11,15 +11,17 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 		'CMSMAIN.ERRORUNFILTER' : 'Nefiltrovaná struktura',
 		'CMSMAIN.PUBLISHINGPAGES' : 'Zveřejňování stránek...',
 		'CMSMAIN.SELECTONEPAGE' : "Prosím, vyberte nejméně 1 stránku.",
+		'CMSMAIN.SELECTMOREPAGES' : "Máte vybráno %s stránek.\n\nSkutečně je chcete %s?",
 		'CMSMAIN.ERRORPUBLISHING' : 'Chyba při zveřejňování stránek',
 		'CMSMAIN.REALLYDELETEPAGES' : "Skutečně chcete smazat %s označené stránky?",
 		'CMSMAIN.DELETINGPAGES' : 'Mazání stránek...',
+		'CMSMAIN.CREATINGFOLDER' : 'Vytváření složky...',
+		'CMSMAIN.DELETINGFOLDERS' : 'Mazání složek...',
 		'CMSMAIN.ERRORDELETINGPAGES': 'Chyba při mazání stránek',
 		'CMSMAIN.PUBLISHING' : 'Zveřejňování...',
 		'CMSMAIN.RESTORING': 'Obnovování...',
 		'CMSMAIN.ERRORREVERTING': 'Chyba převádění na živý obsah',
 		'CMSMAIN.SAVING' : 'ukládání...',
-		'CMSMAIN.SELECTMOREPAGES' : "Máte vybráno %s stránek.\n\nSkutečně je chcete?",
 		'ModelAdmin.SAVED': "Uloženo",
 		'ModelAdmin.REALLYDELETE': "Skutečně chcete smazat?",
 		'ModelAdmin.DELETED': "Smazáno",
diff --git a/javascript/lang/en_US.js b/javascript/lang/en_US.js
index df6c3300..a60651fe 100644
--- a/javascript/lang/en_US.js
+++ b/javascript/lang/en_US.js
@@ -29,6 +29,13 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 		'WidgetAreaEditor.TOOMANY': 'Sorry, you have reached the maximum number of widgets in this area',
 		'CMSMAIN.RollbackConfirmation': 'Do you really want to roll back to version #%s of this page?',
 		'CMSMAIN.CopyPublishedConfirmation': 'Do you really want to copy the published content to the stage site?',
-		'CMSMAIN.PageTypeSaveAlert': 'The page type will be updated after the page is saved'
+		'CMSMAIN.PageTypeSaveAlert': 'The page type will be updated after the page is saved',
+		'LOADING': 'loading...',
+		'TABLEFIELD.DELETECONFIRMMESSAGEV2': '\nThere are %s page(s) that use this file, please review the list of pages on the Links tab of the file before continuing.',
+		'TABLEFIELD.SELECTUPLOAD': 'Please select at least one file for uploading.',
+		'TABLEFIELD.SELECTDELETE': 'Please select some files to delete!',
+		'TABLEFIELD.CONFIRMDELETEV2': 'Do you really want to delete the marked files?',
+		'CMSMAIN.CREATINGFOLDER': 'Creating new folder...',
+		'CMSMAIN.DELETINGFOLDERS': 'Deleting folders...'
 	});
 }
\ No newline at end of file
diff --git a/javascript/lang/sk_SK.js b/javascript/lang/sk_SK.js
index c0d18fc2..f463946f 100644
--- a/javascript/lang/sk_SK.js
+++ b/javascript/lang/sk_SK.js
@@ -11,15 +11,17 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 		'CMSMAIN.ERRORUNFILTER' : 'Nefiltrovaná štruktúra',
 		'CMSMAIN.PUBLISHINGPAGES' : 'Zverejňovanie stránok...',
 		'CMSMAIN.SELECTONEPAGE' : "Prosím, vyberte najmenej 1 stránku.",
+		'CMSMAIN.SELECTMOREPAGES' : "Máte vybraté %s stránok.\n\nSkutočne ich chcete %s?",
 		'CMSMAIN.ERRORPUBLISHING' : 'Chyba pri zverejňovaní stránok',
 		'CMSMAIN.REALLYDELETEPAGES' : "Skutočne chcete zmazať %s označené stránky?",
 		'CMSMAIN.DELETINGPAGES' : 'Mazanie stránok...',
+		'CMSMAIN.CREATINGFOLDER' : 'Vytváranie složky...',
+		'CMSMAIN.DELETINGFOLDERS' : 'Mazanie složiek...',
 		'CMSMAIN.ERRORDELETINGPAGES': 'Chyba pri mazaní stránok',
 		'CMSMAIN.PUBLISHING' : 'Zverejňovanie...',
 		'CMSMAIN.RESTORING': 'Obnovovanie...',
 		'CMSMAIN.ERRORREVERTING': 'Chyba prevádzania na živý obsah',
 		'CMSMAIN.SAVING' : 'ukladanie...',
-		'CMSMAIN.SELECTMOREPAGES' : "Máte vybraté %s stránok.\n\nSkutočne ich chcete?",
 		'ModelAdmin.SAVED': "Uložené",
 		'ModelAdmin.REALLYDELETE': "Skutočně chcete zmazať?",
 		'ModelAdmin.DELETED': "Zmazané",

From e8e5c62c5ad9c55418708be927732c7dadbe1343 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sat, 13 Nov 2010 02:12:48 +0000
Subject: [PATCH 471/483] BUGFIX Avoid reloading CMS form twice after certain
 saving actions (fixes #5451, thanks muzdowski)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113692 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 044b2528..eddf6f2f 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -732,7 +732,8 @@ JS;
 			// Removed virtualpage test as we need to draft/published links when url is changed
 			if( (/*$record->class == 'VirtualPage' &&*/ $originalURLSegment != $record->URLSegment) ||
 				($originalClass != $record->ClassName) || self::$ForceReload == true) {
-				FormResponse::add("$('Form_EditForm').getPageFromServer($record->ID);");
+				// avoid double loading by adding a uniqueness ID
+				FormResponse::add($str = "$('Form_EditForm').getPageFromServer($record->ID);", $str);
 			}
 
 			// After reloading action
@@ -765,7 +766,8 @@ JS;
 			
 			// If there has been a change in the broken link values, reload the page
 			if ($originalBrokenLinkValues != $record->HasBrokenLink.$record->HasBrokenFile) {
-				FormResponse::add("$('Form_EditForm').getPageFromServer($record->ID);");
+				// avoid double loading by adding a uniqueness ID
+				FormResponse::add($str = "$('Form_EditForm').getPageFromServer($record->ID);", $str);
 			}
 
 			// If the 'Save & Publish' button was clicked, also publish the page
@@ -1305,4 +1307,4 @@ JS;
 	
 }
 
-?>
\ No newline at end of file
+?>

From b8338bc2bcaa9ed4bc0cef4b66f2b7ea51f28d65 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 14 Nov 2010 19:39:03 +0000
Subject: [PATCH 472/483] MINOR Typo in AssetAdmin (fixes #6191, thanks
 Juanitou)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113695 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 1437addf..ec886d23 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -629,7 +629,7 @@ JS;
 	/**
 	 * Delete a folder
 	 */
-	public function deletefolder($data, $ofmr) {
+	public function deletefolder($data, $form) {
 		$ids = split(' *, *', $_REQUEST['csvIDs']);
 		
 		if(!$ids) return false;

From 75f12d5a7ee234a5203c28b9c630abe0093a50c4 Mon Sep 17 00:00:00 2001
From: Saophalkun Ponlu <phalkunz@silverstripe.com>
Date: Wed, 17 Nov 2010 05:21:03 +0000
Subject: [PATCH 473/483] ENHANCEMENT: Update Asset's left and right panels
 with filders and files after 'Look for new files' was triggered (open #5543)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113871 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php      |  3 ++-
 javascript/AssetAdmin.js | 26 +++++++++++++++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index ec886d23..17a7377a 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -38,7 +38,8 @@ class AssetAdmin extends LeftAndMain {
 		'sync',
 		'uploadiframe',
 		'UploadForm',
-		'deleteUnusedThumbnails' => 'ADMIN'
+		'deleteUnusedThumbnails' => 'ADMIN',
+		'SitetreeAsUL'
 	);
 	
 	/**
diff --git a/javascript/AssetAdmin.js b/javascript/AssetAdmin.js
index 144a2416..f83f1b4d 100755
--- a/javascript/AssetAdmin.js
+++ b/javascript/AssetAdmin.js
@@ -342,13 +342,25 @@ FilesystemSyncClass.prototype = {
 	
 	onclick : function() {
 		statusMessage('Looking for new files');
-        new Ajax.Request('admin/assets/sync', {
-            onSuccess: function(t) {
-                statusMessage(t.responseText, "good");
-            },
-            onFailure: function(t) {
-                errorMessage("There was an error looking for new files");
-            }
+		new Ajax.Request('admin/assets/sync', {
+			onSuccess: function(t) {
+				statusMessage(t.responseText, "good");
+				
+				// Refresh asset tree
+				new Ajax.Request('admin/assets/SitetreeAsUL', {
+					onSuccess: function(t) {
+						Element.replace($('sitetree'), t.responseText);
+						SiteTree.applyTo('#sitetree');
+						
+						// Reload the right panel
+						var sel = $('sitetree').firstSelected();
+						if(sel !== undefined) sel.selectTreeNode();
+					}
+				});
+         },
+			onFailure: function(t) {
+				errorMessage("There was an error looking for new files");
+			}
 		});
 		return false;
 	}

From e907e2e2664e24cb1b1b9e43f2fb4086c12116bc Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Tue, 23 Nov 2010 00:34:29 +0000
Subject: [PATCH 474/483] BUGFIX Fixed case where AssetAdmin would throw an
 error if $links was not an object in AssetAdmin::getCustomFieldsFor() MINOR
 Defined $backlinks as an array before adding entries to it

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114036 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetTableField.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/AssetTableField.php b/code/AssetTableField.php
index 3b602d8b..7d822cf0 100755
--- a/code/AssetTableField.php
+++ b/code/AssetTableField.php
@@ -200,7 +200,8 @@ class AssetTableField extends ComplexTableField {
 			$links = $childData->BackLinkTracking();
 			if(class_exists('Subsite')) Subsite::disable_subsite_filter(false);
 
-			if($links->exists()) {
+			if($links && $links->exists()) {
+				$backlinks = array();
 				foreach($links as $link) {
 					$backlinks[] = "<li><a href=\"admin/show/$link->ID\">" . $link->Breadcrumbs(null,true). "</a></li>";
 				}

From 3ba6e7054034cc6ee4f94b80d86e2d3f83aa7c15 Mon Sep 17 00:00:00 2001
From: Andreas Piening <andreas@silverstripe.com>
Date: Tue, 23 Nov 2010 04:19:03 +0000
Subject: [PATCH 475/483] MINOR: fixed visual glitch in CMS access tab for IE

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114062 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/SitetreeAccess.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/javascript/SitetreeAccess.js b/javascript/SitetreeAccess.js
index d25d70dc..bc828842 100644
--- a/javascript/SitetreeAccess.js
+++ b/javascript/SitetreeAccess.js
@@ -10,6 +10,7 @@ var siteTreeAccessHandler = function(canField, groupsField) {
 		},
 		onclick: function() {
 			$(groupsField).style.display = (this.value == 'OnlyTheseUsers') ? 'block' : 'none';
+			$(groupsField).style.visibility = (this.value == 'OnlyTheseUsers') ? 'visible' : 'hidden';
 		}
 	}
 	return output;

From 74280107481f6b5810c8afacd457ab43edb673ab Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 25 Nov 2010 19:12:09 +0000
Subject: [PATCH 476/483] BUGFIX Added SecurityToken to
 PageCommentInterface->DeleteAllLink() (fixes #6223, thanks Pigeon)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114195 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/PageCommentInterface.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index ab769c88..9d996dd0 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -254,7 +254,8 @@ class PageCommentInterface extends RequestHandler {
 	 */
 	function DeleteAllLink() {
 		if(Permission::check('CMS_ACCESS_CommentAdmin')) {
-			return Director::absoluteBaseURL() . "PageComment/deleteallcomments?pageid=" . $this->page->ID;
+			$token = SecurityToken::inst();
+			return $token->addToUrl(Director::absoluteBaseURL() . "PageComment/deleteallcomments?pageid=" . $this->page->ID);
 		}
 	}
 	

From 375151c14d0acadeb890b33b5d901618cd4daf6b Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 9 Dec 2010 22:31:02 +0000
Subject: [PATCH 477/483] MINOR Updated SilverStripe logo to new design (from
 r114764)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114765 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 images/loading.gif       | Bin 7009 -> 5004 bytes
 images/mainmenu/logo.gif | Bin 1111 -> 510 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/images/loading.gif b/images/loading.gif
index 3a020ddbc0850170750daba72e368a83bb354026..cfbfba27d7da93e6ba90affb15949bc9149281ee 100755
GIT binary patch
delta 4332
zcmaJ>XFwC%x}7AHNE447N<fTsl@bsV2rVdwqT)eC;2?TH2t`OC2?+#bLXjehAV^2)
zL~7^|P-6u}ilT@S6h#r060m?l%>(b%ckg@ezWFh;_nx)Zx4zkH_6ziBUC`0l!Q8?Z
z5CdR00RZqi$IM9W?!8q|$DaSR{A}{2ynh}pzAi5J+~CB!t0S-aM}|``=Fcq%rry1+
z<+eY6w}6VQB9~r2+di0CS>l@3Qr^<ga_tI|R1DVk-Wt4j@!H6vv8N4v<371vB9Ul|
zNZQlI6>0BF^Id&f*+!5-U%wDM4S5V77)-R*nD4r(feiMy*6=WMLAj83;e&#mm=yd$
z<~}z+W{97KzlN<1(kcQQK_C<GG+$%{A(TkPMp$e3`jd{~v8&^?Wg`vb4+t&9TElMb
z1#+$EE)oTgG&4jQ_@U4!B-+@}c!wzl17h@%CMaW+5z55K*u=mXgWX|*MWK-YyfjwJ
zQTzk22kagGS!{J?tr0|{k+DWb3<krHvBQu=2{bacu&`LuFflP$MHo;ci8S8`10q%P
zr-D76>PHDC(}GDv<eH-IF;Y0qS_545`i~|E<X^f(s^O1@4E;z1qX=KJk+C6at*M_t
z7nlDZN+A3~Q)vhA|84kx3xli5RJTYn-sk|HN(!g=;aBmRYqiMOT@<`8jYM%HkwSld
zNY@||jYJJ1k&(L&nju|${ep>W^B;H@7pyapO7kW9;hpWRHC7c2gM<CCC}VSsxv_<V
z!!DG$v9Y~_#ZHu|1Ii3zhDM`I&>+VCC)u9l7f!$vX+O#SzsPo||C_wZU5f*Oyjt2G
zPYI^u{T(PI0`f=G*x>(c#{QQc_-}63%>0Aw{~yg*{PBzYKe<M$Zj9D8_g^;q=hA9|
z)`q{byE<8ozc2VB{&?bQ<|(V;hKRm@`?@0hvb^;9)5i~s3xfH%*_rq6-cG-ndi`qh
z<%@~u&&J1|@}G=89(nX|_`&_5!GZpJeRuEl_T0X8^TzdSysK9(cXx3+JKEb?Tbi31
zISuu7wKdh3*j1Gk<z=NM#TPFW6&B>@<>q9c&&oWPkq(|sJ99eqR7!GE;>m>gxL6h#
zb0Rv585zN#htsH(Ffxfq2n{(N926LU_xC&I>+|=~Bi@I-{_^y2Kje1sz<$?1_qpud
zv)kFp(cusKT|4b?wl>yQmRJjO4BE_ehso-XWoV$kecM(&T^(&LO^q$c&FY)fR1qr5
zN{YWLZ2WD5p8R?_Ss7`mb#O@uaWNPa0svdSh^?MP0HFWlzIreL;-U%Nj3XbUcb!sm
zZYsZ%sdrG6c^L9ZnkA+fG!YBeVNa~ip)+8wPR&fyJ@osT<{^jevn>zZLuN&-qX9Lu
zZDaKJv+Wa!+vhr7WrxglPFL2<acA1z&vglIZ=dh}I1(~{d3ma4{>s<S@8_=qlKKLk
zm{O?V8eF$la9sv7Be)^&sK0Pi!6S6xmU3Y2!fiFi%t8+`Nq@0dD<^dEj$T#m;$3~P
zeP*!_)uaF6-m{%Jpnsi<4^F~d)gC7fh{@Uw!oq!ULv~R(Q=F~l?8p8+AIf<5_i0|X
zdnlAg+C4ht!7{Uv^5KO)l87b@j`&e!Tb~HD<n8!=+j(d!6<$%>7`1t_ZJhDua@s)j
z((ICjyqdiESj75$auZ2ab><c>m<u3U;%us4%PaEsBb}HGzYBE90>+M3(HnBkCNA15
zlZY9t^4r+<uA*TaYZiV(Zs}3;!RGea;HaV%)7B3*bg?GUGZ`_Gv~3$?m#Ro+@~($V
z_lE%m^>3r<3V&LgsJfo8ejvfRV!cB>`g!Z;Nu}Y=FA{sxznh3@k!%1-Q&9|Pf*X8(
zWy3nXVjOfyTAY7R2?9X3KsE|kU&}pW*D0e|In%ta01vwvhl3u=RFlvW;NT8W=(E(L
z5U?1y@njB2`B1F6$gp1b6$#OCQ<pk43Kx%F58FCsC%B>u`FNi!Z>(^1{R#Q2>m+1h
zo4&q4hO)Z_mr)5DO@X;Aa}ch`uZP-n+d+$i?18-*r$81<P`Df~(x7LA{4J)rS%=pJ
z^WPxpZdEq?fPLFaYy)*g8oKdyuNh3MF^$10+MJYbXG0+{SvPN}FD&<{hw{?NR9}sG
zp2LGq5}c7xK8&!qgPGxkWvRv~o8`5^Xiai?GKE^y;#OOmb6H@VC0^~oop!YmAJPVt
z-4`DV^ufE7?DFP|vh-XBuf+qoSN-FSUnItlZ!yTx($jj2BC}xn^7NX$l_t)Cdz9VI
zg=}&gA4qU!$vO>FOCC<4tr^ZLo<@WxTALIPqHqtw4ix#b11F<ZVAHZ^#Ud0gN*xV$
zj;?=^dFFk96r2O@Ezc+}aViLu{`kbaUqwMSHA~I(FuC)FwFs5gS5_tkClB0M_)r?4
zto>G>>zd9t2!q#oee)N%+$%Aa)g~0$|2ee(j<zABA|z18?f7uPh1k+_Pybp_n0Uae
zKviwP1;|kDV#+Q+*w<5e5G^ubD9jRr*ZIgI@0!(Ih^+>Dv>^K(lVMHn{j~w?twu!w
zar~4|5=ZN{dEddYy3Z|^Yb@vO3}hV|oNbjcK3U-!%W}JtH^(`KeCu7L^GN;Uc^d2F
zjFOi5U&0O7>JIf)23+Ixb;`L*R(vXSa_ke|aowcZDx&J$wmvVz&<)x5q~mO@+wb!e
zU$o^bu<-@kz|LF3&(gftlSdds2cO>m+|l+aM7qz(`(C30SLEw6t>O_CfB%p9&e7SO
z$0B>&)ywCYk7XN_{Vg3PrzXN5_th~6U3Wg)`bqLkYf;o2%S7qYR)%WCq(Q^hUEkXv
zvA^TqyTjBH7Wi^7D4M+co8t>OCX?sVU6r8S_;gy9as$lunP0MzIktyp&UDgm)E)`E
zQdI5vTmPnon7_y1lI<J1P2KH};|u+Ek1Eq&&l+o)TV8!F)wv-@yEyS|Ve+Q!f41zU
zi|s$3bVKh?jjQFVrRTM`jF(@a_oeje&3Ma9Ier~&yl${V3ulQosrj-&*~VM_xz)PS
z{;Yv4<aptNHyC(NJa5oDyD$TCdFsZuyrFYslgBNmr+3TKLJtu|AGIrIOda;{f6LRF
ztT0{(0y-jx&-WHr+7+!+<z_rA@-(UT=zr(lC49t5Ypo4*dGGa9IMOlDTF>Zze{_Yb
zFFV8n60Jk!Oj%;GdY|D4S5|=1#5!3|pi#UyHgJ*!fQSi}JjXgT<jp7q24{8jSQDkJ
zo<iWtOXBuOfPyK3C?eat4ahL5<ih|C3BV+fENP?<<oUk#?$@#cde;g}LJ6}GffU51
z7Cb{MF99q8AnnP5Ov$lMp54Prw6p@?9eEPHX8`(U?{zOEIsr9g9F#l(l>wIFY8;TF
zJZcFnf4>Gup;(e)6EGP8I#~%hFDY;NdObY!u1G{!3^OW$Oa^?Bk};$y$`=C%9$QE<
z_d$w1j$F6d+}`GlV~N8rL;iAHzLVh!gy|NEyH#C>Nsu9u-n{3kON6_>8^$My#w6|;
z;-1+KeFkb(=U#rt%85OP2IQ>vui(Q1q7A9P&szh*w$}i(Es(eJ4R-j=*B8z{kbzxe
zkoAI&SI*?v{)WQ<v>o?CMR2=+2X0J3{xTeW_H%*XcbN2O^ho^KdGWEBF~#0)xZ=bL
z;1ol6Fv4pLR-=b$`poDd83VS@!zg_N5WeL19vBY7HW;5*MB+M|&B5;}Aa3lt&Qjwf
zks{&t_p?!@Yv1l1iP=u|nJCIRG1+!PB*_5JFF}-$pa>I_*d8@G6}FsBHco=JB}H+U
zVkX;2FdpFYh7hv^AUME+Bqb!1Ma&^+F4OnZBUK_;8uBs6-_SM#;jbN_JxajaH(^LU
z0K*R3%!`}Up@K`8SX~^b#frY=m#~h(n${sAkWkZPAXqZyB|74Rc;sd!nxi?(rH5gw
z2WsF>ra02P;U`~x4$aAlPQaWn&W-)@I93Nm<d-G9oQl!%A<qSpEgYe~RS^~rfX+1e
zykz`EU8wYQf`)vun&$~^M`%<MDXJ${ZwOe)iD7`b5n;*zJt74%5u5A@-9OEO@DeqB
z65Jh9HtU8bbkH$+DI&~rLR27ez#X_EnS$?d<+R6CB&TS*CjHTyYRrx>(IXGjX*_s<
zSbFL!iLe^IcnuU~zhnHNWk^3Jh7*yhdFaHppi@Tdl&hmDUGOxWbjo-y>*aEQ7zca}
zCR2|rGh!c+m4Gu40e#Ax7?gZwJ1(&do^*Noj1Dg8&2)0KZdjp5`gO^moc1)a>C-~p
zumv6Bfp*4M_tQ7&p=X1r-Mwd&J5pXur$8*ACcWv!?#cbrCj)Y0J224SI-yEmpdYI;
zt}LJBu`^7kPYuI^NXnkp?DSdlG?)h%89N=nb?BU-Abmt4^SdV$_!2&}Oke*t?zlwE
z=RkV@?dZPVOc7x@>Mus}h$Gbd38={dwmD_#BNK-M$*wAyyDc(%mLcQ1Y5wqRnqt;u
zAVE7X7VShV(}h~IQwns+BM#Y{Cjc4b32hDlt%`H$3?1*y_^KQqWgd?S1d~V>K)F+D
zxt_oJQrI?l{9*_FVqV_K$1$b7X|+qNLPtu-j(i1jm<>C-a5`fE15_-rf~(Hvdop{f
z;&wXZPATW1ma|`Fho6sxs&VqxFDLvRLDF_Tvxo+6O%?)@1)EgT<QyS)lXB&HXzuO+
zloR<n0D?$QxH(0T^MQbGZv!v4T0ZZj>ahqgB-xt5dN4xJ!BHzb(!&|htlr4=DEbYF
z^P&VyXlM{wDg9#0)?!ySL_8QG?Q`<#h&V!}1Voi6@Ff+QB~j@mh<r&kehEWRg2a|;
zd6nugOZD<gw{c7L`K5-!QWT=h1Y2h6RfcAkndg^bxn-agzsyEhhC`I^#FpE8l{+xY
zo$||fbIbSg%l8S(T@e)ruoZ4z74FOm&-@B6ZiP3$;;68~2T^$pTj}pr8NjRz%C9`m
ztqkQ?5`~pyL=^>FMf0knGpi!<tC-xXXns|Uu!@CX$6?tCUhG6BJ2{_yipxIDXQv6-
z=^*0LIqan@uS?m?OS$=%^0}7^`IjyTFBK!IOR?4EUe%S%YIc5gHMe@UmS0^jtmYtU
zny@u3UNvpZnvVP$F1MzeUvouR!$Z_w$JXBTs=dvu?ai;f%dNe~uN@H94k79uVCx=w
z)r~OgM)T|V+`2J--7{g`1fu>Ww*D39RX@e7pU$s;$E}~?*Ut&-1&D@4Y{N&dhR@7~
z<@^RAx8W<l;k&Q_P~|`^Ibw%75>Xs@0Y|EfBlDCax5ANEZT!u$QQ>f-VpOAYK_jB8
zQSE7?`br~GwMoOWN$YTvPE?a#LDRObCjF;PhAT}d)n*gRX4AvX=%{A%0@Y@0SF_dA
ZW}B5}oNCKX%NF~?Ee=sFpga_?{4WQYnd<-m

delta 6353
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
TR?&)A#9|h;xJ51wF9HBNPk0|V

diff --git a/images/mainmenu/logo.gif b/images/mainmenu/logo.gif
index 199a15e35a0836aeb0b194d90c286ddb5cea82d4..c0baae74ccd9b829b8b48bd0348fbc91435f6a1d 100755
GIT binary patch
delta 469
zcmV;`0V@922>t_qM@dFFIbj+A7XZ}&07pnwNJ&;pOj%D*Tu@P6R8?VET4h~bYG7e*
zWo2<`X?ARFd2eufb8~)rdxd>|h<|~Mfq{&LhLMJdk&BF#j*pm+keHE@o0gZMnwz7c
zqN=N_v#+qXv$VRqy~4i0#KpzR$H>gg&C=1+*VWb8+S}e3-{9lo;^pP$>Fez6?(XpN
z^Yr%j`2PO>lW_tze<Aq<2><{t04x9i000^Q7XSbT|G)%eNGwhy#bhzDXgZq>&T90m
zJ`vW%<<x4SvetuQJa&M(-4c1tR*1)o%?jPcwC{&Rf>NTlRvLPOgM<YM8-6Vy4ulB}
z5f2N51Q~uO6$qJ{7bJ5nDIgG<1}SJO8wm%hs~w3gEE%c~e{>S7wi2#r6bBb*CbkC@
zBnlj8DIRBNB?q%zD-Hz(3ds~2T^$M07IX{+rOqE7o-G#(A`S%U1P0>~0lm2`3Iqe{
z>F`|&0Rq;p83F(U9%zMz1OWg5&8X<2Vo|_=7Et(cAOK-N15FG(1Zd9B3JL%%ZXBtB
zg`W@#0s;uYGqR;imX+w7pzw0#%a;PUpxIF1CV(5CK!g4);7P;+p-7Yd6i^}sO{GwU
LE;tYsKo9^sS!cz*

delta 992
zcmV<610VeU1J?+DM@dFFIbj+A7XbGF00000|Ns9}Q(#|TY-nh8W@d9>U~Fn?cVuL6
zVq$J?ZhCNVd}?ZSd3l9&bbxMdd47J0eSL^=aeI1tgoA^Pfq{#LhLC!CgNBBWgM*BJ
ze~5~TlbM;KmX@EKoTZhOouHtopP#3lou!+bqnMbWmzSS^tE;lAs<El5u&Ai7q@=5&
zqN$;wsGpyvo}Q(housd?wzs#vv$MIevA3|Wwy&?XuCBDKtg@)6uD`#<#l_0Q!^pzI
z$GyG6ySu=;y1%)(zPPx(x3|2-#mU6P$kf!>(b3h=(A3Y*)6UM)%*@c^<L2Vx<>BGv
z-rnKe-Qe7R+~3>V-rCyT+1cFI*4fq7*wN9{(9qM*&(i7X>*(m}=jZ9<<mTbw<K5lg
z+}z&v_4f4i_4D)e=;-N3NL5KnS4c@#OH5fxOIS`%Tv1YAQ&eG1PFhe=U0YmfQ&eDG
zUTaraWL8&WRaRnPVQyMmXI@`xU0!NgT4h{aXlH1DbY^FBVPb7yVQg(~dTVTWWMyz;
zWN&I~c4ugFZEksMY<F>TeQIlUZ*Y2UZ+Ucee{*zxa&vupdxdp&fPa9Be0_&=bbWDh
zdxV9Le0_#{e1(dOm41JSeSU|CiIRqgkdBX-fr5&Sj+Ts#m5Yp&ii?wpijs(lk%x$o
zl9QW%l$D&5l$)ZXs-B;wot~wdo1&JNo~o;|tgW-Ds<5P`tD~f<prNOqpr*33xw*Q(
zxVgTsu(hqOv%$j0y}rZ9$<4>e%*Dpa!^FtCyT8`g+SAn6(bCn>(bV1E;N0Ec+uYvi
z>g(s|>GSmT_V)Jl^z{G#{{R30000000001yt0IxG9g(mdk+2<+uo-_L`2+y~0LuU@
z000008UPmn00{p8{RkW=Fb5Zc2ow7G!>}QQB>@7oYDlqS!vh#Ga!3|2fRv0NLuMpE
zl0c7+5vP<~$+BdD0u7j;j0oc8OA0b{Ad%6*=1T+>z|0IV1cA{9Nrr++VH5$KCNsf!
zphGp2(4i4~Q5`X}ON4&`U}0dL31mPQlsxpnfurZw*r66sQgK6f(p8j77P#4THvle_
zuHL+9G1k~6!HZCaL77X98b)u!FmjwramO%{+O!#!Wh@TOI8g3FnWa%0K%-}d!H}kP
z>WCNK&KwqqjqMpIhn=AzJ0guUz!N-~sR|7mACWT{N0VVON-a!t%1D2uY-q4P(#zNy
zs;p2MGvLjvH0e~sh!GWn!kg(d)Ju9ZWa7)8PoLM!9|Gv>-*2TOGEe&jNFOW_5yOCh
O2*xJ>G5GBl5CA*Z`VVaY


From 357b868b4f78247160a49f015341fcb7fe2cef4d Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 9 Dec 2010 22:51:55 +0000
Subject: [PATCH 478/483] BUGFIX Disallow web access to
 cms/silverstripe_version to avoid information leakage (from r114770)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114771 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 .htaccess  |  3 +++
 web.config | 11 +++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 web.config

diff --git a/.htaccess b/.htaccess
index fad44ccd..81e3ed4a 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,3 +1,6 @@
 <FilesMatch "\.(php|php3|php4|php5|phtml|inc)$">
 	Deny from all
+</FilesMatch>
+<FilesMatch "silverstripe_version$">
+	Deny from all
 </FilesMatch>
\ No newline at end of file
diff --git a/web.config b/web.config
new file mode 100644
index 00000000..0e3d0aad
--- /dev/null
+++ b/web.config
@@ -0,0 +1,11 @@
+<configuration>
+	<system.webServer>
+		<security>
+			<requestFiltering>
+				<hiddenSegments>
+					<add segment="silverstripe_version" />
+				</hiddenSegments>
+			</requestFiltering>
+		</security>
+	</system.webServer>
+</configuration>
\ No newline at end of file

From 77c5701fa6031682720ee1471d68d7ed9c40212e Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Tue, 14 Dec 2010 01:32:01 +0000
Subject: [PATCH 479/483] BUGFIX #6162 CMSMain::publishall() fails when over 30
 pages (thanks natmchugh!) (from r114940)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114941 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php      | 32 ++++++++++++++----------------
 tests/CMSMainTest.php |  4 ++--
 tests/CMSMainTest.yml | 46 ++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index b7d65d8e..5125a513 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -1251,23 +1251,21 @@ JS;
 			$start = 0;
 			$pages = DataObject::get("SiteTree", "", "", "", "$start,30");
 			$count = 0;
-			if($pages){
-				while(true) {
-					foreach($pages as $page) {
-						if($page && !$page->canPublish()) return Security::permissionFailure($this);
-						
-						$page->doPublish();
-						$page->destroy();
-						unset($page);
-						$count++;
-						$response .= "<li>$count</li>";
-					}
-					if($pages->Count() > 29) {
-						$start += 30;
-						$pages = DataObject::get("SiteTree", "", "", "", "$start,30");
-					} else {
-						break;
-					}
+			while($pages) {
+				foreach($pages as $page) {
+					if($page && !$page->canPublish()) return Security::permissionFailure($this);
+					
+					$page->doPublish();
+					$page->destroy();
+					unset($page);
+					$count++;
+					$response .= "<li>$count</li>";
+				}
+				if($pages->Count() > 29) {
+					$start += 30;
+					$pages = DataObject::get("SiteTree", "", "", "", "$start,30");
+				} else {
+					break;
 				}
 			}
 			$response .= sprintf(_t('CMSMain.PUBPAGES',"Done: Published %d pages"), $count);
diff --git a/tests/CMSMainTest.php b/tests/CMSMainTest.php
index 4736ee13..6c535a61 100644
--- a/tests/CMSMainTest.php
+++ b/tests/CMSMainTest.php
@@ -38,7 +38,7 @@ class CMSMainTest extends FunctionalTest {
 		$response = $this->get("admin/cms/publishall?confirm=1");
 		
 		$this->assertContains(
-			sprintf(_t('CMSMain.PUBPAGES',"Done: Published %d pages"), 8), 
+			sprintf(_t('CMSMain.PUBPAGES',"Done: Published %d pages"), 30), 
 			$response->getBody()
 		);
 		
@@ -225,4 +225,4 @@ class CMSMainTest extends FunctionalTest {
 		// TODO Logout
 		$this->session()->inst_set('loggedInAs', NULL);
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/CMSMainTest.yml b/tests/CMSMainTest.yml
index 87409f25..d87515a8 100644
--- a/tests/CMSMainTest.yml
+++ b/tests/CMSMainTest.yml
@@ -13,6 +13,50 @@ Page:
       Parent: =>Page.page3
    page4:
       Title: Page 4
+   page5:
+      Title: Page 5
+   page6:
+      Title: Page 6
+   page7:
+      Title: Page 7
+   page8:
+      Title: Page 8
+   page9:
+      Title: Page 9
+   page10:
+      Title: Page 10
+   page11:
+      Title: Page 11
+   page12:
+      Title: Page 12
+   page13:
+      Title: Page 13
+   page14:
+      Title: Page 14
+   page15:
+      Title: Page 15
+   page16:
+      Title: Page 16
+   page17:
+      Title: Page 17
+   page18:
+      Title: Page 18
+   page19:
+      Title: Page 19
+   page20:
+      Title: Page 20
+   page21:
+      Title: Page 21
+   page22:
+      Title: Page 22
+   page23:
+      Title: Page 23
+   page24:
+      Title: Page 24
+   page25:
+      Title: Page 25
+   page26:
+      Title: Page 26
    home:
       Title: Home
       URLSegment: home
@@ -82,4 +126,4 @@ RedirectorPage:
    page5:
       Title: Page 5
       RedirectionType: External
-      ExternalURL: http://www.google.com
\ No newline at end of file
+      ExternalURL: http://www.google.com

From 6a02f2edb556fadccc40d46c81c8074ac6971c0c Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 20 Dec 2010 00:16:49 +0000
Subject: [PATCH 480/483] BUGFIX Removing form actions from $allowed_actions in
 AssetAdmin, CMSMain, LeftAndMain - handled through Form->httpSubmission()
 (from r115185)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115189 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php  | 2 --
 code/CMSMain.php     | 6 ------
 code/LeftAndMain.php | 1 -
 3 files changed, 9 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 17a7377a..9939220d 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -27,13 +27,11 @@ class AssetAdmin extends LeftAndMain {
 		'deletefolder',
 		'deletemarked',
 		'DeleteItemsForm',
-		'deleteUnusedThumbnails',
 		'doUpload',
 		'getfile',
 		'getsubtree',
 		'movemarked',
 		'removefile',
-		'save',
 		'savefile',
 		'sync',
 		'uploadiframe',
diff --git a/code/CMSMain.php b/code/CMSMain.php
index 5125a513..d2f253b6 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -32,8 +32,6 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		'canceldraftchangesdialog',
 		'compareversions',
 		'createtranslation',
-		'delete',
-		'deletefromlive',
 		'deleteitems',
 		'DeleteItemsForm',
 		'dialog',
@@ -44,13 +42,9 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		'publishall',
 		'publishitems',
 		'PublishItemsForm',
-		'restore',
-		'revert',
-		'rollback',
 		'RootForm',
 		'sidereport',
 		'submit',
-		'unpublish',
 		'versions',
 		'EditForm',
 		'AddPageOptionsForm',
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index eddf6f2f..8e050593 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -50,7 +50,6 @@ class LeftAndMain extends Controller {
 		'getsubtree',
 		'myprofile',
 		'printable',
-		'save',
 		'show',
 		'Member_ProfileForm',
 		'EditorToolbar',

From 25de6303a84b43d3722dabc1aada57454ef64e66 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 22 Dec 2010 20:00:33 +0000
Subject: [PATCH 481/483] BUGFIX Allowing CMSMain->rollback() outside of form
 contexts, temporariliy disabling CSRF protection. Necessary in order to get
 rollback actions working from admin/getversion (regression from 2.4.4
 release, see #6291)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115313 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index d2f253b6..192181ae 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -51,7 +51,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		'SiteTreeAsUL',
 		'getshowdeletedsubtree',
 		'getfilteredsubtree',
-		'batchactions'
+		'batchactions',
+		'rollback', // see http://open.silverstripe.org/ticket/6291
 	);
 	
 	/**

From 3b6a9579d44effc8c1fbe94ad5ab94bf27c33090 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Mon, 10 Jan 2011 21:55:44 +0000
Subject: [PATCH 482/483] BUGFIX #6304 PageCommentInterface::PostCommentForm()
 loads inappropriate data from cookie, including wrong values for ParentID

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115399 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/PageCommentInterface.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index 9d996dd0..84568ec8 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -216,8 +216,13 @@ class PageCommentInterface extends RequestHandler {
 		$this->extend('updatePageCommentForm', $form);
 		
 		// Load the users data from a cookie
-		if($cookie = Cookie::get("PageCommentInterface_Data")) {
-			$form->loadDataFrom(unserialize($cookie));
+		$cookie = Cookie::get('PageCommentInterface_Data');
+		if($cookie) {
+			$visibleFields = array();
+			foreach($fields as $field) {
+				if(!$field instanceof HiddenField) $visibleFields[] = $field->Name();
+			}
+			$form->loadDataFrom(unserialize($cookie), false, $visibleFields);
 		}
 
 		return $form;

From 27aad3decad52f0e48f816257ef7af8dc0a8e96e Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Tue, 11 Jan 2011 23:00:59 +0000
Subject: [PATCH 483/483] BUGFIX #6291 Remove rollback action from CMSMain
 allowed_actions and rely on form action_rollback instead which is safer

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115440 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php      | 14 +++++++-------
 tests/CMSMainTest.php | 17 +++++++++++++++--
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 192181ae..f636617d 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -52,7 +52,6 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		'getshowdeletedsubtree',
 		'getfilteredsubtree',
 		'batchactions',
-		'rollback', // see http://open.silverstripe.org/ticket/6291
 	);
 	
 	/**
@@ -390,11 +389,15 @@ JS;
 	 * Get a database record to be managed by the CMS
 	 */
  	public function getRecord($id) {
-
 		$treeClass = $this->stat('tree_class');
 
 		if($id && is_numeric($id)) {
-			$record = DataObject::get_one( $treeClass, "\"$treeClass\".\"ID\" = $id");
+			$version = isset($_REQUEST['Version']) ? $_REQUEST['Version'] : null;
+			if(is_numeric($version)) {
+				$record = Versioned::get_version($treeClass, $id, $version);
+			} else {
+				$record = DataObject::get_one($treeClass, "\"$treeClass\".\"ID\" = $id");
+			}
 
 			// Then, try getting a record from the live site
 			if(!$record) {
@@ -902,10 +905,7 @@ JS;
 				'Root'
 			);
 
-			$actions = new FieldSet(
-				new FormAction("email", _t('CMSMain.EMAIL',"Email")),
-				new FormAction("rollback", _t('CMSMain.ROLLBACK',"Roll back to this version"))
-			);
+			$actions = $record->getCMSActions();
 
 			// encode the message to appear in the body of the email
 			$archiveURL = Director::absoluteBaseURL() . $record->URLSegment . '?archiveDate=' . $record->obj('LastEdited')->URLDatetime();
diff --git a/tests/CMSMainTest.php b/tests/CMSMainTest.php
index 6c535a61..6bbb75c0 100644
--- a/tests/CMSMainTest.php
+++ b/tests/CMSMainTest.php
@@ -186,9 +186,22 @@ class CMSMainTest extends FunctionalTest {
 		$newPage = $cmsMain->getRecord('new-Page-5');
 		$this->assertType('Page', $newPage);
 		$this->assertEquals('5', $newPage->ParentID);
-
 	}
-	
+
+	function testGetVersionRecord() {
+		$cmsMain = new CMSMain();
+		$page1 = $this->objFromFixture('Page', 'page1');
+		$page1->Content = 'this is the old content';
+		$page1->write();
+		$page1->Content = 'this is new content (new version)';
+		$page1->write();
+		$versionID = DB::query('SELECT "Version" FROM "SiteTree_versions" WHERE "Content" = \'this is the old content\'')->value();
+		$_REQUEST['Version'] = $versionID;
+		$this->assertEquals($cmsMain->getRecord($page1->ID)->Version, $versionID);
+		$this->assertEquals($cmsMain->getRecord($page1->ID)->Content, 'this is the old content');
+		unset($_REQUEST['Version']);
+	}
+
 	function testDeletedPagesSiteTreeFilter() {
 		$id = $this->idFromFixture('Page', 'page3');
 		$this->logInWithPermission('ADMIN');