Merge branch '3.2' into 3

Conflicts: lang/en.yml
2024-10-22 08:05:56 +02:00 · 2015-08-17 14:23:16 +01:00 · 2015-08-17 14:23:16 +01:00 · 39ee2ec634
commit 39ee2ec634
parent 71b23b622c 80aca3a511
77 changed files with 632 additions and 625 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -15,7 +15,7 @@ addons:

 env:
  global:
-    - CORE_RELEASE=3
+    - CORE_RELEASE=3.2
    - "ARTIFACTS_AWS_REGION=us-east-1"
    - "ARTIFACTS_S3_BUCKET=silverstripe-travis-artifacts"
    - secure: "7V20Qk3bIG2AlTJaA5D/uzB8vUVvRwQp+xjRYUxlahtj9FcuqEV3HIyjwwJe0T6Z1bnRYuu28ZnCT2CfP9BBZ3FE7AwSZbPase9c0/at2qDJNqkvIdC1xZ1H6Fcy2LSwNB9wLQPe613ItVdanitEuwE41iowxBPslxUUTnwx7eY="
--- a/code/batchactions/CMSBatchActions.php
+++ b/code/batchactions/CMSBatchActions.php
@ -67,6 +67,51 @@ class CMSBatchAction_Archive extends CMSBatchAction {

 }

+/**
+ * Batch restore of pages
+ */
+class CMSBatchAction_Restore extends CMSBatchAction {
+	
+	public function getActionTitle() {
+		return _t('CMSBatchActions.RESTORE', 'Restore');
+	}
+
+	public function run(SS_List $pages) {
+		// Sort pages by depth
+		$pageArray = $pages->toArray();
+		// because of https://bugs.php.net/bug.php?id=50688
+		foreach($pageArray as $page) {
+			$page->getPageLevel();
+		}
+		usort($pageArray, function($a, $b) {
+			return $a->getPageLevel() - $b->getPageLevel();
+		});
+		$pages = new ArrayList($pageArray);
+
+		// Restore
+		return $this->batchaction($pages, 'doRestoreToStage',
+			_t('CMSBatchActions.RESTORED_PAGES', 'Restored %d pages')
+		);
+	}
+
+	/**
+	 * {@see SiteTree::canEdit()}
+	 *
+	 * @param array $ids
+	 * @return bool
+	 */
+	public function applicablePages($ids) {
+		// Basic permission check based on SiteTree::canEdit
+		if(!Permission::check(array("ADMIN", "SITETREE_EDIT_ALL"))) {
+			return array();
+		}
+		
+		// Get pages that exist in stage and remove them from the restore-able set
+		$stageIDs = Versioned::get_by_stage($this->managedClass, 'Stage')->column('ID');
+		return array_values(array_diff($ids, $stageIDs));
+	}
+}
+
 /**
 * Delete items batch action.
 * 
--- a/code/controllers/AssetAdmin.php
+++ b/code/controllers/AssetAdmin.php
@ -176,13 +176,12 @@ JS
 		$columns = $gridField->getConfig()->getComponentByType('GridFieldDataColumns');
 		$columns->setDisplayFields(array(
 			'StripThumbnail' => '',
-			// 'Parent.FileName' => 'Folder',
-			'Title' => _t('File.Name'),
+			'Title' => _t('File.Title', 'Title'),
 			'Created' => _t('AssetAdmin.CREATED', 'Date'),
 			'Size' => _t('AssetAdmin.SIZE', 'Size'),
 		));
 		$columns->setFieldCasting(array(
-			'Created' => 'Date->Nice'
+			'Created' => 'SS_Datetime->Nice'
 		));
 		$gridField->setAttribute(
 			'data-url-folder-template', 
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@ -114,6 +114,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 			CMSBatchActionHandler::register('delete', 'CMSBatchAction_Delete');
 		} else {
 			CMSBatchActionHandler::register('archive', 'CMSBatchAction_Archive');
+			CMSBatchActionHandler::register('restore', 'CMSBatchAction_Restore');
 		}
 	}

--- a/code/model/SiteTree.php
+++ b/code/model/SiteTree.php
@ -1634,7 +1634,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 			// No need to check for subclasses or instanceof, as allowedChildren() already 
 			// deconstructs any inheritance trees already.
 			$allowed = $parent->allowedChildren();
-			$subject = ($this instanceof VirtualPage) ? $this->CopyContentFrom() : $this;
+			$subject = ($this instanceof VirtualPage && $this->CopyContentFromID) ? $this->CopyContentFrom() : $this;
 			if(!in_array($subject->ClassName, $allowed)) {
 				
 				$result->error(
@ -2877,6 +2877,18 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 		return isset($stack[$level-1]) ? $stack[$level-1] : null;
 	}

+	/**
+	 * Gets the depth of this page in the sitetree, where 1 is the root level
+	 *
+	 * @return int
+	 */
+	public function getPageLevel() {
+		if($this->ParentID) {
+			return 1 + $this->Parent()->getPageLevel();
+		}
+		return 1;
+	}
+
 	/**
 	 * Return the CSS classes to apply to this node in the CMS tree.
 	 *
--- a/css/screen.css
+++ b/css/screen.css
@ -47,9 +47,6 @@
 .cms .AssetAdmin .cms-content-toolbar .cms-page-add-button span.btn-icon-add { height: 17px; }
 .cms .AssetAdmin .cms-content-toolbar .cms-page-add-button span.ui-button-text { color: #393939; text-shadow: white 0 1px 1px; }
 .cms .AssetAdmin #Root_TreeView .cms-tree ul .class-Folder a span.text span.jstree-foldericon { background: url(../images/blue-folder-horizontal.png) no-repeat; width: 16px; height: 16px; float: left; display: block; margin-right: 4px; }
-.cms .AssetAdmin table.ss-gridfield-table td { padding-top: 0; padding-bottom: 0; }
 .cms .AssetAdmin table.ss-gridfield-table td.bottom-all { padding: 0.7em; }
-.cms .AssetAdmin table.ss-gridfield-table td.col-StripThumbnail { padding: 1px 5px; width: 32px; height: 32px; }
-.cms .AssetAdmin table.ss-gridfield-table td.col-StripThumbnail img { width: 32px; height: 32px; }
 .cms .AssetAdmin table.ss-gridfield-table tr[data-class=Folder] td.col-StripThumbnail { background: transparent url(../images/treeicons/blue-folder-horizontal.png) no-repeat center; }
 .cms .AssetAdmin table.ss-gridfield-table tr[data-class=File] td.col-StripThumbnail { background: transparent url(../images/treeicons/blue-document.png) no-repeat center; }
--- a/javascript/CMSMain.AddForm.js
+++ b/javascript/CMSMain.AddForm.js
@ -108,7 +108,7 @@
 			updateSelectionFilter: function(disallowedChildren, defaultChildClass) {
 				// Limit selection
 				var allAllowed = null; // troolian
-				this.find('#Form_AddForm_PageType_Holder li').each(function() {
+				this.find('#Form_AddForm_PageType li').each(function() {
 					var className = $(this).find('input').val(), 
 						isAllowed = ($.inArray(className, disallowedChildren) === -1);
 					
@ -121,16 +121,16 @@
 				// Set default child selection, or fall back to first available option
 				if(defaultChildClass) {
 					var selectedEl = this
-						.find('#Form_AddForm_PageType_Holder li input[value=' + defaultChildClass + ']')
+						.find('#Form_AddForm_PageType li input[value=' + defaultChildClass + ']')
 						.parents('li:first');
 				} else {
-					var selectedEl = this.find('#Form_AddForm_PageType_Holder li:not(.disabled):first');
+					var selectedEl = this.find('#Form_AddForm_PageType li:not(.disabled):first');
 				}
 				selectedEl.setSelected(true);
 				selectedEl.siblings().setSelected(false);

 				// Disable the "Create" button if none of the pagetypes are available
-				var buttonState = this.find('#Form_AddForm_PageType_Holder li:not(.disabled)').length
+				var buttonState = this.find('#Form_AddForm_PageType li:not(.disabled)').length
 					? 'enable'
 					: 'disable';
 				this.find('button[name=action_doAdd]').button(buttonState);
@ -139,7 +139,7 @@
 			}
 		});
 		
-		$(".cms-add-form #Form_AddForm_PageType_Holder li").entwine({
+		$(".cms-add-form #Form_AddForm_PageType li").entwine({
 			onclick: function(e) {
 				this.setSelected(true);
 			},
--- a/javascript/lang/cs.js
+++ b/javascript/lang/cs.js
@ -36,16 +36,16 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
    "Tree.ThisPageOnly": "Pouze tuto stránku",
    "Tree.ThisPageAndSubpages": "Tuto stránku a podstránky",
    "Tree.ShowAsList": "Zobrazit potomky jako seznam",
-    "CMSMain.ConfirmRestoreFromLive": "Are you sure you want to revert draft to when the page was last published?",
+    "CMSMain.ConfirmRestoreFromLive": "Určitě chcete obnovit koncept do stavz, kdy stránka byla naposled zveřejněna?",
    "CMSMain.RollbackToVersion": "Skutečně chcete vrátit zpět na verzi #%s této stránky?",
-    "CMSMain.Archive": "Are you sure you want to archive this page?\n\nThe page will be unpublished and sent to the archive.",
-    "CMSMain.Restore": "Are you sure you want to restore this page from archive?",
-    "CMSMain.RestoreToRoot": "Are you sure you want to restore this page from archive?\n\nBecause the parent page is not available this will be restored to the top level.",
-    "CMSMain.Unpublish": "Are you sure you want to remove your page from the published site?\n\nThis page will still be available in the sitetree as draft.",
-    "CMSMain.DeleteFromDraft": "Are you sure you want to remove your page from the draft site?\n\nThis page will remain on the published site.",
+    "CMSMain.Archive": "Určitě chcete archivovat tuto stránku?\n\nTato stránka bude nezveřejněna a bude odeslána do archívu.",
+    "CMSMain.Restore": "Určitě chcete obnovit tyto stránky z archívu?",
+    "CMSMain.RestoreToRoot": "Určitě chcete obnovit tuto stránku z archívu?\n\nProtože nadřazená stránka není k dispozici, bude obnovena do nejvyšší úrovně.",
+    "CMSMain.Unpublish": "Určitě chcete odstranit stránku ze zveřejněného webu?\n\nTato stránka bude stále k dispozici ve struktuře webu jako koncept.",
+    "CMSMain.DeleteFromDraft": "Určitě chcete odstranit stránku z konceptu?\n\nTato stránka zůstane na zveřejněném webu.",
    "URLSEGMENT.Edit": "Editovat",
    "URLSEGMENT.OK": "OK",
    "URLSEGMENT.Cancel": "Storno",
-    "URLSEGMENT.UpdateURL": "Update URL"
+    "URLSEGMENT.UpdateURL": "Aktualizovat URL"
 });
 }
--- a/javascript/lang/en.js
+++ b/javascript/lang/en.js
@ -38,7 +38,7 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	"Tree.ShowAsList": "Show children as list",
 	"CMSMain.ConfirmRestoreFromLive": "Are you sure you want to revert draft to when the page was last published?",
 	"CMSMain.RollbackToVersion": "Do you really want to roll back to version #%s of this page?",
-	"CMSMain.Archive": "Are you sure you want to archive this page?\n\nThe page will be unpublished and sent to the archive.",
+	"CMSMain.Archive": "Are you sure you want to archive this page and all of its children pages?\n\nThis page and all of its children will be unpublished and sent to the archive.",
 	"CMSMain.Restore": "Are you sure you want to restore this page from archive?",
 	"CMSMain.RestoreToRoot": "Are you sure you want to restore this page from archive?\n\nBecause the parent page is not available this will be restored to the top level.",
 	"CMSMain.Unpublish": "Are you sure you want to remove your page from the published site?\n\nThis page will still be available in the sitetree as draft.",
--- a/javascript/lang/es.js
+++ b/javascript/lang/es.js
@ -36,16 +36,16 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
    "Tree.ThisPageOnly": "Sólo en esta página",
    "Tree.ThisPageAndSubpages": "Esta página y subpáginas",
    "Tree.ShowAsList": "Mostrar hijos como lista",
-    "CMSMain.ConfirmRestoreFromLive": "Are you sure you want to revert draft to when the page was last published?",
+    "CMSMain.ConfirmRestoreFromLive": "¿Estás seguro de que quieres revertir el borrador a la última página publicada?",
    "CMSMain.RollbackToVersion": "¿Realmente quieres volver a la versión #%s de esta página?",
-    "CMSMain.Archive": "Are you sure you want to archive this page?\n\nThe page will be unpublished and sent to the archive.",
-    "CMSMain.Restore": "Are you sure you want to restore this page from archive?",
-    "CMSMain.RestoreToRoot": "Are you sure you want to restore this page from archive?\n\nBecause the parent page is not available this will be restored to the top level.",
-    "CMSMain.Unpublish": "Are you sure you want to remove your page from the published site?\n\nThis page will still be available in the sitetree as draft.",
-    "CMSMain.DeleteFromDraft": "Are you sure you want to remove your page from the draft site?\n\nThis page will remain on the published site.",
+    "CMSMain.Archive": "¿Estás seguro que quieres archivar esta página?\n\nLa página será ocultada y enviada al archivo.",
+    "CMSMain.Restore": "¿Estás seguro que quieres restaurar esta página desde el archivo?",
+    "CMSMain.RestoreToRoot": "¿Estás seguro que quieres restaurar esta página desde el archivo?\n\nEl padre de esta página no está disponible, debido a ello, esta página será restaurada en el primer nivel del árbol",
+    "CMSMain.Unpublish": "¿Estás seguro que quieres remover tu página desde el sitio publicado?\n\nEsta página se mantendrá disponible en el árbol de páginas como un borrador.",
+    "CMSMain.DeleteFromDraft": "¿Estás seguro de que quieres remover tu página desde el borrador?\n\nEsta página continuará publicada en el sitio.",
    "URLSEGMENT.Edit": "Editar",
    "URLSEGMENT.OK": "Ok",
    "URLSEGMENT.Cancel": "Cancelar",
-    "URLSEGMENT.UpdateURL": "Update URL"
+    "URLSEGMENT.UpdateURL": "Actualizar URL"
 });
 }
--- a/javascript/lang/it.js
+++ b/javascript/lang/it.js
@ -36,16 +36,16 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
    "Tree.ThisPageOnly": "Solo questa pagina",
    "Tree.ThisPageAndSubpages": "Questa pagina e le sottopagine",
    "Tree.ShowAsList": "Mostra figli come lista",
-    "CMSMain.ConfirmRestoreFromLive": "Are you sure you want to revert draft to when the page was last published?",
+    "CMSMain.ConfirmRestoreFromLive": "Si è sicuri di voler ripristinare questa bozza all'ultima volta che è stata pubblicata?",
    "CMSMain.RollbackToVersion": "Vuoi veramente tornare alla versione #%s di questa pagina?",
-    "CMSMain.Archive": "Are you sure you want to archive this page?\n\nThe page will be unpublished and sent to the archive.",
-    "CMSMain.Restore": "Are you sure you want to restore this page from archive?",
-    "CMSMain.RestoreToRoot": "Are you sure you want to restore this page from archive?\n\nBecause the parent page is not available this will be restored to the top level.",
-    "CMSMain.Unpublish": "Are you sure you want to remove your page from the published site?\n\nThis page will still be available in the sitetree as draft.",
-    "CMSMain.DeleteFromDraft": "Are you sure you want to remove your page from the draft site?\n\nThis page will remain on the published site.",
+    "CMSMain.Archive": "Si è sicuri di voler archiviare questa pagina?\n\nLa pagina sarà nascosta ed archiviata.",
+    "CMSMain.Restore": "Si è sicuri di voler ripristinare questa pagina dall'archivio?",
+    "CMSMain.RestoreToRoot": "Si è sicuri di voler ripristinare questa pagina dall'archivio?\n\nPoiché la pagina genitore non è disponibile, questo ripristinerà al primo livello.",
+    "CMSMain.Unpublish": "Si è sicuri di voler eliminare la pagina dal sito pubblico?\n\nQuesta pagina sarà comunque disponibile nel SiteTree come bozza.",
+    "CMSMain.DeleteFromDraft": "Si è sicuri di voler eliminare la pagina dal sito bozza?\n\nQuesta pagina rimarrà disponibile nel sito pubblico.",
    "URLSEGMENT.Edit": "Modifica",
    "URLSEGMENT.OK": "OK",
    "URLSEGMENT.Cancel": "Annulla",
-    "URLSEGMENT.UpdateURL": "Update URL"
+    "URLSEGMENT.UpdateURL": "Aggiornare l'URL"
 });
 }
--- a/javascript/lang/lt.js
+++ b/javascript/lang/lt.js
@ -36,16 +36,16 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
    "Tree.ThisPageOnly": "Tik šį puslapį",
    "Tree.ThisPageAndSubpages": "Šį puslapį ir visus po juo",
    "Tree.ShowAsList": "Rodyti žemesnius pusl. kaip sąrašą",
-    "CMSMain.ConfirmRestoreFromLive": "Are you sure you want to revert draft to when the page was last published?",
+    "CMSMain.ConfirmRestoreFromLive": "Ar tikrai norite atšaukti pakeitimus juodraštyje į paskutinę publikuotą versiją?",
    "CMSMain.RollbackToVersion": "Ar tikrai norite atstatyti šį puslapį į #%s versiją?",
-    "CMSMain.Archive": "Are you sure you want to archive this page?\n\nThe page will be unpublished and sent to the archive.",
-    "CMSMain.Restore": "Are you sure you want to restore this page from archive?",
-    "CMSMain.RestoreToRoot": "Are you sure you want to restore this page from archive?\n\nBecause the parent page is not available this will be restored to the top level.",
-    "CMSMain.Unpublish": "Are you sure you want to remove your page from the published site?\n\nThis page will still be available in the sitetree as draft.",
-    "CMSMain.DeleteFromDraft": "Are you sure you want to remove your page from the draft site?\n\nThis page will remain on the published site.",
+    "CMSMain.Archive": "Ar tikrai norite archyvuoti šį puslapį?\n\nŠis puslapis bus nebepublikuojamas ir suarchyvuotas.",
+    "CMSMain.Restore": "Ar tikrai norite atstatyti šį puslapį iš archyvo?",
+    "CMSMain.RestoreToRoot": "Ar tikrai norite atstatyti šį puslapį iš archyvo?\n\nKadangi tėvinis puslapis neegzistuoja, šis puslapis bus atstatytas kaip aukščiausio lygio puslapis.",
+    "CMSMain.Unpublish": "Ar tikrai norite pašalinti šį puslapį iš publikuotų puslapių?\n\nŠis puslapis liks puslapių medyje kaip juodraštinis.",
+    "CMSMain.DeleteFromDraft": "Ar tikrai norite pašalinti šį puslapį iš juodraščių?\n\nŠis puslapis liks publikuotuose puslapiuose.",
    "URLSEGMENT.Edit": "Redaguoti",
    "URLSEGMENT.OK": "Gerai",
    "URLSEGMENT.Cancel": "Atšaukti",
-    "URLSEGMENT.UpdateURL": "Update URL"
+    "URLSEGMENT.UpdateURL": "Atnaujinti URL dalį"
 });
 }
--- a/javascript/lang/sk.js
+++ b/javascript/lang/sk.js
@ -36,16 +36,16 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
    "Tree.ThisPageOnly": "Iba túto stránku",
    "Tree.ThisPageAndSubpages": "Túto stránku a podstránky",
    "Tree.ShowAsList": "Zobraziť potomkov ako zoznam",
-    "CMSMain.ConfirmRestoreFromLive": "Are you sure you want to revert draft to when the page was last published?",
+    "CMSMain.ConfirmRestoreFromLive": "Určite chcete obnoviť koncept do doby, kedy bola stránka naposledy zverejnená?",
    "CMSMain.RollbackToVersion": "Skutočne chcete vrátiť späť na verziu #%s tejto stránky?",
-    "CMSMain.Archive": "Are you sure you want to archive this page?\n\nThe page will be unpublished and sent to the archive.",
-    "CMSMain.Restore": "Are you sure you want to restore this page from archive?",
-    "CMSMain.RestoreToRoot": "Are you sure you want to restore this page from archive?\n\nBecause the parent page is not available this will be restored to the top level.",
-    "CMSMain.Unpublish": "Are you sure you want to remove your page from the published site?\n\nThis page will still be available in the sitetree as draft.",
-    "CMSMain.DeleteFromDraft": "Are you sure you want to remove your page from the draft site?\n\nThis page will remain on the published site.",
+    "CMSMain.Archive": "Určite chcete archívovať túto stránku?\n\nStránka bude nezverejnená a odoslaná do archívu.",
+    "CMSMain.Restore": "Určite chcete obnoviť túto stánku z archívu?",
+    "CMSMain.RestoreToRoot": "Určite chcete obnoviť túto stránku z archívu?\n\nPretože nadriadená stránka nie je k dispozícii, bude obnovena do najvyššej úrovne.",
+    "CMSMain.Unpublish": "Určite chcete odstrániť stránku zo zverejneného webu?\n\nTáto stránka bude stále k dispozícii v štruktúre webu ako koncept.",
+    "CMSMain.DeleteFromDraft": "Určite chcete odstrániť stránku z konceptu?\n\nTáto stránka ostane na zverejneném webu.",
    "URLSEGMENT.Edit": "Editovať",
    "URLSEGMENT.OK": "OK",
    "URLSEGMENT.Cancel": "Zrušiť",
-    "URLSEGMENT.UpdateURL": "Update URL"
+    "URLSEGMENT.UpdateURL": "Aktualizovať URL"
 });
 }
--- a/javascript/lang/src/cs.js
+++ b/javascript/lang/src/cs.js
@ -31,15 +31,15 @@
    "Tree.ThisPageOnly": "Pouze tuto stránku",
    "Tree.ThisPageAndSubpages": "Tuto stránku a podstránky",
    "Tree.ShowAsList": "Zobrazit potomky jako seznam",
-    "CMSMain.ConfirmRestoreFromLive": "Are you sure you want to revert draft to when the page was last published?",
+    "CMSMain.ConfirmRestoreFromLive": "Určitě chcete obnovit koncept do stavz, kdy stránka byla naposled zveřejněna?",
    "CMSMain.RollbackToVersion": "Skutečně chcete vrátit zpět na verzi #%s této stránky?",
-    "CMSMain.Archive": "Are you sure you want to archive this page?\n\nThe page will be unpublished and sent to the archive.",
-    "CMSMain.Restore": "Are you sure you want to restore this page from archive?",
-    "CMSMain.RestoreToRoot": "Are you sure you want to restore this page from archive?\n\nBecause the parent page is not available this will be restored to the top level.",
-    "CMSMain.Unpublish": "Are you sure you want to remove your page from the published site?\n\nThis page will still be available in the sitetree as draft.",
-    "CMSMain.DeleteFromDraft": "Are you sure you want to remove your page from the draft site?\n\nThis page will remain on the published site.",
+    "CMSMain.Archive": "Určitě chcete archivovat tuto stránku?\n\nTato stránka bude nezveřejněna a bude odeslána do archívu.",
+    "CMSMain.Restore": "Určitě chcete obnovit tyto stránky z archívu?",
+    "CMSMain.RestoreToRoot": "Určitě chcete obnovit tuto stránku z archívu?\n\nProtože nadřazená stránka není k dispozici, bude obnovena do nejvyšší úrovně.",
+    "CMSMain.Unpublish": "Určitě chcete odstranit stránku ze zveřejněného webu?\n\nTato stránka bude stále k dispozici ve struktuře webu jako koncept.",
+    "CMSMain.DeleteFromDraft": "Určitě chcete odstranit stránku z konceptu?\n\nTato stránka zůstane na zveřejněném webu.",
    "URLSEGMENT.Edit": "Editovat",
    "URLSEGMENT.OK": "OK",
    "URLSEGMENT.Cancel": "Storno",
-    "URLSEGMENT.UpdateURL": "Update URL"
+    "URLSEGMENT.UpdateURL": "Aktualizovat URL"
 }
--- a/javascript/lang/src/en.js
+++ b/javascript/lang/src/en.js
@ -33,7 +33,7 @@
 	"Tree.ShowAsList": "Show children as list",
 	"CMSMain.ConfirmRestoreFromLive": "Are you sure you want to revert draft to when the page was last published?",
 	"CMSMain.RollbackToVersion": "Do you really want to roll back to version #%s of this page?",
-	"CMSMain.Archive": "Are you sure you want to archive this page?\n\nThe page will be unpublished and sent to the archive.",
+	"CMSMain.Archive": "Are you sure you want to archive this page and all of its children pages?\n\nThis page and all of its children will be unpublished and sent to the archive.",
 	"CMSMain.Restore": "Are you sure you want to restore this page from archive?",
 	"CMSMain.RestoreToRoot": "Are you sure you want to restore this page from archive?\n\nBecause the parent page is not available this will be restored to the top level.",
 	"CMSMain.Unpublish": "Are you sure you want to remove your page from the published site?\n\nThis page will still be available in the sitetree as draft.",
--- a/javascript/lang/src/es.js
+++ b/javascript/lang/src/es.js
@ -31,15 +31,15 @@
    "Tree.ThisPageOnly": "Sólo en esta página",
    "Tree.ThisPageAndSubpages": "Esta página y subpáginas",
    "Tree.ShowAsList": "Mostrar hijos como lista",
-    "CMSMain.ConfirmRestoreFromLive": "Are you sure you want to revert draft to when the page was last published?",
+    "CMSMain.ConfirmRestoreFromLive": "¿Estás seguro de que quieres revertir el borrador a la última página publicada?",
    "CMSMain.RollbackToVersion": "¿Realmente quieres volver a la versión #%s de esta página?",
-    "CMSMain.Archive": "Are you sure you want to archive this page?\n\nThe page will be unpublished and sent to the archive.",
-    "CMSMain.Restore": "Are you sure you want to restore this page from archive?",
-    "CMSMain.RestoreToRoot": "Are you sure you want to restore this page from archive?\n\nBecause the parent page is not available this will be restored to the top level.",
-    "CMSMain.Unpublish": "Are you sure you want to remove your page from the published site?\n\nThis page will still be available in the sitetree as draft.",
-    "CMSMain.DeleteFromDraft": "Are you sure you want to remove your page from the draft site?\n\nThis page will remain on the published site.",
+    "CMSMain.Archive": "¿Estás seguro que quieres archivar esta página?\n\nLa página será ocultada y enviada al archivo.",
+    "CMSMain.Restore": "¿Estás seguro que quieres restaurar esta página desde el archivo?",
+    "CMSMain.RestoreToRoot": "¿Estás seguro que quieres restaurar esta página desde el archivo?\n\nEl padre de esta página no está disponible, debido a ello, esta página será restaurada en el primer nivel del árbol",
+    "CMSMain.Unpublish": "¿Estás seguro que quieres remover tu página desde el sitio publicado?\n\nEsta página se mantendrá disponible en el árbol de páginas como un borrador.",
+    "CMSMain.DeleteFromDraft": "¿Estás seguro de que quieres remover tu página desde el borrador?\n\nEsta página continuará publicada en el sitio.",
    "URLSEGMENT.Edit": "Editar",
    "URLSEGMENT.OK": "Ok",
    "URLSEGMENT.Cancel": "Cancelar",
-    "URLSEGMENT.UpdateURL": "Update URL"
+    "URLSEGMENT.UpdateURL": "Actualizar URL"
 }
--- a/javascript/lang/src/it.js
+++ b/javascript/lang/src/it.js
@ -31,15 +31,15 @@
    "Tree.ThisPageOnly": "Solo questa pagina",
    "Tree.ThisPageAndSubpages": "Questa pagina e le sottopagine",
    "Tree.ShowAsList": "Mostra figli come lista",
-    "CMSMain.ConfirmRestoreFromLive": "Are you sure you want to revert draft to when the page was last published?",
+    "CMSMain.ConfirmRestoreFromLive": "Si è sicuri di voler ripristinare questa bozza all'ultima volta che è stata pubblicata?",
    "CMSMain.RollbackToVersion": "Vuoi veramente tornare alla versione #%s di questa pagina?",
-    "CMSMain.Archive": "Are you sure you want to archive this page?\n\nThe page will be unpublished and sent to the archive.",
-    "CMSMain.Restore": "Are you sure you want to restore this page from archive?",
-    "CMSMain.RestoreToRoot": "Are you sure you want to restore this page from archive?\n\nBecause the parent page is not available this will be restored to the top level.",
-    "CMSMain.Unpublish": "Are you sure you want to remove your page from the published site?\n\nThis page will still be available in the sitetree as draft.",
-    "CMSMain.DeleteFromDraft": "Are you sure you want to remove your page from the draft site?\n\nThis page will remain on the published site.",
+    "CMSMain.Archive": "Si è sicuri di voler archiviare questa pagina?\n\nLa pagina sarà nascosta ed archiviata.",
+    "CMSMain.Restore": "Si è sicuri di voler ripristinare questa pagina dall'archivio?",
+    "CMSMain.RestoreToRoot": "Si è sicuri di voler ripristinare questa pagina dall'archivio?\n\nPoiché la pagina genitore non è disponibile, questo ripristinerà al primo livello.",
+    "CMSMain.Unpublish": "Si è sicuri di voler eliminare la pagina dal sito pubblico?\n\nQuesta pagina sarà comunque disponibile nel SiteTree come bozza.",
+    "CMSMain.DeleteFromDraft": "Si è sicuri di voler eliminare la pagina dal sito bozza?\n\nQuesta pagina rimarrà disponibile nel sito pubblico.",
    "URLSEGMENT.Edit": "Modifica",
    "URLSEGMENT.OK": "OK",
    "URLSEGMENT.Cancel": "Annulla",
-    "URLSEGMENT.UpdateURL": "Update URL"
+    "URLSEGMENT.UpdateURL": "Aggiornare l'URL"
 }
--- a/javascript/lang/src/lt.js
+++ b/javascript/lang/src/lt.js
@ -31,15 +31,15 @@
    "Tree.ThisPageOnly": "Tik šį puslapį",
    "Tree.ThisPageAndSubpages": "Šį puslapį ir visus po juo",
    "Tree.ShowAsList": "Rodyti žemesnius pusl. kaip sąrašą",
-    "CMSMain.ConfirmRestoreFromLive": "Are you sure you want to revert draft to when the page was last published?",
+    "CMSMain.ConfirmRestoreFromLive": "Ar tikrai norite atšaukti pakeitimus juodraštyje į paskutinę publikuotą versiją?",
    "CMSMain.RollbackToVersion": "Ar tikrai norite atstatyti šį puslapį į #%s versiją?",
-    "CMSMain.Archive": "Are you sure you want to archive this page?\n\nThe page will be unpublished and sent to the archive.",
-    "CMSMain.Restore": "Are you sure you want to restore this page from archive?",
-    "CMSMain.RestoreToRoot": "Are you sure you want to restore this page from archive?\n\nBecause the parent page is not available this will be restored to the top level.",
-    "CMSMain.Unpublish": "Are you sure you want to remove your page from the published site?\n\nThis page will still be available in the sitetree as draft.",
-    "CMSMain.DeleteFromDraft": "Are you sure you want to remove your page from the draft site?\n\nThis page will remain on the published site.",
+    "CMSMain.Archive": "Ar tikrai norite archyvuoti šį puslapį?\n\nŠis puslapis bus nebepublikuojamas ir suarchyvuotas.",
+    "CMSMain.Restore": "Ar tikrai norite atstatyti šį puslapį iš archyvo?",
+    "CMSMain.RestoreToRoot": "Ar tikrai norite atstatyti šį puslapį iš archyvo?\n\nKadangi tėvinis puslapis neegzistuoja, šis puslapis bus atstatytas kaip aukščiausio lygio puslapis.",
+    "CMSMain.Unpublish": "Ar tikrai norite pašalinti šį puslapį iš publikuotų puslapių?\n\nŠis puslapis liks puslapių medyje kaip juodraštinis.",
+    "CMSMain.DeleteFromDraft": "Ar tikrai norite pašalinti šį puslapį iš juodraščių?\n\nŠis puslapis liks publikuotuose puslapiuose.",
    "URLSEGMENT.Edit": "Redaguoti",
    "URLSEGMENT.OK": "Gerai",
    "URLSEGMENT.Cancel": "Atšaukti",
-    "URLSEGMENT.UpdateURL": "Update URL"
+    "URLSEGMENT.UpdateURL": "Atnaujinti URL dalį"
 }
--- a/javascript/lang/src/sk.js
+++ b/javascript/lang/src/sk.js
@ -31,15 +31,15 @@
    "Tree.ThisPageOnly": "Iba túto stránku",
    "Tree.ThisPageAndSubpages": "Túto stránku a podstránky",
    "Tree.ShowAsList": "Zobraziť potomkov ako zoznam",
-    "CMSMain.ConfirmRestoreFromLive": "Are you sure you want to revert draft to when the page was last published?",
+    "CMSMain.ConfirmRestoreFromLive": "Určite chcete obnoviť koncept do doby, kedy bola stránka naposledy zverejnená?",
    "CMSMain.RollbackToVersion": "Skutočne chcete vrátiť späť na verziu #%s tejto stránky?",
-    "CMSMain.Archive": "Are you sure you want to archive this page?\n\nThe page will be unpublished and sent to the archive.",
-    "CMSMain.Restore": "Are you sure you want to restore this page from archive?",
-    "CMSMain.RestoreToRoot": "Are you sure you want to restore this page from archive?\n\nBecause the parent page is not available this will be restored to the top level.",
-    "CMSMain.Unpublish": "Are you sure you want to remove your page from the published site?\n\nThis page will still be available in the sitetree as draft.",
-    "CMSMain.DeleteFromDraft": "Are you sure you want to remove your page from the draft site?\n\nThis page will remain on the published site.",
+    "CMSMain.Archive": "Určite chcete archívovať túto stránku?\n\nStránka bude nezverejnená a odoslaná do archívu.",
+    "CMSMain.Restore": "Určite chcete obnoviť túto stánku z archívu?",
+    "CMSMain.RestoreToRoot": "Určite chcete obnoviť túto stránku z archívu?\n\nPretože nadriadená stránka nie je k dispozícii, bude obnovena do najvyššej úrovne.",
+    "CMSMain.Unpublish": "Určite chcete odstrániť stránku zo zverejneného webu?\n\nTáto stránka bude stále k dispozícii v štruktúre webu ako koncept.",
+    "CMSMain.DeleteFromDraft": "Určite chcete odstrániť stránku z konceptu?\n\nTáto stránka ostane na zverejneném webu.",
    "URLSEGMENT.Edit": "Editovať",
    "URLSEGMENT.OK": "OK",
    "URLSEGMENT.Cancel": "Zrušiť",
-    "URLSEGMENT.UpdateURL": "Update URL"
+    "URLSEGMENT.UpdateURL": "Aktualizovať URL"
 }
--- a/lang/af.yml
+++ b/lang/af.yml
@ -87,7 +87,6 @@ af:
    DEFAULTABOUTTITLE: 'Oor Ons'
    DEFAULTCONTACTCONTENT: '<p>U kan hierdie bladsy invul met u eie inhoud, of dit verwyder en u eie bladsye skep.<br /></p>'
    DEFAULTCONTACTTITLE: 'Kontak Ons'
-    DEFAULTHOMECONTENT: '<p>Welkom by SilverStripe! Hierdie is die standaard huis-blad. U kan hierdie blad verander deur <a href="admin">the IBS</a> oop te maak. U het nou toegang tot die <a href="http://doc.silverstripe.org">ontwikkelaars dokumentasie</a>, of kan die <a href="http://doc.silverstripe.org/doku.php?id=tutorials">die tutoriale</a> begin.</p>'
    DEFAULTHOMETITLE: Huis
    EDITANYONE: 'Enige iemand wat in die IBS kan inteken'
    EDITHEADER: 'Wie mag hierdie bladsy verander?'
@ -107,5 +106,4 @@ af:
    HAVEASKED: 'U het gevra om die inhoud van ons werf te sien op'
  VirtualPage:
    HEADER: 'Hierdie is ''n virtuele bladsy'
-    PLURALNAME: 'Wesenlik Bladsye'
    SINGULARNAME: 'Virtuele Bladsy'
--- a/lang/ar.yml
+++ b/lang/ar.yml
@ -67,8 +67,6 @@ ar:
    DELETE_PAGES: 'حذف من الصفحة المنشورة'
    PUBLISHED_PAGES: '%d من الصفحات المنشورة'
    PUBLISH_PAGES: النشر
-    UNPUBLISHED_PAGES: '%d من الصفحات غير المنشورة'
-    UNPUBLISH_PAGES: غير منشور
  CMSMain:
    ACCESS: 'النفاذ إلى القسم ''{title}'''
    ACCESS_HELP: 'سماح بعرض لقسم يحتوي على صفحة الشجرة والمحتوى. يمكن التعامل معها عرض وتحرير الأذونات من خلال القائمه المنسدله للروابط محددة صفحة، فضلا عن فصل "أذونات المحتوى".'
@ -99,7 +97,6 @@ ar:
    REMOVED: 'حذف ''{title}''{description} من الموقع الحي'
    REMOVEDPAGE: 'أزيل ''{title}'' من الموقع المنشور'
    REMOVEDPAGEFROMDRAFT: '''%s'' محذوف من مسودة الموقع'
-    RESTORE: تخزين
    RESTORED: 'استعادة ''{title}'' بنجاح'
    ROLLBACK: 'عودة إلى هذا الإصدار'
    ROLLEDBACKPUBv2: 'التراجع إلى النسخة المنشورة.'
@ -150,10 +147,6 @@ ar:
    FILTERDATEHEADING: موعد
    FILTERDATETO: إلى
    FILTERLABELTEXT: المحتوى
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'الصفحات التي تم تغييرها'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'كل الصفحات، بما في ذلك المحذوفة'
  CMSSiteTreeFilter_Search:
    Title: 'كل الصفحات'
  ContentControl:
@ -212,7 +205,6 @@ ar:
    DEFAULTSERVERERRORPAGETITLE: 'خطأ في الملقم'
    DESCRIPTION: 'محتوى مخصص للحالات المختلفة من الأخطاء (على سبيل المثال "الصفحة غير موجودة")'
    ERRORFILEPROBLEM: 'خطأ في فتح الملف "{filename}" للكتابة. يرجى التحقق من تراخيص ملف.'
-    PLURALNAME: 'صفحات الأخطاء'
    SINGULARNAME: 'صفحة الأخطاء'
  Folder:
    AddFolderButton: 'أضف مجلد'
@ -235,7 +227,6 @@ ar:
    HASBEENSETUP: 'صفحة التحويل تم تهيئتها بدون تحديد وجهة التحويل'
    HEADER: 'هذه الصفحة سوف تقوم بتحويل الأعضاء إلى صفحة أخرى'
    OTHERURL: 'رابط موقع آخر'
-    PLURALNAME: 'معيد توجيه الصفحات'
    REDIRECTTO: 'تحويل إلى'
    REDIRECTTOEXTERNAL: 'موقع آخر'
    REDIRECTTOPAGE: 'صفحة في موقعك الشخصي'
@ -311,7 +302,6 @@ ar:
    DEFAULTABOUTTITLE: 'حول'
    DEFAULTCONTACTCONTENT: '<p>يمكنك ملء هذه الصفحة بمحتوى خاص بك أو حذفها و إنشاء صفحات جديدة خاصة بك<br /></p>'
    DEFAULTCONTACTTITLE: 'اتصل بنا'
-    DEFAULTHOMECONTENT: '<p>أهلاً بك في  SilverStripe!<br />هذه هي الصفحة الرئيسة.يمكنك تعديل الصفحة عن طريق  <a href="admin/">نظام إدارة المحتوى</a>.يمكنك الآن الدخول إلى  <a href="http://doc.silverstripe.com">مستندات المطورين</a>, أو الدخول إلى  <a href="http://doc.silverstripe.com/doku.php?id=tutorials">الدروس التعليمية.</a></p>'
    DEFAULTHOMETITLE: الرئيسة
    DELETEDPAGEHELP: 'لم تعد الصفحة المنشورة'
    DELETEDPAGESHORT: المحذوف
@ -398,7 +388,6 @@ ar:
    EditLink: حرر
    HEADER: 'هذه صفحة افتراضية'
    HEADERWITHLINK: 'هذه صفحة افتراضية تنسخ المحتوى من "{title}" ({link})'
-    PLURALNAME: 'الصفحات الافتراضية'
    PageTypNotAllowedOnRoot: 'نوع الصفحة الأصلية "{type}"غير مسموح به على مستوى الجذر لهذه الصفحة الافتراضية'
    SINGULARNAME: 'الصفحة الافتراضية'
  CMSFileAddController:
--- a/lang/az.yml
+++ b/lang/az.yml
@ -2,7 +2,6 @@ az:
  CMSMain:
    DELETE: 'Qaralama saytdan sil'
    DELETEFP: Dərc olunmuş saytdan sil
-    RESTORE: Bərpa et
    SAVE: Yadda saxla
  ContentControl:
    NOTEWONTBESHOWN: 'Qeyd: Bu mesaj ziyarətçilər üçün görünməyəcək'
@ -107,5 +106,4 @@ az:
    many_many_LinkTracking: 'Keçidin izlənməsi'
  VirtualPage:
    HEADER: 'Bu virtual səhifədir'
-    PLURALNAME: 'Virtual səhifələr'
    SINGULARNAME: 'Virtual səhifə'
--- a/lang/bg.yml
+++ b/lang/bg.yml
@ -60,8 +60,6 @@ bg:
    DELETE_PAGES: 'Изтрий от публикуваните страници'
    PUBLISHED_PAGES: 'Публикувани %d страници, %d грешки'
    PUBLISH_PAGES: Публикувай
-    UNPUBLISHED_PAGES: 'Премахнати от публикация %d страници'
-    UNPUBLISH_PAGES: Премахни от публикация
  CMSMain:
    ACCESS: 'Достъп до ''{title}'' секция'
    ACCESS_HELP: 'Разреши излгед на раздела съдържащ структурното дърво и съдържанието. Правата за достъп и редактиране могат да бъдат променени през падащи менюта (dropdowns), както и чрез отделни права на съдържанието'
@ -83,7 +81,6 @@ bg:
    PageAdded: 'успешно създадена страница'
    REMOVEDPAGE: 'Примахнато ''{title}'' от публикувания сайт'
    REMOVEDPAGEFROMDRAFT: 'Премахната(и) ''%s'' от черновите'
-    RESTORE: Възтанови
    RESTORED: 'Успешно възтановен/а ''{title}'''
    ROLLBACK: 'Върни към тази версия'
    SAVE: Запис
@ -116,8 +113,6 @@ bg:
  CMSSearch:
    FILTERDATEFROM: От
    FILTERLABELTEXT: Съдържание
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Всички страници, включително изтритите'
  CMSSiteTreeFilter_Search:
    Title: 'Всички страници'
  ContentControl:
@ -238,7 +233,6 @@ bg:
    DEFAULTABOUTTITLE: 'За Нас'
    DEFAULTCONTACTCONTENT: '<p>Може да запълните тази страница със собствено съдържание, или да я изтриете и да създадете ваши собствени страници.<br /></p>'
    DEFAULTCONTACTTITLE: 'За Контакт'
-    DEFAULTHOMECONTENT: "<p>Добре дошли в SilverStripe! Това е началната страница подразбиране. Може да промените тази страница отваряйки a href=\"admin/\">CMS системата</a>. Сега можете да влезните в <a href=\"http://doc.silverstripe.com\">документацията на \t\nразработчика</a>, или започнете <a href=\"http://doc.silverstripe.com/doku.php?id=tutorials\">уроците.</a></p\n"
    DEFAULTHOMETITLE: Начало
    DELETEDPAGESHORT: Изтрит(а)
    DependtPageColumnLinkType: 'Тип на връзката'
@ -290,7 +284,6 @@ bg:
    CANACCESS: 'Можете да достигнете архивирания сайт, чрез тази връзка'
  VirtualPage:
    HEADER: 'Това е виртуална страница'
-    PLURALNAME: 'Виртуални страници'
    SINGULARNAME: 'Виртуална страница'
  CMSPageEditController:
    MENUTITLE: 'Редактиране на страницата'
--- a/lang/bs.yml
+++ b/lang/bs.yml
@ -1,8 +1,37 @@
 bs:
  AssetAdmin:
+    ADDFILES: 'Dodaj datoteke'
+    ActionAdd: 'Kreiraj direktorij'
+    AppCategoryArchive: Arhiva
+    AppCategoryAudio: Audio
+    AppCategoryDocument: Dokument
+    BackToFolder: 'Nazad na direktorij'
+    CREATED: Datum
+    CurrentFolderOnly: 'Limitiraj na trenutni direktorij?'
+    DetailsView: Detalji
+    FILES: Datoteke
+    FILESYSTEMSYNC: 'Sinhroniziraj datoteke'
+    FROMTHEINTERNET: 'Sa interneta'
+    FROMYOURCOMPUTER: 'Sa Vašeg kompijutera'
+    Filetype: 'Tip datoteke'
    NEWFOLDER: NoviDirektorij
+    SIZE: Veličina
+    THUMBSDELETED: '{count} nekorištenih je obrisano'
+    Upload: Upload
+    MENUTITLE: Datoteke
+  AssetAdmin_DeleteBatchAction:
+    TITLE: 'Izbriši direktorije'
+  AssetAdmin_Tools:
+    FILTER: Filter
  AssetAdmin_left_ss:
    GO: Idi
+  AssetTableField:
+    BACKLINKCOUNT: 'Korišteno ovdje:'
+    PAGES: strana(ice)
+  BackLink_Button_ss:
+    Back: Nazad
+  BrokenLinksReport:
+    Any: Bilo koji
  CMSMain:
    DELETE: 'Izbriši sa privremenog nacrta stranice'
    EMAIL: E-mail
@ -72,7 +101,6 @@ bs:
    DEFAULTABOUTTITLE: 'O nama'
    DEFAULTCONTACTCONTENT: '<p>Ovu stranicu možete popuniti sa vlastitim sadržajem, ili je izbrisati i kreirati svoje vlastite stranice.<br /></p>'
    DEFAULTCONTACTTITLE: 'Kontaktirajte nas'
-    DEFAULTHOMECONTENT: '<p>Dobrodošli u SilverStripe! Ovo je standardna početna stranica. Možete je izmijeniti otvaranjem <a href="admin/">administracijskog odjela CMS-a</a>. Sada možete pristupiti <a href="http://doc.silverstripe.com">razvojnoj dokumentaciji</a> ili <a href="http://doc.silverstripe.com/doku.php?id=tutorials">vodičima</a>.</p>'
    DEFAULTHOMETITLE: Početna
    EDITANYONE: 'Svi korisnici koji se mogu prijaviti u CMS'
    EDITHEADER: 'Ko može izmijeniti ovu stavku unutar CMS-a?'
--- a/lang/ca.yml
+++ b/lang/ca.yml
@ -12,7 +12,6 @@ ca:
    PUBALLFUN: 'Funcionalitat de "Publica-ho tot"'
    PUBALLFUN2: "Prémer aquest botó farà l'equivalent a anar a cada pàgina i prémer \"Publica\". És pràctic d'usar quan hi ha hagut edicions massives del contingut, com ara quan el lloc web s'ha fet per primer cop."
    REMOVEDPAGEFROMDRAFT: 'S''ha suprimit  ''%s'' del lloc esborrany'
-    RESTORE: Restaura
    ROLLBACK: 'Torna a aquesta versió'
    SAVE: Desa
  ErrorPage:
@ -76,7 +75,6 @@ ca:
    DEFAULTABOUTTITLE: 'Sobre nosaltres'
    DEFAULTCONTACTCONTENT: '<p>Podeu omplir aquesta pàgina amb el vostre propi contingut, o eliminar-la i crear les vostres pròpies pàgines.<br/></p>'
    DEFAULTCONTACTTITLE: 'Contacteu amb nosaltres'
-    DEFAULTHOMECONTENT: '<p>Benvingut a SilverStripe! Aquesta és la portada per defecte. Podeu editar aquesta pàgina obrint <a href="admin/">el SGC</a>. Podeu accedir a la <a href="http://doc.silverstripe.com">documentació del desenvolupador</a>, o començar <a href="http://doc.silverstripe.com/doku.php?id=tutorials">els tutorials.</a></p>'
    DEFAULTHOMETITLE: Portada
    EDITANYONE: 'Qualsevol que pot entrar al SGC'
    EDITHEADER: 'Qui pot editar-la des del SGC?'
@ -107,5 +105,4 @@ ca:
    HAVEASKED: 'Heu demanat de veure el contingut del nostre lloc el'
  VirtualPage:
    HEADER: 'Aquesta és una pàgina virtual'
-    PLURALNAME: 'Pàgines virtuals'
    SINGULARNAME: 'Pàgina virtual'
--- a/lang/cs.yml
+++ b/lang/cs.yml
@ -69,6 +69,8 @@ cs:
    PUBLISH_PAGES: Zveřejnit
    UNPUBLISHED_PAGES: 'Nezveřejněných %d stránek'
    UNPUBLISH_PAGES: Nezveřejnit
+    ARCHIVE: Archivovat
+    ARCHIVED_PAGES: 'Archivovaných %d stránek'
  CMSMain:
    ACCESS: 'Přístup k ''{title}'' sekci'
    ACCESS_HELP: 'Povolit prohlížení sekce obsahující strukturu a obsah webu. Oprávnění na prohlížení a úpravu mohou být nastavena skrze menu pro samostatnou stránku, také jako jednotlivé oprávnění pro obsah.'
@ -100,8 +102,11 @@ cs:
    REMOVED: 'Smazáno ''{title}''{description} z webu'
    REMOVEDPAGE: 'Odstraněno ''{title}'' ze zveřejněného webu'
    REMOVEDPAGEFROMDRAFT: 'Odstraněno ''%s'' z konceptu webu'
-    RESTORE: Obnovit
+    RESTORE: 'Obnovit koncept'
+    RESTORE_TO_ROOT: 'Obnovit koncept do nejvyšší úrovně'
+    RESTORE_TO_ROOT_DESC: 'Obnovit archivovanou verzi na koncept stránky nejvyšší úrovně'
    RESTORED: 'Obnoveno ''{title}'' úspěšně'
+    RESTORE_DESC: 'Obnovit archivovanou verzi na koncept'
    ROLLBACK: 'Vrátit se zpět na tuto verzi'
    ROLLEDBACKPUBv2: 'Vráceno zpět na zveřejněnou verzi.'
    ROLLEDBACKVERSIONv2: 'Vráceno zpět na verzi #%d.'
@ -113,9 +118,12 @@ cs:
    TreeFiltered: 'Filtrovaný strom.'
    TreeFilteredClear: 'Vyčistit filtr'
    MENUTITLE: 'Upravit stránku'
+    ARCHIVE: Archív
+    ARCHIVEDPAGE: 'Archivovaná stránka ''%s'''
  CMSMain_left_ss:
    APPLY_FILTER: 'Použít filtr'
    RESET: Resetovat
+    CLEAR_FILTER: 'Vyčistit filtr'
  CMSPageAddController:
    ParentMode_child: 'Pod jinou stránku'
    ParentMode_top: 'Nejvyšší úroveň'
@ -152,11 +160,19 @@ cs:
    FILTERDATETO: Do
    FILTERLABELTEXT: Obsah
  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Změněné stránky'
+    Title: 'Upravené stránky'
  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Všechny stránky, včetně odstraněných'
+    Title: 'Všechny stránky, včetně archivovaných'
+  CMSSIteTreeFilter_PublishedPages:
+    Title: 'Zveřejněné stránky'
  CMSSiteTreeFilter_Search:
    Title: 'Všechny stránky'
+  CMSSiteTreeFilter_StatusDeletedPages:
+    Title: 'Archivované stránky'
+  CMSSiteTreeFilter_StatusDraftPages:
+    Title: 'Stránky koncept'
+  CMSSiteTreeFilter_StatusRemovedFromDraftPages:
+    Title: 'Živé, ale odstraněno z konceptu'
  ContentControl:
    NOTEWONTBESHOWN: 'Poznámka: tato zpráva nebude zobrazena vašim návštěvníkům'
  ContentController:
@ -314,7 +330,7 @@ cs:
    DEFAULTABOUTTITLE: 'O nás'
    DEFAULTCONTACTCONTENT: '<p>Můžete tuto stránku vyplnit vlastním obsahem, nebo ji smazat a vytvořit si vlastní stránky. <br /> </p>'
    DEFAULTCONTACTTITLE: 'Kontaktujte nás'
-    DEFAULTHOMECONTENT: '<p>Vítejte v CMS SilverStripe! Toto je úvodní stránka. Tuto i jiné stránky můžete změnit <a href="admin/">přihlášením do systému</a>. Můžete také navštívit <a href="http://doc.silverstripe.com">vývojářskou dokumentaci (EN)</a>, nebo <a href="http://doc.silverstripe.com/doku.php?id=tutorials">návody (EN)</a></p>'
+    DEFAULTHOMECONTENT: '<p>Vítejte v SilverStripe! Toto je základní domácí stránka. Můžete ji upravit otevřením <a href="admin/">CMS</a>.</p><p>Můžete také nyní vstoupit  do <a href="http://docs.silverstripe.org">dokumentace vývojáře</a>, nebo se přiučit na <a href="http://www.silverstripe.org/learn/lessons">SilverStripe lekcích</a>.</p>'
    DEFAULTHOMETITLE: Úvodní strana
    DELETEDPAGEHELP: 'Stránka už není více zveřejněna'
    DELETEDPAGESHORT: Smazáno
@ -385,6 +401,9 @@ cs:
    many_many_BackLinkTracking: 'Stopování zpětných odkazů'
    many_many_ImageTracking: 'Stopování obrázku'
    many_many_LinkTracking: 'Stopování odkazu'
+    ARCHIVEDPAGEHELP: 'Stránka je odstraněná z konceptu i z webu'
+    ARCHIVEDPAGESHORT: Archivováno
+    BUTTONARCHIVEDESC: 'Nezveřejnit a odeslat do archívu'
  SiteTreeURLSegmentField:
    EMPTY: 'Zadejte prosím URL segment nebo klikněte zrušit'
    HelpChars: 'Zvláštní znaky jsou automaticky zkonvertovány nebo odstraněny'
@ -412,9 +431,6 @@ cs:
    MENUTITLE: 'Editovat stránku'
  CMSSettingsController:
    MENUTITLE: Možnosti
-  CMSSiteTreeFilter_StatusDeletedPages:
-    Title: 'Smazané stránky'
-  CMSSiteTreeFilter_StatusDraftPages:
-    Title: 'Koncept nezveřejněných stránek'
-  CMSSiteTreeFilter_StatusRemovedFromDraftPages:
-    Title: 'Živé, ale odstraněno z konceptu'
+  SiteTreeFileExtension:
+    BACKLINK_LIST_DESCRIPTION: 'Seznam zobrazuje všechny stránky, kde byl soubor přidán pomocí WYSIWYG editoru.'
+    EDIT: Editovat
--- a/lang/da.yml
+++ b/lang/da.yml
@ -59,8 +59,6 @@ da:
    DELETE_PAGES: 'Slet fra publiseret side'
    PUBLISHED_PAGES: 'Publiserede %d sider'
    PUBLISH_PAGES: Publisér
-    UNPUBLISHED_PAGES: 'U-publiserede %d sider'
-    UNPUBLISH_PAGES: U-publisér
  CMSMain:
    ACCESS: 'Adgang til ''{title}'' sektionen'
    ACCESS_HELP: 'Tillad visning af den sektion, som indeholder sidetræet og indhold. Visnings- og redigeringstilladelser kan håndteres gennem sidespecifikke rullemenuer, såvel som de enkelte "Inholdstilladelser".'
@ -86,7 +84,6 @@ da:
    PageAdded: 'Siden blev oprettet med succes'
    REMOVEDPAGE: 'Fjernede ''{title}'' fra den udgivne side'
    REMOVEDPAGEFROMDRAFT: '''%s''  fjernet fra udkast-sitet'
-    RESTORE: Genskab
    RESTORED: 'Genskabte ''{title}'' korrekt'
    ROLLBACK: 'Rul tilbage til denne version'
    SAVE: Gem
@ -133,10 +130,6 @@ da:
    FILTERDATEHEADING: Dato
    FILTERDATETO: Til
    FILTERLABELTEXT: Indhold
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Ændrede sider'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Alle sider, inklusive slettede'
  CMSSiteTreeFilter_Search:
    Title: 'Alle sider'
  ContentControl:
@ -184,7 +177,6 @@ da:
    HASBEENSETUP: 'En omdirigeringsside er blevet sat op, uden et sted at omdirigere til.'
    HEADER: 'Denne side omdirigerer besøgende til en anden side'
    OTHERURL: 'Andet websteds URL'
-    PLURALNAME: 'Videresendende sider'
    REDIRECTTO: 'Omdiriger til'
    REDIRECTTOEXTERNAL: 'Et andet websted'
    REDIRECTTOPAGE: 'En side på dit websted'
@ -248,7 +240,6 @@ da:
    DEFAULTABOUTTITLE: 'Om os'
    DEFAULTCONTACTCONTENT: '<p>Du kan udfylde denne side med dit eget indhold, eller slette den og oprette dine egne sider.<br /></p>'
    DEFAULTCONTACTTITLE: 'Kontakt os'
-    DEFAULTHOMECONTENT: '<p>Velkommen til  SilverStripe! Dette er en standard forside. Du kan redigere den ved at åbne <a href="admin/">CMS</a>. Du kan læse <a href="http://doc.silverstripe.org">udviklerdokumentationen</a>, eller påbegynde en af  <a href="http://doc.silverstripe.org/doku.php?id=tutorials">selvstudierne.</a></p>\n'
    DEFAULTHOMETITLE: Forside
    DELETEDPAGEHELP: 'Siden er ikke længere udgiven'
    DELETEDPAGESHORT: Slettet
@ -310,7 +301,6 @@ da:
  VirtualPage:
    DESCRIPTION: 'Viser indholdet fra en anden side'
    HEADER: 'Dette er en virtuel side'
-    PLURALNAME: 'Virtuelle sider'
    PageTypNotAllowedOnRoot: 'Original side type "{type}" er ikke tilladt på rodniveau for denne virtuelle side'
    SINGULARNAME: 'Virtuel side'
  CMSFileAddController:
--- a/lang/de.yml
+++ b/lang/de.yml
@ -67,8 +67,6 @@ de:
    DELETE_PAGES: 'Von veröffentlichter Site löschen'
    PUBLISHED_PAGES: '%d Seiten veröffentlicht, %d Fehler'
    PUBLISH_PAGES: Veröffentlichen
-    UNPUBLISHED_PAGES: 'Veröffentlichung von %d Seiten zurückgenommen'
-    UNPUBLISH_PAGES: Veröffentlichung zurücknehmen
  CMSMain:
    ACCESS: 'Zugang zum Bereich ''{title}'''
    ACCESS_HELP: 'Seiteninhalt im CMS anzeigen. Anzeige- und Bearbeitungsberechtigungen können sowohl seitenspezifische als auch über die globalen Inhaltsberechtigungen gesetzt werden.'
@ -100,7 +98,6 @@ de:
    REMOVED: 'Lösche ''{title}''{description} von Live Umgebung'
    REMOVEDPAGE: '''{title}'' wurde von der veröffentlichten Site entfernt'
    REMOVEDPAGEFROMDRAFT: 'Lösche ''%s'' von der Entwurfs-Site'
-    RESTORE: Wiederherstellen
    RESTORED: '''{title}'' wurde wiederhergestellt'
    ROLLBACK: 'Diese Version wiederherstellen'
    ROLLEDBACKPUBv2: 'Veröffentlichte Version wiederhergestellt'
@ -151,10 +148,6 @@ de:
    FILTERDATEHEADING: Datum
    FILTERDATETO: Bis
    FILTERLABELTEXT: Inhalt
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Veränderte Seiten'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Alle Seiten, auch gelöschte.'
  CMSSiteTreeFilter_Search:
    Title: 'Alle Seiten'
  ContentControl:
@ -314,7 +307,6 @@ de:
    DEFAULTABOUTTITLE: 'Über uns'
    DEFAULTCONTACTCONTENT: '<p>Sie können diese Seite mit Ihren eigenen Inhalten füllen, oder sie löschen und Ihre eigenen Seiten erstellen.<br /></p>'
    DEFAULTCONTACTTITLE: 'Kontakt'
-    DEFAULTHOMECONTENT: '<p>Willkommen bei SilverStripe! Dies ist die Standard-Startseite. Sie können diese Seite bearbeiten, indem Sie <a href="admin/">das CMS</a> öffnen. Sie können außerdem die  <a href="http://doc.silverstripe.com">Entwicker-Dokumentation</a> oder die <a href="http://doc.silverstripe.com/doku.php?id=tutorials">Einführungskurse und Tutorien</a> aufrufen.</p>'
    DEFAULTHOMETITLE: Startseite
    DELETEDPAGEHELP: 'Die Seite ist nicht länger veröffentlicht'
    DELETEDPAGESHORT: Gelöscht
@ -412,9 +404,3 @@ de:
    MENUTITLE: 'Seite bearbeiten'
  CMSSettingsController:
    MENUTITLE: Einstellungen
-  CMSSiteTreeFilter_StatusDeletedPages:
-    Title: 'Gelöschte Seiten'
-  CMSSiteTreeFilter_StatusDraftPages:
-    Title: 'Nicht veröffentlichte Entwurfs-Seiten'
-  CMSSiteTreeFilter_StatusRemovedFromDraftPages:
-    Title: 'Veröffentlicht aber aus Entwurf entfernt'
--- a/lang/el.yml
+++ b/lang/el.yml
@ -79,7 +79,6 @@ el:
    PUBALLFUN: 'Λειτουργία "Δημοσίευση Όλων"'
    PUBPAGES: 'Ολοκληρώθηκε: Δημοσίευση {count} σελίδων'
    PageAdded: 'Η σελίδα δημιουργήθηκε με επιτυχία'
-    RESTORE: Επαναφορά
    SAVE: Αποθήκευση
    TabContent: Περιεχόμενο
    TabHistory: Ιστορικό
@ -118,10 +117,6 @@ el:
    FILTERDATEHEADING: Ημερομηνία
    FILTERDATETO: Έως
    FILTERLABELTEXT: Περιεχόμενο
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Τροποποιημένες σελίδες'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Όλες οι σελίδες, συμπεριλαμβανομένων των διαγραμμένων'
  CMSSiteTreeFilter_Search:
    Title: 'Όλες οι σελίδες'
  ContentController:
@ -268,5 +263,3 @@ el:
    MENUTITLE: 'Επεξεργασία Σελίδας'
  CMSSettingsController:
    MENUTITLE: Ρυθμίσεις
-  CMSSiteTreeFilter_StatusDeletedPages:
-    Title: 'Διεγραμμένες σελίδες'
--- a/lang/en.yml
+++ b/lang/en.yml
@ -19,12 +19,12 @@ en:
    FROMYOURCOMPUTER: 'From your computer'
    Filetype: 'File type'
    ListView: 'List View'
+    MENUTITLE: Files
    NEWFOLDER: NewFolder
    SIZE: Size
    THUMBSDELETED: '{count} unused thumbnails have been deleted'
    TreeView: 'Tree View'
    Upload: Upload
-    MENUTITLE: Files
  AssetAdmin_DeleteBatchAction:
    TITLE: 'Delete folders'
  AssetAdmin_Tools:
@ -61,19 +61,25 @@ en:
  CMSAddPageController:
    Title: 'Add page'
  CMSBatchActions:
+    ARCHIVE: Archive
+    ARCHIVED_PAGES: 'Archived %d pages'
    DELETED_DRAFT_PAGES: 'Deleted %d pages from draft site, %d failures'
    DELETED_PAGES: 'Deleted %d pages from published site, %d failures'
    DELETE_DRAFT_PAGES: 'Delete from draft site'
    DELETE_PAGES: 'Delete from published site'
    PUBLISHED_PAGES: 'Published %d pages, %d failures'
    PUBLISH_PAGES: Publish
+    RESTORE: Restore
+    RESTORED_PAGES: 'Restored %d pages'
    UNPUBLISHED_PAGES: 'Unpublished %d pages'
    UNPUBLISH_PAGES: Unpublish
-    ARCHIVE: Archive
-    ARCHIVED_PAGES: 'Archived %d pages'
+  CMSFileAddController:
+    MENUTITLE: Files
  CMSMain:
    ACCESS: 'Access to ''{title}'' section'
    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".'
+    ARCHIVE: Archive
+    ARCHIVEDPAGE: 'Archived page ''%s'''
    AddNew: 'Add new page'
    AddNewButton: 'Add new'
    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
@ -89,6 +95,7 @@ en:
    EMAIL: Email
    EditTree: 'Edit Tree'
    ListFiltered: 'Filtered list.'
+    MENUTITLE: 'Edit Page'
    NEWPAGE: 'New {pagetype}'
    PAGENOTEXISTS: 'This page doesn''t exist'
    PAGES: 'Page status'
@ -103,10 +110,10 @@ en:
    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
    REMOVEDPAGEFROMDRAFT: 'Removed ''%s'' from the draft site'
    RESTORE: 'Restore draft'
-    RESTORE_TO_ROOT: 'Restore draft at top level'
-    RESTORE_TO_ROOT_DESC: 'Restore the archived version to draft as a top level page'
    RESTORED: 'Restored ''{title}'' successfully'
    RESTORE_DESC: 'Restore the archived version to draft'
+    RESTORE_TO_ROOT: 'Restore draft at top level'
+    RESTORE_TO_ROOT_DESC: 'Restore the archived version to draft as a top level page'
    ROLLBACK: 'Roll back to this version'
    ROLLEDBACKPUBv2: 'Rolled back to published version.'
    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
@ -122,29 +129,33 @@ en:
    ARCHIVEDPAGE: 'Archived page ''%s'''
  CMSMain_left_ss:
    APPLY_FILTER: 'Search'
-    RESET: Reset
    CLEAR_FILTER: 'Clear Filter'
+    RESET: Reset
  CMSPageAddController:
+    MENUTITLE: 'Add page'
    ParentMode_child: 'Under another page'
    ParentMode_top: 'Top level'
-    MENUTITLE: 'Add page'
+  CMSPageEditController:
+    MENUTITLE: 'Edit Page'
  CMSPageHistoryController:
    COMPAREMODE: 'Compare mode (select two)'
    COMPAREVERSIONS: 'Compare Versions'
    COMPARINGVERSION: 'Comparing versions {version1} and {version2}.'
+    MENUTITLE: History
    REVERTTOTHISVERSION: 'Revert to this version'
    SHOWUNPUBLISHED: 'Show unpublished versions'
    SHOWVERSION: 'Show Version'
    VIEW: view
    VIEWINGLATEST: 'Currently viewing the latest version.'
    VIEWINGVERSION: 'Currently viewing version {version}.'
-    MENUTITLE: History
  CMSPageHistoryController_versions_ss:
    AUTHOR: Author
    NOTPUBLISHED: 'Not published'
    PUBLISHER: Publisher
    UNKNOWN: Unknown
    WHEN: When
+  CMSPageSettingsController:
+    MENUTITLE: 'Edit Page'
  CMSPagesController:
    GalleryView: 'Gallery View'
    ListView: 'List View'
@ -154,17 +165,19 @@ en:
    MULTISELECT: Bulk actions
  CMSPagesController_Tools_ss:
    FILTER: Filter
+  CMSSIteTreeFilter_PublishedPages:
+    Title: 'Published pages'
  CMSSearch:
    FILTERDATEFROM: From
    FILTERDATEHEADING: 'Date'
    FILTERDATETO: To
    FILTERLABELTEXT: 'Search'
+  CMSSettingsController:
+    MENUTITLE: Settings
  CMSSiteTreeFilter_ChangedPages:
    Title: 'Modified pages'
  CMSSiteTreeFilter_DeletedPages:
    Title: 'All pages, including archived'
-  CMSSIteTreeFilter_PublishedPages:
-    Title: 'Published pages'
  CMSSiteTreeFilter_Search:
    Title: 'All pages'
  CMSSiteTreeFilter_StatusDeletedPages:
@ -261,8 +274,8 @@ en:
    SINGULARNAME: 'Redirector Page'
    YOURPAGE: 'Page on your website'
  ReportAdmin:
-    ReportTitle: Title
    MENUTITLE: Reports
+    ReportTitle: Title
  ReportAdminForm:
    FILTERBY: 'Filter by'
  SITETREE:
@ -317,6 +330,9 @@ en:
    ADDEDTODRAFTSHORT: Draft
    ALLOWCOMMENTS: 'Allow comments on this page?'
    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
+    ARCHIVEDPAGEHELP: 'Page is removed from draft and live'
+    ARCHIVEDPAGESHORT: Archived
+    BUTTONARCHIVEDESC: 'Unpublish and send to archive'
    BUTTONCANCELDRAFT: 'Cancel draft changes'
    BUTTONCANCELDRAFTDESC: 'Delete your draft and revert to the currently published page'
    BUTTONPUBLISHED: Published
@ -401,9 +417,9 @@ en:
    many_many_BackLinkTracking: 'Backlink Tracking'
    many_many_ImageTracking: 'Image Tracking'
    many_many_LinkTracking: 'Link Tracking'
-    ARCHIVEDPAGEHELP: 'Page is removed from draft and live'
-    ARCHIVEDPAGESHORT: Archived
-    BUTTONARCHIVEDESC: 'Unpublish and send to archive'
+  SiteTreeFileExtension:
+    BACKLINK_LIST_DESCRIPTION: 'This list shows all pages where the file has been added through a WYSIWYG editor.'
+    EDIT: Edit
  SiteTreeURLSegmentField:
    EMPTY: 'Please enter a URL Segment or click cancel'
    HelpChars: ' Special characters are automatically converted or removed.'
@ -423,14 +439,3 @@ en:
    PLURALNAME: 'Virtual Pages'
    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
    SINGULARNAME: 'Virtual Page'
-  CMSFileAddController:
-    MENUTITLE: Files
-  CMSPageEditController:
-    MENUTITLE: 'Edit Page'
-  CMSPageSettingsController:
-    MENUTITLE: 'Edit Page'
-  CMSSettingsController:
-    MENUTITLE: Settings
-  SiteTreeFileExtension:
-    BACKLINK_LIST_DESCRIPTION: 'This list shows all pages where the file has been added through a WYSIWYG editor.'
-    EDIT: Edit
--- a/lang/en@lolcat.yml
+++ b/lang/en@lolcat.yml
@ -1,50 +0,0 @@
-en@lolcat:
-  ContentController:
-    DRAFT_SITE_ACCESS_RESTRICTION: 'U MUST LOG IN WIF UR CMS PASWORD IN ORDR 2 VIEW TEH DRAFT OR ARCHIVD CONTENT. <a href="%s">CLICK HEAR 2 GO BAK 2 TEH PUBLISHD SIET.</a>'
-  ErrorPage:
-    CODE: 'TEH ERRUR CODE'
-  Folder:
-    UNUSEDFILESTITLE: 'UNUSD FILEZ'
-  RedirectorPage:
-    HASBEENSETUP: 'A REDIRECTOR PAEG HAS BEEN SET UP WITHOUT ANYWHERE 2 REDIRECT 2.'
-    HEADER: 'DIS PAEG WILL REDIRECT USERS 2 ANOTHR PAEG'
-    OTHERURL: 'UDDR WEBSITEZ URL'
-    REDIRECTTO: 'REDIRECT 2'
-    REDIRECTTOEXTERNAL: 'ANOTHR WEBSIET'
-    REDIRECTTOPAGE: 'A PAEG ON UR WEBSEIT'
-    YOURPAGE: 'PAEG ON UR WEBSEIT'
-  SiteTree:
-    ACCESSANYONE: ANY1
-    ACCESSHEADER: 'WAT PEEPS CAN C DAT PAEG ON MY SITE?'
-    ACCESSLOGGEDIN: 'LOGGD-IN USERS'
-    ACCESSONLYTHESE: 'ONLY THEES PEEPS (CHOOSE FRUM LIST)'
-    ALLOWCOMMENTS: 'ALLOW COMMENTZ ON DIS PAEG?'
-    APPEARSVIRTUALPAGES: 'DIS CONTENT ALSO APPEARz ON TEH VIRTUAL PAGEZ IN DA %s SECSHUNS.'
-    BUTTONCANCELDRAFT: 'CANCEL DRAFT CHANGEZ'
-    BUTTONCANCELDRAFTDESC: 'DELETE UR DRAFT AN REVERT 2 TEH CURRENTLY PUBLISHD PAEG'
-    BUTTONSAVEPUBLISH: 'SAV N PUBLISH'
-    BUTTONUNPUBLISH: UNPUBLISH
-    BUTTONUNPUBLISHDESC: 'REMOOV DIS PAEG FRUM TEH PUBLISHD SIET'
-    EDITANYONE: 'ANYONE HOO CAN LOG-IN 2 TEH CMS'
-    EDITHEADER: 'WAT PEEPS CAN EDIT DIS INSIDE TEH CMS?'
-    EDITONLYTHESE: 'ONLY THEEZ PEEPS (CHOOSE FRUM LIST)'
-    HASBROKENLINKS: 'DIS PAEG HAS BROKD LINKZ.
-
-      '
-    HTMLEDITORTITLE: TEH CONTENT
-    MENUTITLE: 'NAVIGASHUN LABEL'
-    METADESC: 'DESCRIPSHUN'
-    METAEXTRA: 'CUSTOM META TAGZ'
-    PAGETITLE: 'NAYM OV TEH PAEG'
-    PAGETYPE: 'TYPE OV TEH PAEG'
-    SHOWINMENUS: 'SHOU IN MENUZ?'
-    SHOWINSEARCH: 'SHOU IN SEARCH?'
-    TABBEHAVIOUR: BEHAVIOUR
-    TABCONTENT: 'CONTENT'
-    TOPLEVEL: 'SIET CONTENT (TOP LEVEL)
-
-      '
-  VirtualPage:
-    CHOOSE: 'CHOOSE PAEG 2 LINK 2'
-    EDITCONTENT: 'kLICK HEER 2 EDIT TEH CONTENT'
-    HEADER: 'DIS R A VIRTUAL PAEG'
--- a/lang/eo.yml
+++ b/lang/eo.yml
@ -67,8 +67,6 @@ eo:
    DELETE_PAGES: 'Forigi el publikigita retejo'
    PUBLISHED_PAGES: 'Publikigis %d paĝojn, %d malsukcesojn'
    PUBLISH_PAGES: Publikigi
-    UNPUBLISHED_PAGES: 'Malpublikigis %d paĝojn'
-    UNPUBLISH_PAGES: Malpublikigi
  CMSMain:
    ACCESS: 'Aliro al sekcio ''{title}'''
    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".'
@ -100,7 +98,6 @@ eo:
    REMOVED: 'Forigis je ''{title}''{description} el la publikigita retejo'
    REMOVEDPAGE: 'Forigis je ''{title}'' el la publikigita retejo'
    REMOVEDPAGEFROMDRAFT: 'Forigis je ''%s'' el la malneta retejo'
-    RESTORE: Restaŭri
    RESTORED: 'Sukcese restaŭris je ''{title}'''
    ROLLBACK: 'Malfari al ĉi tiu versio'
    ROLLEDBACKPUBv2: 'Malfaris ŝanĝojn ĝis la publikigita versio.'
@ -151,10 +148,6 @@ eo:
    FILTERDATEHEADING: Dato
    FILTERDATETO: Al
    FILTERLABELTEXT: Enhavo
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Ŝanĝitaj paĝoj'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Ĉiuj paĝoj, inklude forigitajn'
  CMSSiteTreeFilter_Search:
    Title: 'Ĉiuj paĝoj'
  ContentControl:
@ -314,7 +307,6 @@ eo:
    DEFAULTABOUTTITLE: 'Pri ni'
    DEFAULTCONTACTCONTENT: '<p>Vi povas plenigi ĉi tiun paĝon per via materialo, aŭ forigi ĝin kaj krei viajn proprajn paĝojn.<br /></p>'
    DEFAULTCONTACTTITLE: 'Kontakti nin'
-    DEFAULTHOMECONTENT: '<p>Bonvenon al SilverStripe! Jen la apriora hejmpaĝo. Vi povas redakti ĉi tiun paĝon malfermante je <a href="admin/">la CMS</a>. Tiam vi povas aliri al la <a href="http://doc.silverstripe.com">dokumentaro por evoluigistoj</a>, aŭ ekuzi <a href="http://doc.silverstripe.com/doku.php?id=tutorials">la instruilojn.</a></p>'
    DEFAULTHOMETITLE: Hejmo
    DELETEDPAGEHELP: 'Paĝo ne plu estas publikigita'
    DELETEDPAGESHORT: Forigita
@ -412,9 +404,3 @@ eo:
    MENUTITLE: 'Redakti paĝon'
  CMSSettingsController:
    MENUTITLE: Agordoj
-  CMSSiteTreeFilter_StatusDeletedPages:
-    Title: 'Forigitaj paĝoj'
-  CMSSiteTreeFilter_StatusDraftPages:
-    Title: 'Malnetaj nepublikigitaj paĝoj'
-  CMSSiteTreeFilter_StatusRemovedFromDraftPages:
-    Title: 'Publikaj sed forigitaj el malnetaj'
--- a/lang/es.yml
+++ b/lang/es.yml
@ -67,8 +67,10 @@ es:
    DELETE_PAGES: 'Eliminar del sitio público'
    PUBLISHED_PAGES: 'Publicadas %d páginas, %d fallos'
    PUBLISH_PAGES: Publicar
-    UNPUBLISHED_PAGES: 'No publicadas %d páginas'
-    UNPUBLISH_PAGES: Sin Publicar
+    UNPUBLISHED_PAGES: 'Ocultar %d páginas'
+    UNPUBLISH_PAGES: Ocultar publicación
+    ARCHIVE: Archivar
+    ARCHIVED_PAGES: '%d páginas archivadas'
  CMSMain:
    ACCESS: 'Acceso a la sección ''{title}'''
    ACCESS_HELP: 'Permitir la visualización de la sección que contiene el árbol de la página y el contenido. Ver y editar permisos puede ser gestionado a través de menús desplegables específicos de las páginas, así como los "permisos de contenido" separados.'
@ -100,8 +102,11 @@ es:
    REMOVED: 'Removido'
    REMOVEDPAGE: 'Eliminado ''{title}'' del sitio publicado'
    REMOVEDPAGEFROMDRAFT: 'Borrado ''%s''%s desde el sitio no publicado'
-    RESTORE: Restaurar
+    RESTORE: 'Recuperar borrador'
+    RESTORE_TO_ROOT: 'Recuperar borrador al nivel superior'
+    RESTORE_TO_ROOT_DESC: 'Recuperar la versión archivada del borrador como de nivel superior'
    RESTORED: 'Restablecido ''{title}'' correctamente'
+    RESTORE_DESC: 'Recuperar la versión archivada del borrador'
    ROLLBACK: 'Restaurar esta versión'
    ROLLEDBACKPUBv2: 'Restaurado'
    ROLLEDBACKVERSIONv2: 'Versión #%d restaurada'
@ -113,9 +118,12 @@ es:
    TreeFiltered: 'Árbol filtrado'
    TreeFilteredClear: 'Borrar filtro'
    MENUTITLE: 'Editar página'
+    ARCHIVE: Archivar
+    ARCHIVEDPAGE: '''%s'' páginas archivadas'
  CMSMain_left_ss:
    APPLY_FILTER: 'Aplicar filtro'
    RESET: Restablecer
+    CLEAR_FILTER: 'Limpiar filtro'
  CMSPageAddController:
    ParentMode_child: 'Debajo de otra página'
    ParentMode_top: 'Nivel superior'
@ -152,11 +160,19 @@ es:
    FILTERDATETO: Hasta
    FILTERLABELTEXT: Filtrar
  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Páginas cambiadas'
+    Title: 'Páginas modificadas'
  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Todas las páginas'
+    Title: 'Todas las páginas, incluyendo archivadas'
+  CMSSIteTreeFilter_PublishedPages:
+    Title: 'Páginas publicadas'
  CMSSiteTreeFilter_Search:
    Title: 'Todas las paginas'
+  CMSSiteTreeFilter_StatusDeletedPages:
+    Title: 'Páginas archivadas'
+  CMSSiteTreeFilter_StatusDraftPages:
+    Title: 'Borradores'
+  CMSSiteTreeFilter_StatusRemovedFromDraftPages:
+    Title: 'Publicada, pero eliminada de los borradores'
  ContentControl:
    NOTEWONTBESHOWN: 'Nota: este mensaje no se mostrará a tus visitantes'
  ContentController:
@ -314,7 +330,7 @@ es:
    DEFAULTABOUTTITLE: 'Sobre nosotros'
    DEFAULTCONTACTCONTENT: '<p>Tú puedes rellenar esta página con tu propio contenido, o borrarla y crear tus propias páginas.<br />Aquí pondrías tu información de contacto.<br /></p>'
    DEFAULTCONTACTTITLE: 'Contacta con nosotros'
-    DEFAULTHOMECONTENT: '<p>Bienvenido a SilverStripe! Esta es la página de inicio por defecto. Puedes editarla abriendo <a href="admin/">el Sistema Gestor de Contenidos (CMS)</a>. Puedes acceder ahora a <a href="http://doc.silverstripe.com">la documentación para desarrolladores</a>, o empezar <a href="http://doc.silverstripe.com/doku.php?id=tutorials">los tutoriales.</a></p>'
+    DEFAULTHOMECONTENT: '<p>¡Bienvenido a SilverStripe! Esta es la página de inicio por defecto. Tú puedes editar esta página abriendo <a href="admin/">el CMS</a>.</p><p>También puedes acceder a la  <a href="http://docs.silverstripe.org">documentación de desarrollo</a>, o comenzar con las<a href="http://www.silverstripe.org/learn/lessons">Lecciones de SilverStripe</a>.</p>'
    DEFAULTHOMETITLE: Inicio
    DELETEDPAGEHELP: 'La página ya no está publicada'
    DELETEDPAGESHORT: Borrado
@ -385,6 +401,9 @@ es:
    many_many_BackLinkTracking: 'Rastreo de Backlinks'
    many_many_ImageTracking: 'Rastreo de Imágenes'
    many_many_LinkTracking: 'Rastreo de Enlaces'
+    ARCHIVEDPAGEHELP: 'Esta página ha sido removida de los borradores y del sitio en vivo'
+    ARCHIVEDPAGESHORT: Archivada
+    BUTTONARCHIVEDESC: 'Ocultar y mandar al archivo'
  SiteTreeURLSegmentField:
    EMPTY: 'Vacío'
    HelpChars: 'Los caracteres especiales son automáticamente convertidos o eliminados.'
@ -401,7 +420,7 @@ es:
    EditLink: Editar
    HEADER: 'Esta es una página virtual'
    HEADERWITHLINK: 'Título con link'
-    PLURALNAME: 'Páginas Virtuales'
+    PLURALNAME: 'Páginas virtuales'
    PageTypNotAllowedOnRoot: 'Tipo de página original "{type}" no se permite en el nivel raíz para esta página virtual'
    SINGULARNAME: 'Página Virtual'
  CMSFileAddController:
@ -412,9 +431,6 @@ es:
    MENUTITLE: 'Editar página'
  CMSSettingsController:
    MENUTITLE: Ajustes
-  CMSSiteTreeFilter_StatusDeletedPages:
-    Title: 'Páginas borradas'
-  CMSSiteTreeFilter_StatusDraftPages:
-    Title: 'Enviar al borrador las páginas sin prublicar'
-  CMSSiteTreeFilter_StatusRemovedFromDraftPages:
-    Title: 'Publicada pero eliminada del borrador'
+  SiteTreeFileExtension:
+    BACKLINK_LIST_DESCRIPTION: 'Esta lista muestra todas las páginas que han sido añadidas mediante un editor WYSIWYG.'
+    EDIT: Editar
--- a/lang/es_AR.yml
+++ b/lang/es_AR.yml
@ -29,8 +29,6 @@ es_AR:
    DELETE_PAGES: 'Eliminar del sitio publicado'
    PUBLISHED_PAGES: 'Se publicaron %d páginas, %d fallas'
    PUBLISH_PAGES: Publicar
-    UNPUBLISHED_PAGES: 'Se despublicaron %d páginas'
-    UNPUBLISH_PAGES: Despublicar
  CMSMain:
    ACCESS_HELP: 'Permitir la visualización de la sección que contiene el árbol de páginas y el contenido. Ver y editar permisos que se pueden manejar mediante listas desplegables específicas de la página, así como el apartado "Permisos del contenido".'
    DELETE: 'Eliminar del sitio borrador'
@ -40,7 +38,6 @@ es_AR:
    PUBALLFUN: 'Funcionalidad "Publicar Todo"'
    PUBALLFUN2: "Pulsar este botón hará el equivalente de ir a cada página y pulsar \"Publicar\". Está pensado para ser usado en edición masiva de contenido, por ejemplo cuando se construye el sitio por primera vez."
    REMOVEDPAGEFROMDRAFT: 'Quitados ''%s'' del borrador del sitio'
-    RESTORE: Restaurar
    ROLLBACK: 'Restaurar a ésta versión'
    SAVE: Guardar
  ContentControl:
@ -147,7 +144,6 @@ es_AR:
    DEFAULTABOUTTITLE: 'de Nosotros'
    DEFAULTCONTACTCONTENT: '<p>Puedes llenar esta página con tu propio contenido, o eliminarla y crear tus propias páginas.<br /></p>'
    DEFAULTCONTACTTITLE: 'Contactenos'
-    DEFAULTHOMECONTENT: '<p>¡Bienvenido a SilverStripe! Esta es la página inicial por defecto. Puede editar esta página al abrir <a href="admin/">el CMS</a>. Ahora puede acceder a la <a href="http://doc.silverstripe.org">documentación del desarrollador</a>, o comenzar <a href="http://doc.silverstripe.org/doku.php?id=tutorials">tos tutoriales.</a></p>'
    DEFAULTHOMETITLE: Inicio
    DEPENDENT_NOTE: 'Las siguientes páginas dependen de esta página. Esto incluye páginas virtuales, páginas de redireccionamiento y páginas con enlaces de contenido.'
    DependtPageColumnLinkType: 'Tipo de enlace'
@ -193,5 +189,4 @@ es_AR:
    HAVEASKED: 'Has solicitado ver el contenido de nuestro sitio en'
  VirtualPage:
    HEADER: 'Esta es una página virtual'
-    PLURALNAME: 'Págs. Virtuales'
    SINGULARNAME: 'Página Virtual'
--- a/lang/es_MX.yml
+++ b/lang/es_MX.yml
@ -29,8 +29,6 @@ es_MX:
    DELETE_PAGES: 'Eliminada del sito público'
    PUBLISHED_PAGES: 'Se publicaron %d páginas, %d fallos'
    PUBLISH_PAGES: Publicar
-    UNPUBLISHED_PAGES: '%d páginas no publicadas'
-    UNPUBLISH_PAGES: No publicadas
  CMSMain:
    DELETE: 'Eliminar del boceto del sitio'
    DELETEFP: Eliminar del sitio público
@ -40,7 +38,6 @@ es_MX:
    PUBALLFUN: 'Funcionalidad "Publicar todo"'
    PUBALLFUN2: "Al precionar este botón hará el equivalente de ir a cada página y precionar \"Publicar\". Está pensado para ser usado en edición masiva de contenido, por ejemplo cuando se construye el sitio por primera vez."
    REMOVEDPAGEFROMDRAFT: 'Se ha eliminado ''%s'' del boceto del sitio'
-    RESTORE: Restaurar
    ROLLBACK: 'Restaurar a ésta versión'
    SAVE: Guardar
  ContentControl:
@ -147,7 +144,6 @@ es_MX:
    DEFAULTABOUTTITLE: 'Sobre nosotros'
    DEFAULTCONTACTCONTENT: '<p>Usted puede llenar esta págna con su propio contenido, o eliminarla y crear sus propias páginas.<br /></p>'
    DEFAULTCONTACTTITLE: 'Contacto'
-    DEFAULTHOMECONTENT: '<p>¡Bienvenido a SilverStripe! Ésta es la página de Inicio predeterminada. Usted puede modificar esta página abriendo el <a href="admin/">CMS</a>. Ahora puede navegar por la <a href="http://doc.silverstripe.org">documentación del desarrollador</a>, o comenzar los <a href="href="http://doc.silverstripe.com/doku.php?id=tutorials">tutoriales</a></p>.'
    DEFAULTHOMETITLE: Inicio
    DEPENDENT_NOTE: 'Las siguientes páginas depender de esta página. Esto incluye páginas virtuales, redirección de páginas y páginas con enlaces de contenido.'
    DependtPageColumnLinkType: 'Tipo de enlace'
@ -194,5 +190,4 @@ es_MX:
    HAVEASKED: 'Has solicitado ver el contenido de nuestro sitio en'
  VirtualPage:
    HEADER: 'Esta es una página virtual'
-    PLURALNAME: 'Páginas virtuales'
    SINGULARNAME: 'Página virtual'
--- a/lang/et_EE.yml
+++ b/lang/et_EE.yml
@ -67,8 +67,6 @@ et_EE:
    DELETE_PAGES: 'Kustuta avaldatud lehekülgede hulgast'
    PUBLISHED_PAGES: 'Avaldatud %d lehte, %d tõrget'
    PUBLISH_PAGES: Avalda
-    UNPUBLISHED_PAGES: 'Tühistati %d lehe avaldamine'
-    UNPUBLISH_PAGES: Tühista avaldamine
  CMSMain:
    ACCESS: 'Juurdepääs jaotisele ''{title}'''
    ACCESS_HELP: 'Luba lehepuud ja sisu hõlmava jaotise vaatamine. Vaatamis- ja redigeerimisõigusi on võimalik hallata nii lehepõhiselt kui ka eraldi jaotise "Sisu õigused" abil.'
@ -95,7 +93,6 @@ et_EE:
    PageAdded: 'Lehekülje loomine õnnestus'
    REMOVEDPAGE: 'Leht ''{title}'' eemaldati avaldatud saitide hulgast'
    REMOVEDPAGEFROMDRAFT: '''%s'' eemaldatud visandi lehelt'
-    RESTORE: Taasta
    RESTORED: '''{title}'' taastati edukalt'
    ROLLBACK: 'Pööra tagasi sellesse versiooni'
    SAVE: Salvesta
@ -142,10 +139,6 @@ et_EE:
    FILTERDATEHEADING: Kuupäev
    FILTERDATETO: Kuni
    FILTERLABELTEXT: Sisu
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Muudetud lehed'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Kõik lehed, k.a kustutatud'
  CMSSiteTreeFilter_Search:
    Title: 'Kõik lehed'
  ContentControl:
@ -202,7 +195,6 @@ et_EE:
    DEFAULTSERVERERRORPAGETITLE: 'Serveri viga'
    DESCRIPTION: 'Kohandatud sisu erinevate tõrgete korral (nt "Lehte ei leitud")'
    ERRORFILEPROBLEM: 'Tõrge faili "{filename}" avamisel kirjutamiseks. Kontrollige faili õigusi.'
-    PLURALNAME: 'Vealeheküljed'
    SINGULARNAME: 'Vealehekülg'
  Folder:
    AddFolderButton: 'Lisa kaust'
@ -225,7 +217,6 @@ et_EE:
    HASBEENSETUP: 'Suunav lehekülg seati üles ilma, et ta kuhugile suunaks.'
    HEADER: 'See lehekülg suunab kasutajad teisele leheküljele'
    OTHERURL: 'Teise veebisaidi URL'
-    PLURALNAME: 'Ümbersuunamisleheküljed'
    REDIRECTTO: 'Suuna ümber'
    REDIRECTTOEXTERNAL: 'Teisele veebisaidile'
    REDIRECTTOPAGE: 'Leheküljele sinu veebisaidil'
@ -296,7 +287,6 @@ et_EE:
    DEFAULTABOUTTITLE: 'Meist'
    DEFAULTCONTACTCONTENT: '<p>võid selle lehe sisu muuta või selle ära kustutada.<br /></p>'
    DEFAULTCONTACTTITLE: 'Kontakt'
-    DEFAULTHOMECONTENT: '<p>Tere tulemast kasutama SilverStripe! sisuhaldust, see on algne avaleht.<br>Saad seda muuta <a href="admin/">Sisuhalduse lehel</a>. <br>Abiks on ka <a href="http://doc.silverstripe.com">Sisuhalduse dokumentatsioon</a> või <a href="http://doc.silverstripe.com/doku.php?id=tutorials">õppetus leht.</a></p>'
    DEFAULTHOMETITLE: Avaleht
    DELETEDPAGEHELP: 'Leht ei ole enam avaldatud'
    DELETEDPAGESHORT: Kustutatud
@ -374,7 +364,6 @@ et_EE:
    DESCRIPTION: 'Kuvab sisu teiselt lehelt'
    EditLink: redigeeri
    HEADER: 'See on virtuaalne leht'
-    PLURALNAME: 'Virtuaalsed lehed'
    PageTypNotAllowedOnRoot: 'Lehe originaaltüüp "{type}" ei ole selle virtuaalse lehe juurtasandil lubatud.'
    SINGULARNAME: 'Virtuaalne leht'
  CMSFileAddController:
--- a/lang/fa_IR.yml
+++ b/lang/fa_IR.yml
@ -39,7 +39,6 @@ fa_IR:
    DELETEFP: حذف کردن از منتشر شده های سایت
    EMAIL: پست الکترونیک
    PAGENOTEXISTS: 'این صفحه وجود ندارد'
-    RESTORE: بازنشاندن
    SAVE: ذخیره
  CMSPageHistoryController:
    SHOWVERSION: 'نمایش ویرایش'
@ -122,5 +121,4 @@ fa_IR:
    HAVEASKED: 'شما خواسته اید که درون‌مایه تارگاه ما را ببینید در'
  VirtualPage:
    HEADER: 'این یک صفحه مجازی است'
-    PLURALNAME: 'صفحه های مجازی'
    SINGULARNAME: 'صفحه مجازی'
--- a/lang/fi.yml
+++ b/lang/fi.yml
@ -67,8 +67,6 @@ fi:
    DELETE_PAGES: 'Poista julkaistulta sivustolta'
    PUBLISHED_PAGES: 'Julkaistu %d sivua, %d epäonnistumista'
    PUBLISH_PAGES: Julkaise
-    UNPUBLISHED_PAGES: 'Julkaisemattomat %d sivut'
-    UNPUBLISH_PAGES: Poista julkaisu
  CMSMain:
    ACCESS: 'Pääsy ''{title}'' -osioon'
    ACCESS_HELP: 'Oikeuttaa näkemään osion, joka sisältää sivurakenteen ja sisällön. Katselu- ja muokkausoikeuksia voidaan käsitellä sivukohtaisten pudotusvalikoiden kautta, kuten myös erillisestä "Sisällön oikeudet"-kohdasta.'
@ -100,7 +98,6 @@ fi:
    REMOVED: 'Poista ''{title}''{description} näkyvältä sivustolta'
    REMOVEDPAGE: '''{title}'' poistettiin julkaistulta sivustolta'
    REMOVEDPAGEFROMDRAFT: 'Poistettu ''%s'' luonnossivustolta'
-    RESTORE: Palauta
    RESTORED: '''{title}'' palautettiin onnistuneesti'
    ROLLBACK: 'Siirry takaisin tähän versioon.'
    ROLLEDBACKPUBv2: 'Palattiin takaisin julkaistuun versioon'
@ -151,10 +148,6 @@ fi:
    FILTERDATEHEADING: Pvm
    FILTERDATETO: Päättyen
    FILTERLABELTEXT: Sisältö
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Muuttuneet sivut'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Kaikki sivut, myös poistetut'
  CMSSiteTreeFilter_Search:
    Title: 'Kaikki sivut'
  ContentControl:
@ -314,7 +307,6 @@ fi:
    DEFAULTABOUTTITLE: 'Tietoa meistä'
    DEFAULTCONTACTCONTENT: '<p>Voit täyttää tämän sivun omalla sisällölläsi tai poistaa sen ja luoda omia sivujasi.<br /></p>'
    DEFAULTCONTACTTITLE: 'Ota yhteyttä meihin'
-    DEFAULTHOMECONTENT: '<p>Tervetuloa SilverStripeen! Tämä on oletus-kotisivu. Voit muokata tätä sivua kirjautumalla <a href="admin/">ylläpitonäkymään</a>. Voit myös lukea <a href="http://doc.silverstripe.com">kehittäjä-dokumentaatiota</a> tai aloittaa tutustumisen järjestelmään <a href="http://doc.silverstripe.com/doku.php?id=tutorials">johdatuskursseista</a>.</p>'
    DEFAULTHOMETITLE: Koti
    DELETEDPAGEHELP: 'Sivu ei ole enää julkaistuna'
    DELETEDPAGESHORT: Poistettu
@ -412,9 +404,3 @@ fi:
    MENUTITLE: 'Muokkaa sivua'
  CMSSettingsController:
    MENUTITLE: Asetukset
-  CMSSiteTreeFilter_StatusDeletedPages:
-    Title: 'Poistetut sivut'
-  CMSSiteTreeFilter_StatusDraftPages:
-    Title: 'Luonnokset julkaisemattomista sivuista'
-  CMSSiteTreeFilter_StatusRemovedFromDraftPages:
-    Title: 'Näkyvillä, mutta poistettu luonnoksista'
--- a/lang/fo.yml
+++ b/lang/fo.yml
@ -12,7 +12,6 @@ fo:
    PUBALLFUN: '"Ger alt alment" funka'
    PUBALLFUN2: "Við at trýsta á knøttin við tað sama henda, sum at fara inn á allar síðurnar og trýsta á \"Ger alment\". Endamálið við knøttunum er at hann skal brúkast, tá ið nógv innihald er blivið broytt, t.d. á einari nýggjari heimasíðu."
    REMOVEDPAGEFROMDRAFT: 'Strikaði ''%s'' frá kladdu heimasíðuni'
-    RESTORE: Endurstovna
    ROLLBACK: 'Far aftur til hesa útgávuna'
    SAVE: Goym
  ErrorPage:
--- a/lang/fr.yml
+++ b/lang/fr.yml
@ -67,8 +67,6 @@ fr:
    DELETE_PAGES: 'Supprimer du site publié'
    PUBLISHED_PAGES: '%d pages publiées, %d échecs'
    PUBLISH_PAGES: Publier
-    UNPUBLISHED_PAGES: '%d pages non publiées'
-    UNPUBLISH_PAGES: Non publiées
  CMSMain:
    ACCESS: 'Droits d’accès à la section « {title} »'
    ACCESS_HELP: 'Permettre l''affichage de la section contenant l''arborescence et le contenu. La gestion des permissions de visualisation et d''édition peut se faire à travers des liste spécifiques à chaque page. Et aussi la "Permission de contenu" séparé.'
@ -99,7 +97,6 @@ fr:
    REMOVED: '''{title}''{description} supprimé du site live'
    REMOVEDPAGE: '« {title} » a été éliminée du site public '
    REMOVEDPAGEFROMDRAFT: 'Supprimé ''%s'' du site de test'
-    RESTORE: Restaurer
    RESTORED: '« {title} » restaurée avec succès'
    ROLLBACK: 'Retourner à cette version'
    ROLLEDBACKPUBv2: 'Revenir à la version publiée'
@ -150,10 +147,6 @@ fr:
    FILTERDATEHEADING: Date
    FILTERDATETO: A
    FILTERLABELTEXT: Terme
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Pages modifiées'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Toutes les pages, y compris les supprimées'
  CMSSiteTreeFilter_Search:
    Title: 'Toutes les pages'
  ContentControl:
@ -212,7 +205,6 @@ fr:
    DEFAULTSERVERERRORPAGETITLE: 'Erreur du serveur'
    DESCRIPTION: 'Contenu personnalisé pour diverses erreurs (p. ex. « Page introuvable »)'
    ERRORFILEPROBLEM: ' L’ouverture du fichier « {filename} » afin de le modifier a provoqué une erreur ; vérifiez les droits d’accès au fichier. '
-    PLURALNAME: 'Pages d’erreur'
    SINGULARNAME: 'Page d’erreur'
  Folder:
    AddFolderButton: 'Ajouter un dossier'
@ -235,7 +227,6 @@ fr:
    HASBEENSETUP: 'Une page de redirection sans adresse de redirection a été créée.'
    HEADER: 'Cette page va rediriger les utilisateurs vers une autre page'
    OTHERURL: 'Autre URL de site web'
-    PLURALNAME: 'Pages de redirection'
    REDIRECTTO: 'Rediriger vers'
    REDIRECTTOEXTERNAL: 'Autre site web'
    REDIRECTTOPAGE: 'Une page de votre site web'
@ -311,7 +302,6 @@ fr:
    DEFAULTABOUTTITLE: 'Qui sommes nous ?'
    DEFAULTCONTACTCONTENT: '<p>Vous pouvez éditer cette page avec votre propre contenu ou supprimer celle-ci et créer vos propres pages.<br></p>'
    DEFAULTCONTACTTITLE: 'Contactez-nous'
-    DEFAULTHOMECONTENT: '<p>Bienvenue sur SilverStripe&nbsp;! Ceci est la page d’accueil par défaut. Vous pouvez la modifier dans le <a href="admin/">panneau d’administration</a> du CMS.  Vous pouvez consulter la <a href="http://doc.silverstripe.com">documentation développeur</a> ou commencer <a href="http://doc.silverstripe.com/doku.php?id=tutorials">les tutoriaux.</a></p>'
    DEFAULTHOMETITLE: Accueil
    DELETEDPAGEHELP: 'La page n’est plus publique '
    DELETEDPAGESHORT: Supprimée
@ -398,7 +388,6 @@ fr:
    EditLink: éditer
    HEADER: 'Cette page est virtuelle'
    HEADERWITHLINK: 'Ceci est une page virtuelle copiant le contenu de "{title}" ({link})'
-    PLURALNAME: 'Pages Virtuelles'
    PageTypNotAllowedOnRoot: 'Le type de page d’origine « {type} » n’est pas autorisé au niveau racine pour cette page virtuelle'
    SINGULARNAME: 'Page virtuelle'
  CMSFileAddController:
--- a/lang/gl_ES.yml
+++ b/lang/gl_ES.yml
@ -52,8 +52,6 @@ gl_ES:
    DELETE_PAGES: 'Eliminar do sitio publicado'
    PUBLISHED_PAGES: '%d páxinas publicadas, %d erros'
    PUBLISH_PAGES: Publicar
-    UNPUBLISHED_PAGES: '%d páxinas sen publicar'
-    UNPUBLISH_PAGES: Sen publicar
  CMSMain:
    AddNew: 'Engadir nova páxina'
    AddNewButton: 'Engadir novo'
@ -71,7 +69,6 @@ gl_ES:
    PUBALLFUN: 'Funcionalidade "Publicar Todo"'
    PUBALLFUN2: "Premendo este botón farás o equivalente de ir a todas as páxinas e premer en \"publicar\". \nIsto está pensado para facer un uso masivo despois das edicións de contido, por exemplo \ncando o sitio foi construído por primeira vez."
    REMOVEDPAGEFROMDRAFT: 'Eliminado ''%s''  do borrador do sitio'
-    RESTORE: Restaurar
    ROLLBACK: 'Desfacer a esta versión'
    SAVE: Gardar
    TabContent: Contido
@ -107,10 +104,6 @@ gl_ES:
    MULTISELECT: Selección múltiple
  CMSPagesController_Tools_ss:
    FILTER: Filtro
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Páxinas cambiadas'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Todas as páxinas, incluindo eliminadas'
  CMSSiteTreeFilter_Search:
    Title: 'Todas as páxinas'
  ContentControl:
@ -198,7 +191,6 @@ gl_ES:
    Content: Contido
    DEFAULTABOUTTITLE: 'Sobre nós'
    DEFAULTCONTACTTITLE: 'Contactarnos'
-    DEFAULTHOMECONTENT: '<p>Benvido a SilverStripe! Esta é a páxina de inicio por defecto. Podes editar esta páxina abrindo <a href="admin/">o CMS</a>. Agora podes acceder a <a href="http://doc.silverstripe.org">documentación do desenvolvedor</a>, ou comezar <a href="http://doc.silverstripe.org/doku.php?id=tutorials">os titoriais.</a></p>'
    DEFAULTHOMETITLE: Inicio
    DELETEDPAGESHORT: Eliminado
    DESCRIPTION: 'Páxina de contido xenérico'
@ -249,7 +241,6 @@ gl_ES:
  VirtualPage:
    DESCRIPTION: 'Visualizar o contido doutra páxina'
    HEADER: 'Esta é unha páxina virtual'
-    PLURALNAME: 'Páxs Virtuais'
    SINGULARNAME: 'Páxina Virtual'
  CMSFileAddController:
    MENUTITLE: Ficheiros
--- a/lang/he_IL.yml
+++ b/lang/he_IL.yml
@ -67,8 +67,6 @@ he_IL:
    DELETE_PAGES: 'מחיקה מאתר שפורסם'
    PUBLISHED_PAGES: 'פורסמו %d עמודים, %d שגיאות'
    PUBLISH_PAGES: פרסום
-    UNPUBLISHED_PAGES: 'בוטל פרסומם של %d עמודים'
-    UNPUBLISH_PAGES: ביטול הפרסום
  CMSMain:
    ACCESS: 'גישה לאגף ''{title}'''
    ACCESS_HELP: 'מתן האפשרות לצפות באגף המכיל את עץ העמודים והתוכן. ניתן לצפות ולערוך הרשאות באמצעות תיבות בחירה ייעודיות לכל עמוד, כמו גם „הרשאות התוכן“ הנפרדות.'
@ -95,7 +93,6 @@ he_IL:
    PageAdded: 'העמוד נוצר בהצלחה'
    REMOVEDPAGE: '''{title}'' הוסר מהאתר שפורסם'
    REMOVEDPAGEFROMDRAFT: '''$s'' הוסר מאתר הטיוטה'
-    RESTORE: שחזור
    RESTORED: '''{title}'' שוחזר בהצלחה'
    ROLLBACK: 'שחזור לגרסה זו'
    SAVE: שמירה
@ -142,10 +139,6 @@ he_IL:
    FILTERDATEHEADING: תאריך
    FILTERDATETO: עד
    FILTERLABELTEXT: תוכן
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'דפים ששונו'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'כל העמודים, לרבות אלו שנמחקו'
  CMSSiteTreeFilter_Search:
    Title: 'כל העמודים'
  ContentControl:
@ -200,7 +193,6 @@ he_IL:
    DEFAULTSERVERERRORPAGETITLE: 'שגיאת שרת'
    DESCRIPTION: 'תוכן מותאם אישית למקרי שגיאות שונים (לדוגמה: „העמוד לא נמצא“)'
    ERRORFILEPROBLEM: 'שגיאה בפתיחת הקובץ „{filename}“ לכתיבה. נא לבדוק את הרשאות הקובץ.'
-    PLURALNAME: 'עמודי שגיאה'
    SINGULARNAME: 'עמוד שגיאה'
  Folder:
    AddFolderButton: 'הוספת תיקייות'
@ -223,7 +215,6 @@ he_IL:
    HASBEENSETUP: 'נוצר דף הפניה ללא יעד'
    HEADER: 'העמוד הזה יוביל משתמשים לעמוד אחר'
    OTHERURL: 'כתובת של אתר אחר'
-    PLURALNAME: 'עמודי הפנייה'
    REDIRECTTO: 'העברה אל'
    REDIRECTTOEXTERNAL: 'אתר אחר'
    REDIRECTTOPAGE: 'עמוד באתר שלך'
@ -289,7 +280,6 @@ he_IL:
    DEFAULTABOUTTITLE: 'על אודותינו'
    DEFAULTCONTACTCONTENT: '<p>ניתן למלא עמוד זה בתוכן משלך, או למחוק אותו וליצור עמודים משלך.<br /></p>'
    DEFAULTCONTACTTITLE: 'יצירת קשר'
-    DEFAULTHOMECONTENT: '<p>ברוך בואך ל־SilverStripe! זהו עמוד הבית כבררת המחדל. ניתן לערוך עמוד זה על ידי פתיחת <a href="admin/">ה־CMS</a>. כעת ניתן לגשת <a href="http://doc.silverstripe.org">לתיעוד עבור המפתחים</a>, או לגשת ללמוד <a href="http://doc.silverstripe.org/doku.php?id=tutorials">מהמדריכים.</a></p>'
    DEFAULTHOMETITLE: דף הבית
    DELETEDPAGEHELP: 'העמוד אינו מפורסם עוד'
    DELETEDPAGESHORT: נמחק
@ -361,7 +351,6 @@ he_IL:
  VirtualPage:
    DESCRIPTION: 'הצגת תוכן של עמוד אחר'
    HEADER: 'זהו עמוד וירטואלי'
-    PLURALNAME: 'דפים וירטואליים'
    PageTypNotAllowedOnRoot: 'סוג העמוד המקורי „{type}“ אינו מורשה ברמת העל של עמוד וירטואלי זה'
    SINGULARNAME: 'דף וירטואלי'
  CMSFileAddController:
--- a/lang/hr.yml
+++ b/lang/hr.yml
@ -53,5 +53,4 @@ hr:
    HAVEASKED: 'Zatražili ste sadržaj naše stranice '
  VirtualPage:
    HEADER: 'Ovo je virtualna stranica'
-    PLURALNAME: 'Virtualne stranice'
    SINGULARNAME: 'Virtualna stranica'
--- a/lang/hu.yml
+++ b/lang/hu.yml
@ -9,6 +9,7 @@ hu:
    AppCategoryVideo: Videó
    BackToFolder: 'Vissza a mappába'
    CREATED: Dátum
+    CurrentFolderOnly: 'Csak mappán belül?'
    DetailsView: Részletek
    FILES: Állományok
    FROMTHEINTERNET: 'Internetről'
@ -17,6 +18,7 @@ hu:
    ListView: 'Lista nézet'
    NEWFOLDER: Új mappa
    SIZE: Méret
+    TreeView: '"Fa" nézet'
    Upload: Feltöltés
    MENUTITLE: Állományok
  AssetAdmin_DeleteBatchAction:
@ -32,14 +34,24 @@ hu:
    Back: Vissza
  BrokenLinksReport:
    Any: Bármely
+    BROKENLINKS: 'Hibás linkek listája'
    CheckSite: 'Oldal ellenőrzése'
    CheckSiteDropdownDraft: 'Oldal vázlata'
    CheckSiteDropdownPublished: 'Publikált oldal'
+    ColumnDateLastModified: 'Módosítás utolsó időpontja'
+    ColumnDateLastPublished: 'Publikálás utolsó időpontja'
    ColumnProblemType: 'Probléma típusa'
+    ColumnURL: Link
+    HasBrokenFile: 'Hiányzó fájl'
+    HasBrokenLink: 'Hibás link'
+    HasBrokenLinkAndFile: 'Hibás link és fájl'
    HoverTitleEditPage: 'Oldal szerkesztése'
    PageName: 'Oldal neve'
+    ReasonDropdown: 'Ellenőrizendő'
    ReasonDropdownBROKENFILE: 'Hibás állomány'
    ReasonDropdownBROKENLINK: 'Hibás hivatkozás'
+    ReasonDropdownRPBROKENLINK: '"Redirector" oldal nem létező oldalra hivatkozik'
+    ReasonDropdownVPBROKENLINK: 'Virtuális oldal nem létező oldalra hivatkozik'
    VirtualPageNonExistent: 'a virtuális oldal egy nem létező oldalra hivatkozik'
  CMSAddPageController:
    Title: 'Oldal hozzáadása'
@ -49,15 +61,21 @@ hu:
    DELETE_PAGES: 'Törlés a publikált oldalakból'
    PUBLISHED_PAGES: '%d oldal publikálva, %d hibás'
    PUBLISH_PAGES: Publikálni
-    UNPUBLISHED_PAGES: '%d publikálatlan oldal'
-    UNPUBLISH_PAGES: Publikálás visszavonása
  CMSMain:
    AddNew: 'Új oldal hozzáadása'
    AddNewButton: 'Új hozzáadása'
+    Cancel: Mégsem
+    ChoosePageParentMode: 'Adja meg az oldal létrehozásának helyét'
    ChoosePageType: 'Válassza ki az oldal típusát'
    Create: Létrehozni
    DELETE: 'Vázlat törlése'
    DELETEFP: Törlés
+    DESCREMOVED: 'és {count} gyerek'
+    DUPLICATED: '''{title}'' sikeresen duplikálva'
+    DUPLICATEDWITHCHILDREN: '''{title}'' és oldalai sikeresen duplikálva'
+    EMAIL: E-mail
+    EditTree: 'Menüszerkeszet módosítása'
+    ListFiltered: 'Szűrt lista'
    NEWPAGE: 'Új {pagetype}'
    PAGENOTEXISTS: 'Ez az oldal nem létezik.'
    PAGES: Oldalak
@ -66,12 +84,19 @@ hu:
    PUBALLCONFIRM: 'Minden oldal publikálása, fázistartalmak kitevése'
    PUBALLFUN: '"Összes publikálása" funkció'
    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."
+    PUBPAGES: '{count} oldalt publikált'
    PageAdded: 'Oldal sikeresen létrehozva'
+    REMOVED: '''{title}{description}'' törölve az éles oldalról'
+    REMOVEDPAGE: '''{title}'' törölve a publikált oldalról'
    REMOVEDPAGEFROMDRAFT: '''%s'' törlése a piszkozatoldalról'
-    RESTORE: Visszaállítás
+    RESTORED: '''{title}'' sikeresen helyreállítva'
    ROLLBACK: 'Visszaállítás ehhez a verzióhoz'
+    ROLLEDBACKPUBv2: 'Visszatérés a publikált verzióhoz.'
+    ROLLEDBACKVERSIONv2: '#%d verzió beállítva.'
    SAVE: Mentés
+    SAVEDRAFT: 'Piszkozat mentése'
    TabContent: Tartalom
+    TabHistory: Történet
    TabSettings: Beállítások
    TreeFilteredClear: 'Szűrő törlése'
    MENUTITLE: 'Oldal szerkesztése'
@ -82,16 +107,26 @@ hu:
    ParentMode_top: 'Felső szint'
    MENUTITLE: 'Oldal hozzáadása'
  CMSPageHistoryController:
+    COMPAREMODE: 'Összehasonlítás (select two)'
    COMPAREVERSIONS: 'Verziók összehasonlítása'
+    COMPARINGVERSION: '{version1} és {version2} verziók összehaonlítása. '
    REVERTTOTHISVERSION: 'Visszatérés erre a verzióra'
+    SHOWUNPUBLISHED: 'Publikálatlan verziók megjelenítése'
+    SHOWVERSION: 'Verzió megtekintése'
    VIEW: megtekintés
+    VIEWINGLATEST: 'Jelenleg ez az utolsó verzió'
+    VIEWINGVERSION: 'Verziószám: {version}'
+    MENUTITLE: Történet
  CMSPageHistoryController_versions_ss:
+    AUTHOR: Szerző
    NOTPUBLISHED: 'Nincs publikálva'
    PUBLISHER: Szerző
+    UNKNOWN: Ismeretlen
    WHEN: Mikor
  CMSPagesController:
    GalleryView: 'Galéria nézet'
    ListView: 'Lista nézet'
+    MENUTITLE: Oldalak
    TreeView: 'Fa nézet'
  CMSPagesController_Tools_ss:
    FILTER: Szűrő
@ -100,47 +135,65 @@ hu:
    FILTERDATEHEADING: Dátum
    FILTERDATETO: -ig
    FILTERLABELTEXT: Tartalom
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Változtatott oldalak'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Összes oldal, a töröltekkel együtt'
+  CMSSiteTreeFilter_Search:
+    Title: 'Összes oldal'
  ContentControl:
    NOTEWONTBESHOWN: 'Megjegyzés: ez az üzenet a látogatók számára nem jelenik meg'
  ContentController:
    ARCHIVEDSITE: 'Előnézeti verzió'
    ARCHIVEDSITEFROM: 'Archiválva'
+    CMS: Tartalomkezelő
+    DRAFT: Piszkozat
    DRAFTSITE: 'Vázlat oldal'
    DRAFT_SITE_ACCESS_RESTRICTION: 'Be kell jelentkezned a CMS jelszavaddal, hogy megtekinthesd a piszkozatot vagy az archivált tartalmat. <a href="%s">A publikált oldalra való visszatéréshez kattints ide.</a>'
+    Email: E-mail
    INSTALL_SUCCESS: 'Sikeres telepítés!'
    InstallFilesDeleted: 'A telepítő állományok sikeresen tőrőlve lettek.'
    InstallSuccessCongratulations: 'A SilverStripe sikeresen telepítve lett!'
    LOGGEDINAS: 'Bejelentkezve, mint'
    LOGIN: Bejelentkezés
    LOGOUT: 'Kijelentkezés'
+    NOTLOGGEDIN: 'Kijelentkezett'
+    PUBLISHED: Publikált
    PUBLISHEDSITE: 'Publikált oldal'
    Password: Jelszó
    UnableDeleteInstall: 'A telepítő állományok törlése nem sikerült. Kérjük törölje az alábbi állományokat kézzel.'
+    VIEWPAGEIN: 'Oldal megtekintése'
  ErrorPage:
    400: '400 - Hibás kérés'
+    401: '401 - Jogosulatlan kérés'
+    403: '403 - Tiltott hozzáférés'
    404: '404 - Az oldal nem létezik'
+    405: '405 - Tiltott Művelet'
+    406: '406 - Elfogadhatatlan művelet'
+    407: '407 - Proxy azonosítás szükséges'
+    408: '408 - Időtullépés'
    409: '409 - Konfliktus'
+    410: '410 - Kapcsolat bontva'
+    411: '411 - Hossz kötelező'
    CODE: 'Hibakód'
    DEFAULTERRORPAGETITLE: 'Az oldal nem található'
    DEFAULTSERVERERRORPAGETITLE: 'Szerver hiba'
-    PLURALNAME: 'Hiba oldalak'
+    PLURALNAME: 'Hibaoldalak'
    SINGULARNAME: 'Hiba oldal'
  Folder:
    AddFolderButton: 'Mappa hozzáadása'
    DELETEUNUSEDTHUMBNAILS: 'Nem használt bélyegképek törlése'
    UNUSEDFILESTITLE: 'Nem használt állományok'
    UNUSEDTHUMBNAILSTITLE: 'Nem használt bélyegképek'
+    UploadFilesButton: Feltöltés
  LeftAndMain:
    DELETED: Törölve.
+    PreviewButton: Előnézet
    SAVEDUP: Elmentve.
    SearchResults: 'Találatok'
  Permission:
    CMS_ACCESS_CATEGORY: 'CMS hozzáférés'
+  Permissions:
+    CONTENT_CATEGORY: 'Tartalommal kapcsolatos jogosultságok'
+    PERMISSIONS_CATEGORY: 'Szerepkörök kés jogosultságok'
  RedirectorPage:
+    DESCRIPTION: 'Átirányít belső oldalra'
    HASBEENSETUP: 'Egy átirányító oldal került létrehozásra, anélkül hogy lenne hova átirányítania.'
    HEADER: 'Ez az oldal egy másik oldalra fogja írányítani a felhasználókat'
    OTHERURL: 'Egy másik weboldal URL-je '
@ -151,28 +204,47 @@ hu:
    SINGULARNAME: 'Átirányító oldal'
    YOURPAGE: 'Oldal a weblapodon'
  ReportAdmin:
+    ReportTitle: Cím
    MENUTITLE: Jelentések
+  ReportAdminForm:
+    FILTERBY: 'Szűrés'
  SearchForm:
    GO: Mehet
    SEARCH: Keresés
    SearchResults: 'Találatok'
  SideReport:
+    BROKENFILES: 'Oldalak hibás fájl hivatkozásokkal'
    BROKENLINKS: 'Oldalak hibás hivatkozásokkal'
    BROKENREDIRECTORPAGES: 'RedirectorPage-ek törölt oldalakra hivatkoznak'
    BROKENVIRTUALPAGES: 'VirtualPages törölt oldalakra mutatnak'
+    BrokenLinksGroupTitle: 'Hibás linkek listája'
+    ContentGroupTitle: 'Tartalommal kapcsolatos riportok'
    EMPTYPAGES: 'Üres oldalak'
    LAST2WEEKS: 'Elmúlt 2 héten belül szerkesztett oldalak'
    OtherGroupTitle: Más
+    ParameterLiveCheckbox: 'Éles oldal megtekintése'
+    REPEMPTY: 'A {title} riport üres.'
+  SilverStripeNavigator:
+    ARCHIVED: Archiválva
  SilverStripeNavigatorLink:
+    ShareInstructions: 'Az oldal megosztásához másolja ki az alábbi linket'
    ShareLink: 'Hivatkozás megosztása'
+  SilverStripeNavigatorLinkl:
+    CloseLink: Bezár
  SiteConfig:
    DEFAULTTHEME: '(Alap téma használata)'
+    EDITHEADER: 'A webhely oldalai módosíthajtja'
+    EDIT_PERMISSION: 'Webhely konfiguráció'
    PLURALNAME: 'Oldal konfigurációk'
    SINGULARNAME: 'Oldal konfiguráció'
    SITENAMEDEFAULT: 'Az oldal neve'
+    SITETAGLINE: 'Webhely címsora'
    SITETITLE: 'Oldal címe'
    TABACCESS: Hozzáférés
+    TABMAIN: Fő
    THEME: Témák
+    TOPLEVELCREATE: 'A webhely legfelső szintjén oldalakat hozhat létre'
+    VIEWHEADER: 'A webhely oldalait olvashatják'
  SiteTree:
    ACCESSANYONE: Mindenki
    ACCESSHEADER: 'Ki láthatja ezt az oldalt a weblapon?'
@ -183,51 +255,91 @@ hu:
    ALLOWCOMMENTS: 'Megjegyzések engedélyezése ezen az oldalon?'
    BUTTONCANCELDRAFT: 'Piszkozaton végzett változtatások visszavonása'
    BUTTONCANCELDRAFTDESC: 'Piszkozat törlése, és vissztérés a jelenleg publikált oldalra'
+    BUTTONPUBLISHED: Publikálva
+    BUTTONSAVED: Elmentve
+    BUTTONSAVEPUBLISH: 'Ment és publikál'
    BUTTONUNPUBLISH: Publikálás visszavonása
    BUTTONUNPUBLISHDESC: 'Oldal eltávolítása a publikált oldalról'
    Comments: Kommentárok
    Content: Tartalom
+    DEFAULTABOUTTITLE: 'Rólunk'
    DEFAULTCONTACTTITLE: 'Kapcsolat'
+    DEFAULTHOMETITLE: Kezdőlap
+    DELETEDPAGEHELP: 'Az oldal nincs publikálva'
    DELETEDPAGESHORT: Törölve
+    DESCRIPTION: 'Egyszerű oldal'
    DependtPageColumnLinkType: 'Hivatkozás típusa'
+    DependtPageColumnURL: Link
    EDITANYONE: 'Bárki, aki be tud jelentkezni a CMS-be'
    EDITHEADER: 'Ki szerkesztheti ezt a CMS-ben?'
    EDITONLYTHESE: 'Csak ezek az emberek (válassz a listából)'
+    EDITORGROUPS: 'Szerkesztők csoportja'
    EDIT_ALL_DESCRIPTION: 'Bármely oldal szerkesztése'
+    Editors: 'Szerkesztők csoportja'
+    GroupPlaceholder: 'Válasszon csoportot'
    HASBROKENLINKS: 'Ez az oldal hibás linkeket tartalmaz.'
    HTMLEDITORTITLE: Tartalom
+    INHERIT: 'Azonos a szülő értékével'
+    LASTPUBLISHED: 'Publikálás utolsó időpontja'
+    LASTSAVED: 'Utoljára frissítve'
    LASTUPDATED: 'Utoljára frissítve'
    MENUTITLE: 'Navigációs cimke'
    METADESC: 'Leírás'
    METAEXTRA: 'Saját meta címkék'
+    MODIFIEDONDRAFTHELP: 'Az oldal egyes módosításai nincsenek publikálva'
    MODIFIEDONDRAFTSHORT: Változtatva
    MetadataToggle: Metaadatok
+    MoreOptions: 'További lehetőségek'
+    NOTPUBLISHED: 'Nincs publikálva'
+    PAGELOCATION: 'Oldal helyzete'
    PAGETITLE: 'Oldal neve'
    PAGETYPE: 'Oldal típusa'
+    PARENTID: 'Szülő oldal'
+    PARENTTYPE: 'Oldal helyzete'
    PARENTTYPE_ROOT: 'Felső szintű oldal'
+    PARENTTYPE_SUBPAGE: 'Aloldal'
+    PERMISSION_GRANTACCESS_DESCRIPTION: 'Tartalom hozzáférését szabályozza'
    PLURALNAME: Oldalak
+    PageTypNotAllowedOnRoot: 'A "{type}" oldal nem helyezkedhet el a gyökér szintjén'
+    PageTypeNotAllowed: 'A "{type}" oldal nem helyezkedhet el a kiválasztott szülő alá'
    REMOVEDFROMDRAFTHELP: 'Az oldal publikálva lett, de törölve lett a vázlatok közül'
    REMOVEDFROMDRAFTSHORT: 'Törölve a vázlatokból'
    REMOVE_INSTALL_WARNING: 'Figyelmeztetés: Törölje az install.php állományt a Silverstripe telepítéséből. '
    REORGANISE_DESCRIPTION: 'Oldal szerkezetének megváltoztatása'
+    REORGANISE_HELP: 'Az oldalak sorrendje egérrel átrendezhető.'
    SHOWINMENUS: 'Látható legyen a menükben?'
    SHOWINSEARCH: 'Látható legyen a keresésben?'
    SINGULARNAME: Oldal
    TABBEHAVIOUR: Viselkedés
    TABCONTENT: 'Tartalom'
+    TABDEPENDENT: 'Kapcsolodó oldalak'
    TOPLEVEL: 'Oldaltartalom (legfelső szint)'
+    TOPLEVELCREATORGROUPS: 'A legfelső szinten új elemeket létrehozhatnak'
    URLSegment: 'URL szegmens'
+    VIEWERGROUPS: 'Olvasási joggal rendelkező csoportok'
    VIEW_ALL_DESCRIPTION: 'Bármely oldal megtekintése'
+    VIEW_DRAFT_CONTENT: 'Piszkozat megtekintése'
+    Viewers: 'Olvasási joggal rendelkező csoportok'
    Visibility: Láthatóság
    has_one_Parent: 'Szülő oldal'
+    many_many_BackLinkTracking: 'Backlink követés'
    many_many_ImageTracking: 'Kép követése'
+    many_many_LinkTracking: 'Link követés'
  SiteTreeURLSegmentField:
+    EMPTY: 'Írjon be egy URL szegmenst, vagy kattitson a "mégse" feliratra'
    HelpChars: 'A speciális karakterek automatikusan konvertálódnak vagy törlődnek.'
+  URLSegmentField:
+    Cancel: Mégsem
+    Edit: Szerkeszt
+    OK: OK
  ViewArchivedEmail_ss:
    CANACCESS: 'Az archivált oldalt elérheted ezen a linken:'
    HAVEASKED: 'Azt kérted, hogy megnézhesd a honlapunk tartalmát ekkor:'
  VirtualPage:
+    CHOOSE: 'Hivatkozott oldal'
+    EditLink: szerkeszt
    HEADER: 'Ez egy virtuális oldal'
+    PLURALNAME: 'Virtuális oldalak'
    SINGULARNAME: 'Virtuális oldal'
  CMSFileAddController:
    MENUTITLE: Állományok
@ -235,3 +347,5 @@ hu:
    MENUTITLE: 'Oldal szerkesztése'
  CMSPageSettingsController:
    MENUTITLE: 'Oldal szerkesztése'
+  CMSSettingsController:
+    MENUTITLE: Beállítások
--- a/lang/id.yml
+++ b/lang/id.yml
@ -67,8 +67,6 @@ id:
    DELETE_PAGES: 'Hapus dari situs terbit'
    PUBLISHED_PAGES: 'Menerbitkan %d laman, %d gagal'
    PUBLISH_PAGES: Terbitkan
-    UNPUBLISHED_PAGES: '%d laman dibatalterbitkan'
-    UNPUBLISH_PAGES: Batalterbitkan
  CMSMain:
    ACCESS: 'Akses ke bagian ''{title}'''
    ACCESS_HELP: 'Perbolehkan menampilkan bagian dengan struktur laman dan konten. Perijinan menampilkan dan mengedit dapat diatur melalui pilihan terkait laman, sebagaimana "Perijinan Konten".'
@ -100,7 +98,6 @@ id:
    REMOVED: 'Dihapus ''{title}''{description} dari situs langsung'
    REMOVEDPAGE: 'Menghapus ''{title}'' dari situs terbit'
    REMOVEDPAGEFROMDRAFT: 'Menghapus ''%s'' dari draf situs'
-    RESTORE: Pulihkan
    RESTORED: 'Pemulihan ''{title}'' sukses'
    ROLLBACK: 'Kembali ke versi ini'
    ROLLEDBACKPUBv2: 'Kembali ke versi terbit'
@ -151,10 +148,6 @@ id:
    FILTERDATEHEADING: Tanggal
    FILTERDATETO: Ke
    FILTERLABELTEXT: Konten
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Laman yang berubah'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Semua laman, termasuk yang terhapus'
  CMSSiteTreeFilter_Search:
    Title: 'Semua laman'
  ContentControl:
@ -314,7 +307,6 @@ id:
    DEFAULTABOUTTITLE: 'Tentang Kami'
    DEFAULTCONTACTCONTENT: '<p>Anda dapat mengisi laman ini dengan konten Anda sendiri, atau menghapusnya dan membuat laman Anda sendiri.<br /></p>'
    DEFAULTCONTACTTITLE: 'Hubungi Kami'
-    DEFAULTHOMECONTENT: '<p>Selamat datang di SilverStripe! Ini adalah halaman awal situs Anda. Anda dapat mengedit laman ini dengan membuka <a href="admin/">CMS ini</a>. Selanjutnya Anda dapat mengakses <a href="http://doc.silverstripe.com">dokumentasi pengembang</a>, atau mulai dengan <a href="http://doc.silverstripe.com/doku.php?id=tutorials">tutorial-tutorial yang tersedia.</a></p>'
    DEFAULTHOMETITLE: Beranda
    DELETEDPAGEHELP: 'Laman tidak lagi terbit'
    DELETEDPAGESHORT: Hapus
--- a/lang/is.yml
+++ b/lang/is.yml
@ -2,7 +2,6 @@ is:
  CMSMain:
    DELETE: 'Eyða úr drögum'
    DELETEFP: Eyða úr birtum síðum
-    RESTORE: Endurheimta
    SAVE: Vista
  ContentController:
    LOGGEDINAS: 'Innskráður sem'
@ -52,7 +51,6 @@ is:
    DEFAULTABOUTTITLE: 'Um okkur'
    DEFAULTCONTACTCONTENT: '<p>Þú getur fyllt út þessa síðu með þínu efni  eða eytt því og búið til þína eigin síður<br/></p>'
    DEFAULTCONTACTTITLE: 'Hafa samband'
-    DEFAULTHOMECONTENT: '<p>Velkomin(n) á SilverStripe! Þetta er sjálfvalda heimasíðan. Þú getur breytt þessari síðu með því að opna <a href="admin/">kerfið</a>. Þú getur skoðað <a href="http://doc.silverstripe.com">hönnunar leiðbeiningarnar</a>, eða skoðað<a href="http://doc.silverstripe.com/doku.php?id=tutorials">kennsluna</a></p>'
    DEFAULTHOMETITLE: Heim
    EDITANYONE: 'Allir þeir sem geta innskráð sig í kerfið'
    EDITHEADER: 'Hver getur breytt þessu í kerfinu?'
@ -74,5 +72,4 @@ is:
    has_one_Parent: 'Yfir síða'
  VirtualPage:
    HEADER: 'Þetta er sýndarsíða'
-    PLURALNAME: 'Sýndar síða'
    SINGULARNAME: 'Sýndar síða'
--- a/lang/it.yml
+++ b/lang/it.yml
@ -62,19 +62,22 @@ it:
    Title: 'Aggiungi pagina'
  CMSBatchActions:
    DELETED_DRAFT_PAGES: 'Eliminate %d pagine dal sito bozza, %d non a buon fine'
-    DELETED_PAGES: 'Eliminate %d pagine dal sito pubblicato, %d non a buon fine'
+    DELETED_PAGES: 'Eliminate %d pagine dal sito pubbico, %d non a buon fine'
    DELETE_DRAFT_PAGES: 'Elimina dal sito bozza'
    DELETE_PAGES: 'Eliminata dal sito pubblicato'
    PUBLISHED_PAGES: 'Pubblicate %d pagine, %d non a buon fine'
    PUBLISH_PAGES: Pubblica
-    UNPUBLISHED_PAGES: '%d pagine non pubblicate'
-    UNPUBLISH_PAGES: Non pubblicare
+    UNPUBLISHED_PAGES: '%d pagine nascoste'
+    UNPUBLISH_PAGES: Nascondere
+    ARCHIVE: Archiviare
+    ARCHIVED_PAGES: '%d pagine archiviate'
  CMSMain:
    ACCESS: 'Accesso alla sezione ''{title}'''
    ACCESS_HELP: 'Consente la visualizzazione della sezione con l''albero delle pagine e i contenuti. I permessi di visualizzazione e modifica possono essere gestiti attraverso menù a tendina specifici della pagina, come dai separati "Permessi sui contenuti".'
    AddNew: 'Aggiungi nuova pagina'
    AddNewButton: 'Aggiungi nuova'
    AddPageRestriction: 'Nota: alcuni tipi di pagina non sono permessi in questa sezione'
+    Cancel: Annulla
    ChoosePageParentMode: 'Scegli dove creare questa pagina'
    ChoosePageType: 'Scegli tipo di pagina'
    Create: Crea
@ -99,8 +102,11 @@ it:
    REMOVED: '''{title}'' {description} rimosso dal sito pubblico'
    REMOVEDPAGE: 'Eliminata ''{title}'' dal sito pubblicato'
    REMOVEDPAGEFROMDRAFT: 'Eliminata ''%s'' dal sito bozza'
-    RESTORE: Ripristina
+    RESTORE: 'Ripristinare bozza'
+    RESTORE_TO_ROOT: 'Ripristinare bozza al primo livello'
+    RESTORE_TO_ROOT_DESC: 'Ripristinare la versione archiviata nella bozza come pagina di primo livello'
    RESTORED: 'Ripristinata ''{title}'' con successo'
+    RESTORE_DESC: 'Ripristinare la versione archiviata nella bozza'
    ROLLBACK: 'Ripristina a questa versione'
    ROLLEDBACKPUBv2: 'Ripristinata la versione pubblicata.'
    ROLLEDBACKVERSIONv2: 'Ripristinata la versione #%d.'
@ -112,9 +118,12 @@ it:
    TreeFiltered: 'Albero filtrato.'
    TreeFilteredClear: 'Azzera filtro'
    MENUTITLE: 'Modifica pagina'
+    ARCHIVE: Archiviare
+    ARCHIVEDPAGE: 'Pagina ''%s'' archiviata'
  CMSMain_left_ss:
    APPLY_FILTER: 'Applica filtro'
    RESET: Azzera
+    CLEAR_FILTER: 'Azzera filtro'
  CMSPageAddController:
    ParentMode_child: 'Sotto un''altra pagina'
    ParentMode_top: 'Primo livello'
@ -124,7 +133,7 @@ it:
    COMPAREVERSIONS: 'Confronta versioni'
    COMPARINGVERSION: 'Confronto versioni {version1} e {version2}.'
    REVERTTOTHISVERSION: 'Ripristina a questa versione'
-    SHOWUNPUBLISHED: 'Mostra versioni non pubblicate'
+    SHOWUNPUBLISHED: 'Mostra versioni nascoste'
    SHOWVERSION: 'Mostra versione'
    VIEW: vista
    VIEWINGLATEST: 'Attualmente visualizzata ultima versione.'
@ -151,11 +160,19 @@ it:
    FILTERDATETO: A
    FILTERLABELTEXT: Contenuto
  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Pagine cambiate'
+    Title: 'Pagine modificate'
  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Tutte le pagine, eliminate incluse'
+    Title: 'Tutte le pagine, comprese quelle archiviate'
+  CMSSIteTreeFilter_PublishedPages:
+    Title: 'Pagine pubblicate'
  CMSSiteTreeFilter_Search:
    Title: 'Tutte le pagine'
+  CMSSiteTreeFilter_StatusDeletedPages:
+    Title: 'Pagine archiviate'
+  CMSSiteTreeFilter_StatusDraftPages:
+    Title: 'Pagine bozza'
+  CMSSiteTreeFilter_StatusRemovedFromDraftPages:
+    Title: 'Live ma rimosse dalla bozza'
  ContentControl:
    NOTEWONTBESHOWN: 'Nota: questo messaggio non verrà mostrato ai visitatori'
  ContentController:
@ -199,6 +216,8 @@ it:
    415: '415 - Tipo di media non supportato'
    416: '416 - Intervallo di richiesta non soddisfacibile'
    417: '417 - Attesa fallita'
+    422: '422 - Entità non elaborabile'
+    429: '429 - Troppe richieste'
    500: '500 - Errore Interno del Server'
    501: '501 - Non implementato'
    502: '502 - Gateway errato'
@ -212,7 +231,7 @@ it:
    DEFAULTSERVERERRORPAGETITLE: 'Errore server'
    DESCRIPTION: 'Contenuto personalizzato per differenti casi di errore (es. "Pagina non trovata")'
    ERRORFILEPROBLEM: 'Errore nell''apertura del file "{filename}" per la scrittura. Controlla i permessi del file.'
-    PLURALNAME: 'Pagine errore'
+    PLURALNAME: 'Pagine di errore'
    SINGULARNAME: 'Pagine errore'
  Folder:
    AddFolderButton: 'Aggiungi cartella'
@ -303,7 +322,7 @@ it:
    BUTTONPUBLISHED: Pubblicato
    BUTTONSAVED: Salvato
    BUTTONSAVEPUBLISH: 'Salva & pubblica'
-    BUTTONUNPUBLISH: Non pubblicare
+    BUTTONUNPUBLISH: Nascondere
    BUTTONUNPUBLISHDESC: 'Rimuovi questa pagina dal sito pubblicato'
    Comments: Commenti
    Content: Contenuto
@ -311,7 +330,7 @@ it:
    DEFAULTABOUTTITLE: 'Chi siamo'
    DEFAULTCONTACTCONTENT: '<p>Puoi riempire questa pagina con i tuoi contenuti, oppure cancellarla e creare le tue pagine.<br /></p>'
    DEFAULTCONTACTTITLE: 'Contattaci'
-    DEFAULTHOMECONTENT: '<p>Benvenuto in SilverStripe! Questa è l''homepage di default. Puoi modificare questa pagina aprendo <a href="admin/">il CMS</a>. Puoi visualizzare adesso la <a href="http://doc.silverstripe.com">documentazione di sviluppo</a>, o iniziaren <a href="http://doc.silverstripe.com/doku.php?id=tutorials">i tutorial.</a></p>'
+    DEFAULTHOMECONTENT: '<p>Benvenuto in SilverStripe! Questa è la home page di default. Puoi modificare questa pagina direttamente <a href="admin/">dal CMS</a>.</p><p>Puoi accedere alla <a href="http://docs.silverstripe.org">documentazione per gli sviluppatori</a> o partire dalle <a href="http://www.silverstripe.org/learn/lessons">lezioni di SilverStripe</a>.</p>'
    DEFAULTHOMETITLE: Home
    DELETEDPAGEHELP: 'La pagina non è più pubblicata'
    DELETEDPAGESHORT: Eliminata
@ -339,7 +358,7 @@ it:
    METADESCHELP: 'I motori di ricerca utilizzano questo contenuto per visualizzare i risultati (ma non ne influenza la posizione)'
    METAEXTRA: 'Meta tag personalizzati'
    METAEXTRAHELP: 'Tag HTML per meta addizionali. Per esempio &lt;meta name="nomePersonalizzato" content="Il tuo contenuto personalizzato" /&gt;'
-    MODIFIEDONDRAFTHELP: 'La pagina ha modifiche non pubblicate'
+    MODIFIEDONDRAFTHELP: 'La pagina ha modifiche nascoste'
    MODIFIEDONDRAFTSHORT: Modificata
    MetadataToggle: Metadati
    MoreOptions: 'Altre opzioni'
@ -382,6 +401,9 @@ it:
    many_many_BackLinkTracking: 'Monitoriaggio link di ritorno'
    many_many_ImageTracking: 'Monitoraggio immagine'
    many_many_LinkTracking: 'Monitoraggio link'
+    ARCHIVEDPAGEHELP: 'Pagina rimossa da bozza e live'
+    ARCHIVEDPAGESHORT: Archiviato
+    BUTTONARCHIVEDESC: 'Nascondere e mettere in archivio'
  SiteTreeURLSegmentField:
    EMPTY: 'Perfavore inserisci un segmento URL o clicca cancella'
    HelpChars: 'I caratteri speciali sono automaticamente convertiti o eliminati.'
@ -409,3 +431,6 @@ it:
    MENUTITLE: 'Modifica pagina'
  CMSSettingsController:
    MENUTITLE: Impostazioni
+  SiteTreeFileExtension:
+    BACKLINK_LIST_DESCRIPTION: 'Questo elenco mostra tutte le pagine dove il file è stato aggiunto con l''editor WYSIWYG.'
+    EDIT: Modifica
--- a/lang/ja.yml
+++ b/lang/ja.yml
@ -67,8 +67,6 @@ ja:
    DELETE_PAGES: '公開サイトから削除'
    PUBLISHED_PAGES: '%dページを公開しましたが、%dページの公開に失敗しました。'
    PUBLISH_PAGES: 公開
-    UNPUBLISHED_PAGES: '%dページを非公開にしました'
-    UNPUBLISH_PAGES: 非公開
  CMSMain:
    ACCESS: '''{title}'' セクションにアクセス'
    ACCESS_HELP: 'ページツリーとコンテンツを含むセクションの閲覧を許可します。　表示および編集の権限は、ページの特定のドロップダウンだけでなく、独立した"コンテンツの権限"を介して処理することができます。'
@ -99,7 +97,6 @@ ja:
    REMOVED: 'この配信サイトから ''{title}''{description} を削除しました'
    REMOVEDPAGE: '''{title}''を公開されているサイトから削除しました'
    REMOVEDPAGEFROMDRAFT: '%sを下書きサイトから削除しました'
-    RESTORE: 復元
    RESTORED: '{title}を復旧しました'
    ROLLBACK: 'このバージョンへ戻す'
    ROLLEDBACKPUBv2: '公開されたバージョンにロールバックされました。'
@ -150,10 +147,6 @@ ja:
    FILTERDATEHEADING: 日付
    FILTERDATETO: 終了日
    FILTERLABELTEXT: コンテンツ
-  CMSSiteTreeFilter_ChangedPages:
-    Title: '変更されたページ'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: '全ページ（削除されたページも含む）'
  CMSSiteTreeFilter_Search:
    Title: '全ページ'
  ContentControl:
@ -212,7 +205,6 @@ ja:
    DEFAULTSERVERERRORPAGETITLE: 'サーバーエラー'
    DESCRIPTION: 'それぞれのエラーケースに対してカスタムコンテンツを表示する(例:"ページがありません")'
    ERRORFILEPROBLEM: '書き込み用のファイル"{filename}"を開く際にエラーが発生しました。　ファイルの権限を確認してください。'
-    PLURALNAME: 'エラーページ'
    SINGULARNAME: 'エラーページ'
  Folder:
    AddFolderButton: 'フォルダの追加'
@ -235,7 +227,6 @@ ja:
    HASBEENSETUP: '転送URLを含むページには、転送先がない状態で設定されています。'
    HEADER: 'このページをユーザーを変更して他のページにしますか？'
    OTHERURL: '他のウェブサイトのURL'
-    PLURALNAME: 'リダイレクトページ'
    REDIRECTTO: '変更は'
    REDIRECTTOEXTERNAL: '他のウェブサイト'
    REDIRECTTOPAGE: '貴方のウェブサイトを表示します'
@ -311,7 +302,6 @@ ja:
    DEFAULTABOUTTITLE: '私たちについて'
    DEFAULTCONTACTCONTENT: '<p>あなた自身、自由にページに書き込むことが出来、もちろん添削も自由に行えます。<br /></p>'
    DEFAULTCONTACTTITLE: '連絡はこちらまで'
-    DEFAULTHOMECONTENT: '<p>SilverStripeへようこそ！これはデフォルトのホームページです。このページを編集するには、<a href="admin/">CMS</a>にアクセスしてください。<a href="http://doc.silverstripe.org">開発者向けドキュメント</a>や、<a href="http://doc.silverstripe.org/doku.php?id=tutorials">チュートリアル</a>もご覧いただけます。</p>'
    DEFAULTHOMETITLE: ホーム
    DELETEDPAGEHELP: 'このページは今は公開されていません。'
    DELETEDPAGESHORT: 削除済
@ -398,7 +388,6 @@ ja:
    EditLink: 編集
    HEADER: 'これがバーチャルページです'
    HEADERWITHLINK: 'これは "{title}" ({link}) からコンテンツをコピーしている仮想ページです'
-    PLURALNAME: '仮想ページ'
    PageTypNotAllowedOnRoot: 'この仮想ページに対して元のページの種類{type}はルートレベルに配置されることが許可されていません。'
    SINGULARNAME: '仮想ページ'
  CMSFileAddController:
--- a/lang/ko.yml
+++ b/lang/ko.yml
@ -67,8 +67,6 @@ ko:
    DELETE_PAGES: '공개 사이트에서 삭제'
    PUBLISHED_PAGES: '%d페이지를 공개하고, %d페이지는 공개에서 실패했습니다.'
    PUBLISH_PAGES: 공개
-    UNPUBLISHED_PAGES: '%d페이지를 비공개시킴'
-    UNPUBLISH_PAGES: 비공개
  CMSMain:
    ACCESS: '''{title}'' 섹션으로 이동'
    ACCESS_HELP: '페이지 트리 및 내용을 포함 섹션의 열람을 허용합니다. 표시 및 편집 권한은 페이지의 특정 드롭 다운뿐만 아니라 독립적 인 "콘텐츠의 권한"을 통해 처리 할 수 있습니다.'
@ -100,7 +98,6 @@ ko:
    REMOVED: '이 전달 사이트에서''{title}''{description}을 제거했습니다.'
    REMOVEDPAGE: '''{title}''을 공개된 사이트에서 제거했습니다'
    REMOVEDPAGEFROMDRAFT: '%s 초안 사이트에서 제거했습니다'
-    RESTORE: 복원
    RESTORED: '{title}를 복구했습니다'
    ROLLBACK: '이 버전으로 복원'
    ROLLEDBACKPUBv2: '공개된 버전으로 롤백되었습니다.'
@ -151,10 +148,6 @@ ko:
    FILTERDATEHEADING: 날짜
    FILTERDATETO: 종료일
    FILTERLABELTEXT: 컨텐츠
-  CMSSiteTreeFilter_ChangedPages:
-    Title: '변경된 페이지'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: '전체 페이지 (삭제된 페이지도 포함)'
  CMSSiteTreeFilter_Search:
    Title: '전체 페이지'
  ContentControl:
@ -215,7 +208,6 @@ ko:
    DEFAULTSERVERERRORPAGETITLE: '서버 오류'
    DESCRIPTION: '각각의 오류 사례에 대해 사용자 지정 콘텐츠를 표시 (예: "페이지가 없습니다")'
    ERRORFILEPROBLEM: '쓰기용 파일 "{filename}"을 열때 오류가 발생했습니다. 파일 권한을 확인하십시오.'
-    PLURALNAME: '오류 페이지'
    SINGULARNAME: '오류 페이지'
  Folder:
    AddFolderButton: '폴더 추가'
@ -238,7 +230,6 @@ ko:
    HASBEENSETUP: '다른곳으로 리다이렉트되지않고 리다이렉터 페이지가 설치되었습니다.'
    HEADER: '이 페이지는 다른 페이지로 사용자들을 이동시킵니다.'
    OTHERURL: '다른 웹사이트 URL'
-    PLURALNAME: '리디렉션 페이지'
    REDIRECTTO: '변경'
    REDIRECTTOEXTERNAL: '다른 웹사이트'
    REDIRECTTOPAGE: '당신의 웹사이트의 페이지'
@ -314,7 +305,6 @@ ko:
    DEFAULTABOUTTITLE: '회사 소개'
    DEFAULTCONTACTCONTENT: '<p> 이 페이지에 내용을 자유롭게 채워넣을 수 있으며, 또한 삭제하거나 새로 만들 수 있습니다.<br /> </p>'
    DEFAULTCONTACTTITLE: '연락처'
-    DEFAULTHOMECONTENT: '<p> SilverStripe에 오신 것을 환영합니다!  이것은 기본 홈페이지입니다. 이 페이지를 편집하려면 <a href="admin/"> CMS </a>에 액세스하십시오. <a href="http: //doc.silverstripe.org"> 개발자 문서 </a>과 <a href="http: //doc.silverstripe.org/doku.php?id=tutorials"> 튜토리얼 </a>도 보실 수 있습니다. </p>'
    DEFAULTHOMETITLE: 홈
    DELETEDPAGEHELP: '이 문서는 더이상 공개되지 않습니다.'
    DELETEDPAGESHORT: 삭제됨
@ -401,7 +391,6 @@ ko:
    EditLink: 편집
    HEADER: '가상 페이지입니다'
    HEADERWITHLINK: '이것은 "{title}"({link})에서 콘텐츠를 복사하는 가상 페이지입니다'
-    PLURALNAME: '가상 페이지'
    PageTypNotAllowedOnRoot: '이 가상 페이지에 대해 원본 페이지 형식 {type}는 루트 레벨에 배치되는 것을 허용하지 않습니다.'
    SINGULARNAME: '가상 페이지'
  CMSFileAddController:
@ -412,9 +401,3 @@ ko:
    MENUTITLE: '페이지 편집'
  CMSSettingsController:
    MENUTITLE: 설정
-  CMSSiteTreeFilter_StatusDeletedPages:
-    Title: '삭제된 페이지들'
-  CMSSiteTreeFilter_StatusDraftPages:
-    Title: '초안, 공개안된 페이지들'
-  CMSSiteTreeFilter_StatusRemovedFromDraftPages:
-    Title: '살아있으나 초안으로부터는 제거됨'
--- a/lang/lt.yml
+++ b/lang/lt.yml
@ -67,8 +67,10 @@ lt:
    DELETE_PAGES: 'Trinti iš publikuojamos svetainės'
    PUBLISHED_PAGES: 'Publikuoti %d puslapiai, %d klaidų.'
    PUBLISH_PAGES: Publikuoti
-    UNPUBLISHED_PAGES: 'Nebepublikuojami %d puslapiai.'
+    UNPUBLISHED_PAGES: 'Nebepublikuojami %d puslapiai'
    UNPUBLISH_PAGES: Nebepublikuoti
+    ARCHIVE: Archyvuoti
+    ARCHIVED_PAGES: 'Suarchyvuoti %d puslapiai'
  CMSMain:
    ACCESS: 'Priėjimas prie ''{title}'' dalies'
    ACCESS_HELP: 'Leisti peržiūrėti svetainės medžio ir turinio skiltį. Peržiūros, bei redagavimo leidimai gali būti pakeisti per iškrentančius pasirinkimus ir per atskirus "Turinio leidimai".'
@ -100,8 +102,11 @@ lt:
    REMOVED: 'Iš publikuojamos svetainės ištrintas ''{title}''{description}'
    REMOVEDPAGE: 'Iš publikuojamos svetainės pašalintas ''{title}'''
    REMOVEDPAGEFROMDRAFT: '''%s'' pašalintas iš juodraštinės svetainės'
-    RESTORE: Atstatyti
+    RESTORE: 'Atstatyti juodraštį'
+    RESTORE_TO_ROOT: 'Atstatyti juodraštį aukščiausiame lygyje'
+    RESTORE_TO_ROOT_DESC: 'Atstatyti suarchyvuotą versiją kaip aukščiausio lygio juodraštinį puslapį'
    RESTORED: '''{title}'' atstatytas sėkmingai'
+    RESTORE_DESC: 'Atstatyti suarchyvuotą versiją kaip juodraštinį puslapį'
    ROLLBACK: 'Grįžti prie šios versijos'
    ROLLEDBACKPUBv2: 'Sugrįžta prie publikuotos versijos.'
    ROLLEDBACKVERSIONv2: 'Sugrįžta prie  #%d versijos.'
@ -113,9 +118,12 @@ lt:
    TreeFiltered: 'Filtruotas medis.'
    TreeFilteredClear: 'Išvalyti filtrą'
    MENUTITLE: 'Redaguoti puslapį'
+    ARCHIVE: Archyvas
+    ARCHIVEDPAGE: 'Suarchyvuotas puslapis ''%s'''
  CMSMain_left_ss:
    APPLY_FILTER: 'Vykdyti'
    RESET: Atstatyti
+    CLEAR_FILTER: 'Išvalyti filtrą'
  CMSPageAddController:
    ParentMode_child: 'Po kitu puslapiu'
    ParentMode_top: 'Aukščiausias lygmuo'
@ -154,9 +162,17 @@ lt:
  CMSSiteTreeFilter_ChangedPages:
    Title: 'Pakeisti puslapiai'
  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Visi puslapiai (ir ištrinti)'
+    Title: 'Visi puslapiai, kartu su suarchyvuotais'
+  CMSSIteTreeFilter_PublishedPages:
+    Title: 'Publikuoti puslapiai'
  CMSSiteTreeFilter_Search:
    Title: 'Visi puslapiai'
+  CMSSiteTreeFilter_StatusDeletedPages:
+    Title: 'Suarchyvuoti puslapiai'
+  CMSSiteTreeFilter_StatusDraftPages:
+    Title: 'Juyodraštiniai puslapiai'
+  CMSSiteTreeFilter_StatusRemovedFromDraftPages:
+    Title: 'Publikuotas, bet pašalintas iš juodraščių'
  ContentControl:
    NOTEWONTBESHOWN: 'Pastaba: ši žinutė nebus rodoma jūsų lankytojams'
  ContentController:
@ -314,7 +330,7 @@ lt:
    DEFAULTABOUTTITLE: 'Apie mus'
    DEFAULTCONTACTCONTENT: '<p>Jūs galite į šį puslapį patalpinti savo norimą turinį. Taip pat galite šį puslapį ištrinti ir sukurti visiškai naujus puslapius.<br /></p>'
    DEFAULTCONTACTTITLE: 'Kontaktai'
-    DEFAULTHOMECONTENT: '<p>Sveiki atvykę į SilverStripe! Tai yra pagrindinis puslapis. Jūs galite redaguoti šį puslapį atidarę <a href="admin/">TVS</a>. Dabar galite naudotis <a href="http://doc.silverstripe.com">programuotojų dokumentacija</a>, arba <a href = "http://doc.silverstripe.com/doku.php?id=tutorials">pradėti nuo pamokų.</a></p>'
+    DEFAULTHOMECONTENT: '<p>Sveiki atvykę į SilverStripe! Tai yra pagrindinis puslapis. Jūs galite redaguoti šį puslapį atsidarę <a href="admin/">TVS</a>. Dabar galite naudotis <a href="http://doc.silverstripe.com">programuotojų dokumentacija</a>, arba pradėti nuo <a href = "http://doc.silverstripe.com/doku.php?id=tutorials">SilverStripe pamokų.</a></p>'
    DEFAULTHOMETITLE: Pradžia
    DELETEDPAGEHELP: 'Puslapis nebepublikuojamas'
    DELETEDPAGESHORT: Ištrinti
@ -385,6 +401,9 @@ lt:
    many_many_BackLinkTracking: 'Atgalinis stebėjimas'
    many_many_ImageTracking: 'Paveikslėlių sekimas'
    many_many_LinkTracking: 'Nuorodos sekimas'
+    ARCHIVEDPAGEHELP: 'Puslapis pašalintas iš juodraščių ir publikuotų puslapių'
+    ARCHIVEDPAGESHORT: Archyvuota
+    BUTTONARCHIVEDESC: 'Nebepublikuoti ir suarchyvuoti'
  SiteTreeURLSegmentField:
    EMPTY: 'Prašome įvesti URL dalį arba spauskite atšaukti'
    HelpChars: 'Specialūs simboliai automatiškai pakeičiami arba pašalinami.'
@ -412,9 +431,6 @@ lt:
    MENUTITLE: 'Redaguoti puslapį'
  CMSSettingsController:
    MENUTITLE: Nustatymai
-  CMSSiteTreeFilter_StatusDeletedPages:
-    Title: 'Ištrinti puslapiai'
-  CMSSiteTreeFilter_StatusDraftPages:
-    Title: 'Juodraštiniai nepublikuoti puslapiai'
-  CMSSiteTreeFilter_StatusRemovedFromDraftPages:
-    Title: 'Publikuoti, bet pašalinti iš juodraščių'
+  SiteTreeFileExtension:
+    BACKLINK_LIST_DESCRIPTION: 'Šiame sąraše rodomi visi puslapiai, kurie turi per teksto redaktorių prisegtų bylų.'
+    EDIT: Redaguoti
--- a/lang/lv.yml
+++ b/lang/lv.yml
@ -2,7 +2,6 @@ lv:
  CMSMain:
    DELETE: 'Dzēst no melnrakstu vietnes'
    DELETEFP: Dzēst no publicētās vietnes
-    RESTORE: Restaurēt
    SAVE: Saglabāt
  ContentControl:
    NOTEWONTBESHOWN: 'Piezīme: šī ziņa nebūs redzama Jūsu apmeklētājiem'
@ -95,7 +94,6 @@ lv:
    DEFAULTABOUTTITLE: 'Par mums'
    DEFAULTCONTACTCONTENT: '<p>Jūs variet aizpildīt šo lapu ar savu saturu, vai dzēst šo lapu un izveidot savas lapas.<br /></p>'
    DEFAULTCONTACTTITLE: 'Sazinieties ar mums'
-    DEFAULTHOMECONTENT: '<p>Laipni lūgti Silverstripe! Šī ir noklusētā mājaslapa. Jūs varat labot šo lapu atverot <a href="admin/">CMS</a>. Jūs varat piekļūt <a href="http://doc.silverstripe.org">izstrādātāju dokumentācijai</a>, vai sākt ar <a href="http://doc.silverstripe.org/doku.php?id=tutorials">apmācību.</a></p>'
    DEFAULTHOMETITLE: Sākums
    DEPENDENT_NOTE: 'Sekojošās lapas ir atkarīgas no šīs lapas. Tās var būt virtuālās lapas, novirzītājlapas, un lapas, kas satur saites.'
    DependtPageColumnLinkType: 'Saites tips'
@ -143,5 +141,4 @@ lv:
    many_many_LinkTracking: 'Saišu izsekošana'
  VirtualPage:
    HEADER: 'Šī ir virtuāla lapa'
-    PLURALNAME: 'Virtuālās lapas'
    SINGULARNAME: 'Virtuālās lapa'
--- a/lang/mi.yml
+++ b/lang/mi.yml
@ -67,8 +67,6 @@ mi:
    DELETE_PAGES: 'Mukua i te pae kua whakaputaina'
    PUBLISHED_PAGES: '%d ngā whārangi kua whakaputaina, %d i rahua'
    PUBLISH_PAGES: Whakaputa
-    UNPUBLISHED_PAGES: ' %d ngā whārangi kua wetewhakaputaina'
-    UNPUBLISH_PAGES: Wete-whakaputa
  CMSMain:
    ACCESS: 'Uru ki te wāhanga ''{title}'' '
    ACCESS_HELP: 'Tukua kia kitea te wāhanga kei roto te whārangi rākau me ngā ihirangi. Ka taea te whakahaere i te tiro me te whakatika whakaaetanga mā ngā takaiho tauwhāiti-whārangi, mā "Ngā whakaaetanga ihirangi" motuhake hoki.'
@ -99,7 +97,6 @@ mi:
    REMOVED: 'I mukua te ''{title}''{description} i te pae ora'
    REMOVEDPAGE: 'I tango te ''{title}'' i te pae kua whakaputaina'
    REMOVEDPAGEFROMDRAFT: 'I tangohia a ''%s'' i te pae hukihuki'
-    RESTORE: Whakaora
    RESTORED: 'I momoho te whakaora i te ''{title}'''
    ROLLBACK: 'Hoki whakamuri ki tēnei putanga.'
    ROLLEDBACKPUBv2: 'I hoki ki te tauira kua whakaputaina.'
@ -150,10 +147,6 @@ mi:
    FILTERDATEHEADING: Rā
    FILTERDATETO: Ki
    FILTERLABELTEXT: Ngā Ihirangi
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Ngā whārangi kua hurihia'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Ngā whārangi katoa, tae atu ki ērā kua mukua'
  CMSSiteTreeFilter_Search:
    Title: 'Ngā Whārangi Katoa'
  ContentControl:
@ -212,7 +205,6 @@ mi:
    DEFAULTSERVERERRORPAGETITLE: 'Hapa tūmau'
    DESCRIPTION: 'Ngā ihirangi ritenga mō ngā take hapa rerekē (hei tauira. "Kāore i kitea te whārangi")'
    ERRORFILEPROBLEM: 'Kua hapa te whakatuwhera i te kōnae "{filename}" mō te tuhituhi. Tirohia ngā whakaaetanga kōnae.'
-    PLURALNAME: 'Ngā Whārangi Hapa'
    SINGULARNAME: 'Whārangi Hapa'
  Folder:
    AddFolderButton: 'Tāpiri kōpaki'
@ -235,7 +227,6 @@ mi:
    HASBEENSETUP: 'Kua tatū he whārangi tuku anō me te kore whai wāhi hei tuku anō.'
    HEADER: 'Ka tuku anō tēnei whārangi i ngā kaiwhakamahi ki whārangi kē'
    OTHERURL: 'Tētahi atu PRO paetukutuku'
-    PLURALNAME: 'Ngā Whārangi Tuku Anō'
    REDIRECTTO: 'Tukua anō ki'
    REDIRECTTOEXTERNAL: 'Tētahi atu paetukutuku'
    REDIRECTTOPAGE: 'Whārangi kei tō paetukutuku'
@ -311,7 +302,6 @@ mi:
    DEFAULTABOUTTITLE: 'Mō Mātou'
    DEFAULTCONTACTCONTENT: '<p>Ka taea te whakakī i tēnei whārangi ki āu ake ihirangi, te muku rānei me te hanga i āu ake whārangi.<br /></p>'
    DEFAULTCONTACTTITLE: 'Whakapā Mai'
-    DEFAULTHOMECONTENT: '<p>Nau mai ki SilverStripe! Ko tēnei te whārangi kāinga taunoa. Ka taea tēnei whārangi te whakatika mā te <a href="admin/">the CMS</a>. Ka taea ngā tuhinga kaiwhakawhanake <a href="http://doc.silverstripe.org">te uru</a>, te tīmata rānei i ngā akoranga <a href="http://doc.silverstripe.org/doku.php?id=tutorials">.</a></p>'
    DEFAULTHOMETITLE: Kāinga
    DELETEDPAGEHELP: 'Kua kore e whakaputaina te whārangi'
    DELETEDPAGESHORT: Kua Mukua
@ -398,7 +388,6 @@ mi:
    EditLink: Whakatika
    HEADER: 'He whārangi mariko tēnei'
    HEADERWITHLINK: 'He whārangi mariko tēnei e tārua ihirangi ana i "{title}" ({link})'
-    PLURALNAME: 'Ngā Whārangi Mariko'
    PageTypNotAllowedOnRoot: 'Kāore e whakaaetia te momo whārangi taketake "{type}" i te taumata pūtake o tēnei whārangi mariko'
    SINGULARNAME: 'Whārangi Mariko'
  CMSFileAddController:
--- a/lang/ms.yml
+++ b/lang/ms.yml
@ -31,7 +31,6 @@ ms:
    DEFAULTABOUTTITLE: 'Tentang Kami'
    DEFAULTCONTACTCONTENT: '<p>Anda bole isikan kandungan anda sendiri ke dalam mukasurat ini. atau padamkannya dan hasilkan mukasurat yang baru untuk menggantikannya.<br /></p>'
    DEFAULTCONTACTTITLE: 'Hubungi Kami'
-    DEFAULTHOMECONTENT: '<p>Selamat datang ke laman SilverStripe! Ini adalah laman utama yang asal. Anda boleh menyunting mukasurat ini dengan menggunakan <a href="admin/">CMS yang disediakan</a>. Untuk bantuan, sila lawati <a href="http://doc.silverstripe.com">dukumentasi pembangun perisian</a>, atau mula menggunakan <a href="http://doc.silverstripe.com/doku.php?id=tutorials">dokumen tutorial.</a></p>'
    DEFAULTHOMETITLE: Utama
    EDITANYONE: 'Sesiapa sahaja yang boleh mendaftar masuk ke CMS'
    EDITHEADER: 'Siapa yang boleh melakukan penyuntingan menggunakan CMS?'
@ -52,5 +51,4 @@ ms:
    has_one_Parent: 'Halaman Induk'
  VirtualPage:
    HEADER: 'Ini adalah mukasurat maya'
-    PLURALNAME: 'Halaman-halaman Maya'
    SINGULARNAME: 'Halaman Maya'
--- a/lang/nb.yml
+++ b/lang/nb.yml
@ -67,8 +67,6 @@ nb:
    DELETE_PAGES: 'Slett fra publisert side'
    PUBLISHED_PAGES: 'Publiserte %d sider, %d feilet.'
    PUBLISH_PAGES: Publiser
-    UNPUBLISHED_PAGES: 'Avpubliserte %d sider'
-    UNPUBLISH_PAGES: Avpubliser
  CMSMain:
    ACCESS: 'Adgang til seksjon for ''{title}'''
    ACCESS_HELP: 'Lar deg se seksjonen som inneholder sidetreet og annet innhold. Tillatelser for å vise og redigere kan behandles gjennom sidespesifikke nedtrekkslister, så vel som  separate "Innholdstillatelser".'
@ -99,7 +97,6 @@ nb:
    REMOVED: 'Slettet "{title}" {description} fra publisert nettsted.'
    REMOVEDPAGE: 'Fjernet "{title}" fra det publiserte nettstedet'
    REMOVEDPAGEFROMDRAFT: 'Fjernet ''%s''  fra utkastnettstedet'
-    RESTORE: Gjenopprett
    RESTORED: 'Vellykket gjenoppretting av "{title}".'
    ROLLBACK: 'Tilbakestill til denne versjonen'
    ROLLEDBACKPUBv2: 'Tilbakestilte til den publiserte versjonen.'
@ -150,10 +147,6 @@ nb:
    FILTERDATEHEADING: Dato
    FILTERDATETO: Til
    FILTERLABELTEXT: Innhold
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Endrede sider'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Alle sider, inkludert slettede'
  CMSSiteTreeFilter_Search:
    Title: 'Alle sider'
  ContentControl:
@ -212,7 +205,6 @@ nb:
    DEFAULTSERVERERRORPAGETITLE: 'Serverfeil'
    DESCRIPTION: 'Egendefinert innhold for forskjellige feilsituasjoner (f.eks "Siden ble ikke funnet")'
    ERRORFILEPROBLEM: 'Feil ved åpning av filen "{filename}". Vennligst sjekk filtillatelser.'
-    PLURALNAME: 'Feilsider'
    SINGULARNAME: 'Feilside'
  Folder:
    AddFolderButton: 'Legg til mappe'
@ -235,7 +227,6 @@ nb:
    HASBEENSETUP: 'En omdirigeringssside har blitt satt opp uten et mål å omdirigere til.'
    HEADER: 'Denne siden vil omdirigere brukere til en annen side'
    OTHERURL: 'Nettadresse til et annet nettsted'
-    PLURALNAME: 'Omdirigeringssider'
    REDIRECTTO: 'Omdiriger til'
    REDIRECTTOEXTERNAL: 'Et annet nettsted'
    REDIRECTTOPAGE: 'En side på nettstedet'
@ -311,7 +302,6 @@ nb:
    DEFAULTABOUTTITLE: 'Om oss'
    DEFAULTCONTACTCONTENT: '<p>Du kan fylle denne siden med ditt innhold, eller du kan slette siden og lage dine egne sider.<br /></p>'
    DEFAULTCONTACTTITLE: 'Kontakt oss'
-    DEFAULTHOMECONTENT: '<p>Velkommen til SilverStripe! Dette er en standard side som vi har opprettet for deg. Du kan redigere denne siden ved å åpne <a href="admin/">publiseringssystemet</a>. Du kan nå se på <a href="http://doc.silverstripe.com">dokumentasjonen for utviklere</a>, eller begynne å <a href="http://doc.silverstripe.com/doku.php?id=tutorials">lære SilverStripe.</a></p>'
    DEFAULTHOMETITLE: Hjem
    DELETEDPAGEHELP: 'Siden er ikke lenger publisert.'
    DELETEDPAGESHORT: Slettet
@ -398,7 +388,6 @@ nb:
    EditLink: rediger
    HEADER: 'Dette er en virituell side'
    HEADERWITHLINK: 'Dette er en virtuell side som kopierer innhold fra "{title}" ({link})'
-    PLURALNAME: 'Virtuelle sider'
    PageTypNotAllowedOnRoot: 'Originaltypen "{type}" er ikke tillatt på toppnivået for denne virtuelle siden.'
    SINGULARNAME: 'Virtuell side'
  CMSFileAddController:
--- a/lang/nl.yml
+++ b/lang/nl.yml
@ -67,8 +67,6 @@ nl:
    DELETE_PAGES: 'Verwijder van gepubliceerde site'
    PUBLISHED_PAGES: '%d pagina''s gepubliceerd'
    PUBLISH_PAGES: Publiceer
-    UNPUBLISHED_PAGES: 'Publicatie van %d pagina''s ingetrokken'
-    UNPUBLISH_PAGES: Publicatie intrekken
  CMSMain:
    ACCESS: 'Toegang tot het ''{title}'' gedeelte'
    ACCESS_HELP: 'Bevoegdheid om paginastructuur en inhoud te bekijken. Bekijk- en bewerkingstoestemmingen kunnen worden toegekend met pagina-specifieke menu''s en het aparte "Inhoudsmachtigingen".'
@ -100,7 +98,6 @@ nl:
    REMOVED: '''{title}''{description} verwijderd van de live site'
    REMOVEDPAGE: '''{title}'' is van de gepubliceerde site verwijderd'
    REMOVEDPAGEFROMDRAFT: '''%s'' is verwijderd uit de concept site'
-    RESTORE: Herstel
    RESTORED: '''{title}'' is met succes hersteld'
    ROLLBACK: 'Terugdraaien naar deze versie'
    ROLLEDBACKPUBv2: 'Teruggedraaid naar gepubliceerde versie.'
@ -151,10 +148,6 @@ nl:
    FILTERDATEHEADING: Datum
    FILTERDATETO: Tot
    FILTERLABELTEXT: Inhoud
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Gewijzigde pagina''s'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Alle pagina''s (inclusief verwijderde)'
  CMSSiteTreeFilter_Search:
    Title: 'Alle pagina''s'
  ContentControl:
@ -215,7 +208,6 @@ nl:
    DEFAULTSERVERERRORPAGETITLE: 'Probleem met de server'
    DESCRIPTION: 'Aangepaste tekst voor verschillende foutmeldingen (bv. "Pagina niet gevonden")'
    ERRORFILEPROBLEM: 'Fout: "{filename}" kan niet geopend worden om te schrijven. Controleer alstublieft de bestandspermissies.'
-    PLURALNAME: 'Foutpagina''s'
    SINGULARNAME: 'Foutpagina'
  Folder:
    AddFolderButton: 'Map toevoegen'
@ -238,7 +230,6 @@ nl:
    HASBEENSETUP: 'Er is een verwijspagina opgezet zonder ergens naar te verwijzen.'
    HEADER: 'Deze pagina zal gebruikers naar een andere pagina doorsturen (redirect)'
    OTHERURL: 'Andere website URL'
-    PLURALNAME: 'Verwijzingspagina''s'
    REDIRECTTO: 'Doorverwijzen naar'
    REDIRECTTOEXTERNAL: 'Een andere website'
    REDIRECTTOPAGE: 'Een pagina op deze website'
@ -314,7 +305,6 @@ nl:
    DEFAULTABOUTTITLE: 'Over Ons'
    DEFAULTCONTACTCONTENT: '<p>Je kan deze pagina vullen met je eigen inhoud, of ze verwijderen en je eigen pagina''s aanmaken.</p>'
    DEFAULTCONTACTTITLE: 'Contact'
-    DEFAULTHOMECONTENT: '<p>Welkom bij Silverstripe! Dit is de standaard homepagina. Je kan deze pagina wijzigen door <a href="admin/">het CMS</a> te openen. Je kan nu de <a href="http://doc.silverstripe.org">documentatie voor ontwikkelaars</a> bekijken, of aan <a href="http://doc.silverstripe.org/doku.php?id=tutorials">de tutorials</a> beginnen.'
    DEFAULTHOMETITLE: Home
    DELETEDPAGEHELP: 'Deze pagina is niet langer gepubliceerd'
    DELETEDPAGESHORT: Verwijderd
@ -401,7 +391,6 @@ nl:
    EditLink: wijzigen
    HEADER: 'Dit is een virtuele pagina'
    HEADERWITHLINK: 'Dit is een virtuele pagina met de inhoud van "{title}" ({link})'
-    PLURALNAME: 'Virtuele pagina''s'
    PageTypNotAllowedOnRoot: 'Voor deze virtuele pagina is het originele paginatype "{type}" niet toegestaan op het hoogste niveau.'
    SINGULARNAME: 'Virtuele pagina'
  CMSFileAddController:
@ -412,9 +401,3 @@ nl:
    MENUTITLE: 'Wijzig pagina'
  CMSSettingsController:
    MENUTITLE: Instellingen
-  CMSSiteTreeFilter_StatusDeletedPages:
-    Title: 'Verwijderde pagina''s'
-  CMSSiteTreeFilter_StatusDraftPages:
-    Title: 'Niet gepubliceerde concept pagina''s'
-  CMSSiteTreeFilter_StatusRemovedFromDraftPages:
-    Title: 'Gepubliceerd maar verwijderd uit concept'
--- a/lang/pl.yml
+++ b/lang/pl.yml
@ -67,8 +67,6 @@ pl:
    DELETE_PAGES: 'Usuń z opublikowanej witryny'
    PUBLISHED_PAGES: 'Opublikowano %d stron, %d się nie powiodło'
    PUBLISH_PAGES: Opublikuj
-    UNPUBLISHED_PAGES: 'Usunięto z opublikowanych %d stron'
-    UNPUBLISH_PAGES: Cofnij publikację
  CMSMain:
    ACCESS: 'Dostęp do sekcji ''{title}'''
    ACCESS_HELP: 'Zezwala na oglądanie sekcji zawierających drzewo stron oraz treść. Prawo Przeglądaj i edytuj może być obsługiwane przez pola wyboru dostępne na stronach oraz poprzez zakładkę uprawnień.'
@ -100,7 +98,6 @@ pl:
    REMOVED: 'Usunięto ''{title}''{description} z witryny'
    REMOVEDPAGE: 'Usunięto ''{title}'' z opublikowanej witryny'
    REMOVEDPAGEFROMDRAFT: '''%s'' usunięto ze szkiców'
-    RESTORE: Przywróć
    RESTORED: 'Pomyślnie przywrócono ''{title}'''
    ROLLBACK: 'Wróć do tej wersji'
    ROLLEDBACKPUBv2: 'Przywrócono opublikowaną wersję'
@ -151,10 +148,6 @@ pl:
    FILTERDATEHEADING: Data
    FILTERDATETO: Do
    FILTERLABELTEXT: Zawartość
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Zmienione strony'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Wszystkie strony włącznie z usuniętymi'
  CMSSiteTreeFilter_Search:
    Title: 'Wszystkie strony'
  ContentControl:
@ -215,7 +208,6 @@ pl:
    DEFAULTSERVERERRORPAGETITLE: 'Błąd serwera'
    DESCRIPTION: 'Własna zawartość dla różnych błędów (np. "Strona nie została znaleziona")'
    ERRORFILEPROBLEM: 'Błąd podczas otwierania pliku "{filename}". Proszę sprawdzić uprawnienia do plików.'
-    PLURALNAME: 'Strony błędów'
    SINGULARNAME: 'Strona błędów'
  Folder:
    AddFolderButton: 'Dodaj katalog'
@ -238,7 +230,6 @@ pl:
    HASBEENSETUP: 'Strona przekierowująca została ustawiona bez celu, do którego ma przekierowywać.'
    HEADER: 'Ta strona przeniesie użytkowników na inną stronę'
    OTHERURL: 'Adres URL innej strony'
-    PLURALNAME: 'Strony przekierowujące'
    REDIRECTTO: 'Przenieś do'
    REDIRECTTOEXTERNAL: 'Inna strona'
    REDIRECTTOPAGE: 'Strona na Twojej witrynie'
@ -314,7 +305,6 @@ pl:
    DEFAULTABOUTTITLE: 'O nas'
    DEFAULTCONTACTCONTENT: '<p>Możesz wypełnić tę stronę własną treścią, usunąć ją i tworzyć własne strony.<br /></p>'
    DEFAULTCONTACTTITLE: 'Kontakt'
-    DEFAULTHOMECONTENT: '<p>Witaj w SilverStripe! To jest domyślna strona główna. Możesz ją edytować, otwierając <a href="admin/">CMS</a>. Możesz również otworzyć <a href="http://doc.silverstripe.com">dokumentację dla developerów</a>, lub rozpocząć <a href="http://doc.silverstripe.com/doku.php?id=tutorials">jeden z samouczków.</a></p>'
    DEFAULTHOMETITLE: Strona główna
    DELETEDPAGEHELP: 'Strona nie jest już opublikowana'
    DELETEDPAGESHORT: Usunięty
@ -401,7 +391,6 @@ pl:
    EditLink: edytuj
    HEADER: 'To jest wirtualna strona'
    HEADERWITHLINK: 'Strona wirtualna odzwierciedlająca treść "{title}" ({link})'
-    PLURALNAME: 'Wirtualne Strony'
    PageTypNotAllowedOnRoot: '"{type}" nie jest dozwolona dla głównego poziomu wirtualnej strony'
    SINGULARNAME: 'Wirtualna Strona'
  CMSFileAddController:
@ -412,9 +401,3 @@ pl:
    MENUTITLE: 'Edytuj stronę'
  CMSSettingsController:
    MENUTITLE: Ustawienia
-  CMSSiteTreeFilter_StatusDeletedPages:
-    Title: 'Usunięte strony'
-  CMSSiteTreeFilter_StatusDraftPages:
-    Title: 'Szkic nieopublikowanych stron'
-  CMSSiteTreeFilter_StatusRemovedFromDraftPages:
-    Title: 'Opublikowana ale usunięta ze szkicu strony'
--- a/lang/pt.yml
+++ b/lang/pt.yml
@ -64,7 +64,6 @@ pt:
    DELETE_DRAFT_PAGES: 'Apagar do site de rascunho'
    PUBLISHED_PAGES: 'Publicadas %d páginas, %d falhas'
    PUBLISH_PAGES: Publicar
-    UNPUBLISHED_PAGES: '%d páginas não publicadas'
  CMSMain:
    ACCESS: 'Acesso à secção ''{title}'''
    ACCESS_HELP: 'Permitir a visualização da árvore de páginas e respectivos conteúdos. Ver e editar permissões que podem ser seleccionadas a partir de uma caixa de selecção, bem como os separadores de "permissões de conteúdo".'
@ -93,7 +92,6 @@ pt:
    PageAdded: 'Página criada com sucesso'
    REMOVEDPAGE: 'Remover ''{title}'' do site publicado'
    REMOVEDPAGEFROMDRAFT: 'Removido ''%s'' do site de rascunho'
-    RESTORE: Restaurar
    RESTORED: '''{title}'' restaurado com sucesso'
    ROLLBACK: 'Voltar para esta versão'
    ROLLEDBACKPUBv2: 'Voltar para a versão publicada.'
@ -144,10 +142,6 @@ pt:
    FILTERDATEHEADING: Data
    FILTERDATETO: Para
    FILTERLABELTEXT: Conteúdo
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Páginas alteradas'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Todas as páginas, incluindo apagadas'
  CMSSiteTreeFilter_Search:
    Title: 'Todas as páginas'
  ContentControl:
@ -199,7 +193,6 @@ pt:
    DEFAULTSERVERERRORPAGETITLE: '500 - Erro do servidor'
    DESCRIPTION: 'Conteúdo personalizado para as diferentes possibilidades de erro (ex. página não encontrada)'
    ERRORFILEPROBLEM: 'Erro ao escrever no ficheiro "{filename}". Por favor, verifique as permissões do ficheiro.'
-    PLURALNAME: 'Página de erro'
    SINGULARNAME: 'Página de erro'
  Folder:
    AddFolderButton: 'Adicionar pasta'
@ -222,7 +215,6 @@ pt:
    HASBEENSETUP: 'Uma página de redireccionamento foi criada sem nenhum destino.'
    HEADER: 'Esta página irá redireccionar os utilizadores para outra página'
    OTHERURL: 'Outro Site'
-    PLURALNAME: 'Página de redirecção'
    REDIRECTTO: 'Redireccionar para'
    REDIRECTTOEXTERNAL: 'Outro site'
    REDIRECTTOPAGE: 'Uma página no seu site'
@ -288,7 +280,6 @@ pt:
    DEFAULTABOUTTITLE: 'Quem Somos'
    DEFAULTCONTACTCONTENT: '<p>Pode preencher esta página com o seu próprio conteúdo, ou apagá-la e criar as suas próprias páginas.</p>'
    DEFAULTCONTACTTITLE: 'Contacte-nos'
-    DEFAULTHOMECONTENT: '<p>Bem-vido ao SilverStripe! Esta é a página principal. Pode editar esta página acedendo ao <a href="admin/">CMS</a>. Poderá também visitar a <a href="http//doc.silverstripe.com">documentação para desenvolvimento</a>, ou começar <a href="http://doc.silverstripe.com/doku.php?id=tutorials">pelos tutoriais.</a></p>'
    DEFAULTHOMETITLE: Página Principal
    DELETEDPAGEHELP: 'A página nunca mais será publicada'
    DELETEDPAGESHORT: Apagada
@ -360,7 +351,6 @@ pt:
    EditLink: editar
    HEADER: 'Esta é uma página virtual'
    HEADERWITHLINK: 'Esta é uma página virtual com o conteúdo copiado da página "{title}" ({link})'
-    PLURALNAME: 'Páginas Virtuais'
    PageTypNotAllowedOnRoot: 'Páginas do tipo "{type}" não tem permissões para serem criadas a este nível.'
    SINGULARNAME: 'Página Virtual'
  CMSFileAddController:
--- a/lang/pt_BR.yml
+++ b/lang/pt_BR.yml
@ -12,7 +12,6 @@ pt_BR:
    PUBALLFUN: 'Funcionalidade "Publicar Tudo"'
    PUBALLFUN2: "Apertar este botão equivale a ir em cada página individualmente e clicar em \"Publicar\". Serve para ser usado em situações em que foram editadas grandes quantidades de conteúdo, como por exemplo quando o site foi inicialmente construído."
    REMOVEDPAGEFROMDRAFT: 'Removido ''%s''  do site de rascunho'
-    RESTORE: Restaurar
    ROLLBACK: 'Reverter para esta versão'
    SAVE: Salvar
  ErrorPage:
@ -76,7 +75,6 @@ pt_BR:
    DEFAULTABOUTTITLE: 'Sobre nós'
    DEFAULTCONTACTCONTENT: '<p>Você pode alimentar esta página com seu próprio conteúdo, ou excluir esta página e criar as suas proprias.<br /></p>'
    DEFAULTCONTACTTITLE: 'Contato'
-    DEFAULTHOMECONTENT: '<p>Bem vindo ao SilverStripe! Esta é a página padrão de entrada. Você pode editar esta página abrindo o <a href="admin/">a area de administração CMS</a>. Você pode acessar a <a href="http://doc.silverstripe.com"> documentação do desenvolvedor</a>, ou começar <a href="http://doc.silverstripe.com/doku.php?id=tutorials">com os tutoriais.</a></p>'
    DEFAULTHOMETITLE: Página Inicial
    EDITANYONE: 'Qualquer pessoa que possa fazer log-in'
    EDITHEADER: 'Quem pode editar esta página?'
@ -109,5 +107,4 @@ pt_BR:
    HAVEASKED: 'Você pediu para ver o conteúdo do nosso site em'
  VirtualPage:
    HEADER: 'Esta é uma página virtual'
-    PLURALNAME: 'Páginas virtuais'
    SINGULARNAME: 'Página virtual'
--- a/lang/ro.yml
+++ b/lang/ro.yml
@ -67,8 +67,6 @@ ro:
    DELETE_PAGES: 'Ştergere de pe site-ul live'
    PUBLISHED_PAGES: '%d pagini publicate, %d erori'
    PUBLISH_PAGES: Publicare
-    UNPUBLISHED_PAGES: '%d pagini au fost deactivate de la publicare'
-    UNPUBLISH_PAGES: Deactivare publicare
  CMSMain:
    ACCESS: 'Acces la secţiunea ''{title}'' '
    ACCESS_HELP: 'Permite vizualizarea secțiunii cu arborele de pagini și conținut. Permisiunile de vizualizare și editare pot fi setate specific prin meniul vertical din pagini sau separat în "Permisiuni de conținut". '
@ -99,7 +97,6 @@ ro:
    REMOVED: 'Șterge ''{title}''{description} din site-ul live'
    REMOVEDPAGE: 'Înlătură ''{title}'' din site-ul publicat'
    REMOVEDPAGEFROMDRAFT: 'Înlătură ''%s'' din site-ul ciornă'
-    RESTORE: Restaurează
    RESTORED: 'Restaurare ''{title}'' cu succes'
    ROLLBACK: 'Revenire la versiunea aceasta'
    ROLLEDBACKPUBv2: 'Revenire la versiunea publicată'
@ -150,10 +147,6 @@ ro:
    FILTERDATEHEADING: Data
    FILTERDATETO: La
    FILTERLABELTEXT: Conținut
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Pagini schimbate'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Toate paginile, incluzând cele șterse'
  CMSSiteTreeFilter_Search:
    Title: 'Toate paginile'
  ContentControl:
@ -212,7 +205,6 @@ ro:
    DEFAULTSERVERERRORPAGETITLE: 'Eroare de server'
    DESCRIPTION: 'Conșinut preferențial pentru diferitele cazuri (ex. "Pagină negăsită")'
    ERRORFILEPROBLEM: 'Eroare la deschiderea fișierului "{filename}" pentru scriere. Vă rugăm verificași permisiunile.'
-    PLURALNAME: 'Eroare pagini'
    SINGULARNAME: 'Pagină de eroare'
  Folder:
    AddFolderButton: 'Adaugă director'
@ -235,7 +227,6 @@ ro:
    HASBEENSETUP: 'O pagină referitoare a fost creată fără a direcționa către ceva'
    HEADER: 'Pagina v-a redirecționa utilizatorii către altă pagină'
    OTHERURL: 'URL-ul altui website'
-    PLURALNAME: 'Pagini referitoare'
    REDIRECTTO: 'Redirecționare către'
    REDIRECTTOEXTERNAL: 'Alt website'
    REDIRECTTOPAGE: 'O pagină de pe website-ul dumneavoastră'
@ -311,7 +302,6 @@ ro:
    DEFAULTABOUTTITLE: 'Despre Noi'
    DEFAULTCONTACTCONTENT: '<p>Puteți completa pagina cu conținut propriu, sau o puteți șterge și să vă creați alte pagini.<br /></p>'
    DEFAULTCONTACTTITLE: 'Contactați-ne'
-    DEFAULTHOMECONTENT: '<p>Bine ați venit în SilverStripe! Aceasta este pagina principala. Puteți edita pagina deschizînd <a href="admin/">CMS-ul</a>. Acum puteți accesa <a href="http://doc.silverstripe.org">developer documentatia</a>, sau să începeți <a href="http://doc.silverstripe.org/doku.php?id=tutorials">tutorialele.</a></p>'
    DEFAULTHOMETITLE: Acasă
    DELETEDPAGEHELP: 'Pagina nu mai este publicată'
    DELETEDPAGESHORT: Șters
@ -398,7 +388,6 @@ ro:
    EditLink: editare
    HEADER: 'Aceasta este o pagină virtuală '
    HEADERWITHLINK: 'Aceasta este o pagina virtuală care copiază conținut din "{title}" ({link})'
-    PLURALNAME: 'Pagini virtuale'
    PageTypNotAllowedOnRoot: 'Tipul original al pagini "{type}" nu este permis pe nivelul rădăcină pentru pagina virtuală'
    SINGULARNAME: 'Pagina Virtuala'
  CMSFileAddController:
--- a/lang/ru.yml
+++ b/lang/ru.yml
@ -67,8 +67,6 @@ ru:
    DELETE_PAGES: 'Удалить из опубликованной версии сайта'
    PUBLISHED_PAGES: 'Опубликовано %d страниц, %d ошибок'
    PUBLISH_PAGES: Опубликовать
-    UNPUBLISHED_PAGES: 'Публикация %d страниц отменена'
-    UNPUBLISH_PAGES: Отмена публикации
  CMSMain:
    ACCESS: 'Доступ к разделу ''{title}'''
    ACCESS_HELP: 'Возможность просматривать раздел, содержащий дерево страниц и контент. Настройка прав просмотра и редактирования производится через выпадающие меню на отдельных страницах, а также через "Права доступа к содержимому".'
@ -100,7 +98,6 @@ ru:
    REMOVED: 'Страница ''{title}''{description} удалена с опубликованного сайта'
    REMOVEDPAGE: 'Страница ''{title}'' удалена с опубликованного сайта'
    REMOVEDPAGEFROMDRAFT: 'Страница ''%s'' удалена с чернового сайта'
-    RESTORE: Восстановить
    RESTORED: '''{title}'' успешно восстановлен'
    ROLLBACK: 'Откатить до этой версии'
    ROLLEDBACKPUBv2: 'Выполнен откат к опубликованной версии.'
@ -151,10 +148,6 @@ ru:
    FILTERDATEHEADING: Дата
    FILTERDATETO: До
    FILTERLABELTEXT: Содержимое
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Измененные страницы'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Все страницы, включая удаленные'
  CMSSiteTreeFilter_Search:
    Title: 'Все страницы'
  ContentControl:
@ -215,7 +208,6 @@ ru:
    DEFAULTSERVERERRORPAGETITLE: 'Ошибка сервера'
    DESCRIPTION: 'Пользовательские страницы ошибок (например, "Страница не найдена")'
    ERRORFILEPROBLEM: 'Ошибка при открытии файла "{filename}" для записи. Пожалуйста, проверьте права доступа к файлам.'
-    PLURALNAME: 'Страницы ошибок'
    SINGULARNAME: 'Страница ошибки'
  Folder:
    AddFolderButton: 'Добавить папку'
@ -238,7 +230,6 @@ ru:
    HASBEENSETUP: 'Страница перенаправления установлена без указания места перенаправления.'
    HEADER: 'Эта страница будет перенаправлять пользователей на другую страницу'
    OTHERURL: 'URL другого сайта'
-    PLURALNAME: 'Страницы перенаправления'
    REDIRECTTO: 'Перенаправлять на'
    REDIRECTTOEXTERNAL: 'Другой сайт'
    REDIRECTTOPAGE: 'Страницу вашего сайта'
@ -314,7 +305,6 @@ ru:
    DEFAULTABOUTTITLE: 'О нас'
    DEFAULTCONTACTCONTENT: '<p>Вы можете заполнить эту страницу собственным содержимым или удалить ее и создать новые страницы.<br /></p>'
    DEFAULTCONTACTTITLE: 'Контакты'
-    DEFAULTHOMECONTENT: '<p>Добро пожаловать в SilverStripe! Это главная страница по умолчанию. Вы можете редактировать ее в <a href="admin/">Системе Управления Содержимым</a>. Вы также можете обратиться к <a href="http://doc.silverstripe.com">документации для разработчиков</a> или начать с <a href="http://doc.silverstripe.com/doku.php?id=tutorials">учебных материалов.</a></p>'
    DEFAULTHOMETITLE: Главная
    DELETEDPAGEHELP: 'Страница больше не является опубликованной'
    DELETEDPAGESHORT: Удалено
@ -401,7 +391,6 @@ ru:
    EditLink: редактировать
    HEADER: 'Это виртуальная страница'
    HEADERWITHLINK: 'Это виртуальная страница, копирующая содержимое из "{title}" ({link})'
-    PLURALNAME: 'Виртуальная страница'
    PageTypNotAllowedOnRoot: 'Страницы типа "{type}" недопустимы в качестве корневых для этой виртуальной страницы'
    SINGULARNAME: 'Виртуальная страница'
  CMSFileAddController:
@ -412,9 +401,3 @@ ru:
    MENUTITLE: 'Править страницу'
  CMSSettingsController:
    MENUTITLE: Настройки
-  CMSSiteTreeFilter_StatusDeletedPages:
-    Title: 'Удаленные страницы'
-  CMSSiteTreeFilter_StatusDraftPages:
-    Title: 'Неопубликованные черновые страницы'
-  CMSSiteTreeFilter_StatusRemovedFromDraftPages:
-    Title: 'Опубликовано, но удалено из черновика'
--- a/lang/si.yml
+++ b/lang/si.yml
@ -74,5 +74,4 @@ si:
    HAVEASKED: 'ඹබට අපගේ වෙබ් අඩවිය නිරීක්ශනය කරන ලෙස ඉල්ලා ඇත'
  VirtualPage:
    HEADER: 'මෙය මනඃකල්පිත පිටුවකි'
-    PLURALNAME: 'මනඃකල්පිත පිටු'
    SINGULARNAME: 'මනඃකල්පිත පිටුව'
--- a/lang/sk.yml
+++ b/lang/sk.yml
@ -67,8 +67,10 @@ sk:
    DELETE_PAGES: 'Vymazať z verejného webu'
    PUBLISHED_PAGES: 'Publikovaných %d stránok, %d zlyhaní'
    PUBLISH_PAGES: Zverejniť
-    UNPUBLISHED_PAGES: 'Ne-zverejnené %d stranky'
-    UNPUBLISH_PAGES: Ne-zverejniť
+    UNPUBLISHED_PAGES: 'Nezverejnených %d stránok'
+    UNPUBLISH_PAGES: Nezverejniť
+    ARCHIVE: Archivovať
+    ARCHIVED_PAGES: 'Archivované %d stranky'
  CMSMain:
    ACCESS: 'Pristup k ''{title}'' sekcii'
    ACCESS_HELP: 'Povoliť prezeranie sekcie obsahujúcu strom stránok a obsah. Práva na prezeranie a úpravu môžu byť nastavené cez výber, ako aj jednotlivo  "Práva obsahu".'
@ -100,8 +102,11 @@ sk:
    REMOVED: 'Smazané ''{title}''{description} z webu'
    REMOVEDPAGE: 'Smazané ''{title}'' z verejného webu'
    REMOVEDPAGEFROMDRAFT: 'Odstránené ''%s'' z konceptu webu'
-    RESTORE: Obnoviť
+    RESTORE: 'Obnoviť koncept'
+    RESTORE_TO_ROOT: 'Obnoviť koncept na najvyšiu úroveň'
+    RESTORE_TO_ROOT_DESC: 'Obnoviť archivovanú verziu na koncept ako stránku najvyššej úrovne'
    RESTORED: 'Obnovené ''{title}'' úspešne'
+    RESTORE_DESC: 'Obnoviť archivovanú verziu na koncept'
    ROLLBACK: 'Návrat späť na túto verziu'
    ROLLEDBACKPUBv2: 'Vrátené späť na zverejnenú verziu.'
    ROLLEDBACKVERSIONv2: 'Vrátené späť na verziu #%d.'
@ -113,9 +118,12 @@ sk:
    TreeFiltered: 'Filtrovaný strom.'
    TreeFilteredClear: 'Vyčistiť filter'
    MENUTITLE: 'Upraviť stránku'
+    ARCHIVE: Archív
+    ARCHIVEDPAGE: 'Archivovaná stránka ''%s'''
  CMSMain_left_ss:
    APPLY_FILTER: 'Použiť filter'
    RESET: Reset
+    CLEAR_FILTER: 'Vyčistiť filter'
  CMSPageAddController:
    ParentMode_child: 'Pod inú stránku'
    ParentMode_top: 'Najvyššia úroveň'
@ -154,9 +162,17 @@ sk:
  CMSSiteTreeFilter_ChangedPages:
    Title: 'Zmenené stránky'
  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Všetky stránky, vrátane vymazaných'
+    Title: 'Všetky stránky, vrátane archivovaných'
+  CMSSIteTreeFilter_PublishedPages:
+    Title: 'Zverejnené stránky'
  CMSSiteTreeFilter_Search:
    Title: 'Všechny stránky'
+  CMSSiteTreeFilter_StatusDeletedPages:
+    Title: 'Archivované stranky'
+  CMSSiteTreeFilter_StatusDraftPages:
+    Title: 'Stránky konceptu'
+  CMSSiteTreeFilter_StatusRemovedFromDraftPages:
+    Title: 'Živé, ale odstránené z konceptu'
  ContentControl:
    NOTEWONTBESHOWN: 'Poznámka: Táto správa sa nebude zobrazovať vašim návštevníkom'
  ContentController:
@ -314,7 +330,7 @@ sk:
    DEFAULTABOUTTITLE: 'O nás'
    DEFAULTCONTACTCONTENT: '<p>Túto stránku môžete vyplniť vlastným obsahom, alebo ju zmazať a vytvoriť vaše vlastné stránky.<br /></p>'
    DEFAULTCONTACTTITLE: 'Kontakt'
-    DEFAULTHOMECONTENT: '<p>Vitajte v SilverStripe! Toto je predvolená úvodná stránka. Môžete you upraviť otvorením <a href="admin/">CMS-ka</a>. Môžete isť na <a href="http://doc.silverstripe.org">dokumentáciu vývoára</a>, alebo začať s <a href="http://doc.silverstripe.org/doku.php?id=tutorials">návodmi</a>.</p>'
+    DEFAULTHOMECONTENT: '<p>Vitajte v SilverStripe! Toto je základná domáca stránka. Môžte ju upraviť otvorením <a href="admin/">CMS</a>.</p><p>Môžte tiež vstúpiť k <a href="http://docs.silverstripe.org">dokumentácii vývojára</a>, alebo sa priučit na <a href="http://www.silverstripe.org/learn/lessons">SilverStripe lekciách</a>.</p>'
    DEFAULTHOMETITLE: Domov
    DELETEDPAGEHELP: 'Stránka už nie je viacej zverejnená'
    DELETEDPAGESHORT: Smazané
@ -385,6 +401,9 @@ sk:
    many_many_BackLinkTracking: 'Záznamy o Backlinkoch'
    many_many_ImageTracking: 'Záznamy o obrázkoch'
    many_many_LinkTracking: 'Záznamy o odkazoch'
+    ARCHIVEDPAGEHELP: 'Stránka je odstránená z konceptu a z webu'
+    ARCHIVEDPAGESHORT: Archivované
+    BUTTONARCHIVEDESC: 'Nezverejniť a odoslať do archívu'
  SiteTreeURLSegmentField:
    EMPTY: 'Zadajte prosím URL segment alebo kliknite zrušiť'
    HelpChars: 'Špeciálne znaky sú automaticky zkonvertované alebo ostránené.'
@ -412,9 +431,6 @@ sk:
    MENUTITLE: 'Editovať stránku'
  CMSSettingsController:
    MENUTITLE: Nastavenia
-  CMSSiteTreeFilter_StatusDeletedPages:
-    Title: 'Zmazané stránky.'
-  CMSSiteTreeFilter_StatusDraftPages:
-    Title: 'Koncept nezverejnených stránok'
-  CMSSiteTreeFilter_StatusRemovedFromDraftPages:
-    Title: 'Živé, ale odstránené z konceptu'
+  SiteTreeFileExtension:
+    BACKLINK_LIST_DESCRIPTION: 'Zoznam zobrazuje všetky stránky, kde bol súbor pridaný pomocou WYSIWYG editora.'
+    EDIT: Editovať
--- a/lang/sl.yml
+++ b/lang/sl.yml
@ -55,8 +55,6 @@ sl:
    DELETE_PAGES: 'Izbriši z objavljenega spletnega mesta'
    PUBLISHED_PAGES: 'Objavljenih je bilo %d strani. (Število napak %d)'
    PUBLISH_PAGES: Objavi
-    UNPUBLISHED_PAGES: 'Število iz objave umaknjenih strani: %d'
-    UNPUBLISH_PAGES: Umakni iz objave
  CMSMain:
    ACCESS: 'Dostop do razdelka ''{title}'' '
    ACCESS_HELP: 'Dovoli vpogled  sklop z drevesno strukturo in vsebino. Pravice za ogled in urejanje je možno urejati prek dropdown-seznamov za vsako posamezno stran, ali pa ločeno v sklopu Nastavitve pravic za upravljanje z vsebino (Content permissions). '
@ -80,7 +78,6 @@ sl:
    PageAdded: 'Stran je bila uspešno ustvarjena'
    REMOVEDPAGE: '''{title}'' je odstranjen z objavljenega spletnega mesta. '
    REMOVEDPAGEFROMDRAFT: 'Vsebina, odstranjena iz osnutka spletnega mesta: ''%s'''
-    RESTORE: Obnovi
    ROLLBACK: 'Ponastavi na to različico'
    SAVE: Shrani
    TabContent: Vsebina
@ -100,10 +97,6 @@ sl:
    SHOWVERSION: 'Pokaži različico'
    VIEWINGVERSION: 'Trenutno prikazana različica {version}.'
    MENUTITLE: Zgodovina
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Spremenjene strani'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Vse strani, tudi izbrisane'
  CMSSiteTreeFilter_Search:
    Title: 'Vse strani'
  ContentControl:
@ -237,7 +230,6 @@ sl:
    DEFAULTABOUTTITLE: 'O nas'
    DEFAULTCONTACTCONTENT: '<p>Na to stran lahko vnesete svojo vsebino ali pa jo izbrišete in sami ustvarjate strani po svoji meri.<br /></p>'
    DEFAULTCONTACTTITLE: 'Kontakt'
-    DEFAULTHOMECONTENT: '<p>Pozdravljeni pri SilverStripe! To je privzeto spletno mesto, ki ga lahko urejate prek <a href="admin/">CMS-vmesnika</a>. Oglejte si <a href="http://doc.silverstripe.org">dokumentacijo za razvijalce</a> ali pa <a href="http://doc.silverstripe.org/doku.php?id=tutorials">napotke za uporabo.</a></p>'
    DEFAULTHOMETITLE: Domov
    DELETEDPAGEHELP: 'Stran ni več objavljena'
    DELETEDPAGESHORT: Izbrisano
@ -304,7 +296,6 @@ sl:
    HAVEASKED: 'Za vpogled v vsebino našega spletnega mesta ste zaprosili'
  VirtualPage:
    HEADER: 'To je navidezna stran'
-    PLURALNAME: 'Virtualne strani'
    SINGULARNAME: 'Virtualna stran'
  CMSFileAddController:
    MENUTITLE: Datoteke
--- a/lang/sr.yml
+++ b/lang/sr.yml
@ -67,8 +67,6 @@ sr:
    DELETE_PAGES: 'Избриши из објављеног сајта'
    PUBLISHED_PAGES: 'Објављено %d страница. Није успело објављивање %d страница.'
    PUBLISH_PAGES: Објави
-    UNPUBLISHED_PAGES: 'Поништена је објава %d страница.'
-    UNPUBLISH_PAGES: Поништи објаву
  CMSMain:
    ACCESS: 'Приступ ''{title}'' секцији'
    ACCESS_HELP: 'Дозвољава преглед секције која садржи стабло страница и садржај. Дозволе за преглед и уређивање могу се подесити путем специфичних падајућих листи појединачних страница, као и путем "Дозволе за садржај".'
@ -99,7 +97,6 @@ sr:
    REMOVED: 'Са објављеног сајта обрисана је страница ''{title}''{description}'
    REMOVEDPAGE: 'Са објављеног сајта уклоњена је страница ''{title}'''
    REMOVEDPAGEFROMDRAFT: 'Страница ''%s'' је уклоњена из нацрта сајта'
-    RESTORE: Обнови
    RESTORED: '''{title}'' успешно обновљен'
    ROLLBACK: 'Врати се на ову верзију'
    ROLLEDBACKPUBv2: 'Враћено на објављену верзију.'
@ -150,10 +147,6 @@ sr:
    FILTERDATEHEADING: Датум
    FILTERDATETO: За
    FILTERLABELTEXT: Садржај
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Измењене странице'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Све странице, укључујући и избрисане'
  CMSSiteTreeFilter_Search:
    Title: 'Све странице'
  ContentControl:
@ -212,7 +205,6 @@ sr:
    DEFAULTSERVERERRORPAGETITLE: 'Грешка сервера'
    DESCRIPTION: 'Прилагођени садржај за различите случајеве грешака (нпр. "Страница није пронађена" )'
    ERRORFILEPROBLEM: 'Грешка при отварању датотеке "{filename}" за упис. Молимо Вас да проверите права приступа датотеци. '
-    PLURALNAME: 'Странице грешака'
    SINGULARNAME: 'Страница грешке'
  Folder:
    AddFolderButton: 'Додај фасциклу'
@ -235,7 +227,6 @@ sr:
    HASBEENSETUP: 'Страници за преусмеравање није подешено одредиште на које преусмерава.'
    HEADER: 'Ова страница ће преусмерити кориснике на другу страницу'
    OTHERURL: 'URL другог веб сајта'
-    PLURALNAME: 'Странице за преусмеравања'
    REDIRECTTO: 'Преусмери на'
    REDIRECTTOEXTERNAL: 'Други веб сајт'
    REDIRECTTOPAGE: 'Страницу на Вашем веб сајту'
@ -311,7 +302,6 @@ sr:
    DEFAULTABOUTTITLE: 'О нама'
    DEFAULTCONTACTCONTENT: '<p>Ову страницу можете попунити Вашим садржајем. Осим тога, можете је избрисати и креирати сопствене странице.<br /></p>'
    DEFAULTCONTACTTITLE: 'Контактирајте нас'
-    DEFAULTHOMECONTENT: '<p>Добро дошли у SilverStripe! Ово је подразумевана почетна страница коју можете је изменити отварањем <a href="admin/">ЦМС-а</a>. Такође, можете приступити <a href="http://doc.silverstripe.org">документуацији за развијаоце</a> или <a href="http://doc.silverstripe.org/doku.php?id=tutorials">упутствима за кориснике.</a></p>'
    DEFAULTHOMETITLE: Почетна страница
    DELETEDPAGEHELP: 'Страница није више објављена'
    DELETEDPAGESHORT: Избрисано
@ -398,7 +388,6 @@ sr:
    EditLink: измени
    HEADER: 'Ово је виртуелна страница'
    HEADERWITHLINK: 'Ово је виртуелна страница која копира садржај из "{title}" ({link})'
-    PLURALNAME: 'Виртуелне странице'
    PageTypNotAllowedOnRoot: 'Оригинални тип странице "{type}" није дозвољен на вршном нивоу за ову виртуелну страницу'
    SINGULARNAME: 'Виртуелна страница'
  CMSFileAddController:
--- a/lang/sv.yml
+++ b/lang/sv.yml
@ -67,8 +67,8 @@ sv:
    DELETE_PAGES: 'Radera från publicerade sajten'
    PUBLISHED_PAGES: 'Publicerade %d sidor, %d misslyckades'
    PUBLISH_PAGES: Publicera
-    UNPUBLISHED_PAGES: 'Avpublicerade %d sidor'
-    UNPUBLISH_PAGES: Avpublicera
+    ARCHIVE: Arkivera
+    ARCHIVED_PAGES: 'Arkiverade %d sidor'
  CMSMain:
    ACCESS: 'Tillgång till sektionen ''{title}'''
    ACCESS_HELP: 'Tillåt visning av sektionen innehållande sidträdet och dess innehåll. Rättigheter att visa och redigera sidan kan hanteras i dess rullgardinsmenyer, liksom i "Innehållsbehörigheter".'
@ -100,7 +100,7 @@ sv:
    REMOVED: 'Tog bort ''{title}''{description} från den publicerade sajten'
    REMOVEDPAGE: 'Tog bort ''{title}'' från den publicerade sajten'
    REMOVEDPAGEFROMDRAFT: 'Raderade ''%s'' från utkast'
-    RESTORE: Återskapa
+    RESTORE: 'Återställ utkast'
    RESTORED: 'Återskapandet av  ''{title}'' lyckades'
    ROLLBACK: 'Återställ den här versionen'
    ROLLEDBACKPUBv2: 'Återställde till den publicerade versionen.'
@ -113,6 +113,7 @@ sv:
    TreeFiltered: 'Filtrerat träd'
    TreeFilteredClear: 'Rensa lista'
    MENUTITLE: 'Redigera sida'
+    ARCHIVE: Arkiv
  CMSMain_left_ss:
    APPLY_FILTER: 'Filtrera'
    RESET: Rensa
@ -153,8 +154,6 @@ sv:
    FILTERLABELTEXT: Innehåll
  CMSSiteTreeFilter_ChangedPages:
    Title: 'Ändrade sidor'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Alla sidor, inklusive raderade'
  CMSSiteTreeFilter_Search:
    Title: 'Alla sidor'
  ContentControl:
@ -314,7 +313,6 @@ sv:
    DEFAULTABOUTTITLE: 'Om oss'
    DEFAULTCONTACTCONTENT: '<p>Du kan fylla den här sidan med ditt eget innehåll, eller radera den och skapa dina egna sidor.<br/></p>'
    DEFAULTCONTACTTITLE: 'Kontakta oss'
-    DEFAULTHOMECONTENT: '<p>Välkommen till SilverStripe! Det här är standardhemsidan. Du kan redigera sidan genom att öppna <a href="admin/">CMS:et</a>. Du kan även komma åt <a href="http://doc.silverstripe.com">utvecklardokumentationen</a>, eller börja med <a href="http://doc.silverstripe.com/doku.php?id=tutorials">guiderna</a></p>'
    DEFAULTHOMETITLE: Hem
    DELETEDPAGEHELP: 'Sidan är inte längre publicerad'
    DELETEDPAGESHORT: Raderad
@ -412,9 +410,3 @@ sv:
    MENUTITLE: 'Redigera sida'
  CMSSettingsController:
    MENUTITLE: Inställningar
-  CMSSiteTreeFilter_StatusDeletedPages:
-    Title: 'Raderade sidor'
-  CMSSiteTreeFilter_StatusDraftPages:
-    Title: 'Ej publicerade utkast'
-  CMSSiteTreeFilter_StatusRemovedFromDraftPages:
-    Title: 'Live men borttagen från utkast'
--- a/lang/th.yml
+++ b/lang/th.yml
@ -66,8 +66,6 @@ th:
    DELETE_PAGES: 'ลบออกจากเว็บไซต์ที่เผยแพร่อยู่'
    PUBLISHED_PAGES: 'เผยแพร่แล้ว %d หน้า, ล้วเหลว %d'
    PUBLISH_PAGES: เผยแพร่
-    UNPUBLISHED_PAGES: 'ยกเลิกการเผยแพร่หน้าเว็บแล้ว %d หน้า'
-    UNPUBLISH_PAGES: ยกเลิกการเผยแพร่
  CMSMain:
    ACCESS: 'เข้าถึงเซ็กชั่น ''{title}'''
    ACCESS_HELP: 'อนุญาตให้เปิดดูส่วนของเซ็กชั่นที่บรรจุรายการหน้าเว็บแบบทรีและเนื้อหาได้ สิทธิ์ในการเปิดดูและแก้ไขสามารถจัดการได้ผ่านทางหน้าเว็บทีระบุอยู่ในเมนูแบบดรอปดาวน์ เช่นเดียวกับ "สิทธิ์อนุญาตของเนื้อหา" ที่แยกออกมาต่างหากด้วยเช่นกัน'
@ -94,7 +92,6 @@ th:
    PageAdded: 'หน้าเว็บที่สร้างเสร็จเรียบร้อยแล้ว'
    REMOVEDPAGE: 'ลบ ''{title}'' ออกจากเว็บไซต์ที่เผยแพร่อยู่แล้ว'
    REMOVEDPAGEFROMDRAFT: 'ลบ ''%s'' ออกจากเว็บไซต์ฉบับร่างแล้ว'
-    RESTORE: คืนค่า
    RESTORED: 'เรียกคืนค่า ''{title}'' เสร็จเรียบร้อยแล้ว'
    ROLLBACK: 'ย้อนกลับไปที่รุ่นนี้'
    SAVE: บันทึก
@ -135,10 +132,6 @@ th:
    FILTER: ตัวกรองข้อมูล
  CMSSearch:
    FILTERDATEHEADING: วันที่
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'หน้าที่ถูกเปลี่ยนแปลง'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'ทุกหน้า รวมทั้งหน้าที่ถูกลบไปแล้วด้วย'
  CMSSiteTreeFilter_Search:
    Title: 'หน้าทั้งหมด'
  ContentControl:
@ -193,7 +186,6 @@ th:
    DEFAULTSERVERERRORPAGETITLE: 'เซิร์ฟเวอร์เกิดข้อผิดพลาด'
    DESCRIPTION: 'กำหนดเนื้อหาเองสำหรับข้อผิดพลาดต่างๆ (e.g. "ไม่พบหน้าเว็บที่ต้องการ")'
    ERRORFILEPROBLEM: 'เกิดข้อผิดพลาดในการเปิดไฟล์ "{filename}" เพื่อเขียนข้อมูล. กรุณาตรวจสอบสิทธิ์.'
-    PLURALNAME: 'หน้าเว็บแสดงข้อผิดพลาด'
    SINGULARNAME: 'หน้าเว็บแสดงข้อผิดพลาด'
  Folder:
    AddFolderButton: 'เพิ่มโฟลเดอร์'
@ -214,7 +206,6 @@ th:
    HASBEENSETUP: 'หน้าเว็บที่มีการเปลี่ยนเส้นทางซึ่งได้รับการตั้งค่าโดยปราศจากตำแหน่งปลายทางที่ต้องการเปลี่ยนเส้นทางไป'
    HEADER: 'หน้าเว็บนี้จะเปลี่ยนเส้นทางผู้ใช้งานไปยังหน้าเว็บอื่นๆ'
    OTHERURL: 'ที่อยู่ URL ของเว็บไซต์อื่นๆ'
-    PLURALNAME: 'หน้าเว็บเปลี่ยนเส้นทาง'
    REDIRECTTO: 'เปลี่ยนเส้นทางไปที่'
    REDIRECTTOEXTERNAL: 'เว็บไซต์อื่นๆ'
    REDIRECTTOPAGE: 'หน้าเว็บในเว็บไซต์ของคุณ'
@ -278,7 +269,6 @@ th:
    DEFAULTABOUTTITLE: 'เกี่ยวกับเรา'
    DEFAULTCONTACTCONTENT: '<p>คุณสามารถใส่เนื้อหาของคุณลงไปในหน้าเว็บนี้ได้, หรือลบเนื้อหาออกแล้วสร้างหน้าเว็บที่เป็นของคุณเองใหม่ได้.<br /></p>'
    DEFAULTCONTACTTITLE: 'ติดต่อเรา'
-    DEFAULTHOMECONTENT: '<p>ยินดีต้อนรับเข้าสู่ SilverStripe! นี่คือคือหน้าแรกที่กำหนดไว้เริ่มต้น. คุณสามารถแก้ไขหน้าเว็บนี้ได้ด้วยการเปิด <a href="admin/">CMS</a>. คุณสามารถเข้าไปที่ <a href="http://doc.silverstripe.org">เอกสารคู่มือประกอบการใช้งานสำหรับนักพัฒนา</a>, หรือเข้าไปที่<a href="http://doc.silverstripe.org/doku.php?id=tutorials">เพื่อศึกษาบทเรียนต่างๆได้.</a></p>'
    DEFAULTHOMETITLE: หน้าแรก
    DELETEDPAGEHELP: 'หน้าเว็บไม่ได้ถูกเผยแพร่อีกต่อไปแล้ว'
    DELETEDPAGESHORT: ถูกลบ
@ -348,7 +338,6 @@ th:
  VirtualPage:
    DESCRIPTION: 'แสดงเนื้อหาของหน้าเว็บอื่นๆ'
    HEADER: 'นี่เป็นหน้าเว็บจำลอง'
-    PLURALNAME: 'หน้าเว็บจำลอง'
    PageTypNotAllowedOnRoot: 'ชนิดของหน้าเว็บดั้งเดิม "{type}" ไม่ได้รับอนุญาตให้ใช้งานกับหน้าเว็บจำลองที่ตำแหน่ง root'
    SINGULARNAME: 'หน้าจำลอง'
  CMSFileAddController:
--- a/lang/tr.yml
+++ b/lang/tr.yml
@ -24,7 +24,6 @@ tr:
  CMSBatchActions:
    DELETE_PAGES: 'Yayındaki siteden sil'
    PUBLISH_PAGES: Yayınla
-    UNPUBLISH_PAGES: Yayından kaldır
  CMSMain:
    AddNew: 'Yeni sayfa ekle'
    AddNewButton: 'Yeni ekle'
@ -42,7 +41,6 @@ tr:
    PUBALLFUN2: "Bu butona bastığınız zaman, tüm sayfaları tek tek açıp \"yayınla\" butonuna basmışsınız gibi işlem yapılacaktır.  Bunun amacı sitede toplu miktarda içerik düzenleyip eklediyseniz (örneğin sitenin ilk yayınlanması gibi) size kolaylık sağlamaktır."
    PageAdded: 'Sayfa başarıyla oluşturuldu'
    REMOVEDPAGEFROMDRAFT: '''%s'' taslak siteden silindi'
-    RESTORE: Geri yükle
    ROLLBACK: 'Bu sürüme geri dön'
    SAVE: Kaydet
    TabContent: İçerik
@ -68,8 +66,6 @@ tr:
    MENUTITLE: Sayfalar
  CMSPagesController_Tools_ss:
    FILTER: Filtre
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Değiştirilen sayfalar'
  CMSSiteTreeFilter_Search:
    Title: 'Tüm sayfalar'
  ContentControl:
@ -169,7 +165,6 @@ tr:
    DEFAULTABOUTTITLE: 'Hakkımızda'
    DEFAULTCONTACTCONTENT: '<p>Bu sayfayı kendi içeriğinizle doldurabilir, ya da bu sayfayı silip kendi sayfalarınızı oluşturabilirsiniz.<br /></p>'
    DEFAULTCONTACTTITLE: 'İletişim'
-    DEFAULTHOMECONTENT: '<p>SilverStripe''a hoşgeldiniz! Burası anasayfanız. <a href="admin/">Yönetim panelinden</a> bu sayfayı düzenleyebilirsiniz. Geliştirici dökümanlarına <a href="http://doc.silverstripe.com">buradan</a> ulaşabilir, veya <a href="http://doc.silverstripe.com/doku.php?id=tutorials">eğitim videolarını</a> izleyebilirsiniz.</p>'
    DEFAULTHOMETITLE: Anasayfa
    DependtPageColumnLinkType: 'Link tipi'
    EDITANYONE: 'CMS''e giriş yapabilen herkes'
@ -210,7 +205,6 @@ tr:
    HAVEASKED: 'Şu tarihe kadar olan site içeriğini görüntülemek istediniz:'
  VirtualPage:
    HEADER: 'Bu sanal bir sayfadır'
-    PLURALNAME: 'Sanal Sayfalar'
    SINGULARNAME: 'Sanal Sayfa'
  CMSFileAddController:
    MENUTITLE: Dosyalar
--- a/lang/uk.yml
+++ b/lang/uk.yml
@ -61,8 +61,6 @@ uk:
    DELETE_PAGES: 'Видалити з опублікованого сайту'
    PUBLISHED_PAGES: 'Опубліковано %d сторінок, %d навдач'
    PUBLISH_PAGES: Опублікувати
-    UNPUBLISHED_PAGES: 'Знято з публікації %d сторінок'
-    UNPUBLISH_PAGES: Зняти з публікації
  CMSMain:
    ACCESS: 'Доступ до секції ''{title}'' '
    ACCESS_HELP: 'Дозволити перегляд розділу, що містить дерево сторінок і зміст. Дозволами на перегляд та редагування, а також окремими дозволами на контент, можна керувати на відповідних сторінках.'
@ -85,7 +83,6 @@ uk:
    PageAdded: 'Сторінка успішно створена'
    REMOVEDPAGE: '''{title}'' видалено з публічного сайту'
    REMOVEDPAGEFROMDRAFT: 'Видалено ''%s'' з чорнового сайту'
-    RESTORE: Відновити
    ROLLBACK: 'Повернутися до цієї версії'
    SAVE: Зберегти
    TabContent: Вміст
@ -121,10 +118,6 @@ uk:
    FILTER: Фільтр
  CMSSearch:
    FILTERDATEFROM: Від
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Змінені сторінки'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Всі сторінки, включаючи видалені'
  CMSSiteTreeFilter_Search:
    Title: 'Всі сторінки'
  ContentControl:
@ -231,7 +224,6 @@ uk:
    DEFAULTABOUTTITLE: 'Про нас'
    DEFAULTCONTACTCONTENT: '<p>Ви можете заповнити цю сторінку власним вмістом або видалити її та створити інші сторінки.<br /></p>'
    DEFAULTCONTACTTITLE: 'Контакти'
-    DEFAULTHOMECONTENT: '<p>Ласкаво просимо до SilverStripe! Це стандартна домашня сторінка. Ви можете редагувати цю сторінку відкривши <a href="admin/">CMS</a>. Ви можете переглянути <a href="http://doc.silverstripe.org">документацію для розробників</a>, або почати з <a href="http://doc.silverstripe.org/doku.php?id=tutorials"> туторіалів.</a></p>'
    DEFAULTHOMETITLE: Домівка
    DELETEDPAGEHELP: 'Сторінка вже не є опублікованою'
    DELETEDPAGESHORT: Видалений
@ -296,7 +288,6 @@ uk:
  VirtualPage:
    DESCRIPTION: 'Відображення вмісту іншої сторінки'
    HEADER: 'Це віртуальна сторінка'
-    PLURALNAME: 'Віртуальні сторінки'
    PageTypNotAllowedOnRoot: 'Тип сторінки "{type}" не допускається на кореневому рівні для цієї віртуальної сторінки'
    SINGULARNAME: 'Віртуальна сторінка'
  CMSFileAddController:
--- a/lang/zh.yml
+++ b/lang/zh.yml
@ -67,8 +67,6 @@ zh:
    DELETE_PAGES: '从已发布网站中删除'
    PUBLISHED_PAGES: '发布 %d 个页面， %d 个失败'
    PUBLISH_PAGES: 发布
-    UNPUBLISHED_PAGES: '已取消发布 %d 页面'
-    UNPUBLISH_PAGES: 取消发布
  CMSMain:
    ACCESS: '访问 ''{title}'' 部分'
    ACCESS_HELP: '允许查看包含页面树及内容 部分。查看和编辑权限可以通过页面特定的下拉菜单进行控制，与使用单独的”内容权限“处理一样。'
@ -99,7 +97,6 @@ zh:
    REMOVED: '从线上站点删除‘{title}''{description}'
    REMOVEDPAGE: '从已发布站点删除’{title}'''
    REMOVEDPAGEFROMDRAFT: '从草稿站点删除‘s%’'
-    RESTORE: 恢复
    RESTORED: '成功恢复’{title}‘'
    ROLLBACK: '回滚到该版本'
    ROLLEDBACKPUBv2: '回滚到已发布版本。'
@ -150,10 +147,6 @@ zh:
    FILTERDATEHEADING: 日期
    FILTERDATETO: 到
    FILTERLABELTEXT: 内容
-  CMSSiteTreeFilter_ChangedPages:
-    Title: '有改动的页面'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: '所有页面，包括已删除的'
  CMSSiteTreeFilter_Search:
    Title: '所有页面'
  ContentControl:
@ -212,7 +205,6 @@ zh:
    DEFAULTSERVERERRORPAGETITLE: '服务器错误'
    DESCRIPTION: '给不同的错误自定义内容（例如”未发现页面“）'
    ERRORFILEPROBLEM: '打开文件”{filename}“尝试写入. 请检查文件许可'
-    PLURALNAME: '错误页面'
    SINGULARNAME: '错误页面'
  Folder:
    AddFolderButton: '增加文件夹'
@ -235,7 +227,6 @@ zh:
    HASBEENSETUP: '建立了一个没有任何跳转目标的重定向页。'
    HEADER: '该页面将会使用户转向另外一个页面'
    OTHERURL: '其他网站URL'
-    PLURALNAME: '重定向页'
    REDIRECTTO: '重定向到'
    REDIRECTTOEXTERNAL: '另一个网站'
    REDIRECTTOPAGE: '您网站上的一个页面'
@ -311,7 +302,6 @@ zh:
    DEFAULTABOUTTITLE: '关于我们'
    DEFAULTCONTACTCONTENT: '<p>您可以使用您自己的内容填充该页面，或者删除它并创建您自己的页面。<br /></p>'
    DEFAULTCONTACTTITLE: '联络我们'
-    DEFAULTHOMECONTENT: '<p>欢迎来到SilverStripe！这是默认首页。您可以通过打开<a href="admin/">内容管理系统</a>修改该页面。您现在可以访问<a href="http://doc.silverstripe.org">开发者文档</a>，或者从<a href="http://doc.silverstripe.org/doku.php?id=tutorials">教程</a>开始。</p>'
    DEFAULTHOMETITLE: 首页
    DELETEDPAGEHELP: '页面已停止发布'
    DELETEDPAGESHORT: 已删除
@ -398,7 +388,6 @@ zh:
    EditLink: 编辑
    HEADER: '这是一个虚拟页面'
    HEADERWITHLINK: '这是一个从“{标题}”复制内容的虚拟页面（{链接}）'
-    PLURALNAME: '虚拟页面'
    PageTypNotAllowedOnRoot: '此虚拟页面的根级不允许使用原页面类型 "{type}"'
    SINGULARNAME: '虚拟页面'
  CMSFileAddController:
--- a/lang/zh_CN.yml
+++ b/lang/zh_CN.yml
@ -13,8 +13,6 @@ zh_CN:
    REMOVEDPAGEFROMDRAFT: '已从测试站点删除 ''%s'''
    ROLLBACK: '恢复到这一版本'
    SAVE: 保存
-  CMSSiteTreeFilter_DeletedPages:
-    Title: '所有页面(包含已删除)'
  ErrorPage:
    CODE: '错误代码'
  Folder:
--- a/lang/zh_TW.yml
+++ b/lang/zh_TW.yml
@ -10,8 +10,6 @@ zh_TW:
    DELETE_PAGES: '從已出版網站刪除'
    PUBLISHED_PAGES: '已出版 %d 網頁, %d 失敗'
    PUBLISH_PAGES: 出版
-    UNPUBLISHED_PAGES: '未出版 %d 網頁'
-    UNPUBLISH_PAGES: 未出版的
  CMSMain:
    EMAIL: 電子郵件
    PAGENOTEXISTS: '這頁不存在'
@ -39,8 +37,6 @@ zh_TW:
    ListView: '清單瀏覽'
    MENUTITLE: 網頁
    TreeView: '樹狀瀏覽'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: '所有網頁, 包括已刪除的'
  CMSSiteTreeFilter_Search:
    Title: '所有網頁'
  ContentControl:
@ -89,7 +85,6 @@ zh_TW:
    DEFAULTABOUTTITLE: '關於我們'
    DEFAULTCONTACTCONTENT: '<p>您可以用您自己的內容填入本網頁, 或是刪除它並建立您自己的網頁<br /></p>'
    DEFAULTCONTACTTITLE: '連絡我們'
-    DEFAULTHOMECONTENT: '<p>歡迎光臨 SilverStrip! 這是預設的主頁. 您可以開啟<a href="admin/">the CMS</a>來編輯這個網頁. 您現在可存取<a href="http://doc.silverstripe.org">developer documentation</a>, 或是開始<a href="http://doc.silverstripe.org/doku.php?id=tutorials">the tutorials.</a></p>'
    DEFAULTHOMETITLE: 首頁
    DELETEDPAGESHORT: 已刪除
    DEPENDENT_NOTE: '以下的網頁是依附在本網頁的. 這包含了虛擬網頁, 重新導向網頁, 以及有內容鏈結的網頁.'
@ -148,7 +143,6 @@ zh_TW:
  VirtualPage:
    DESCRIPTION: '顯示其他網頁的內容'
    HEADER: '這是一個虛擬網頁'
-    PLURALNAME: '虛擬網頁'
    SINGULARNAME: '虛擬網頁'
  CMSPageSettingsController:
    MENUTITLE: '編輯網頁'
--- a/scss/_AssetAdmin.scss
+++ b/scss/_AssetAdmin.scss
@ -45,23 +45,10 @@

 	table.ss-gridfield-table {
 		td {
-			// Taken care of by minimum image sizes
-			padding-top: 0;
-			padding-bottom: 0;
 			&.bottom-all {
 				padding:0.7em;
 			}
 		}
-		td.col-StripThumbnail {
-			padding: 1px 5px;
-			width: 32px;
-			height: 32px;
-
-			img {
-				width: 32px;
-				height: 32px;
-			}
-		}
 		tr[data-class=Folder] {
 			td.col-StripThumbnail {
 				background: transparent url(../images/treeicons/blue-folder-horizontal.png) no-repeat center;
--- a/tests/behat/features/insert-an-image.feature
+++ b/tests/behat/features/insert-an-image.feature
@ -59,7 +59,7 @@ Feature: Insert an image into a page
    Given I press the "Insert Media" button
    And I press the "From the CMS" button
    And I fill in the "ParentID" dropdown with "folder1"
-    And I click on "file1.jpg" in the "Files" table
+    And I click on "file1" in the "Files" table
    When I press the "Insert" button
    Then the "Content" HTML field should contain "file1.jpg"
    # Required to avoid "unsaved changed" browser dialog
@ -69,7 +69,7 @@ Feature: Insert an image into a page
    Given I press the "Insert Media" button
    And I press the "From the CMS" button
    And I fill in the "ParentID" dropdown with "folder1"
-    And I click on "file1.jpg" in the "Files" table
+    And I click on "file1" in the "Files" table
    And I press the "Edit" button
    When I fill in "Alternative text (alt)" with "My alt"
    And I press the "Insert" button
--- a/tests/controller/CMSBatchActionsTest.php
+++ b/tests/controller/CMSBatchActionsTest.php
@ -12,20 +12,20 @@ class CMSBatchActionsTest extends SapphireTest {
 		parent::setUp();

 		// published page
-		$published = $this->objFromFixture('Page', 'published');
+		$published = $this->objFromFixture('SiteTree', 'published');
 		$published->doPublish();

 		// Deleted / archived page
-		$archived = $this->objFromFixture('Page', 'archived');
-		$archived->doArchive();
+		$archived = $this->objFromFixture('SiteTree', 'archived');
+		$archived->doArchive(); // should archive all children
 		
 		// Unpublished
-		$unpublished = $this->objFromFixture('Page', 'unpublished');
+		$unpublished = $this->objFromFixture('SiteTree', 'unpublished');
 		$unpublished->doPublish();
 		$unpublished->doUnpublish();

 		// Modified
-		$modified = $this->objFromFixture('Page', 'modified');
+		$modified = $this->objFromFixture('SiteTree', 'modified');
 		$modified->doPublish();
 		$modified->Title = 'modified2';
 		$modified->write();
@ -34,53 +34,128 @@ class CMSBatchActionsTest extends SapphireTest {
 	/**
 	 * Test which pages can be published via batch actions
 	 */
-	public function testBatchPublish() {
+	public function testBatchPublishApplicable() {
 		$this->logInWithPermission('ADMIN');
-		$pages = Versioned::get_including_deleted('Page');
+		$pages = Versioned::get_including_deleted('SiteTree');
 		$ids = $pages->column('ID');
 		$action = new CMSBatchAction_Publish();

 		// Test applicable pages
 		$applicable = $action->applicablePages($ids);
-		$this->assertContains($this->idFromFixture('Page', 'published'), $applicable);
-		$this->assertNotContains($this->idFromFixture('Page', 'archived'), $applicable);
-		$this->assertContains($this->idFromFixture('Page', 'unpublished'), $applicable);
-		$this->assertContains($this->idFromFixture('Page', 'modified'), $applicable);
+		$this->assertContains($this->idFromFixture('SiteTree', 'published'), $applicable);
+		$this->assertNotContains($this->idFromFixture('SiteTree', 'archived'), $applicable);
+		$this->assertNotContains($this->idFromFixture('SiteTree', 'archivedx'), $applicable);
+		$this->assertNotContains($this->idFromFixture('SiteTree', 'archivedy'), $applicable);
+		$this->assertContains($this->idFromFixture('SiteTree', 'unpublished'), $applicable);
+		$this->assertContains($this->idFromFixture('SiteTree', 'modified'), $applicable);
 	}


 	/**
 	 * Test which pages can be unpublished via batch actions
 	 */
-	public function testBatchUnpublish() {
+	public function testBatchUnpublishApplicable() {
 		$this->logInWithPermission('ADMIN');
-		$pages = Versioned::get_including_deleted('Page');
+		$pages = Versioned::get_including_deleted('SiteTree');
 		$ids = $pages->column('ID');
 		$action = new CMSBatchAction_Unpublish();

 		// Test applicable page
 		$applicable = $action->applicablePages($ids);
-		$this->assertContains($this->idFromFixture('Page', 'published'), $applicable);
-		$this->assertNotContains($this->idFromFixture('Page', 'archived'), $applicable);
-		$this->assertNotContains($this->idFromFixture('Page', 'unpublished'), $applicable);
-		$this->assertContains($this->idFromFixture('Page', 'modified'), $applicable);
+		$this->assertContains($this->idFromFixture('SiteTree', 'published'), $applicable);
+		$this->assertNotContains($this->idFromFixture('SiteTree', 'archived'), $applicable);
+		$this->assertNotContains($this->idFromFixture('SiteTree', 'archivedx'), $applicable);
+		$this->assertNotContains($this->idFromFixture('SiteTree', 'archivedy'), $applicable);
+		$this->assertNotContains($this->idFromFixture('SiteTree', 'unpublished'), $applicable);
+		$this->assertContains($this->idFromFixture('SiteTree', 'modified'), $applicable);
 	}

 	/**
-	 * Test which pages can be published via batch actions
+	 * Test which pages can be archived via batch actions
 	 */
-	public function testBatchArchive() {
+	public function testBatchArchiveApplicable() {
 		$this->logInWithPermission('ADMIN');
-		$pages = Versioned::get_including_deleted('Page');
+		$pages = Versioned::get_including_deleted('SiteTree');
 		$ids = $pages->column('ID');
 		$action = new CMSBatchAction_Archive();

 		// Test applicable pages
 		$applicable = $action->applicablePages($ids);
-		$this->assertContains($this->idFromFixture('Page', 'published'), $applicable);
-		$this->assertNotContains($this->idFromFixture('Page', 'archived'), $applicable);
-		$this->assertContains($this->idFromFixture('Page', 'unpublished'), $applicable);
-		$this->assertContains($this->idFromFixture('Page', 'modified'), $applicable);
+		$this->assertContains($this->idFromFixture('SiteTree', 'published'), $applicable);
+		$this->assertNotContains($this->idFromFixture('SiteTree', 'archived'), $applicable);
+		$this->assertContains($this->idFromFixture('SiteTree', 'unpublished'), $applicable);
+		$this->assertContains($this->idFromFixture('SiteTree', 'modified'), $applicable);
+	}
+
+	/**
+	 * Test restore batch actions
+	 */
+	public function testBatchRestoreApplicable() {
+		$this->logInWithPermission('ADMIN');
+		$pages = Versioned::get_including_deleted('SiteTree');
+		$ids = $pages->column('ID');
+		$action = new CMSBatchAction_Restore();
+
+		// Test applicable pages
+		$applicable = $action->applicablePages($ids);
+		$this->assertNotContains($this->idFromFixture('SiteTree', 'published'), $applicable);
+		$this->assertContains($this->idFromFixture('SiteTree', 'archived'), $applicable);
+		$this->assertContains($this->idFromFixture('SiteTree', 'archivedx'), $applicable);
+		$this->assertContains($this->idFromFixture('SiteTree', 'archivedy'), $applicable);
+		$this->assertNotContains($this->idFromFixture('SiteTree', 'unpublished'), $applicable);
+		$this->assertNotContains($this->idFromFixture('SiteTree', 'modified'), $applicable);	
+	}
+
+	public function testBatchRestore() {
+		$this->logInWithPermission('ADMIN');
+		$pages = Versioned::get_including_deleted('SiteTree');
+		$action = new CMSBatchAction_Restore();
+		$archivedID = $this->idFromFixture('SiteTree', 'archived');
+		$archivedxID = $this->idFromFixture('SiteTree', 'archivedx');
+		$archivedyID = $this->idFromFixture('SiteTree', 'archivedy');
+
+		// Just restore one child
+		$list = $pages->filter('RecordID', $archivedxID);
+		$this->assertEquals(1, $list->count());
+		$this->assertEquals($archivedID, $list->first()->ParentID);
+
+		// Run restore
+		$result = json_decode($action->run($list), true);
+		$this->assertEquals(
+			array(
+				$archivedxID => $archivedxID
+			),
+			$result['success']
+		);
+		$archivedx = SiteTree::get()->byID($archivedxID);
+		$this->assertNotNull($archivedx);
+		$this->assertEquals(0, $archivedx->ParentID); // Restore to root because parent is unrestored
+
+		// Restore both remaining pages
+		$list = $pages
+			->filter('RecordID', array($archivedID, $archivedyID))
+			->sort('Title');
+		$this->assertEquals(2, $list->count());
+		$this->assertEquals($archivedID, $list->first()->ParentID); // archivedy
+		$this->assertEquals(0, $list->last()->ParentID); // archived (parent)
+
+		// Run restore
+		$result = json_decode($action->run($list), true);
+		$this->assertEquals(
+			array(
+				// Order of archived is opposite to order items are passed in, as
+				// these are sorted by level first
+				$archivedID => $archivedID,
+				$archivedyID => $archivedyID
+			),
+			$result['success']
+		);
+		$archived = SiteTree::get()->byID($archivedID);
+		$archivedy = SiteTree::get()->byID($archivedyID);
+		$this->assertNotNull($archived);
+		$this->assertNotNull($archivedy);
+		$this->assertEquals($archivedID, $archivedy->ParentID); // Not restored to root, but to the parent
+		$this->assertEquals(0, $archived->ParentID); // Root stays root
 	}

 }
--- a/tests/controller/CMSBatchActionsTest.yml
+++ b/tests/controller/CMSBatchActionsTest.yml
@ -1,9 +1,15 @@
-Page:
+SiteTree:
  published:
    Title: Published
  archived:
-    Title: archived
+    Title: 'Parent Archived'
  unpublished:
    Title: unpublished
  modified:
    Title: modified1
+  archivedx:
+    Title: 'Archived: Child1'
+    Parent: =>SiteTree.archived
+  archivedy:
+    Title: 'Archived: Child2'
+    Parent: =>SiteTree.archived
--- a/tests/model/SiteTreeTest.php
+++ b/tests/model/SiteTreeTest.php
@ -318,6 +318,13 @@ class SiteTreeTest extends SapphireTest {
 		$this->assertEquals('about-us/tom&jerry', $about->RelativeLink('tom&jerry'), 'Doesnt url encode parameter');
 	}

+	public function testPageLevel() {
+		$about = $this->objFromFixture('Page', 'about');
+		$staff = $this->objFromFixture('Page', 'staff');
+		$this->assertEquals(1, $about->getPageLevel());
+		$this->assertEquals(2, $staff->getPageLevel());
+	}
+
 	public function testAbsoluteLiveLink() {
 		$parent = $this->objFromFixture('Page', 'about');
 		$child = $this->objFromFixture('Page', 'staff');
--- a/tests/model/VirtualPageTest.php
+++ b/tests/model/VirtualPageTest.php
@ -7,6 +7,7 @@ class VirtualPageTest extends SapphireTest {
 		'VirtualPageTest_ClassA',
 		'VirtualPageTest_ClassB',
 		'VirtualPageTest_VirtualPageSub',
+		'VirtualPageTest_PageWithAllowedChildren'
 	);

 	protected $illegalExtensions = array(
@ -604,6 +605,45 @@ class VirtualPageTest extends SapphireTest {
 		$this->assertEquals('SOME CONTENT', $virtual->obj('CastingTest')->forTemplate());
 	}

+	public function testVirtualPageAsAnAllowedChild() {
+		$parentPage = new VirtualPageTest_PageWithAllowedChildren();
+		$parentPage->write();
+
+		$childPage = new VirtualPageTest_ClassA();
+		$childPage->ParentID = $parentPage->ID;
+		$childPage->write();
+
+		// Check we're allowed to create a VirtualPage without linking it to a page yet
+		$childVirtualPage = new VirtualPage();
+		$childVirtualPage->ParentID = $parentPage->ID;
+		try {
+			$childVirtualPage->write();
+		} catch(ValidationException $e) {
+			$this->fail('Failed to write VirtualPage when it is an allowed child');
+		}
+
+		// Check that we can link a VirtualPage to a page type that's an allowed child
+		$childVirtualPage->CopyContentFromID = $childPage->ID;
+		try {
+			$childVirtualPage->write();
+		} catch(ValidationException $e) {
+			$this->fail('Failed to write VirtualPage when it is linked to an allowed child');
+		}
+
+		// Check that we CAN'T link a VirtualPage to a page that is NOT an allowed child
+		$disallowedChild = new VirtualPageTest_ClassB();
+		$disallowedChild->write();
+		$childVirtualPage->CopyContentFromID = $disallowedChild->ID;
+		$isDetected = false;
+		try {
+			$childVirtualPage->write();
+		} catch(ValidationException $e) {
+			$this->assertContains('not allowed as child of this parent page', $e->getMessage());
+			$isDetected = true;
+		} 
+
+		if(!$isDetected) $this->fail("Shouldn't be allowed to write a VirtualPage that links to a disallowed child");
+	}
 }

 class VirtualPageTest_ClassA extends Page implements TestOnly {
@ -652,3 +692,10 @@ class VirtualPageTest_PageExtension extends DataExtension implements TestOnly {
 	);

 }
+
+class VirtualPageTest_PageWithAllowedChildren extends Page implements TestOnly {
+	private static $allowed_children = array(
+		'VirtualPageTest_ClassA',
+		'VirtualPage'
+	);
+}