Merge remote-tracking branch 'origin/master' into translation-staging

2024-10-22 08:05:56 +02:00 · 2012-08-11 09:11:28 +02:00 · 2012-08-11 09:11:28 +02:00 · ed07428085
commit ed07428085
parent 4c65eb98b0 e2faa6fbbd
54 changed files with 587 additions and 468 deletions
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@ -303,6 +303,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 			->unsetValidator();
 		$form->loadDataFrom($this->request->getVars());

+		$this->extend('updateSearchForm', $form);
 		return $form;
 	}
 	
@ -700,6 +701,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		$columns->setFieldCasting(array(
 			'Created' => 'Datetime->Ago',
 			'LastEdited' => 'Datetime->Ago',
+			'getTreeTitle' => 'HTMLText'
 		));

 		$controller = $this;
--- a/code/controllers/CMSPageHistoryController.php
+++ b/code/controllers/CMSPageHistoryController.php
@ -97,8 +97,11 @@ class CMSPageHistoryController extends CMSMain {
 		// Respect permission failures from parent implementation
 		if(!($form instanceof Form)) return $form;

+		$nav = new SilverStripeNavigatorItem_ArchiveLink($record);
+
 		$form->setActions(new FieldList(
-			$revert = FormAction::create('doRollback', _t('CMSPageHistoryController.REVERTTOTHISVERSION', 'Revert to this version'))->setUseButtonTag(true)
+			$revert = FormAction::create('doRollback', _t('CMSPageHistoryController.REVERTTOTHISVERSION', 'Revert to this version'))->setUseButtonTag(true),
+			$navField = new LiteralField('ArchivedLink', $nav->getHTML())
 		));
 		
 		$fields = $form->Fields();
@ -107,6 +110,7 @@ class CMSPageHistoryController extends CMSMain {
 		$fields->push(new HiddenField("Version"));
 		
 		$fields = $fields->makeReadonly();		
+		$navField->setAllowHTML(true);
 		
 		foreach($fields->dataFields() as $field) {
 			$field->dontEscape = true;
--- a/code/controllers/CMSSettingsController.php
+++ b/code/controllers/CMSSettingsController.php
@ -5,6 +5,7 @@ class CMSSettingsController extends LeftAndMain {
 	static $url_rule = '/$Action/$ID/$OtherID';
 	static $menu_priority = -1;
 	static $menu_title = 'Settings';
+	static $tree_class = 'SiteConfig';

 	public function getResponseNegotiator() {
 		$neg = parent::getResponseNegotiator();
--- a/code/controllers/CMSSiteTreeFilter.php
+++ b/code/controllers/CMSSiteTreeFilter.php
@ -173,44 +173,51 @@ class CMSSiteTreeFilter_Search extends CMSSiteTreeFilter {
 	 * 
 	 * @return Array
 	 */
-	function pagesIncluded() {
+	public function pagesIncluded() {
+		$sng = singleton('SiteTree');
 		$ids = array();
-		$q = new SQLQuery();
-		$q->setSelect(array('"ID"','"ParentID"'))
-			->setFrom('"SiteTree"');
-		$where = array();

-		$SQL_params = Convert::raw2sql($this->params);
-		foreach($SQL_params as $name => $val) {
+		$query = new DataQuery('SiteTree');
+		$query->setQueriedColumns(array('ID', 'ParentID'));
+
+		foreach($this->params as $name => $val) {
+			$SQL_val = Convert::raw2sql($val);
+
 			switch($name) {
-				// Match against URLSegment, Title, MenuTitle & Content
 				case 'Term':
-					if($val) $where[] = "\"URLSegment\" LIKE '%$val%' OR \"Title\" LIKE '%$val%' OR \"MenuTitle\" LIKE '%$val%' OR \"Content\" LIKE '%$val%'";
+					$query->whereAny(array(
+						"\"URLSegment\" LIKE '%$SQL_val%'",
+						"\"Title\" LIKE '%$SQL_val%'",
+						"\"MenuTitle\" LIKE '%$SQL_val%'",
+						"\"Content\" LIKE '%$SQL_val%'"
+					));
 					break;
-				// Match against date
+
 				case 'LastEditedFrom':
-					if($val) $where[] = "\"LastEdited\" >= '$val'";
+					$query->where("\"LastEdited\" >= '$SQL_val'");
 					break;
+
 				case 'LastEditedTo':
-					if($val) $where[] = "\"LastEdited\" <= '$val'";
+					$query->where("\"LastEdited\" <= '$SQL_val'");
 					break;
-				// Match against exact ClassName
+
 				case 'ClassName':
 					if($val && $val != 'All') {
-						$where[] = "\"ClassName\" = '$val'";
+						$query->where("\"ClassName\" = '$SQL_val'");
 					}
 					break;
+
 				default:
-					// Partial string match against a variety of fields 
-					if(!empty($val) && singleton("SiteTree")->hasDatabaseField($name)) {
-						$where[] = "\"$name\" LIKE '%$val%'";
+					if(!empty($val) && $sng->hasDatabaseField($name)) {
+						$filter = $sng->dbObject($name)->defaultSearchFilter();
+						$filter->setValue($val);
+						$filter->apply($query);
 					}
 			}
 		}
-		$q->setWhere(empty($where) ? '' : '(' . implode(') AND (',$where) . ')');

-		foreach($q->execute() as $row) {
-			$ids[] = array('ID'=>$row['ID'],'ParentID'=>$row['ParentID']);
+		foreach($query->execute() as $row) {
+			$ids[] = array('ID' => $row['ID'], 'ParentID' => $row['ParentID']);
 		}

 		return $ids;
--- a/code/controllers/ModelAsController.php
+++ b/code/controllers/ModelAsController.php
@ -159,7 +159,11 @@ class ModelAsController extends Controller implements NestedController {
 				'SiteTree', 
 				"\"URLSegment\" = '$URLSegment'" . ($useParentIDFilter ? ' AND "ParentID" = ' . (int)$parentID : '')
 			);
-			if($pages && $pages->Count() == 1) return $pages->First();
+
+			if($pages && $pages->Count() == 1 && ($page = $pages->First())) {
+				$parent = $page->ParentID ? $page->Parent() : $page;
+				if($parent->isPublished()) return $page;
+			}
 		}
 		
 		// Get an old version of a page that has been renamed.
@ -175,8 +179,9 @@ class ModelAsController extends Controller implements NestedController {
 		$record = $query->execute()->first();
 		
 		if($record && ($oldPage = DataObject::get_by_id('SiteTree', $record['RecordID']))) {
+			$oldParent = $oldPage->ParentID ? $oldPage->Parent() : $oldPage;
 			// Run the page through an extra filter to ensure that all extensions are applied.
-			if(SiteTree::get_by_link($oldPage->RelativeLink())) return $oldPage;
+			if(SiteTree::get_by_link($oldPage->RelativeLink()) && $oldParent->isPublished()) return $oldPage;
 		}
 	}
 	
--- a/code/controllers/SilverStripeNavigator.php
+++ b/code/controllers/SilverStripeNavigator.php
@ -308,7 +308,7 @@ class SilverStripeNavigatorItem_ArchiveLink extends SilverStripeNavigatorItem {

 	function getHTML() {
 			$this->recordLink = $this->record->AbsoluteLink();
-			return "<a href=\"$this->recordLink?archiveDate={$this->record->LastEdited}\" target=\"_blank\">". _t('ContentController.ARCHIVEDSITE', 'Archived Site') ."</a>";
+			return "<a class=\"ss-ui-button\" href=\"$this->recordLink?archiveDate={$this->record->LastEdited}\" target=\"_blank\">". _t('ContentController.ARCHIVEDSITE', 'Preview version') ."</a>";
 	}
 	
 	function getMessage() { 
--- a/code/model/SiteConfig.php
+++ b/code/model/SiteConfig.php
@ -65,7 +65,8 @@ class SiteConfig extends DataObject implements PermissionProvider {
 					$topLevelCreatorsGroupsField = ListboxField::create("CreateTopLevelGroups", _t('SiteTree.TOPLEVELCREATORGROUPS', "Top level creators"))
 						->setMultiple(true)->setSource($groupsMap)
 				)
-			)
+			),
+			new HiddenField('ID')
 		);

 		$themeDropdownField->setEmptyString(_t('SiteConfig.DEFAULTTHEME', '(Use default theme)'));
@ -149,6 +150,13 @@ class SiteConfig extends DataObject implements PermissionProvider {
 		return $actions;
 	}

+	/**
+	 * @return String
+	 */
+	function CMSEditLink() {
+		return singleton('CMSSettingsController')->Link();
+	}
+	
 	/**
 	 * Get the current sites SiteConfig, and creates a new one
 	 * through {@link make_site_config()} if none is found.
--- a/code/model/SiteTree.php
+++ b/code/model/SiteTree.php
@ -2712,16 +2712,10 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 		if(isset($entities['Page.SINGULARNAME'])) $entities['Page.SINGULARNAME'][3] = FRAMEWORK_DIR;
 		if(isset($entities['Page.PLURALNAME'])) $entities['Page.PLURALNAME'][3] = FRAMEWORK_DIR;		

-		$types = ClassInfo::subclassesFor('SiteTree');
-		foreach($types as $k => $type) {
-			$inst = singleton($type);
-			$entities[$type . '.DESCRIPTION'] = array(
-				$inst->stat('description'),
-				
-				'Description of the page type (shown in the "add page" dialog)'
-			);
-		}
-		
+		$entities[$this->class . '.DESCRIPTION'] = array(
+			$this->stat('description'),
+			'Description of the page type (shown in the "add page" dialog)'
+		);

 		return $entities;
 	}
--- a/code/search/SearchForm.php
+++ b/code/search/SearchForm.php
@ -172,7 +172,8 @@ class SearchForm extends Form {
 		// legacy usage: $data was defaulting to $_REQUEST, parameter not passed in doc.silverstripe.org tutorials
 		if(!isset($data)) $data = $_REQUEST;
 		
-		return Convert::raw2xml($data['Search']);
+		// The form could be rendered without the search being done, so check for that.
+		if (isset($data['Search'])) return Convert::raw2xml($data['Search']);
 	}
 	
 	/**
--- a/code/staticpublisher/FilesystemPublisher.php
+++ b/code/staticpublisher/FilesystemPublisher.php
@ -56,7 +56,7 @@ class FilesystemPublisher extends StaticPublisher {
 	 *   with the filename 'index.html'.  If you set the extension to PHP, then a simple PHP script will
 	 *   be generated that can do appropriate cache & redirect header negotation.
 	 */
-	function __construct($destFolder, $fileExtension = null) {
+	function __construct($destFolder = 'cache', $fileExtension = null) {
 		// Remove trailing slash from folder
 		if(substr($destFolder, -1) == '/') $destFolder = substr($destFolder, 0, -1);
 		
--- a/config.rb
+++ b/config.rb
@ -9,6 +9,7 @@ sass_dir = "scss"
 images_dir = "images"
 javascripts_dir = "javascript"
 output_style = :compact
+line_comments = false
 # To enable relative paths to assets via compass helper functions. Uncomment:
 # relative_assets = true

--- a/css/screen.css
+++ b/css/screen.css
@ -18,7 +18,7 @@
 .cms-content-tools #cms-content-treeview .cms-tree-expand-trigger { display: inline-block; margin: 0 0 2px 0; position: absolute; top: 8px; right: 4px; }
 .cms-content-tools #cms-content-treeview .cms-tree-expand-trigger span.ui-button-text { padding-right: 8px; }
 .cms-content-tools #cms-content-treeview .cms-tree .badge, .cms-content-tools #cms-content-treeview .cms-tree a > .jstree-icon { display: none; }
-.cms-content-tools #cms-content-treeview .cms-tree a:hover > .text > .badge { display: inline-block; }
+.cms-content-tools #cms-content-treeview .cms-tree a:hover > .text > .badge, .cms-content-tools #cms-content-treeview .cms-tree .jstree-clicked > .text > .badge { display: inline-block; }

 /** ------------------------------------------------------------------ URLSegment field ----------------------------------------------------------------- */
 .field.urlsegment.disabled { color: #444; padding-left: 0px; margin-left: 0px; background: none; border-color: transparent; }
--- a/javascript/SiteTreeURLSegmentField.js
+++ b/javascript/SiteTreeURLSegmentField.js
@ -160,7 +160,7 @@
 				// edit button
 				editAction = $('<button />', {
 					'class': 'ss-ui-button ss-ui-button-small edit',
-					'text': 'Edit',
+					'text': ss.i18n._t('URLSEGMENT.Edit'),
 					'click': function(e) {
 						e.preventDefault();
 						self.edit();
@ -171,7 +171,7 @@
 				// update button
 				updateAction = $('<button />', {
 					'class': 'update ss-ui-button-small',
-					'text': 'OK',
+					'text': ss.i18n._t('URLSEGMENT.OK'),
 					'click': function(e) {
 						e.preventDefault();
 						self.update();
@ -182,7 +182,7 @@
 				cancelAction = $('<button />', {
 					'class': 'cancel ss-ui-action-minor ss-ui-button-small',
 					'href': '#',
-					'text': 'cancel',
+					'text':  ss.i18n._t('URLSEGMENT.Cancel'),
 					'click': function(e) {
 						e.preventDefault();
 						self.cancel();
--- a/javascript/lang/en_US.js
+++ b/javascript/lang/en_US.js
@ -31,6 +31,9 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 		'Tree.AddSubPage': 'Add new page here',
 		'Tree.EditPage': 'Edit',
 		'CMSMain.ConfirmRestoreFromLive': "Do you really want to copy the published content to the draft site?",
-		'CMSMain.RollbackToVersion': "Do you really want to roll back to version #%s of this page?"
+		'CMSMain.RollbackToVersion': "Do you really want to roll back to version #%s of this page?",
+		'URLSEGMENT.Edit': 'Edit',
+		'URLSEGMENT.OK': 'OK',
+		'URLSEGMENT.Cancel': 'Cancel'
 	});
 }
--- a/javascript/lang/ja_JP.js
+++ b/javascript/lang/ja_JP.js
@ -0,0 +1,36 @@
+if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
+	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
+} else {
+	ss.i18n.addDictionary('ja_JP', {
+		'CMSMAIN.WARNINGSAVEPAGESBEFOREADDING' : "子ページを追加する前に，そのページを保存する必要があります．",
+		'CMSMAIN.CANTADDCHILDREN' : "選択されたノードには子供を追加することはできません．",
+		'CMSMAIN.ERRORADDINGPAGE' : 'ページの追加でエラーが起きました．',
+		'CMSMAIN.FILTEREDTREE' : '変更されたページのみ表示するフィルタされたツリー',
+		'CMSMAIN.ERRORFILTERPAGES' : '変更されたページのみ表示するようにツリーをフィルタできませんでした<br />%s',
+		'CMSMAIN.ERRORUNFILTER' : 'フィルタされていないツリー',
+		'CMSMAIN.PUBLISHINGPAGES' : 'ページを公開しています...',
+		'CMSMAIN.SELECTONEPAGE' : "最低でも1ページ選択してください．",
+		'CMSMAIN.ERRORPUBLISHING' : 'ページを公開中にエラー',
+		'CMSMAIN.REALLYDELETEPAGES' : "Do you really want to delete the %s marked pages?",
+		'CMSMAIN.DELETINGPAGES' : 'ページを削除しています',
+		'CMSMAIN.ERRORDELETINGPAGES': 'ページ削除においてエラー',
+		'CMSMAIN.PUBLISHING' : '公開しています...',
+		'CMSMAIN.RESTORING': '復元しています...',
+		'CMSMAIN.ERRORREVERTING': 'Error reverting to live content',
+		'CMSMAIN.SAVING' : '保存しています...',
+		'CMSMAIN.SELECTMOREPAGES' : "You have %s pages selected.\n\nDo you really want to perform this action?",
+		'CMSMAIN.ALERTCLASSNAME': 'ページ保存後にページの種類は更新されます．',
+		'CMSMAIN.URLSEGMENTVALIDATION': 'URLはアルファベットの文字か数値，及びハイフンのみから構成されます．',
+		'AssetAdmin.BATCHACTIONSDELETECONFIRM': "%sフォルダを本当に削除しますか?",
+		'AssetTableField.REALLYDELETE': 'マークされているファイルを本当に削除しますか?',
+		'AssetTableField.MOVING': '%sファイルを移動中．',
+		'CMSMAIN.AddSearchCriteria': 'Add Criteria',
+		'WidgetAreaEditor.TOOMANY': '申し訳ございません．このエリアにおけるウィジェットの最大数に到達しました．',
+		'AssetAdmin.ConfirmDelete': 'このフォルダとフォルダに含まれるすべてのファイルを本当に削除しますか?',
+		'Folder.Name': 'フォルダ名',
+		'Tree.AddSubPage': 'ここに新しいページを追加',
+		'Tree.EditPage': '編集',
+		'CMSMain.ConfirmRestoreFromLive': "公開されているコンテンツを下書きサイトへ本当にコピーしますか?",
+		'CMSMain.RollbackToVersion': "このページのバージョン#%sへ本当にロールバックしますか?"
+	});
+}
--- a/javascript/lang/mi_NZ.js
+++ b/javascript/lang/mi_NZ.js
@ -0,0 +1,39 @@
+if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
+	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
+} else {
+	ss.i18n.addDictionary('mi_NZ', {
+		'CMSMAIN.WARNINGSAVEPAGESBEFOREADDING' : "Me tiaki i te whārangi i mua i te tāpiri tamariki ki raro",
+		'CMSMAIN.CANTADDCHILDREN' : "Kāore e taea te tāpiri tamariki ki te kōpuku kua tīpakotia",
+		'CMSMAIN.ERRORADDINGPAGE' : 'Hapa tāpiri whārangi',
+		'CMSMAIN.FILTEREDTREE' : 'Me whakaatu te rākau kua tātaritia i ngā whārangi kua hurihia anake',
+		'CMSMAIN.ERRORFILTERPAGES' : 'Kāore i taea te tātari i te rākau kia whakaaturia ngā whārangi kua hurihia anake<br />%s',
+		'CMSMAIN.ERRORUNFILTER' : 'Rākau tē tātaritia',
+		'CMSMAIN.PUBLISHINGPAGES' : 'Whakaputa whārangi ana...',
+		'CMSMAIN.SELECTONEPAGE' : "Kōwhiria kotahi whārangi i te iti rawa.",
+		'CMSMAIN.ERRORPUBLISHING' : 'Kua hapa te whakaputa whārangi',
+		'CMSMAIN.REALLYDELETEPAGES' : "Kei te tino hiahia muku i ngā whārangi kua tohua %s?",
+		'CMSMAIN.DELETINGPAGES' : 'Muku whārangi ana...',
+		'CMSMAIN.ERRORDELETINGPAGES': 'Kua hapa te muku whārangi',
+		'CMSMAIN.PUBLISHING' : 'Whakaputa ana...',
+		'CMSMAIN.RESTORING': 'Whakaora ana...',
+		'CMSMAIN.ERRORREVERTING': 'Kua hapa te hoki ki ngā ihirangi hohe',
+		'CMSMAIN.SAVING' : 'Tiaki ana...',
+		'CMSMAIN.SELECTMOREPAGES' : "Kua kōwhiria e %s ngā whārangi.\n\nHe tika kia mahia tēnei mahi?",
+		'CMSMAIN.ALERTCLASSNAME': 'Ka whakahōutia te momo whārangi i muri i te tiaki i te whārangi',
+		'CMSMAIN.URLSEGMENTVALIDATION': 'Ka taea anake ngā pūāhua, ngā mati me ngā tohuhono i ngā PRO.',
+		'AssetAdmin.BATCHACTIONSDELETECONFIRM': "Kei te tino hiahia muku i ngā kōpaki %s?",
+		'AssetTableField.REALLYDELETE': "Kei te tino hiahia muku i ngā kōnae kua tohua?",
+		'AssetTableField.MOVING': 'Neke ana i te %s kōnae',
+		'CMSMAIN.AddSearchCriteria': 'Tāpiri Paearu',
+		'WidgetAreaEditor.TOOMANY': 'Aroha noa, kua taea te mōrahi o ngā taupānga iti i tēnei wāhi',
+		'AssetAdmin.ConfirmDelete': 'Kei te tino hiahia muku i tēnei kōpaki me ngā kōnae i roto?',
+		'Folder.Name': 'Ingoa kōpaki',
+		'URLSEGMENT.Edit': 'Whakatika',
+		'URLSEGMENT.OK': 'Tiaki',
+		'URLSEGMENT.Cancel': 'Whakakore',
+		'Tree.AddSubPage': 'Tāpiritia he whārangi hōu ki konei',
+		'Tree.EditPage': 'Whakatika',
+		'CMSMain.ConfirmRestoreFromLive': "Kei te tino hiahia tārua i te ihirangi kua whakaputaina ki te pae hukihuki?",
+		'CMSMain.RollbackToVersion': "Kei te tino hiahia hoki ki te tauira #%s o tēnei whārangi?"
+	});
+}
--- a/lang/ar.yml
+++ b/lang/ar.yml
@ -290,11 +290,11 @@ ar:
    TABACCESS: الوصول
    TABMAIN: الرئيسي
    TAGLINEDEFAULT: 'علامتك هنا'
-    THEME: الثيم
+    THEME: 'الثيم'
    TOPLEVELCREATE: 'من يستطيع إنشاء صفحات في جذر الموقع؟'
    VIEWHEADER: 'من يستطيع عرض الصفحات على هذا الموقع؟...'
  SiteTree:
-    ACCESSANYONE: الجميع
+    ACCESSANYONE: 'الجميع'
    ACCESSHEADER: 'من يستطيع مشاهدة هذه الصفحة ؟'
    ACCESSLOGGEDIN: 'الأعضاء المسجلين'
    ACCESSONLYTHESE: 'فقط هؤلاء الأشخاص ( اختر من القائمة)'
@ -309,7 +309,7 @@ ar:
    BUTTONUNPUBLISHDESC: 'حذف هذه الصفحة من الموقع المنشور'
    CREATED: 'Date Created'
    Comments: التعليقات
-    Content: المحتوى
+    Content: 'المحتوى'
    DEFAULTABOUTCONTENT: '<p>يمكنك ملء هذه الصفحة بمحتوى خاص بك أو حذفها و إنشاء صفحات جديدة خاصة بك<br /></p>'
    DEFAULTABOUTTITLE: حول
    DEFAULTCONTACTCONTENT: '<p>يمكنك ملء هذه الصفحة بمحتوى خاص بك أو حذفها و إنشاء صفحات جديدة خاصة بك<br /></p>'
@ -330,11 +330,11 @@ ar:
    EDIT_ALL_HELP: 'القدرة على تحرير أي صفحة على الموقع ، بغض النظر عن الإعدادات على علامة تبويب الوصول. يتطلب تصريح "الوصول إلى محتوى الموقع" '
    Editors: 'مجموعات المحررين'
    HASBROKENLINKS: 'هذه الصفحة تحتوي على روابط معطوبة'
-    HTMLEDITORTITLE: محتوى
+    HTMLEDITORTITLE: 'محتوى'
    INHERIT: 'استيراد من الصفحة المرجعية'
    LASTUPDATED: 'Last Updated'
    LINKCHANGENOTE: 'تغيير هذا وصلة رابط الصفحة سوف تؤثر أيضًا على الوصلات لجميع صفحات الفرعية.'
-    MENUTITLE: القائمة
+    MENUTITLE: 'القائمة'
    METADESC: الوصف
    METAEXTRA: 'تخصيص Meta Tags'
    METAKEYWORDS: 'الكلمات المفتاحية'
@ -363,7 +363,7 @@ ar:
    SHOWINSEARCH: 'عرض في البحث ؟'
    SINGULARNAME: 'هيكلة الموقع'
    TABBEHAVIOUR: الشسلوك
-    TABCONTENT: المحتوى
+    TABCONTENT: 'المحتوى'
    TABDEPENDENT: 'الصفحات المعتدة'
    TOPLEVEL: 'محتوى الموقع ( مستوى أعلى )'
    TOPLEVELCREATORGROUPS: 'منشيء المستوى الأعلى'
--- a/lang/bg.yml
+++ b/lang/bg.yml
@ -3,7 +3,7 @@ bg:
    ADDFILES: 'Добави файлове'
    ALLOWEDEXTS: 'Разрешени разширения'
    ActionAdd: 'Добави директория'
-    AppCategoryArchive: Архив
+    AppCategoryArchive: 'Архив'
    AppCategoryAudio: Audio
    AppCategoryFlash: Flash
    AppCategoryImage: Image
@ -20,14 +20,14 @@ bg:
    ListView: 'List View'
    MENUTITLE: Файлове
    NEWFOLDER: 'Нова директория'
-    SIZE: Размер
+    SIZE: 'Размер'
    THUMBSDELETED: '{count} unused thumbnails have been deleted'
    TreeView: 'Tree View'
    Upload: Upload
  AssetAdmin_DeleteBatchAction:
    TITLE: 'Delete folders'
  AssetAdmin_Tools.ss:
-    FILTER: Filter
+    FILTER: Филтър
  AssetAdmin_left.ss:
    GO: Давай
  AssetTableField:
@ -169,7 +169,7 @@ bg:
  ContentControl:
    NOTEWONTBESHOWN: 'Забележка: Това съобщение няма да се показва на Вашите посетители'
  ContentController:
-    ARCHIVEDSITE: 'Archived Site'
+    ARCHIVEDSITE: 'Архивиран сайт'
    ARCHIVEDSITEFROM: 'Архивиран сайт от'
    CMS: 'СУС (CMS)'
    DRAFTSITE: Чернови
@ -180,7 +180,7 @@ bg:
    InstallSuccessCongratulations: 'SilverStripe has been successfully installed.'
    LOGGEDINAS: 'Влязъл като'
    LOGIN: Login
-    LOGOUT: Изход
+    LOGOUT: 'Изход'
    NOTLOGGEDIN: 'Извън системата'
    PUBLISHEDSITE: 'Публикувани страници'
    Password: Password
--- a/lang/cs.yml
+++ b/lang/cs.yml
@ -10,7 +10,7 @@ cs:
    AppCategoryVideo: Video
    BackToFolder: 'Zpět na složku'
    CREATED: Datum
-    CurrentFolderOnly: 'Omezit na aktuální složku?'
+    CurrentFolderOnly: 'Limit to current folder?'
    DetailsView: Detaily
    FILES: Soubory
    FILESYSTEMSYNCTITLE: 'Aktualizace záznamů souborů databáze CMS na souborovém systému. Užitečné, když byly nové soubory nahrány mimo CMS, např. přes FTP.'
@ -21,18 +21,18 @@ cs:
    MENUTITLE: Soubory
    NEWFOLDER: 'Nová složka'
    SIZE: Velikost
-    THUMBSDELETED: '{count} nepoužitých miniatur bylo smazáno'
-    TreeView: 'Zobrazit strom'
+    THUMBSDELETED: '{count} unused thumbnails have been deleted'
+    TreeView: 'Tree View'
    Upload: Nahrát
  AssetAdmin_DeleteBatchAction:
-    TITLE: 'Smazat složky'
+    TITLE: 'Delete folders'
  AssetAdmin_Tools.ss:
    FILTER: Filtr
  AssetAdmin_left.ss:
    GO: Proveď
  AssetTableField:
-    BACKLINKCOUNT: 'Použito na:'
-    PAGES: stránka(y)
+    BACKLINKCOUNT: 'Used on:'
+    PAGES: page(s)
  BackLink_Button.ss:
    Back: Zpět
  BasicFieldsTestPage:
@ -86,9 +86,9 @@ cs:
    DELETEFP: 'Smazat z publikovaných stránek'
    DESCREMOVED: 'a {count} potomků'
    EMAIL: Email
-    EditTree: 'Editovat strom'
-    ListFiltered: 'Filtrovaný seznam.'
-    MENUTITLE: 'Editovat stránku'
+    EditTree: 'Edit Tree'
+    ListFiltered: 'Filtered list.'
+    MENUTITLE: 'Edit Page'
    NEW: Nový
    PAGENOTEXISTS: 'Tato stránka neexistuje'
    PAGES: Stránky
@ -108,15 +108,15 @@ cs:
    ROLLEDBACKPUB: 'Vrací se zpět na zveřejněnou verzi. Číslo nové verze je #{version}'
    ROLLEDBACKVERSION: 'Vracím se zpět na verzi #%d. Číslo nové verze je #%d'
    SAVE: Uložit
-    SAVEDRAFT: 'Uložit koncept'
-    TabContent: Obsah
-    TabHistory: Historie
-    TabSettings: Nastavení
-    TreeFiltered: 'Filtrovaný strom.'
-    TreeFilteredClear: 'Vyčistit filtr'
+    SAVEDRAFT: 'Save Draft'
+    TabContent: Content
+    TabHistory: History
+    TabSettings: Settings
+    TreeFiltered: 'Filtered tree.'
+    TreeFilteredClear: 'Clear filter'
  CMSMain_left.ss:
-    'APPLY FILTER': 'Použít filtr'
-    RESET: Resetovat
+    'APPLY FILTER': 'Apply Filter'
+    RESET: Reset
  CMSPageAddController:
    MENUTITLE: 'Přidat stránku'
    ParentMode_child: 'Pod jinou stránku'
@ -132,13 +132,13 @@ cs:
    SHOWUNPUBLISHED: 'Zobrazit nezveřejněné verze'
    SHOWVERSION: 'Zobrazit verzi'
    VIEW: zobrazit
-    VIEWINGVERSION: 'Právě prohlížíte verzi {version}.'
+    VIEWINGVERSION: 'Currently viewing version {version}.'
  CMSPageHistoryController_versions.ss:
    AUTHOR: Autor
    NOTPUBLISHED: Nezveřejněno
-    PUBLISHER: Vydavatel
+    PUBLISHER: Publisher
    UNKNOWN: Neznámý
-    WHEN: Když
+    WHEN: When
  CMSPageSettingsController:
    MENUTITLE: 'Editovat stránku'
  CMSPagesController:
@ -147,8 +147,8 @@ cs:
    MENUTITLE: Stránky
    TreeView: Strom
  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: 'Táhni a pusť'
-    MULTISELECT: 'Multi výběr'
+    ENABLEDRAGGING: 'Drag''n''drop'
+    MULTISELECT: Multi-selection
  CMSPagesController_Tools.ss:
    FILTER: Filtr
  CMSSearch:
@ -159,7 +159,7 @@ cs:
  CMSSettingsController:
    MENUTITLE: Možnosti
  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Změněné stránky'
+    Title: 'Changed pages'
  CMSSiteTreeFilter_DeletedPages:
    Title: 'Všechny stránky, včetně odstraněných'
  CMSSiteTreeFilter_Search:
@ -194,8 +194,8 @@ cs:
    DEFAULTERRORPAGETITLE: 'Strana nenelazena'
    DEFAULTSERVERERRORPAGECONTENT: '<p>Je nám to líto, ale nastal problém se zpracováním Vašeho poždavku.</p>'
    DEFAULTSERVERERRORPAGETITLE: 'Chyba serveru'
-    DESCRIPTION: 'Vlastní obsah pro různé případy chyb (např. "Stránka nenalezena")'
-    ERRORFILEPROBLEM: 'Chyba otevření souboru "{filename}" pro zápis. Zkontrolujte oprávnění souboru, prosím.'
+    DESCRIPTION: 'Custom content for different error cases (e.g. "Page not found")'
+    ERRORFILEPROBLEM: 'Error opening file "{filename}" for writing. Please check file permissions.'
    400: '400 - Špatný požadavek'
    401: '401 - Neautorizováno'
    403: '403 - Zakázáno'
@ -235,7 +235,7 @@ cs:
    SearchResults: 'Výsledky hledání'
    VersionUnknown: Neznámý
  LegacyTableFieldsTestPage:
-    DESCRIPTION: 'Obecný obsah stránky'
+    DESCRIPTION: 'Generic content page'
  Page:
    DESCRIPTION: 'Obecný obsah stránky'
  Permission:
@ -253,7 +253,7 @@ cs:
    REDIRECTTOPAGE: 'Stránku na Vašem webu'
    YOURPAGE: 'Stránku na Vašem webu'
  RelationFieldsTestPage:
-    DESCRIPTION: 'Obecný obsah stránky'
+    DESCRIPTION: 'Generic content page'
  ReportAdmin:
    MENUTITLE: Výkazy
  ReportAdminForm:
@ -319,7 +319,7 @@ cs:
    DELETEDPAGEHELP: 'Stránka už není více zveřejněna'
    DELETEDPAGESHORT: Smazáno
    DEPENDENT_NOTE: 'Následující stránky závisí na této stránce. Tyto obsahují virtuální stránky, redirektor stránky, a stránky s odkazy obsahu.'
-    DESCRIPTION: 'Obecný obsah stránky'
+    DESCRIPTION: 'Generic content page'
    DependtPageColumnLinkType: 'Typ odkazu'
    DependtPageColumnURL: URL
    EDITANYONE: 'Kdokoliv, kdo se do CMS může přihlásit'
@ -392,9 +392,9 @@ cs:
    SORTASC: 'Třídit v vzestupném pořadí'
    SORTDESC: 'Třídit v sestupném pořadí'
  TableListField_PageControls.ss:
-    DISPLAYING: Zobrazuji
-    OF: z
-    TO: do
+    DISPLAYING: Displaying
+    OF: of
+    TO: to
    VIEWFIRST: 'Zobrazit první'
    VIEWLAST: 'Zobrazit poslední'
    VIEWNEXT: 'Zobrazit další'
@ -404,7 +404,7 @@ cs:
  TestPage:
    DESCRIPTION: 'Obecný obsah stránky'
  TreeTools:
-    DisplayLabel: 'Zobrazení:'
+    DisplayLabel: 'Display:'
  ViewArchivedEmail.ss:
    CANACCESS: 'Můžete přistupovat k archivu pomocí tohoto odkazu:'
    HAVEASKED: 'Požadovali jste prohlížet obsah našich stránek během'
--- a/lang/de.yml
+++ b/lang/de.yml
@ -176,7 +176,7 @@ de:
    DRAFT_SITE_ACCESS_RESTRICTION: 'Sie müssen sich mit ihrem CMS Passwort einloggen, um den Entwurf oder den archivierten Inhalt zu sehen. <a href="%s">Hier klicken um zurück zur veröffentlichten Site zu gehen.</a>'
    Email: E-Mail
    InstallFilesDeleted: 'Die Installationsdateien wurden erfolgreich gelöscht.'
-    InstallSecurityWarning: 'Zu Ihrer Sicherheit löschen Sie jetzt bitte die Installationsdateien, es sei denn Sie möchten zu einem späteren Zeitpunkt erneut installieren. (<em>Dies erfordert den Administrator-Zugang (siehe oben)</em>). Der Webserver benötigt nun nur noch Schreibrechte auf das "assets" Verzeichnis und Sie können die Schreibrechte für alle anderen Ordner entfernen. <a href="{link}" style="text-align: center;">Die Installationsdaten jetzt löschen.</a> '
+    InstallSecurityWarning: 'Aus Sicherheitsgründen sollten Sie jetzt die Installationsdaten loeschen, es sei denn sie moechten spaeter erneut installieren. (<em>Dieses erfordert den Administratoren Zugang (siehe oben)</em>). Der Web server benoetigt nun nur noch Schreibzugriff auf den "assets" Ordner und Sie koennen nun den Schreibzugriff fuer alle anderen Ordner loeschen. <a href="{link}" style="text-align: center;"> Klicken Sie hier um die Installationsdaten zu loeschen.</a> '
    InstallSuccessCongratulations: 'SilverStripe wurde erfolgreich installiert.'
    LOGGEDINAS: 'Angemeldet als'
    LOGIN: Anmelden
--- a/lang/el.yml
+++ b/lang/el.yml
@ -107,7 +107,7 @@ el:
    ROLLBACK: 'Roll back to this version'
    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
-    SAVE: Αποθήκευση
+    SAVE: 'Αποθήκευση'
    SAVEDRAFT: 'Save Draft'
    TabContent: Content
    TabHistory: History
--- a/lang/en.yml
+++ b/lang/en.yml
@ -26,7 +26,7 @@ en:
    MENUTITLE: Files
  AssetAdmin_DeleteBatchAction:
    TITLE: 'Delete folders'
-  AssetAdmin_Tools.ss:
+  AssetAdmin_Tools:
    FILTER: Filter
  AssetAdmin_left.ss:
    GO: Go
@ -35,10 +35,6 @@ en:
    PAGES: page(s)
  BackLink_Button.ss:
    Back: Back
-  BasicFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
-  BigFamilyPage:
-    DESCRIPTION: 'Generic content page'
  BrokenLinksReport:
    Any: Any
    BROKENLINKS: 'Broken links report'
@ -161,7 +157,7 @@ en:
  ContentControl:
    NOTEWONTBESHOWN: 'Note: this message will not be shown to your visitors'
  ContentController:
-    ARCHIVEDSITE: 'Archived Site'
+    ARCHIVEDSITE: 'Preview version'
    ARCHIVEDSITEFROM: 'Archived site from'
    CMS: CMS
    DRAFTSITE: 'Draft Site'
@ -211,14 +207,14 @@ en:
    DEFAULTSERVERERRORPAGETITLE: 'Server error'
    DESCRIPTION: 'Custom content for different error cases (e.g. "Page not found")'
    ERRORFILEPROBLEM: 'Error opening file "{filename}" for writing. Please check file permissions.'
+    PLURALNAME: 'Error Pags'
+    SINGULARNAME: 'Error Page'
  Folder:
    AddFolderButton: 'Add folder'
    DELETEUNUSEDTHUMBNAILS: 'Delete unused thumbnails'
    UNUSEDFILESTITLE: 'Unused files'
    UNUSEDTHUMBNAILSTITLE: 'Unused thumbnails'
    UploadFilesButton: Upload
-  GridFieldTestPage:
-    DESCRIPTION: 'Generic content page'
  LeftAndMain:
    DELETED: Deleted.
    PreviewButton: Preview
@ -226,10 +222,6 @@ en:
    STATUSPUBLISHEDSUCCESS: 'Published ''{title}'' successfully'
    SearchResults: 'Search Results'
    VersionUnknown: Unknown
-  LegacyTableFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
-  Page:
-    DESCRIPTION: 'Generic content page'
  Permission:
    CMS_ACCESS_CATEGORY: 'CMS Access'
  Permissions:
@ -240,12 +232,12 @@ en:
    HASBEENSETUP: 'A redirector page has been set up without anywhere to redirect to.'
    HEADER: 'This page will redirect users to another page'
    OTHERURL: 'Other website URL'
+    PLURALNAME: 'Redirector Pags'
    REDIRECTTO: 'Redirect to'
    REDIRECTTOEXTERNAL: 'Another website'
    REDIRECTTOPAGE: 'A page on your website'
+    SINGULARNAME: 'Redirector Page'
    YOURPAGE: 'Page on your website'
-  RelationFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
  ReportAdminForm:
    FILTERBY: 'Filter by'
  SearchForm:
@ -274,6 +266,8 @@ en:
    EDITHEADER: 'Who can edit pages on this site?'
    EDIT_PERMISSION: 'Manage site configuration'
    EDIT_PERMISSION_HELP: 'Ability to edit global access settings/top-level page permissions.'
+    PLURALNAME: 'Site Configs'
+    SINGULARNAME: 'Site Config'
    SITENAMEDEFAULT: 'Your Site Name'
    SITETAGLINE: 'Site Tagline/Slogan'
    SITETITLE: 'Site title'
@ -389,10 +383,6 @@ en:
    VIEWLAST: 'View last'
    VIEWNEXT: 'View next'
    VIEWPREVIOUS: 'View previous'
-  TestFileUploadPage:
-    DESCRIPTION: 'Generic content page'
-  TestPage:
-    DESCRIPTION: 'Generic content page'
  TreeTools:
    DisplayLabel: 'Display:'
  ViewArchivedEmail.ss:
--- a/lang/en_GB.yml
+++ b/lang/en_GB.yml
@ -165,7 +165,7 @@ en_GB:
  CMSSiteTreeFilter_Search:
    Title: 'All pages'
  CaseStudy:
-    DESCRIPTION: 'Case study page to feature work examples'
+    DESCRIPTION: 'Case study page to fature work examples'
  ContentControl:
    NOTEWONTBESHOWN: 'Note: this message will not be shown to your visitors'
  ContentController:
--- a/lang/es.yml
+++ b/lang/es.yml
@ -27,7 +27,7 @@ es:
  AssetAdmin_DeleteBatchAction:
    TITLE: 'Eliminar carpetas'
  AssetAdmin_Tools.ss:
-    FILTER: Filtrar
+    FILTER: Filtro
  AssetAdmin_left.ss:
    GO: Ir
  AssetTableField:
@ -165,7 +165,7 @@ es:
  CMSSiteTreeFilter_Search:
    Title: 'Todas las paginas'
  CaseStudy:
-    DESCRIPTION: 'Página de casos de estudio para ejemplos de futuros trabajos'
+    DESCRIPTION: 'Página de casos de estudio para ejemplos de trabajos futuros'
  ContentControl:
    NOTEWONTBESHOWN: 'Nota: este mensaje no se mostrará a tus visitantes'
  ContentController:
--- a/lang/fa_IR.yml
+++ b/lang/fa_IR.yml
@ -294,7 +294,7 @@ fa_IR:
    TOPLEVELCREATE: 'چه کسی میتواند صفحه جدیدی در ریشه(root) سایت ایجاد کند؟'
    VIEWHEADER: 'چه کسی میتواند صفحات سایت را مشاهده کند؟'
  SiteTree:
-    ACCESSANYONE: همه
+    ACCESSANYONE: 'همه'
    ACCESSHEADER: 'چه کسی بتواند این صفحه را مشاهده کنید ؟'
    ACCESSLOGGEDIN: 'کاربران وارد شده'
    ACCESSONLYTHESE: 'فقط این افراد (انتخاب از لیست)'
@ -330,7 +330,7 @@ fa_IR:
    EDIT_ALL_HELP: 'Ability to edit any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
    Editors: 'Editors Groups'
    HASBROKENLINKS: 'لینک این صفحه شکسته است.'
-    HTMLEDITORTITLE: درون‌مایه
+    HTMLEDITORTITLE: 'درون‌مایه'
    INHERIT: 'Inherit from parent page'
    LASTUPDATED: 'Last Updated'
    LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
@ -363,7 +363,7 @@ fa_IR:
    SHOWINSEARCH: 'نمایش در جستجو ؟'
    SINGULARNAME: 'لینک سایت'
    TABBEHAVIOUR: Behavior
-    TABCONTENT: مطلب
+    TABCONTENT: 'مطلب'
    TABDEPENDENT: 'Dependent pages'
    TOPLEVEL: 'Site Content (Top Level)'
    TOPLEVELCREATORGROUPS: 'Top level creators'
--- a/lang/fi.yml
+++ b/lang/fi.yml
@ -27,7 +27,7 @@ fi:
  AssetAdmin_DeleteBatchAction:
    TITLE: 'Poista kansiot'
  AssetAdmin_Tools.ss:
-    FILTER: Filter
+    FILTER: Suodatin
  AssetAdmin_left.ss:
    GO: Siirry
  AssetTableField:
@ -235,7 +235,7 @@ fi:
    SearchResults: Hakutulokset
    VersionUnknown: Tuntematon
  LegacyTableFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Yleinen sisältösivu'
  Page:
    DESCRIPTION: 'Generic content page'
  Permission:
@ -253,7 +253,7 @@ fi:
    REDIRECTTOPAGE: 'Sivu verkkosivustollasi'
    YOURPAGE: 'Sivu verkkosivustollasi'
  RelationFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Yleinen sisältösivu'
  ReportAdmin:
    MENUTITLE: Raportit
  ReportAdminForm:
--- a/lang/fr.yml
+++ b/lang/fr.yml
@ -154,7 +154,7 @@ fr:
  CMSSearch:
    FILTERDATEFROM: De
    FILTERDATEHEADING: Date
-    FILTERDATETO: à
+    FILTERDATETO: 'à'
    FILTERLABELTEXT: Contenu
  CMSSettingsController:
    MENUTITLE: Paramètres
@ -165,7 +165,7 @@ fr:
  CMSSiteTreeFilter_Search:
    Title: 'Toutes les pages'
  CaseStudy:
-    DESCRIPTION: 'Étude de cas avec exemple de fonctionnalités.'
+    DESCRIPTION: 'Étude de cas avec des exemples de fonctionnalités.'
  ContentControl:
    NOTEWONTBESHOWN: 'Note : ce message ne sera pas visible de vos visiteurs.'
  ContentController:
@ -319,7 +319,7 @@ fr:
    DELETEDPAGEHELP: 'La page n’est plus publique '
    DELETEDPAGESHORT: Supprimée
    DEPENDENT_NOTE: 'Les pages suivantes dépendent de cette page. Ceci inclut les pages virtuelles, les redirections et les pages avec des liens.'
-    DESCRIPTION: 'Page au contenu générique'
+    DESCRIPTION: 'Page remplie par default'
    DependtPageColumnLinkType: 'Type de lien'
    DependtPageColumnURL: URL
    EDITANYONE: 'Toute personne pouvant se connecter au CMS'
@ -394,7 +394,7 @@ fr:
  TableListField_PageControls.ss:
    DISPLAYING: Affichage
    OF: de
-    TO: à
+    TO: 'à'
    VIEWFIRST: 'Voir le(s) premier(s)'
    VIEWLAST: 'Voir le(s) dernier(s)'
    VIEWNEXT: 'Voir le(s) suivant(s)'
--- a/lang/gl_ES.yml
+++ b/lang/gl_ES.yml
@ -27,7 +27,7 @@ gl_ES:
  AssetAdmin_DeleteBatchAction:
    TITLE: 'Eliminar cartafoles'
  AssetAdmin_Tools.ss:
-    FILTER: Filter
+    FILTER: Filtro
  AssetAdmin_left.ss:
    GO: Ir
  AssetTableField:
@ -235,7 +235,7 @@ gl_ES:
    SearchResults: 'Resultados Busca'
    VersionUnknown: Descoñecido
  LegacyTableFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Páxina de contido xenérico'
  Page:
    DESCRIPTION: 'Generic content page'
  Permission:
@ -253,7 +253,7 @@ gl_ES:
    REDIRECTTOPAGE: 'Unha páxina no teu sitio web'
    YOURPAGE: 'Páxina no teu sitio web'
  RelationFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Páxina de contido xenérico'
  ReportAdmin:
    MENUTITLE: Informes
  ReportAdminForm:
@ -319,7 +319,7 @@ gl_ES:
    DELETEDPAGEHELP: 'Page is no longer published'
    DELETEDPAGESHORT: Eliminado
    DEPENDENT_NOTE: 'The following pages depend on this page. This includes virtual pages, redirector pages, and pages with content links.'
-    DESCRIPTION: 'Páxina de contido xenérico'
+    DESCRIPTION: 'Generic content page'
    DependtPageColumnLinkType: 'Tipo de ligazón'
    DependtPageColumnURL: URL
    EDITANYONE: 'Ningún pode iniciar sesión no CMS'
--- a/lang/hu.yml
+++ b/lang/hu.yml
@ -27,7 +27,7 @@ hu:
  AssetAdmin_DeleteBatchAction:
    TITLE: 'Mappák törlése'
  AssetAdmin_Tools.ss:
-    FILTER: Filter
+    FILTER: Szűrő
  AssetAdmin_left.ss:
    GO: Mehet
  AssetTableField:
@ -169,7 +169,7 @@ hu:
  ContentControl:
    NOTEWONTBESHOWN: 'Note: this message will not be shown to your visitors'
  ContentController:
-    ARCHIVEDSITE: 'Archived Site'
+    ARCHIVEDSITE: 'Archivált oldal'
    ARCHIVEDSITEFROM: 'Archived site from'
    CMS: CMS
    DRAFTSITE: 'Vázlat oldal'
--- a/lang/it.yml
+++ b/lang/it.yml
@ -25,16 +25,16 @@ it:
    TreeView: 'Visualizzazione a albero'
    Upload: Carica
  AssetAdmin_DeleteBatchAction:
-    TITLE: 'Elimina cartelle'
+    TITLE: 'Delete folders'
  AssetAdmin_Tools.ss:
    FILTER: Filter
  AssetAdmin_left.ss:
    GO: Vai
  AssetTableField:
-    BACKLINKCOUNT: 'Usato in:'
-    PAGES: pagina/e
+    BACKLINKCOUNT: 'Used on:'
+    PAGES: page(s)
  BackLink_Button.ss:
-    Back: Indietro
+    Back: Back
  BasicFieldsTestPage:
    DESCRIPTION: 'Generic content page'
  BigFamilyPage:
@ -57,10 +57,10 @@ it:
    ReasonDropdown: 'Problemi da verificare'
    ReasonDropdownBROKENFILE: 'File non funzionante'
    ReasonDropdownBROKENLINK: 'Link non funzionante'
-    ReasonDropdownRPBROKENLINK: 'Pagina di redirezione che punta a una pagina che non esiste'
-    ReasonDropdownVPBROKENLINK: 'Pagina virtuale che punta a una pagina che non esiste'
-    RedirectorNonExistent: 'pagina di redirezione che punta a una pagina che non esiste'
-    VirtualPageNonExistent: 'pagina virtuale che punta a una pagina che non esiste'
+    ReasonDropdownRPBROKENLINK: 'Redirector page pointing to non-existent page'
+    ReasonDropdownVPBROKENLINK: 'Virtual page pointing to non-existent page'
+    RedirectorNonExistent: 'redirector page pointing to non-existent page'
+    VirtualPageNonExistent: 'virtual page pointing to non-existent page'
  CMSAddPageController:
    Title: 'Aggiungi pagina'
  CMSBatchActions:
@ -86,9 +86,9 @@ it:
    DELETEFP: 'Elimina dal sito pubblicato'
    DESCREMOVED: 'e {count} discendenti'
    EMAIL: Email
-    EditTree: 'Modifica albero'
-    ListFiltered: 'Lista filtrata.'
-    MENUTITLE: 'Modifica pagina'
+    EditTree: 'Edit Tree'
+    ListFiltered: 'Filtered list.'
+    MENUTITLE: 'Edit Page'
    NEW: Nuova
    PAGENOTEXISTS: 'Questa pagina non esiste'
    PAGES: Pagine
@ -108,15 +108,15 @@ it:
    ROLLEDBACKPUB: 'Ripristinata la versione pubblicata. Il nuovo numero di versione è #{version}'
    ROLLEDBACKVERSION: 'Ripristinata la versione #%d. Il nuovo numero di versione è #%d'
    SAVE: Salva
-    SAVEDRAFT: 'Salva bozza'
-    TabContent: Contenuto
-    TabHistory: Archivio
-    TabSettings: Impostazioni
-    TreeFiltered: 'Albero filtrato.'
-    TreeFilteredClear: 'Azzera filtro'
+    SAVEDRAFT: 'Save Draft'
+    TabContent: Content
+    TabHistory: History
+    TabSettings: Settings
+    TreeFiltered: 'Filtered tree.'
+    TreeFilteredClear: 'Clear filter'
  CMSMain_left.ss:
-    'APPLY FILTER': 'Applica filtro'
-    RESET: Azzera
+    'APPLY FILTER': 'Apply Filter'
+    RESET: Reset
  CMSPageAddController:
    MENUTITLE: 'Aggiungi pagina'
    ParentMode_child: 'Sotto un''altra pagina'
@ -124,46 +124,46 @@ it:
  CMSPageEditController:
    MENUTITLE: 'Modifica pagina'
  CMSPageHistoryController:
-    COMPAREMODE: 'Modalità confronto (selezionane due)'
-    COMPAREVERSIONS: 'Confronta versioni'
-    COMPARINGVERSION: 'Confronto versioni {version1} e {version2}.'
-    MENUTITLE: Archivio
-    REVERTTOTHISVERSION: 'Ripristina a questa versione'
-    SHOWUNPUBLISHED: 'Mostra versioni non pubblicate'
-    SHOWVERSION: 'Mostra versione'
-    VIEW: vista
-    VIEWINGVERSION: 'Versione attualmente visualizzata {version}.'
+    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
+    VIEWINGVERSION: 'Currently viewing version {version}.'
  CMSPageHistoryController_versions.ss:
-    AUTHOR: Autore
-    NOTPUBLISHED: 'Non pubblicato'
-    PUBLISHER: Editore
-    UNKNOWN: Sconosciuto
-    WHEN: Quando
+    AUTHOR: Author
+    NOTPUBLISHED: 'Not published'
+    PUBLISHER: Publisher
+    UNKNOWN: Unknown
+    WHEN: When
  CMSPageSettingsController:
    MENUTITLE: 'Modifica pagina'
  CMSPagesController:
-    GalleryView: 'Visualizzazione a galleria'
-    ListView: 'Visualizzazione a lista'
-    MENUTITLE: Pagine
-    TreeView: 'Visualizzazione a albero'
+    GalleryView: 'Gallery View'
+    ListView: 'List View'
+    MENUTITLE: Pages
+    TreeView: 'Tree View'
  CMSPagesController_ContentToolbar.ss:
    ENABLEDRAGGING: 'Drag''n''drop'
-    MULTISELECT: 'Selezione multipla'
+    MULTISELECT: Multi-selection
  CMSPagesController_Tools.ss:
-    FILTER: Filtra
+    FILTER: Filter
  CMSSearch:
    FILTERDATEFROM: Da
    FILTERDATEHEADING: Data
    FILTERDATETO: A
    FILTERLABELTEXT: Contenuto
  CMSSettingsController:
-    MENUTITLE: Impostazioni
+    MENUTITLE: Settings
  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Pagine cambiate'
+    Title: 'Changed pages'
  CMSSiteTreeFilter_DeletedPages:
    Title: 'Tutte le pagine, eliminate incluse'
  CMSSiteTreeFilter_Search:
-    Title: 'Tutte le pagine'
+    Title: 'All pages'
  CaseStudy:
    DESCRIPTION: 'Case study page to fature work examples'
  ContentControl:
@ -307,7 +307,7 @@ it:
    BUTTONSAVEPUBLISH: 'Salva & pubblica'
    BUTTONUNPUBLISH: 'Non pubblicare'
    BUTTONUNPUBLISHDESC: 'Rimuovi questa pagina dal sito pubblicato'
-    CREATED: 'Data creazione'
+    CREATED: 'Date Created'
    Comments: Commenti
    Content: Contenuto
    DEFAULTABOUTCONTENT: '<p>Puoi riempire questa pagina con i tuoi contenuti, oppure cancellarla e creare le tue pagine.<br /></p>'
@ -316,11 +316,11 @@ it:
    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>'
    DEFAULTHOMETITLE: Home
-    DELETEDPAGEHELP: 'La pagina non è più pubblicata'
-    DELETEDPAGESHORT: Eliminata
-    DEPENDENT_NOTE: 'Le seguenti pagine dipendono da questa pagina. Queste includono pagine virtuali, pagine di redirezione e pagine con link nel contenuto.'
-    DESCRIPTION: 'Pagina con contenuto generico'
-    DependtPageColumnLinkType: 'Tipo di link'
+    DELETEDPAGEHELP: 'Page is no longer published'
+    DELETEDPAGESHORT: Deleted
+    DEPENDENT_NOTE: 'The following pages depend on this page. This includes virtual pages, redirector pages, and pages with content links.'
+    DESCRIPTION: 'Generic content page'
+    DependtPageColumnLinkType: 'Link type'
    DependtPageColumnURL: URL
    EDITANYONE: 'Chiunque può autenticarsi all''interno del CMS'
    EDITHEADER: 'Chi può modificare questo all''interno del CMS?'
@ -339,10 +339,10 @@ it:
    METAEXTRA: 'Meta tag personalizzati'
    METAKEYWORDS: 'Parole chiavi'
    METATITLE: Titolo
-    MODIFIEDONDRAFTHELP: 'La pagina ha modifiche non pubblicate'
-    MODIFIEDONDRAFTSHORT: Modificata
+    MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
+    MODIFIEDONDRAFTSHORT: Modified
    MetadataToggle: Metadata
-    PAGELOCATION: 'Collocazione pagina'
+    PAGELOCATION: 'Page location'
    PAGETITLE: 'Nome della pagina'
    PAGETYPE: 'Tipo di pagina'
    PARENTID: 'Pagina madre'
@ -386,15 +386,15 @@ it:
    EXPORTTO: 'Esporta in questa cartella'
    NAME: 'Sistema di esportazione statico'
  TableListField:
-    SELECT: 'Seleziona:'
+    SELECT: 'Select:'
  TableListField.ss:
-    NOITEMSFOUND: 'Nessun elemento trovato'
-    SORTASC: 'Ordina in modo ascendente'
-    SORTDESC: 'Ordina in modo discendente'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
  TableListField_PageControls.ss:
-    DISPLAYING: Visualizzo
-    OF: di
-    TO: a
+    DISPLAYING: Displaying
+    OF: of
+    TO: to
    VIEWFIRST: 'Visualizza primo'
    VIEWLAST: 'Visualizza ultimo'
    VIEWNEXT: 'Visualizza successivo'
@ -404,7 +404,7 @@ it:
  TestPage:
    DESCRIPTION: 'Generic content page'
  TreeTools:
-    DisplayLabel: 'Visualizza:'
+    DisplayLabel: 'Display:'
  ViewArchivedEmail.ss:
    CANACCESS: 'Puoi accedere al sito archiviato da questo indirizzo:'
    HAVEASKED: 'Hai chiesto di visualizzare il contenuto del nostro sito il'
--- a/lang/ja_JP.yml
+++ b/lang/ja_JP.yml
@ -1,8 +1,8 @@
 ja_JP:
  AssetAdmin:
-    ADDFILES: ファイルを追加
+    ADDFILES: 'ファイルを追加'
    ALLOWEDEXTS: 利用可能な拡張子
-    ActionAdd: フォルダを追加
+    ActionAdd: 'フォルダを追加'
    AppCategoryArchive: アーカイブ
    AppCategoryAudio: 音楽
    AppCategoryFlash: Flash
@ -13,7 +13,7 @@ ja_JP:
    CurrentFolderOnly: 'このフォルダに限定しますか?'
    DetailsView: 詳細
    FILES: ファイル
-    FILESYSTEMSYNCTITLE: ファイルに関するCMSデータベースエントリーを更新する。例えば、FTPなどCMS以外を経由してファイルをアップロードした場合に便利です。
+    FILESYSTEMSYNCTITLE: 'ファイルに関するCMSデータベースエントリーを更新する。例えば、FTPなどCMS以外を経由してファイルをアップロードした場合に便利です。'
    FROMTHEINTERNET: インターネットから
    FROMYOURCOMPUTER: コンピュータから
    Filetype: ファイルの種類
@ -27,7 +27,7 @@ ja_JP:
  AssetAdmin_DeleteBatchAction:
    TITLE: フォルダを削除
  AssetAdmin_Tools.ss:
-    FILTER: Filter
+    FILTER: フィルタ
  AssetAdmin_left.ss:
    GO: Go
  AssetTableField:
@ -36,17 +36,17 @@ ja_JP:
  BackLink_Button.ss:
    Back: 戻る
  BasicFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 通常のコンテンツページ
  BigFamilyPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 通常のコンテンツページ
  BrokenLinksReport:
    Any: 何でも
    BROKENLINKS: 壊れたリンクのレポート
    CheckSite: 'Check site'
    CheckSiteDropdownDraft: 下書きサイト
-    CheckSiteDropdownPublished: 公開済みサイト
+    CheckSiteDropdownPublished: '公開済みサイト'
    ColumnDateLastModified: 最終更新日
-    ColumnDateLastPublished: 最終公開日
+    ColumnDateLastPublished: '最終公開日'
    ColumnProblemType: 問題の種類
    ColumnURL: URL
    HasBrokenFile: 'has broken file'
@ -62,28 +62,28 @@ ja_JP:
    RedirectorNonExistent: 存在しないページを指しているリダイレクトページ
    VirtualPageNonExistent: 存在しないページを指している仮想ページ
  CMSAddPageController:
-    Title: ページを追加
+    Title: 'ページを追加'
  CMSBatchActions:
    DELETED_DRAFT_PAGES: '%dページを下書きサイトから削除しましたが、%dページの削除に失敗しました。'
    DELETED_PAGES: '%dページを公開サイトから削除しましたが、%dページの削除に失敗しました。'
    DELETE_DRAFT_PAGES: 下書きサイトから削除
-    DELETE_PAGES: 公開サイトから削除
+    DELETE_PAGES: '公開サイトから削除'
    PUBLISHED_PAGES: '%dページを公開しましたが、%dページの公開に失敗しました。'
-    PUBLISH_PAGES: 公開
+    PUBLISH_PAGES: '公開'
    UNPUBLISHED_PAGES: '%dページを非公開にしました'
-    UNPUBLISH_PAGES: 非公開
+    UNPUBLISH_PAGES: '非公開'
  CMSFileAddController:
    MENUTITLE: ファイル
  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".'
-    AddNew: 新しいページを追加
-    AddNewButton: 新しく追加
-    ChoosePageParentMode: このページを作成する場所を選択
+    AddNew: '新しいページを追加'
+    AddNewButton: '新しく追加'
+    ChoosePageParentMode: 'このページを作成する場所を選択'
    ChoosePageType: ページの種類を選択
    Create: 作成
    DELETE: ドラフトサイトから削除
-    DELETEFP: 公開サイトから削除
+    DELETEFP: '公開サイトから削除'
    DESCREMOVED: 'and {count} descendants'
    EMAIL: Eメール
    EditTree: ツリーを編集
@ -102,7 +102,7 @@ ja_JP:
    REMOVED: '''%s''%sを実サイトから削除しました'
    REMOVEDPAGE: '''{title}''を公開されているサイトから削除しました'
    REMOVEDPAGEFROMDRAFT: '%sを下書きサイトから削除しました'
-    RESTORE: 復元
+    RESTORE: '復元'
    RESTORED: '{title}を復旧しました'
    ROLLBACK: このバージョンへ戻す
    ROLLEDBACKPUB: '公開された版へロールバックしました。新しいバージョン番号は#{version}です'
@ -118,7 +118,7 @@ ja_JP:
    'APPLY FILTER': 'Apply Filter'
    RESET: リセット
  CMSPageAddController:
-    MENUTITLE: ページを追加
+    MENUTITLE: 'ページを追加'
    ParentMode_child: 他のページの下に作成
    ParentMode_top: 最上位層
  CMSPageEditController:
@ -129,13 +129,13 @@ ja_JP:
    COMPARINGVERSION: '{version1}と{version2}を比較しています。'
    MENUTITLE: 履歴
    REVERTTOTHISVERSION: このバージョンに戻す
-    SHOWUNPUBLISHED: 公開されていないバージョンを表示
+    SHOWUNPUBLISHED: '公開されていないバージョンを表示'
    SHOWVERSION: バージョンを表示
    VIEW: 表示
    VIEWINGVERSION: '現在表示しているバージョンは{version}です。'
  CMSPageHistoryController_versions.ss:
-    AUTHOR: 作成者
-    NOTPUBLISHED: 未公開
+    AUTHOR: '作成者'
+    NOTPUBLISHED: '未公開'
    PUBLISHER: パブリッシャー
    UNKNOWN: 不明
    WHEN: いつ
@ -161,9 +161,9 @@ ja_JP:
  CMSSiteTreeFilter_ChangedPages:
    Title: 変更されたページ
  CMSSiteTreeFilter_DeletedPages:
-    Title: 全ページ（削除されたページも含む）
+    Title: '全ページ（削除されたページも含む）'
  CMSSiteTreeFilter_Search:
-    Title: 全ページ
+    Title: '全ページ'
  CaseStudy:
    DESCRIPTION: 'Case study page to fature work examples'
  ContentControl:
@ -182,11 +182,11 @@ ja_JP:
    LOGIN: ログイン
    LOGOUT: ログアウト
    NOTLOGGEDIN: ログインされていません
-    PUBLISHEDSITE: 公開サイト
+    PUBLISHEDSITE: '公開サイト'
    Password: パスワード
    PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 2 site. To extend this, please take a look at {link}.'
    StartEditing: '<a href="{link}">CMS</a>のリンクをクリックすることであなたのサイトのコンテンツの編集を開始することができます。'
-    UnableDeleteInstall: インストールファイルを削除することができませんでした。次のファイルを手動で削除してください。
+    UnableDeleteInstall: 'インストールファイルを削除することができませんでした。次のファイルを手動で削除してください。'
    VIEWPAGEIN: 'View Page in:'
  ErrorPage:
    CODE: エラーコード
@ -220,13 +220,13 @@ ja_JP:
    504: '504 - Gatewayが時間切れです'
    505: '505 - サポートされていないHTTPのバージョンです'
  Folder:
-    AddFolderButton: フォルダの追加
-    DELETEUNUSEDTHUMBNAILS: 未使用のサムネイルを削除
+    AddFolderButton: 'フォルダの追加'
+    DELETEUNUSEDTHUMBNAILS: '未使用のサムネイルを削除'
    UNUSEDFILESTITLE: 未使用のファイル
-    UNUSEDTHUMBNAILSTITLE: 未使用のサムネイル
+    UNUSEDTHUMBNAILSTITLE: '未使用のサムネイル'
    UploadFilesButton: アップロード
  GridFieldTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 通常のコンテンツページ
  LeftAndMain:
    DELETED: 削除済
    PreviewButton: プレビュー
@ -235,17 +235,17 @@ ja_JP:
    SearchResults: 検索結果
    VersionUnknown: 不明
  LegacyTableFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 通常のコンテンツページ
  Page:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 通常のコンテンツページ
  Permission:
    CMS_ACCESS_CATEGORY: CMSへのアクセス
  Permissions:
    CONTENT_CATEGORY: コンテンツに関する権限
    PERMISSIONS_CATEGORY: 役割とアクセス権限
  RedirectorPage:
-    DESCRIPTION: 別の内部ページにリダイレクト
-    HASBEENSETUP: 転送URLを含むページには、転送先がない状態で設定されています。
+    DESCRIPTION: '別の内部ページにリダイレクト'
+    HASBEENSETUP: '転送URLを含むページには、転送先がない状態で設定されています。'
    HEADER: このページをユーザーを変更して他のページにしますか？
    OTHERURL: 他のウェブサイトのURL
    REDIRECTTO: 変更は
@ -253,7 +253,7 @@ ja_JP:
    REDIRECTTOPAGE: 貴方のウェブサイトを表示します
    YOURPAGE: 貴方のウェブサイトを表示します
  RelationFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 通常のコンテンツページ
  ReportAdmin:
    MENUTITLE: レポート
  ReportAdminForm:
@ -275,8 +275,8 @@ ja_JP:
    ParameterLiveCheckbox: 'Check live site'
    REPEMPTY: '{title}のレポートは空です'
  SilverStripeNavigatorLink:
-    ShareInstructions: このページを共有するには、以下のリンクをコピー＆ペーストとします。
-    ShareLink: 共有リンク
+    ShareInstructions: 'このページを共有するには、以下のリンクをコピー＆ペーストとします。'
+    ShareLink: '共有リンク'
  SilverStripeNavigatorLinkl:
    CloseLink: 閉じる
  SiteConfig:
@ -289,7 +289,7 @@ ja_JP:
    SITETITLE: サイトタイトル
    TABACCESS: アクセス権限
    TABMAIN: メイン
-    TAGLINEDEFAULT: サイトのキャッチフレーズをここに入力
+    TAGLINEDEFAULT: 'サイトのキャッチフレーズをここに入力'
    THEME: テーマ
    TOPLEVELCREATE: サイトのルートにおいてページを作成できる人
    VIEWHEADER: このサイト上でページを閲覧できる人
@ -298,15 +298,15 @@ ja_JP:
    ACCESSHEADER: 本サイトにあるページを誰か閲覧しますか？
    ACCESSLOGGEDIN: ログインしたユーザ
    ACCESSONLYTHESE: 'この人達だけ (リストから選択してください)'
-    ADDEDTODRAFTHELP: ページはまだ公開されていません
+    ADDEDTODRAFTHELP: 'ページはまだ公開されていません'
    ADDEDTODRAFTSHORT: 下書き
    ALLOWCOMMENTS: コメントを許可しますか？
    APPEARSVIRTUALPAGES: 'このコンテンツは{title}として仮想ページにおいても表示されます。'
-    BUTTONCANCELDRAFT: 草稿の編集内容を取り消します
-    BUTTONCANCELDRAFTDESC: 草稿と前回公開されたページを削除します
-    BUTTONSAVEPUBLISH: 保存して公開
-    BUTTONUNPUBLISH: 非公開
-    BUTTONUNPUBLISHDESC: 公開サイトから取り除きました
+    BUTTONCANCELDRAFT: '草稿の編集内容を取り消します'
+    BUTTONCANCELDRAFTDESC: '草稿と前回公開されたページを削除します'
+    BUTTONSAVEPUBLISH: '保存して公開'
+    BUTTONUNPUBLISH: '非公開'
+    BUTTONUNPUBLISHDESC: '公開サイトから取り除きました'
    CREATED: 作成日
    Comments: コメント
    Content: コンテンツ
@ -315,7 +315,7 @@ ja_JP:
    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: ホーム
+    DEFAULTHOMETITLE: 'ホーム'
    DELETEDPAGEHELP: 'Page is no longer published'
    DELETEDPAGESHORT: 削除済
    DEPENDENT_NOTE: 'The following pages depend on this page. This includes virtual pages, redirector pages, and pages with content links.'
@ -325,58 +325,58 @@ ja_JP:
    EDITANYONE: 誰でもCMSにログインが可能
    EDITHEADER: この中から誰をCMSの編集を可能にしますか？
    EDITONLYTHESE: 'この人達だけ (リストから選択してください)'
-    EDITORGROUPS: 編集者グループ
+    EDITORGROUPS: '編集者グループ'
    EDIT_ALL_DESCRIPTION: すべてのページを編集
    EDIT_ALL_HELP: 'Ability to edit any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
    Editors: 編集グループ
    HASBROKENLINKS: このページはリンク切れがあります
-    HTMLEDITORTITLE: 内容
+    HTMLEDITORTITLE: '内容'
    INHERIT: 親ページを受け継ぐ
    LASTUPDATED: 最終更新日時
    LINKCHANGENOTE: このページのリンクを変更するとすべての子ページのリンクに影響を与える可能性があります。
    MENUTITLE: 操作レベル
    METADESC: 説明
-    METAEXTRA: メタタグをカスタム
+    METAEXTRA: 'メタタグをカスタム'
    METAKEYWORDS: キーワード
    METATITLE: タイトル
-    MODIFIEDONDRAFTHELP: 公開されていない変更がページにあります
+    MODIFIEDONDRAFTHELP: '公開されていない変更がページにあります'
    MODIFIEDONDRAFTSHORT: 更新日時
    MetadataToggle: メタデータ
-    PAGELOCATION: ページの場所
+    PAGELOCATION: 'ページの場所'
    PAGETITLE: ページ名
    PAGETYPE: ページタイプ
    PARENTID: 親ページ
-    PARENTTYPE: ページの場所
+    PARENTTYPE: 'ページの場所'
    PARENTTYPE_ROOT: 最上位層のページ
    PARENTTYPE_SUBPAGE: 親ページの下にあるサブページ
    PERMISSION_GRANTACCESS_DESCRIPTION: コンテンツへのアクセス権限を編集
    PERMISSION_GRANTACCESS_HELP: 'Allow setting of page-specific access restrictions in the "Pages" section.'
-    PLURALNAME: サイトのツリー構造
+    PLURALNAME: 'サイトのツリー構造'
    PageTypNotAllowedOnRoot: 'ページタイプ"{type}"は最上位層のページになることができません'
    PageTypeNotAllowed: 'ページタイプ"{type}"はこの親ページの子になることができません'
    REMOVEDFROMDRAFTHELP: 'Page is published, but has been deleted from draft'
    REMOVEDFROMDRAFTSHORT: 下書きから削除
    REMOVE_INSTALL_WARNING: '警告: セキュリティ上の理由から、SilverStripeのインストール先にあるinstall.phpを削除してください。'
-    REORGANISE_DESCRIPTION: サイト構造を変更
-    REORGANISE_HELP: サイトツリー内のページをドラッグ・アンド・ドロップで再編集
+    REORGANISE_DESCRIPTION: 'サイト構造を変更'
+    REORGANISE_HELP: 'サイトツリー内のページをドラッグ・アンド・ドロップで再編集'
    SHOWINMENUS: メニューに表示しますか？
    SHOWINSEARCH: 検索に表示しますか？
-    SINGULARNAME: サイトのツリー構造
+    SINGULARNAME: 'サイトのツリー構造'
    TABBEHAVIOUR: 動作
    TABCONTENT: コンテンツ
    TABDEPENDENT: 依存ページ
    TOPLEVEL: 'サイトの内容 (最上位層)'
-    TOPLEVELCREATORGROUPS: 最上位層のページ作成者
+    TOPLEVELCREATORGROUPS: '最上位層のページ作成者'
    URLSegment: URLセグメント
-    VIEWERGROUPS: 閲覧者グループ
+    VIEWERGROUPS: '閲覧者グループ'
    VIEW_ALL_DESCRIPTION: すべてのページを閲覧
    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to Site Content" permission'
    VIEW_DRAFT_CONTENT: ドラフトを見る
    VIEW_DRAFT_CONTENT_HELP: 'Applies to viewing pages outside of the CMS in draft mode. Useful for external collaborators without CMS access.'
-    Viewers: 閲覧者のグループ
+    Viewers: '閲覧者のグループ'
    Visibility: 表示・非表示
    has_one_Parent: 親ページ
-    many_many_BackLinkTracking: リンク元を追跡
+    many_many_BackLinkTracking: 'リンク元を追跡'
    many_many_ImageTracking: 画像へのリンクを追跡
    many_many_LinkTracking: リンクを追跡
  SiteTreeURLSegmentField:
@ -388,9 +388,9 @@ ja_JP:
  TableListField:
    SELECT: 選択：
  TableListField.ss:
-    NOITEMSFOUND: 見つかった項目はありませんでした
-    SORTASC: 昇順に並び替える
-    SORTDESC: 降順に並び替える
+    NOITEMSFOUND: '見つかった項目はありませんでした'
+    SORTASC: '昇順に並び替える'
+    SORTDESC: '降順に並び替える'
  TableListField_PageControls.ss:
    DISPLAYING: 表示中
    OF: of
@ -400,16 +400,16 @@ ja_JP:
    VIEWNEXT: 次を表示
    VIEWPREVIOUS: 前回を表示
  TestFileUploadPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 通常のコンテンツページ
  TestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 通常のコンテンツページ
  TreeTools:
    DisplayLabel: 'Display:'
  ViewArchivedEmail.ss:
    CANACCESS: 'You can access the archived site at this link:'
    HAVEASKED: 'You have asked to view the content of our site on'
  VirtualPage:
-    CHOOSE: リンクするページを選択してください
+    CHOOSE: 'リンクするページを選択してください'
    DESCRIPTION: 別のページのコンテンツを表示
    EDITCONTENT: クリックしてコンテンツを編集
    HEADER: これがバーチャルページです
--- a/lang/km.yml
+++ b/lang/km.yml
@ -413,8 +413,8 @@ km:
    DESCRIPTION: 'Displays the content of another page'
    EDITCONTENT: 'click here to edit the content'
    HEADER: 'This is a virtual page'
-    PLURALNAME: ទំព័រដូច
+    PLURALNAME: 'ទំព័រដូច'
    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
-    SINGULARNAME: ទំព័រដូច
+    SINGULARNAME: 'ទំព័រដូច'
  cms:
    FILESYSTEMSYNC: 'Sync files'
--- a/lang/lt.yml
+++ b/lang/lt.yml
@ -27,7 +27,7 @@ lt:
  AssetAdmin_DeleteBatchAction:
    TITLE: 'Ištrinti aplankus'
  AssetAdmin_Tools.ss:
-    FILTER: Filter
+    FILTER: Filtras
  AssetAdmin_left.ss:
    GO: Vykdyti
  AssetTableField:
@ -36,9 +36,9 @@ lt:
  BackLink_Button.ss:
    Back: Atgal
  BasicFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Standartinio turinio puslapis'
  BigFamilyPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Standartinio turinio puslapis'
  BrokenLinksReport:
    Any: 'Bet kurias'
    BROKENLINKS: 'Sugadintų nuorodų ataskaita'
@ -226,7 +226,7 @@ lt:
    UNUSEDTHUMBNAILSTITLE: 'Nenaudojamos ikonos'
    UploadFilesButton: Įkelti
  GridFieldTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Standartinio turinio puslapis'
  LeftAndMain:
    DELETED: Ištrinta.
    PreviewButton: Peržiūra
@ -235,9 +235,9 @@ lt:
    SearchResults: 'Paieškos rezultatai'
    VersionUnknown: Nežinoma
  LegacyTableFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Standartinio turinio puslapis'
  Page:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Standartinio turinio puslapis'
  Permission:
    CMS_ACCESS_CATEGORY: 'TVS Prieiga'
  Permissions:
@ -253,7 +253,7 @@ lt:
    REDIRECTTOPAGE: 'Jūsų svetainės puslapis'
    YOURPAGE: 'Jūsų svetainės puslapis'
  RelationFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Standartinio turinio puslapis'
  ReportAdmin:
    MENUTITLE: Ataskaitos
  ReportAdminForm:
@ -400,9 +400,9 @@ lt:
    VIEWNEXT: 'Žiūrėti sekantį'
    VIEWPREVIOUS: 'Žiūrėti ankstesnį'
  TestFileUploadPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Standartinio turinio puslapis'
  TestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Standartinio turinio puslapis'
  TreeTools:
    DisplayLabel: 'Rodyti:'
  ViewArchivedEmail.ss:
--- a/lang/mi_NZ.yml
+++ b/lang/mi_NZ.yml
@ -36,9 +36,9 @@ mi_NZ:
  BackLink_Button.ss:
    Back: Hoki
  BasicFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Whārangi ihirangi ahuwhānui'
  BigFamilyPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Whārangi ihirangi ahuwhānui'
  BrokenLinksReport:
    Any: 'Ko tētahi'
    BROKENLINKS: 'Pūrongo hono whati'
@ -165,7 +165,7 @@ mi_NZ:
  CMSSiteTreeFilter_Search:
    Title: 'Ngā Whārangi Katoa'
  CaseStudy:
-    DESCRIPTION: 'Case study page to fature work examples'
+    DESCRIPTION: 'Whārangi mātai tūāhua hei whakaatu tauira mahi'
  ContentControl:
    NOTEWONTBESHOWN: 'Tuhipoka: kāore tēnei karere e whakaaturia ki ō manuhiri'
  ContentController:
@ -226,7 +226,7 @@ mi_NZ:
    UNUSEDTHUMBNAILSTITLE: 'Ngā karakōnui kāore i whakamahia'
    UploadFilesButton: Tukuatu
  GridFieldTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Whārangi ihirangi ahuwhānui'
  LeftAndMain:
    DELETED: 'Kua Mukua'
    PreviewButton: Arokite
@ -235,9 +235,9 @@ mi_NZ:
    SearchResults: 'Ngā Hua Rapu'
    VersionUnknown: 'Tē Mōhiotia'
  LegacyTableFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Whārangi ihirangi ahuwhānui'
  Page:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Whārangi ihirangi ahuwhānui'
  Permission:
    CMS_ACCESS_CATEGORY: 'Uru CMS'
  Permissions:
@ -253,7 +253,7 @@ mi_NZ:
    REDIRECTTOPAGE: 'Whārangi kei tō paetukutuku'
    YOURPAGE: 'Whārangi kei tō paetukutuku'
  RelationFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Whārangi ihirangi ahuwhānui'
  ReportAdmin:
    MENUTITLE: 'Ngā Pūrongo'
  ReportAdminForm:
@ -400,9 +400,9 @@ mi_NZ:
    VIEWNEXT: 'Tiro panuku'
    VIEWPREVIOUS: 'Tirohia tōmua'
  TestFileUploadPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Whārangi ihirangi ahuwhānui'
  TestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Whārangi ihirangi ahuwhānui'
  TreeTools:
    DisplayLabel: 'Whakaatu:'
  ViewArchivedEmail.ss:
--- a/lang/nb.yml
+++ b/lang/nb.yml
@ -226,7 +226,7 @@ nb:
    UNUSEDTHUMBNAILSTITLE: 'Miniatyrbilder ikke i bruk'
    UploadFilesButton: 'Last opp'
  GridFieldTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Generisk innholdsside'
  LeftAndMain:
    DELETED: Deleted.
    PreviewButton: Forhåndsvisning
@ -253,7 +253,7 @@ nb:
    REDIRECTTOPAGE: 'En side på nettstedet'
    YOURPAGE: 'Side på ditt nettsted'
  RelationFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Generisk innholdsside'
  ReportAdmin:
    MENUTITLE: Rapporter
  ReportAdminForm:
@ -319,7 +319,7 @@ nb:
    DELETEDPAGEHELP: 'Page is no longer published'
    DELETEDPAGESHORT: Slettet
    DEPENDENT_NOTE: 'De følgende sidene avhenger av denne siden. Dette inkluderer virtuelle sider, omdirigeringssider og sider med innholdslenker.'
-    DESCRIPTION: 'Generisk innholdsside'
+    DESCRIPTION: 'Generic content page'
    DependtPageColumnLinkType: 'Link type'
    DependtPageColumnURL: URL
    EDITANYONE: 'Alle som kan logge inn til kontrollpanelet'
@ -402,7 +402,7 @@ nb:
  TestFileUploadPage:
    DESCRIPTION: 'Generic content page'
  TestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Generisk innholdsside'
  TreeTools:
    DisplayLabel: 'Display:'
  ViewArchivedEmail.ss:
--- a/lang/nl.yml
+++ b/lang/nl.yml
@ -165,7 +165,7 @@ nl:
  CMSSiteTreeFilter_Search:
    Title: 'Alle pagina''s'
  CaseStudy:
-    DESCRIPTION: 'Case study page to fature work examples'
+    DESCRIPTION: 'De Case study pagina zal voorzien zijn van voorbeelden'
  ContentControl:
    NOTEWONTBESHOWN: 'N.B. : Dit bericht is niet zichtbaar voor bezoekers'
  ContentController:
@ -235,7 +235,7 @@ nl:
    SearchResults: Zoekresultaten
    VersionUnknown: Onbekend
  LegacyTableFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Algemene tekst pagina'
  Page:
    DESCRIPTION: 'Generic content page'
  Permission:
@ -253,7 +253,7 @@ nl:
    REDIRECTTOPAGE: 'Een pagina op deze website'
    YOURPAGE: 'Pagina op deze website'
  RelationFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Algemene tekst pagina'
  ReportAdmin:
    MENUTITLE: Rapporten
  ReportAdminForm:
@ -319,7 +319,7 @@ nl:
    DELETEDPAGEHELP: 'Deze pagina is niet langer gepubliceerd'
    DELETEDPAGESHORT: Verwijderd
    DEPENDENT_NOTE: 'De volgende pagina''s zijn afhankelijk van deze pagina. Hieronder vallen virtuelepagina''s, verwijsingspagina''s en pagina''s met links in de inhoud.'
-    DESCRIPTION: 'Algemene tekst pagina'
+    DESCRIPTION: 'Pagina voor algemene inhoud'
    DependtPageColumnLinkType: 'Link type'
    DependtPageColumnURL: URL
    EDITANYONE: 'Iedereen die kan inloggen in het CMS'
--- a/lang/pl.yml
+++ b/lang/pl.yml
@ -27,7 +27,7 @@ pl:
  AssetAdmin_DeleteBatchAction:
    TITLE: 'Usuń foldery'
  AssetAdmin_Tools.ss:
-    FILTER: Filter
+    FILTER: Filtr
  AssetAdmin_left.ss:
    GO: Przejdź
  AssetTableField:
@ -229,13 +229,13 @@ pl:
    DESCRIPTION: 'Generic content page'
  LeftAndMain:
    DELETED: Usunięty
-    PreviewButton: Podgląd
+    PreviewButton: 'Podgląd'
    SAVEDUP: Zapisane
    STATUSPUBLISHEDSUCCESS: 'Opublikowano ''{title}'' '
    SearchResults: 'Wyniki wyszukiwania'
    VersionUnknown: Nieznany
  LegacyTableFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Zwykła strona'
  Page:
    DESCRIPTION: 'Generic content page'
  Permission:
@ -253,7 +253,7 @@ pl:
    REDIRECTTOPAGE: 'Strona na Twojej witrynie'
    YOURPAGE: 'Strona na Twojej witrynie'
  RelationFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Zwykła strona'
  ReportAdmin:
    MENUTITLE: Raporty
  ReportAdminForm:
--- a/lang/pt.yml
+++ b/lang/pt.yml
@ -27,7 +27,7 @@ pt:
  AssetAdmin_DeleteBatchAction:
    TITLE: 'Apagar pastas'
  AssetAdmin_Tools.ss:
-    FILTER: Filter
+    FILTER: Filtro
  AssetAdmin_left.ss:
    GO: Ir
  AssetTableField:
@ -38,7 +38,7 @@ pt:
  BasicFieldsTestPage:
    DESCRIPTION: 'Generic content page'
  BigFamilyPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Página de conteúdo genérico'
  BrokenLinksReport:
    Any: Qualquer
    BROKENLINKS: 'Relatório de links inválidos'
@ -165,11 +165,11 @@ pt:
  CMSSiteTreeFilter_Search:
    Title: 'Todas as páginas'
  CaseStudy:
-    DESCRIPTION: 'Case study page to fature work examples'
+    DESCRIPTION: 'Página de estudo a apresentar em trabalhos de exemplo'
  ContentControl:
    NOTEWONTBESHOWN: 'Nota: Esta mensagem não vai ser apresentada aos visitantes'
  ContentController:
-    ARCHIVEDSITE: 'Archived Site'
+    ARCHIVEDSITE: 'Arquivar o site'
    ARCHIVEDSITEFROM: 'Arquivar o site de'
    CMS: 'Gestor de Conteúdos'
    DRAFTSITE: 'Site Rascunho'
@ -226,7 +226,7 @@ pt:
    UNUSEDTHUMBNAILSTITLE: 'Miniaturas não utilizadas'
    UploadFilesButton: Submeter
  GridFieldTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Página de conteúdo genérico'
  LeftAndMain:
    DELETED: Apagada
    PreviewButton: Pré-visualização
@ -235,9 +235,9 @@ pt:
    SearchResults: 'Resultados da pesquisa'
    VersionUnknown: Desconhecido
  LegacyTableFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Página de conteúdo genérico'
  Page:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Página de conteúdo genérico'
  Permission:
    CMS_ACCESS_CATEGORY: 'Acesso ao CMS'
  Permissions:
@ -253,7 +253,7 @@ pt:
    REDIRECTTOPAGE: 'Uma página no seu site'
    YOURPAGE: 'Página no seu Site'
  RelationFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Página de conteúdo genérico'
  ReportAdmin:
    MENUTITLE: Relatórios
  ReportAdminForm:
@ -400,9 +400,9 @@ pt:
    VIEWNEXT: 'Ver o próximo'
    VIEWPREVIOUS: 'Ver o anterior'
  TestFileUploadPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Página de conteúdo genérico'
  TestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Página de conteúdo genérico'
  TreeTools:
    DisplayLabel: 'Apresentar:'
  ViewArchivedEmail.ss:
--- a/lang/ru.yml
+++ b/lang/ru.yml
@ -107,7 +107,7 @@ ru:
    ROLLBACK: 'Откатить до этой версии'
    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
    ROLLEDBACKVERSION: 'Произведен откат до версии #%d. Номер новой версии #%d'
-    SAVE: Сохранить
+    SAVE: 'Сохранить'
    SAVEDRAFT: 'Save Draft'
    TabContent: Content
    TabHistory: History
@ -134,18 +134,18 @@ ru:
    VIEW: обзор
    VIEWINGVERSION: 'Currently viewing version {version}.'
  CMSPageHistoryController_versions.ss:
-    AUTHOR: Автор
-    NOTPUBLISHED: 'Не издавалось'
-    PUBLISHER: Издатель
-    UNKNOWN: Неизвестно
-    WHEN: Когда
+    AUTHOR: Author
+    NOTPUBLISHED: 'Not published'
+    PUBLISHER: Publisher
+    UNKNOWN: Unknown
+    WHEN: When
  CMSPageSettingsController:
    MENUTITLE: 'Править страницы'
  CMSPagesController:
-    GalleryView: 'Обзор галереи'
-    ListView: 'Обзор списка'
-    MENUTITLE: Страницы
-    TreeView: 'Обзор дерева'
+    GalleryView: 'Gallery View'
+    ListView: 'List View'
+    MENUTITLE: Pages
+    TreeView: 'Tree View'
  CMSPagesController_ContentToolbar.ss:
    ENABLEDRAGGING: 'Drag''n''drop'
    MULTISELECT: Multi-selection
@ -157,13 +157,13 @@ ru:
    FILTERDATETO: Кому
    FILTERLABELTEXT: Содержимое
  CMSSettingsController:
-    MENUTITLE: Настройки
+    MENUTITLE: Settings
  CMSSiteTreeFilter_ChangedPages:
    Title: 'Changed pages'
  CMSSiteTreeFilter_DeletedPages:
    Title: 'All pages, including deleted'
  CMSSiteTreeFilter_Search:
-    Title: 'Все страницы'
+    Title: 'All pages'
  CaseStudy:
    DESCRIPTION: 'Case study page to fature work examples'
  ContentControl:
--- a/lang/si.yml
+++ b/lang/si.yml
@ -89,7 +89,7 @@ si:
    EditTree: 'Edit Tree'
    ListFiltered: 'Filtered list.'
    MENUTITLE: 'Edit Page'
-    NEW: අලුත්
+    NEW: 'අලුත්'
    PAGENOTEXISTS: 'මෙම  පිටුව තවදුරටත් නොපවතී'
    PAGES: Pages
    PAGETYPEANYOPT: Any
@ -309,7 +309,7 @@ si:
    BUTTONUNPUBLISHDESC: 'මෙම පිටුව ප්රසිද්ධ කල අඩවියෙන් ගලවන්න'
    CREATED: 'Date Created'
    Comments: Comments
-    Content: අන්තර්ගතය
+    Content: 'අන්තර්ගතය'
    DEFAULTABOUTCONTENT: '<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>'
    DEFAULTABOUTTITLE: 'අපි ගැන'
    DEFAULTCONTACTCONTENT: '<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>'
@ -330,12 +330,12 @@ si:
    EDIT_ALL_HELP: 'Ability to edit any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
    Editors: 'Editors Groups'
    HASBROKENLINKS: 'මෙම පිටුවට කැඩුනු බැදීම් ඇත'
-    HTMLEDITORTITLE: අන්තර්ගතය
+    HTMLEDITORTITLE: 'අන්තර්ගතය'
    INHERIT: 'Inherit from parent page'
    LASTUPDATED: 'Last Updated'
    LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
    MENUTITLE: 'සංක්රමන ලේබලය'
-    METADESC: අර්තකතනය
+    METADESC: 'අර්තකතනය'
    METAEXTRA: 'සැකසූ මෙටා ටැග්'
    METAKEYWORDS: යතුරැ
    METATITLE: මාතෘකා
@ -363,9 +363,9 @@ si:
    SHOWINSEARCH: 'සර්ච් ඵකේ පෙන්වන්නද?'
    SINGULARNAME: 'Site Tree'
    TABBEHAVIOUR: හැසිරීම
-    TABCONTENT: අන්තර්ගතය
+    TABCONTENT: 'අන්තර්ගතය'
    TABDEPENDENT: 'Dependent pages'
-    TOPLEVEL: අන්ර්ගතය
+    TOPLEVEL: 'අන්ර්ගතය'
    TOPLEVELCREATORGROUPS: 'Top level creators'
    URLSegment: 'URL කොටස'
    VIEWERGROUPS: 'Viewer Groups'
--- a/lang/sk.yml
+++ b/lang/sk.yml
@ -25,16 +25,16 @@ sk:
    TreeView: 'Zobraziť strom'
    Upload: Nahrať
  AssetAdmin_DeleteBatchAction:
-    TITLE: 'Vymazať priečinky'
+    TITLE: 'Delete folders'
  AssetAdmin_Tools.ss:
    FILTER: Filter
  AssetAdmin_left.ss:
-    GO: Choď
+    GO: Vykonať
  AssetTableField:
    BACKLINKCOUNT: 'Použité na:'
-    PAGES: stránka(y)
+    PAGES: page(s)
  BackLink_Button.ss:
-    Back: Späť
+    Back: Back
  BasicFieldsTestPage:
    DESCRIPTION: 'Obecný obsah stránky'
  BigFamilyPage:
@ -59,7 +59,7 @@ sk:
    ReasonDropdownBROKENLINK: 'Porušnený odkaz'
    ReasonDropdownRPBROKENLINK: 'Presmerovávacia stránka odkazuje na ne-existujúcu stránku'
    ReasonDropdownVPBROKENLINK: 'Virtuálna stránka odkazuje na ne-existujúcu stránku'
-    RedirectorNonExistent: 'stránka presmerovania odkazuje na ne-existujúcu stránku'
+    RedirectorNonExistent: 'presmerovávacia stránka odkazuje na ne-existujúcu stránku'
    VirtualPageNonExistent: 'virtuálna stránka odkazuje na ne-existujúcu stránku'
  CMSAddPageController:
    Title: 'Pridať stránku'
@ -86,8 +86,8 @@ sk:
    DELETEFP: 'Vymazať z publikovaného webu'
    DESCREMOVED: 'a {count} potomkov'
    EMAIL: 'Pošli e-mailom'
-    EditTree: 'Editovať strom'
-    ListFiltered: 'Filtrovaný zoznam.'
+    EditTree: 'Edit Tree'
+    ListFiltered: 'Filtered list.'
    MENUTITLE: 'Upraviť stránku'
    NEW: Nový
    PAGENOTEXISTS: 'Táto stránka neexistuje.'
@ -112,10 +112,10 @@ sk:
    TabContent: Obsah
    TabHistory: História
    TabSettings: Nastavenia
-    TreeFiltered: 'Filtrovaný strom.'
-    TreeFilteredClear: 'Vyčistiť filter'
+    TreeFiltered: 'Filtered tree.'
+    TreeFilteredClear: 'Clear filter'
  CMSMain_left.ss:
-    'APPLY FILTER': 'Použiť filter'
+    'APPLY FILTER': 'Apply Filter'
    RESET: Reset
  CMSPageAddController:
    MENUTITLE: 'Pridať stránku'
@ -128,29 +128,29 @@ sk:
    COMPAREVERSIONS: 'Porovnať verzie'
    COMPARINGVERSION: 'Porovnie verzií {version1} a {version2}.'
    MENUTITLE: História
-    REVERTTOTHISVERSION: 'Vrátiť sa k tejto verzii'
-    SHOWUNPUBLISHED: 'Zobraziť nepublikované verzie'
-    SHOWVERSION: 'Zobraziť verziu'
-    VIEW: zobraziť
-    VIEWINGVERSION: 'Práve sa zobrazuje verzia {version}.'
+    REVERTTOTHISVERSION: 'Revert to this version'
+    SHOWUNPUBLISHED: 'Show unpublished versions'
+    SHOWVERSION: 'Show Version'
+    VIEW: view
+    VIEWINGVERSION: 'Currently viewing version {version}.'
  CMSPageHistoryController_versions.ss:
    AUTHOR: Autor
    NOTPUBLISHED: Nepublikovaná
-    PUBLISHER: Vydavateľ
+    PUBLISHER: Publisher
    UNKNOWN: Neznáma
-    WHEN: Keď
+    WHEN: When
  CMSPageSettingsController:
    MENUTITLE: 'Upraviť stránku'
  CMSPagesController:
    GalleryView: 'Zobraziť galériu'
    ListView: 'Zobraziť zoznam'
    MENUTITLE: Stránky
-    TreeView: 'Zobraziť strom'
+    TreeView: 'Tree View'
  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: 'Tiahni a pusť'
-    MULTISELECT: 'Multi výber'
+    ENABLEDRAGGING: 'Drag''n''drop'
+    MULTISELECT: Multi-selection
  CMSPagesController_Tools.ss:
-    FILTER: Filtrovať
+    FILTER: Filter
  CMSSearch:
    FILTERDATEFROM: Od
    FILTERDATEHEADING: Dátum
@ -159,7 +159,7 @@ sk:
  CMSSettingsController:
    MENUTITLE: Nastavenia
  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Zmenené stránky'
+    Title: 'Changed pages'
  CMSSiteTreeFilter_DeletedPages:
    Title: 'Všetky stránky, vrátane vymazaných'
  CMSSiteTreeFilter_Search:
@ -235,7 +235,7 @@ sk:
    SearchResults: 'Výsledky vyhľadávania'
    VersionUnknown: Neznáma
  LegacyTableFieldsTestPage:
-    DESCRIPTION: 'Obecný obsah stránky'
+    DESCRIPTION: 'Generic content page'
  Page:
    DESCRIPTION: 'Obecný obsah stránky'
  Permission:
@ -253,13 +253,13 @@ sk:
    REDIRECTTOPAGE: 'Stránka na vašom webe'
    YOURPAGE: 'Stránka na vašom webe'
  RelationFieldsTestPage:
-    DESCRIPTION: 'Obecný obsah stránky'
+    DESCRIPTION: 'Generic content page'
  ReportAdmin:
    MENUTITLE: Výkazy
  ReportAdminForm:
    FILTERBY: 'Filtrovať podľa'
  SearchForm:
-    GO: Štart
+    GO: 'Štart'
    SEARCH: Hľadať
    SearchResults: 'Výsledky vyhľadávania'
  SideReport:
@ -307,7 +307,7 @@ sk:
    BUTTONSAVEPUBLISH: 'Uložiť a publikovať'
    BUTTONUNPUBLISH: Nepublikovať
    BUTTONUNPUBLISHDESC: 'Odstrániť túto stránku z publikovaných na webe'
-    CREATED: 'Dátum vytvorenia'
+    CREATED: 'Date Created'
    Comments: Komentáre
    Content: Obsah
    DEFAULTABOUTCONTENT: 'Túto stránku môžete vyplniť vlastným obsahom, alebo ju zmazať a vytvoriť vaše vlastné stránky.'
@ -316,10 +316,10 @@ sk:
    DEFAULTCONTACTTITLE: 'Kontaktuje nás'
    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</a>, alebo začať s <a href="http://doc.silverstripe.org/doku.php?id=tutorials">návodmi</a>.</p>'
    DEFAULTHOMETITLE: Domov
-    DELETEDPAGEHELP: 'Stránka už nie je viacej zverejnená'
-    DELETEDPAGESHORT: Smazané
-    DEPENDENT_NOTE: 'Nasledujúce stránky závisia na tejto stránke. To zahŕňa virtuálne stránky, presmerovania a stránky s odkazmi.'
-    DESCRIPTION: 'Obecný obsah stránky'
+    DELETEDPAGEHELP: 'Page is no longer published'
+    DELETEDPAGESHORT: Deleted
+    DEPENDENT_NOTE: 'Nasledujúce stránky sú závislé na tejto stránke. To zahŕňa virtuálne stránky, presmerovania a stránky s odkazmi.'
+    DESCRIPTION: 'Generic content page'
    DependtPageColumnLinkType: 'Typ odkazu'
    DependtPageColumnURL: Url
    EDITANYONE: 'Ktokoľvek kto sa môže prihlásiť do CMS'
@ -339,9 +339,9 @@ sk:
    METAEXTRA: 'Vlastné Meta Tagy'
    METAKEYWORDS: 'Meta kľúčové slová'
    METATITLE: Titulok
-    MODIFIEDONDRAFTHELP: 'Stránka má nezverejnené zmeny'
-    MODIFIEDONDRAFTSHORT: Zmenené
-    MetadataToggle: Metaúdaje
+    MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
+    MODIFIEDONDRAFTSHORT: Modified
+    MetadataToggle: Metadata
    PAGELOCATION: 'Pozícia stránky'
    PAGETITLE: 'Názov stránky'
    PAGETYPE: 'Typ stránky'
@ -388,13 +388,13 @@ sk:
  TableListField:
    SELECT: 'Vyberte:'
  TableListField.ss:
-    NOITEMSFOUND: 'Žiadne položky nájdené'
+    NOITEMSFOUND: 'No items found'
    SORTASC: 'Zoradiť poradie vzostupne'
    SORTDESC: 'Zoradiť poradie zostupne'
  TableListField_PageControls.ss:
-    DISPLAYING: Zobrazujem
-    OF: z
-    TO: do
+    DISPLAYING: Displaying
+    OF: of
+    TO: to
    VIEWFIRST: 'Zobraz prvé'
    VIEWLAST: 'Zobraz posledné'
    VIEWNEXT: 'Zobraz nasledujúce'
@ -404,7 +404,7 @@ sk:
  TestPage:
    DESCRIPTION: 'Obecný obsah stránky'
  TreeTools:
-    DisplayLabel: 'Zobrazenie:'
+    DisplayLabel: 'Display:'
  ViewArchivedEmail.ss:
    CANACCESS: 'Archivovaný web môžete navštíviť týmto odkazom:'
    HAVEASKED: 'Požiadali ste o zobrazenie obsahu webu z'
--- a/lang/sv.yml
+++ b/lang/sv.yml
@ -27,7 +27,7 @@ sv:
  AssetAdmin_DeleteBatchAction:
    TITLE: 'Radera mapparna'
  AssetAdmin_Tools.ss:
-    FILTER: Filter
+    FILTER: Filtrera
  AssetAdmin_left.ss:
    GO: Kör
  AssetTableField:
@ -102,7 +102,7 @@ sv:
    REMOVED: 'Raderade ''%s''%s från den publicerade sajten'
    REMOVEDPAGE: 'Tog bort ''{title}'' från den publicerade sajten'
    REMOVEDPAGEFROMDRAFT: 'Raderade ''%s'' från utkast'
-    RESTORE: Återskapa
+    RESTORE: 'Återskapa'
    RESTORED: 'Återskapandet av  ''{title}'' lyckades'
    ROLLBACK: 'Återställ den här versionen'
    ROLLEDBACKPUB: 'Återskapade publicerad version. Nytt versionsnummer är #{version}'
@ -165,7 +165,7 @@ sv:
  CMSSiteTreeFilter_Search:
    Title: 'Alla sidor'
  CaseStudy:
-    DESCRIPTION: 'Case study page to fature work examples'
+    DESCRIPTION: 'Casestudiesida som ska innehålla exempel på arbeten'
  ContentControl:
    NOTEWONTBESHOWN: 'Observera: Detta meddelande kommer inte att visas för besökarna'
  ContentController:
@ -235,7 +235,7 @@ sv:
    SearchResults: Sökresultat
    VersionUnknown: Okänd
  LegacyTableFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Allmän innehållssida'
  Page:
    DESCRIPTION: 'Generic content page'
  Permission:
@ -253,7 +253,7 @@ sv:
    REDIRECTTOPAGE: 'En sida på din sajt'
    YOURPAGE: 'Sida på din sajt'
  RelationFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Generisk innehållssida'
  ReportAdmin:
    MENUTITLE: Rapporter
  ReportAdminForm:
@ -319,7 +319,7 @@ sv:
    DELETEDPAGEHELP: 'Sidan är inte längre publicerad'
    DELETEDPAGESHORT: Raderad
    DEPENDENT_NOTE: 'Följande sidor berörs av den här sidan. Inklusive virtuella sidor, omdirigerings sidor, och sidor med innehålls länkar.'
-    DESCRIPTION: 'Generisk innehållssida'
+    DESCRIPTION: 'Allmän innehållssida'
    DependtPageColumnLinkType: Länktyp
    DependtPageColumnURL: URL
    EDITANYONE: 'Alla som kan logga in'
@ -373,7 +373,7 @@ sv:
    VIEW_ALL_HELP: 'Möjlighet att visa vilken sida som helst på webbplatsen, oavsett inställningarna på fliken Åtkomst. Kräver "Tillgång till Webbplatsinnehåll" tillåtelse'
    VIEW_DRAFT_CONTENT: 'Se utkast'
    VIEW_DRAFT_CONTENT_HELP: 'Gäller att visa sidor i utkast läge. Användbart för externa samarbetspartners utan CMS åtkomst.'
-    Viewers: Åskådargrupper
+    Viewers: 'Åskådargrupper'
    Visibility: Synlighet
    has_one_Parent: Föräldrasida
    many_many_BackLinkTracking: 'Spåra inlänkar'
--- a/lang/th.yml
+++ b/lang/th.yml
@ -6,7 +6,7 @@ th:
    AppCategoryArchive: Archive
    AppCategoryAudio: ไฟล์เสียง
    AppCategoryFlash: แฟลช
-    AppCategoryImage: รูปภาพ
+    AppCategoryImage: 'รูปภาพ'
    AppCategoryVideo: วีดีโอ
    BackToFolder: ย้อนกลับไปที่โฟลเดอร์
    CREATED: วันที่
@ -27,7 +27,7 @@ th:
  AssetAdmin_DeleteBatchAction:
    TITLE: 'Delete folders'
  AssetAdmin_Tools.ss:
-    FILTER: Filter
+    FILTER: ตัวกรองข้อมูล
  AssetAdmin_left.ss:
    GO: ไป
  AssetTableField:
@ -47,7 +47,7 @@ th:
    CheckSiteDropdownPublished: เว็บไซต์ที่เผยแพร่แล้ว
    ColumnDateLastModified: วันที่แก้ไขล่าสุด
    ColumnDateLastPublished: วันที่เผยแพร่ล่าสุด
-    ColumnProblemType: ประเภทปัญหา
+    ColumnProblemType: 'ประเภทปัญหา'
    ColumnURL: URL
    HasBrokenFile: มีไฟล์เสีย
    HasBrokenLink: มีลิงค์เสีย
@ -253,7 +253,7 @@ th:
    REDIRECTTOPAGE: หน้าเว็บในเว็บไซต์ของคุณ
    YOURPAGE: หน้าเว็บที่อยู่บนเว็บไซต์ของคุณ
  RelationFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: หน้าเนื้อหาทั่วไป
  ReportAdmin:
    MENUTITLE: Reports
  ReportAdminForm:
@ -319,7 +319,7 @@ th:
    DELETEDPAGEHELP: 'Page is no longer published'
    DELETEDPAGESHORT: Deleted
    DEPENDENT_NOTE: 'The following pages depend on this page. This includes virtual pages, redirector pages, and pages with content links.'
-    DESCRIPTION: หน้าเนื้อหาทั่วไป
+    DESCRIPTION: 'Generic content page'
    DependtPageColumnLinkType: ชนิดของลิงค์
    DependtPageColumnURL: URL
    EDITANYONE: 'ทุกคนสามารถเข้าสู่ระบบของ CMS ได้ทั้งหมด'
--- a/lang/uk.yml
+++ b/lang/uk.yml
@ -3,7 +3,7 @@ uk:
    ADDFILES: 'Додати файли'
    ALLOWEDEXTS: 'Допустимі розширення'
    ActionAdd: 'Додати папку'
-    AppCategoryArchive: Архівувати
+    AppCategoryArchive: 'Архівувати'
    AppCategoryAudio: Аудіо
    AppCategoryFlash: Flash
    AppCategoryImage: Зображення
@ -20,14 +20,14 @@ uk:
    ListView: 'У вигляді списку'
    MENUTITLE: Файли
    NEWFOLDER: 'Нова Тека'
-    SIZE: Розмір
+    SIZE: 'Розмір'
    THUMBSDELETED: '{count} невикористаних ескізів було видалено'
    TreeView: 'У вигляді дерева'
    Upload: Завантажити
  AssetAdmin_DeleteBatchAction:
    TITLE: 'Видалені папки'
  AssetAdmin_Tools.ss:
-    FILTER: Filter
+    FILTER: Фільтр
  AssetAdmin_left.ss:
    GO: Уперед
  AssetTableField:
@ -235,7 +235,7 @@ uk:
    SearchResults: 'Результати пошуку'
    VersionUnknown: Невідомий
  LegacyTableFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Загальна сторінка з вмістом'
  Page:
    DESCRIPTION: 'Generic content page'
  Permission:
@ -253,7 +253,7 @@ uk:
    REDIRECTTOPAGE: 'Сторінку на Вашому сайті'
    YOURPAGE: 'Сторінки на Вашому сайті'
  RelationFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: 'Загальний вміст сторінки'
  ReportAdmin:
    MENUTITLE: Звіти
  ReportAdminForm:
@ -294,7 +294,7 @@ uk:
    TOPLEVELCREATE: 'Хто може створювати сторінки верхнього рівня на сайті?'
    VIEWHEADER: 'Хто може переглядати сторінки на цьому сайті?'
  SiteTree:
-    ACCESSANYONE: Будь-хто
+    ACCESSANYONE: 'Будь-хто'
    ACCESSHEADER: 'Хто може переглядати цю сторінку?'
    ACCESSLOGGEDIN: 'Тільки ті, що увійшли'
    ACCESSONLYTHESE: 'Тільки ці люди (виберіть зі списку)'
@ -319,7 +319,7 @@ uk:
    DELETEDPAGEHELP: 'Сторінка вже не є опублікованою'
    DELETEDPAGESHORT: Видалений
    DEPENDENT_NOTE: 'Наступні сторінки залежать від цієї сторінки. Вони включають віртуальні сторінки, сторінки переадресації і сторінки з посиланням у змісті'
-    DESCRIPTION: 'Загальний вміст сторінки'
+    DESCRIPTION: 'Generic content page'
    DependtPageColumnLinkType: 'Тип посилання'
    DependtPageColumnURL: URL
    EDITANYONE: 'Будь-хто, хто може увійти до системи'
--- a/lang/zh_CN.yml
+++ b/lang/zh_CN.yml
@ -82,7 +82,7 @@ zh_CN:
    ChoosePageParentMode: 'Choose where to create this page'
    ChoosePageType: 'Choose page type'
    Create: Create
-    DELETE: 从测试网站中删除
+    DELETE: '从测试网站中删除'
    DELETEFP: Delete
    DESCREMOVED: 'and {count} descendants'
    EMAIL: 电子邮件
@ -94,8 +94,8 @@ zh_CN:
    PAGES: Pages
    PAGETYPEANYOPT: Any
    PAGETYPEOPT: 'Page Type'
-    PUBALLCONFIRM: 请发布该站的每一网页，这样，预备发布站上的内容就会复制到正式发布站上
-    PUBALLFUN: “全部发布“功能
+    PUBALLCONFIRM: '请发布该站的每一网页，这样，预备发布站上的内容就会复制到正式发布站上'
+    PUBALLFUN: '“全部发布“功能'
    PUBALLFUN2: 按下这一按键将等同于逐一发布每一网页。此功能适用于被大量编辑过的网页，如在网站被第一次使用时。
    PUBPAGES: 'Done: Published {count} pages'
    PageAdded: 'Successfully created page'
@ -189,7 +189,7 @@ zh_CN:
    UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
    VIEWPAGEIN: 'View Page in:'
  ErrorPage:
-    CODE: 错误代码
+    CODE: '错误代码'
    DEFAULTERRORPAGECONTENT: '<p>Sorry, it seems you were trying to access a page that doesn''t exist.</p><p>Please check the spelling of the URL you were trying to access and try again.</p>'
    DEFAULTERRORPAGETITLE: 'Page not found'
    DEFAULTSERVERERRORPAGECONTENT: '<p>Sorry, there was a problem with handling your request.</p>'
@ -270,7 +270,7 @@ zh_CN:
    BrokenLinksGroupTitle: 'Broken links reports'
    ContentGroupTitle: 'Content reports'
    EMPTYPAGES: 空白页
-    LAST2WEEKS: 在过去2周内编辑过的网页
+    LAST2WEEKS: '在过去2周内编辑过的网页'
    OtherGroupTitle: Other
    ParameterLiveCheckbox: 'Check live site'
    REPEMPTY: 'The {title} report is empty.'
@ -297,16 +297,16 @@ zh_CN:
    ACCESSANYONE: 任何人
    ACCESSHEADER: 在我的网站上，谁可以浏览此页？
    ACCESSLOGGEDIN: 已登录的用户
-    ACCESSONLYTHESE: 只有这些人（请从下列清单中选择）
+    ACCESSONLYTHESE: '只有这些人（请从下列清单中选择）'
    ADDEDTODRAFTHELP: 'Page has not been published yet'
    ADDEDTODRAFTSHORT: Draft
-    ALLOWCOMMENTS: 是否允许对次页进行评论？
+    ALLOWCOMMENTS: '是否允许对次页进行评论？'
    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
    BUTTONCANCELDRAFT: 取消草稿的改动
    BUTTONCANCELDRAFTDESC: 将您的草稿恢复到目前正式发布的版本
    BUTTONSAVEPUBLISH: 保存并发布
    BUTTONUNPUBLISH: 撤消发布
-    BUTTONUNPUBLISHDESC: 将此页从正式发布站删除
+    BUTTONUNPUBLISHDESC: '将此页从正式发布站删除'
    CREATED: 'Date Created'
    Comments: Comments
    Content: Content
@ -324,21 +324,21 @@ zh_CN:
    DependtPageColumnURL: URL
    EDITANYONE: 任何可以登录CMS的人
    EDITHEADER: 谁能在CMS中编辑此页？
-    EDITONLYTHESE: 只有这些人（请从下列清单中选择）
+    EDITONLYTHESE: '只有这些人（请从下列清单中选择）'
    EDITORGROUPS: 'Editor Groups'
    EDIT_ALL_DESCRIPTION: 'Edit any page'
    EDIT_ALL_HELP: 'Ability to edit any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
    Editors: 'Editors Groups'
    HASBROKENLINKS: 该页有失效链接。
-    HTMLEDITORTITLE: 内容
+    HTMLEDITORTITLE: '内容'
    INHERIT: 'Inherit from parent page'
    LASTUPDATED: 'Last Updated'
    LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
-    MENUTITLE: 导航标签
-    METADESC: 网页描述标签
-    METAEXTRA: 自定义Meta标签
-    METAKEYWORDS: 网页关键词标签
-    METATITLE: Title标签
+    MENUTITLE: '导航标签'
+    METADESC: '网页描述标签'
+    METAEXTRA: '自定义Meta标签'
+    METAKEYWORDS: '网页关键词标签'
+    METATITLE: 'Title标签'
    MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
    MODIFIEDONDRAFTSHORT: Modified
    MetadataToggle: Metadata
@ -360,12 +360,12 @@ zh_CN:
    REORGANISE_DESCRIPTION: 'Change site structure'
    REORGANISE_HELP: 'Rearrange pages in the site tree through drag&drop.'
    SHOWINMENUS: 是否出现在菜单中？
-    SHOWINSEARCH: 是否包括在搜索结果中？
+    SHOWINSEARCH: '是否包括在搜索结果中？'
    SINGULARNAME: 'Site Tree'
    TABBEHAVIOUR: 行为特点
-    TABCONTENT: 内容
+    TABCONTENT: '内容'
    TABDEPENDENT: 'Dependent pages'
-    TOPLEVEL: 网站内容（顶层）
+    TOPLEVEL: '网站内容（顶层）'
    TOPLEVELCREATORGROUPS: 'Top level creators'
    URLSegment: 'URL Segment'
    VIEWERGROUPS: 'Viewer Groups'
@ -406,12 +406,12 @@ zh_CN:
  TreeTools:
    DisplayLabel: 'Display:'
  ViewArchivedEmail.ss:
-    CANACCESS: 您可通过这个链接进入已归挡的网页：
+    CANACCESS: '您可通过这个链接进入已归挡的网页：'
    HAVEASKED: '在%s,您要求浏览我们网站'
  VirtualPage:
    CHOOSE: 选择一个网页进行链接
    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 点击这里以编辑内容
+    EDITCONTENT: '点击这里以编辑内容'
    HEADER: 这是一个虚拟页
    PLURALNAME: 'Virtual Pags'
    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
--- a/lang/zh_TW.yml
+++ b/lang/zh_TW.yml
@ -36,7 +36,7 @@ zh_TW:
  BackLink_Button.ss:
    Back: 返回
  BasicFieldsTestPage:
-    DESCRIPTION: 'Generic content page'
+    DESCRIPTION: '一般內容網頁'
  BigFamilyPage:
    DESCRIPTION: 'Generic content page'
  BrokenLinksReport:
@ -90,13 +90,13 @@ zh_TW:
    ListFiltered: 'Filtered list.'
    MENUTITLE: 'Edit Page'
    NEW: 新增
-    PAGENOTEXISTS: 這頁不存在
+    PAGENOTEXISTS: '這頁不存在'
    PAGES: Pages
    PAGETYPEANYOPT: Any
    PAGETYPEOPT: 'Page Type'
-    PUBALLCONFIRM: 請發布所有網頁
+    PUBALLCONFIRM: '請發布所有網頁'
    PUBALLFUN: '"全部發布" 功能'
-    PUBALLFUN2: 按下這個按鈕就是如同到每頁按「發布」。當有很多內容更變時，這個功能可以省時。
+    PUBALLFUN2: '按下這個按鈕就是如同到每頁按「發布」。當有很多內容更變時，這個功能可以省時。'
    PUBPAGES: 'Done: Published {count} pages'
    PageAdded: 'Successfully created page'
    REMOVED: 'Deleted ''%s''%s from live site'
@ -124,7 +124,7 @@ zh_TW:
  CMSPageEditController:
    MENUTITLE: 'Edit Page'
  CMSPageHistoryController:
-    COMPAREMODE: 比較模式(選擇兩個)
+    COMPAREMODE: '比較模式(選擇兩個)'
    COMPAREVERSIONS: 比較版本
    COMPARINGVERSION: 'Comparing versions {version1} and {version2}.'
    MENUTITLE: 歷史
@ -134,17 +134,17 @@ zh_TW:
    VIEW: 瀏覽
    VIEWINGVERSION: 'Currently viewing version {version}.'
  CMSPageHistoryController_versions.ss:
-    AUTHOR: 作者
+    AUTHOR: '作者'
    NOTPUBLISHED: 未發行的
-    PUBLISHER: 發行者
+    PUBLISHER: '發行者'
    UNKNOWN: 未知的
    WHEN: 何時
  CMSPageSettingsController:
-    MENUTITLE: 編輯網頁
+    MENUTITLE: '編輯網頁'
  CMSPagesController:
    GalleryView: 圖庫瀏覽
-    ListView: 清單瀏覽
-    MENUTITLE: 網頁
+    ListView: '清單瀏覽'
+    MENUTITLE: '網頁'
    TreeView: 樹狀瀏覽
  CMSPagesController_ContentToolbar.ss:
    ENABLEDRAGGING: 'Drag''n''drop'
@ -163,7 +163,7 @@ zh_TW:
  CMSSiteTreeFilter_DeletedPages:
    Title: '所有網頁, 包括已刪除的'
  CMSSiteTreeFilter_Search:
-    Title: 所有網頁
+    Title: '所有網頁'
  CaseStudy:
    DESCRIPTION: 'Case study page to fature work examples'
  ContentControl:
@ -191,7 +191,7 @@ zh_TW:
  ErrorPage:
    CODE: 錯誤代碼
    DEFAULTERRORPAGECONTENT: '<p>抱歉, 看來您正再嘗試存取一個不存在的網頁</p><p>請檢查您正在嘗試存取網址的拼寫並再試一次.</p>'
-    DEFAULTERRORPAGETITLE: 未發現網頁
+    DEFAULTERRORPAGETITLE: '未發現網頁'
    DEFAULTSERVERERRORPAGECONTENT: '<p>抱歉, 處裡您的要求發生一個問題</p>'
    DEFAULTSERVERERRORPAGETITLE: 伺服器錯誤
    DESCRIPTION: 'Custom content for different error cases (e.g. "Page not found")'
@ -229,7 +229,7 @@ zh_TW:
    DESCRIPTION: 'Generic content page'
  LeftAndMain:
    DELETED: Deleted.
-    PreviewButton: 預覽
+    PreviewButton: '預覽'
    SAVEDUP: Saved.
    STATUSPUBLISHEDSUCCESS: 'Published ''{title}'' successfully'
    SearchResults: 搜尋結果
@ -244,14 +244,14 @@ zh_TW:
    CONTENT_CATEGORY: 'Content permissions'
    PERMISSIONS_CATEGORY: 'Roles and access permissions'
  RedirectorPage:
-    DESCRIPTION: 重新導向到一個內部不同的網頁
-    HASBEENSETUP: 沒有任何地方被重新導向的一個重新導向網頁已被設定.
-    HEADER: 本網頁將重新導向用戶至別的網頁
-    OTHERURL: 其他網站網址
+    DESCRIPTION: '重新導向到一個內部不同的網頁'
+    HASBEENSETUP: '沒有任何地方被重新導向的一個重新導向網頁已被設定.'
+    HEADER: '本網頁將重新導向用戶至別的網頁'
+    OTHERURL: '其他網站網址'
    REDIRECTTO: 重新導向到
    REDIRECTTOEXTERNAL: 別的網站
-    REDIRECTTOPAGE: 在您網站上的一個網頁
-    YOURPAGE: 在您網站上的網頁
+    REDIRECTTOPAGE: '在您網站上的一個網頁'
+    YOURPAGE: '在您網站上的網頁'
  RelationFieldsTestPage:
    DESCRIPTION: 'Generic content page'
  ReportAdmin:
@ -269,8 +269,8 @@ zh_TW:
    BROKENVIRTUALPAGES: 'VirtualPages pointing to deleted pages'
    BrokenLinksGroupTitle: 'Broken links reports'
    ContentGroupTitle: 'Content reports'
-    EMPTYPAGES: 空頁
-    LAST2WEEKS: 網頁在過去兩個禮拜有被更改過
+    EMPTYPAGES: '空頁'
+    LAST2WEEKS: '網頁在過去兩個禮拜有被更改過'
    OtherGroupTitle: Other
    ParameterLiveCheckbox: 'Check live site'
    REPEMPTY: 'The {title} report is empty.'
@ -295,12 +295,12 @@ zh_TW:
    VIEWHEADER: 'Who can view pages on this site?'
  SiteTree:
    ACCESSANYONE: 所有人
-    ACCESSHEADER: 誰可以瀏覽這頁？
-    ACCESSLOGGEDIN: 已登入的使用者
-    ACCESSONLYTHESE: 只有這些人(從清單選擇)
+    ACCESSHEADER: '誰可以瀏覽這頁？'
+    ACCESSLOGGEDIN: '已登入的使用者'
+    ACCESSONLYTHESE: '只有這些人(從清單選擇)'
    ADDEDTODRAFTHELP: 'Page has not been published yet'
    ADDEDTODRAFTSHORT: Draft
-    ALLOWCOMMENTS: 允許留言嗎？
+    ALLOWCOMMENTS: '允許留言嗎？'
    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
    BUTTONCANCELDRAFT: 取消草稿更變
    BUTTONCANCELDRAFTDESC: 刪除草稿並回複到正式發布的版本
@ -309,47 +309,47 @@ zh_TW:
    BUTTONUNPUBLISHDESC: 從正式發布站移除
    CREATED: 建立日期
    Comments: 意見
-    Content: 內容
+    Content: '內容'
    DEFAULTABOUTCONTENT: '<p>您可以用您自己的內容填入本網頁, 或是刪除它並建立您自己的網頁<br /></p>'
    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: 首頁
+    DEFAULTHOMETITLE: '首頁'
    DELETEDPAGEHELP: 'Page is no longer published'
    DELETEDPAGESHORT: 已刪除
    DEPENDENT_NOTE: '以下的網頁是依附在本網頁的. 這包含了虛擬網頁, 重新導向網頁, 以及有內容鏈結的網頁.'
    DESCRIPTION: 'Generic content page'
    DependtPageColumnLinkType: 鏈結類型
    DependtPageColumnURL: 網址
-    EDITANYONE: 所有可以登入CMS的人
-    EDITHEADER: 誰可以編輯這頁？
-    EDITONLYTHESE: 只有這些人(從清單選擇)
-    EDITORGROUPS: 編輯者群組
-    EDIT_ALL_DESCRIPTION: 編輯任何網頁
+    EDITANYONE: '所有可以登入CMS的人'
+    EDITHEADER: '誰可以編輯這頁？'
+    EDITONLYTHESE: '只有這些人(從清單選擇)'
+    EDITORGROUPS: '編輯者群組'
+    EDIT_ALL_DESCRIPTION: '編輯任何網頁'
    EDIT_ALL_HELP: '不管在存取Tab上的設定值, 在網站上有能力去編輯任何網頁. 需要 "到''網頁''部分的存取"許可'
-    Editors: 編輯者群體
-    HASBROKENLINKS: 網頁含有失效的連結。
-    HTMLEDITORTITLE: 內容
-    INHERIT: 從母頁繼承
+    Editors: '編輯者群體'
+    HASBROKENLINKS: '網頁含有失效的連結。'
+    HTMLEDITORTITLE: '內容'
+    INHERIT: '從母頁繼承'
    LASTUPDATED: 最近更新
-    LINKCHANGENOTE: 改變這個網頁鏈結將也會影響所有子網頁的鏈結
+    LINKCHANGENOTE: '改變這個網頁鏈結將也會影響所有子網頁的鏈結'
    MENUTITLE: 捷徑標籤
    METADESC: 敘述
-    METAEXTRA: 自訂元標籤(meta-tags)
+    METAEXTRA: '自訂元標籤(meta-tags)'
    METAKEYWORDS: 關鍵詞
    METATITLE: 標題
    MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
    MODIFIEDONDRAFTSHORT: 已修改
    MetadataToggle: Metadata
-    PAGELOCATION: 網頁位置
-    PAGETITLE: 網頁名稱
-    PAGETYPE: 網頁類型
-    PARENTID: 母頁
-    PARENTTYPE: 網頁位置
-    PARENTTYPE_ROOT: 頂級網頁
-    PARENTTYPE_SUBPAGE: 在母頁下面的次頁
-    PERMISSION_GRANTACCESS_DESCRIPTION: 管理內容的存取權限
+    PAGELOCATION: '網頁位置'
+    PAGETITLE: '網頁名稱'
+    PAGETYPE: '網頁類型'
+    PARENTID: '母頁'
+    PARENTTYPE: '網頁位置'
+    PARENTTYPE_ROOT: '頂級網頁'
+    PARENTTYPE_SUBPAGE: '在母頁下面的次頁'
+    PERMISSION_GRANTACCESS_DESCRIPTION: '管理內容的存取權限'
    PERMISSION_GRANTACCESS_HELP: '允許設定在"網頁"部分的網頁-特定存取限制.'
    PLURALNAME: '網站 Tres'
    PageTypNotAllowedOnRoot: 'Page type "{type}" is not allowed on the root level'
@ -363,19 +363,19 @@ zh_TW:
    SHOWINSEARCH: 在搜尋結果裡顯示嗎？
    SINGULARNAME: 網站樹狀架構
    TABBEHAVIOUR: 作用
-    TABCONTENT: 內容
-    TABDEPENDENT: 依賴網頁
+    TABCONTENT: '內容'
+    TABDEPENDENT: '依賴網頁'
    TOPLEVEL: '網站內容 (高層)'
-    TOPLEVELCREATORGROUPS: 頂級創作者
+    TOPLEVELCREATORGROUPS: '頂級創作者'
    URLSegment: 網址分類
-    VIEWERGROUPS: 瀏覽者群組
-    VIEW_ALL_DESCRIPTION: 瀏覽任何網頁
+    VIEWERGROUPS: '瀏覽者群組'
+    VIEW_ALL_DESCRIPTION: '瀏覽任何網頁'
    VIEW_ALL_HELP: '不管在存取Tab上的設定值, 在網站上有能力去編輯任何網頁. 需要 "到''網頁''部分的存取"許可'
-    VIEW_DRAFT_CONTENT: 瀏覽內容草稿
+    VIEW_DRAFT_CONTENT: '瀏覽內容草稿'
    VIEW_DRAFT_CONTENT_HELP: '應用於在草稿模式下觀看CMS以外的網頁. 沒有CMS存取權的外部合作者是有用的.'
-    Viewers: 瀏覽者群組
+    Viewers: '瀏覽者群組'
    Visibility: 能見度
-    has_one_Parent: 母頁
+    has_one_Parent: '母頁'
    many_many_BackLinkTracking: 背面鏈結追蹤
    many_many_ImageTracking: 影像追蹤
    many_many_LinkTracking: 鏈結追蹤
@ -384,7 +384,7 @@ zh_TW:
  StaticExporter:
    BASEURL: 基本網址
    EXPORTTO: 匯出至那個資料夾
-    NAME: 網站靜態匯出
+    NAME: '網站靜態匯出'
  TableListField:
    SELECT: 'Select:'
  TableListField.ss:
@ -406,15 +406,15 @@ zh_TW:
  TreeTools:
    DisplayLabel: 'Display:'
  ViewArchivedEmail.ss:
-    CANACCESS: 您可以利用哲格連結到已歸檔站：
-    HAVEASKED: 您要瀏覽這一天的網站內容：
+    CANACCESS: '您可以利用哲格連結到已歸檔站：'
+    HAVEASKED: '您要瀏覽這一天的網站內容：'
  VirtualPage:
-    CHOOSE: 請選擇一個網頁來連結至
-    DESCRIPTION: 顯示其他網頁的內容
-    EDITCONTENT: 點擊即可更改內容
-    HEADER: 這是一個虛擬網頁
-    PLURALNAME: 虛擬網頁
+    CHOOSE: '請選擇一個網頁來連結至'
+    DESCRIPTION: '顯示其他網頁的內容'
+    EDITCONTENT: '點擊即可更改內容'
+    HEADER: '這是一個虛擬網頁'
+    PLURALNAME: '虛擬網頁'
    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
-    SINGULARNAME: 虛擬網頁
+    SINGULARNAME: '虛擬網頁'
  cms:
    FILESYSTEMSYNC: 'Sync files'
--- a/scss/_CMSMain.scss
+++ b/scss/_CMSMain.scss
@ -84,7 +84,7 @@
 			}

 			// Show badge on hovered node
-			a:hover > .text > .badge {
+			a:hover > .text > .badge, .jstree-clicked > .text > .badge {
 				display: inline-block;
 			}
 		}
--- a/templates/CMSPageHistoryController_versions.ss
+++ b/templates/CMSPageHistoryController_versions.ss
@ -2,9 +2,9 @@
 	<thead>
 		<tr>
 			<th class="ui-helper-hidden"></th>
-			<th><% _t('WHEN','When') %></th>
-			<th><% _t('AUTHOR','Author') %></th>
-			<th><% _t('PUBLISHER','Publisher') %></th>
+			<th><% _t('CMSPageHistoryController_versions.ss.WHEN','When') %></th>
+			<th><% _t('CMSPageHistoryController_versions.ss.AUTHOR','Author') %></th>
+			<th><% _t('CMSPageHistoryController_versions.ss.PUBLISHER','Publisher') %></th>
 		</tr>
 	</thead>
 	
@ -15,8 +15,8 @@
 			<% with LastEdited %>
 				<td class="last-edited first-column" title="$Ago - $Nice">$Nice</td>
 			<% end_with %>
-			<td><% if Author %>$Author.FirstName $Author.Surname.Initial<% else %><% _t('UNKNOWN','Unknown') %><% end_if %></td>
-			<td class="last-column"><% if Published %><% if Publisher %>$Publisher.FirstName $Publisher.Surname.Initial<% else %><% _t('UNKNOWN','Unknown') %><% end_if %><% else %><% _t('NOTPUBLISHED','Not published') %><% end_if %></td>			
+			<td><% if Author %>$Author.FirstName $Author.Surname.Initial<% else %><% _t('CMSPageHistoryController_versions.ss.UNKNOWN','Unknown') %><% end_if %></td>
+			<td class="last-column"><% if Published %><% if Publisher %>$Publisher.FirstName $Publisher.Surname.Initial<% else %><% _t('CMSPageHistoryController_versions.ss.UNKNOWN','Unknown') %><% end_if %><% else %><% _t('CMSPageHistoryController_versions.ss.NOTPUBLISHED','Not published') %><% end_if %></td>			
 		</tr>
 		<% end_loop %>
 	</tbody>
--- a/templates/Includes/AssetAdmin_Tools.ss
+++ b/templates/Includes/AssetAdmin_Tools.ss
@ -1,9 +1,9 @@
 <div class="cms-content-tools west cms-panel cms-panel-layout collapsed" id="cms-content-tools-AssetAdmin" data-expandOnClick="true" data-layout-type="border">
 	<div class="cms-panel-content center">
-		<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
+		<h3 class="cms-panel-header"><% _t('AssetAdmin_Tools.FILTER', 'Filter') %></h3>
 		$SearchForm
 	</div>
 	<div class="cms-panel-content-collapsed">
-		<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
+		<h3 class="cms-panel-header"><% _t('AssetAdmin_Tools.FILTER', 'Filter') %></h3>
 	</div>
 </div>
--- a/templates/Includes/CMSMain_TreeView.ss
+++ b/templates/Includes/CMSMain_TreeView.ss
@ -22,7 +22,7 @@ $ExtraTreeTools
 	</div>
 	<% end_if %>

-	<div class="cms-tree" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" data-url-addpage="{$LinkPageAdd}AddForm/?action_doAdd=1&amp;ParentID=%s&amp;PageType=%s&amp;SecurityID=$SecurityID" data-url-editpage="$LinkPageEdit('%s')" data-hints="$SiteTreeHints">
+	<div class="cms-tree" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" data-url-updatetreenodes="$Link(updatetreenodes)" data-url-addpage="{$LinkPageAdd}AddForm/?action_doAdd=1&amp;ParentID=%s&amp;PageType=%s&amp;SecurityID=$SecurityID" data-url-editpage="$LinkPageEdit('%s')" data-hints="$SiteTreeHints">
 		$SiteTreeAsUL
 	</div>
 </div>
--- a/templates/Includes/CMSPagesController_ContentToolbar.ss
+++ b/templates/Includes/CMSPagesController_ContentToolbar.ss
@ -3,12 +3,12 @@
 	<% if CanOrganiseSitetree %> 
 	<div class="checkboxAboveTree">
 		<input type="radio" name="view-mode" class="view-mode" value="draggable" id="view-mode-draggable" checked="checked" />
-		<label for="view-mode-draggable"><% _t("ENABLEDRAGGING","Drag'n'drop") %></label>
+		<label for="view-mode-draggable"><% _t("CMSPagesController_ContentToolbar.ss.ENABLEDRAGGING","Drag'n'drop") %></label>
 	</div>
 	<% end_if %>
 	<div>
 		<input type="radio" name="view-mode" class="view-mode" value="multiselect" id="view-mode-multiselect" />
-		<label for="view-mode-multiselect"><% _t("MULTISELECT","Multi-selection") %></label>
+		<label for="view-mode-multiselect"><% _t("CMSPagesController_ContentToolbar.ss.MULTISELECT","Multi-selection") %></label>
 	</div>
 </div>
 <% include CMSPagesController_ContentToolActions %>
--- a/templates/Includes/CMSPagesController_Tools.ss
+++ b/templates/Includes/CMSPagesController_Tools.ss
@ -1,9 +1,9 @@
 <div class="cms-content-tools west cms-panel cms-panel-layout collapsed" data-expandOnClick="true" data-layout-type="border" id="cms-content-tools-CMSPagesController">
 	<div class="cms-panel-content center">
-		<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
+		<h3 class="cms-panel-header"><% _t('CMSPagesController_Tools.ss.FILTER', 'Filter') %></h3>
 		$SearchForm
 	</div>
 	<div class="cms-panel-content-collapsed">
-		<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
+		<h3 class="cms-panel-header"><% _t('CMSPagesController_Tools.ss.FILTER', 'Filter') %></h3>
 	</div>
 </div>
--- a/templates/email/ViewArchivedEmail.ss
+++ b/templates/email/ViewArchivedEmail.ss
@ -1,3 +1,3 @@
-<% _t('HAVEASKED','You have asked to view the content of our site on',30,'Followed by a date') %> $ArchiveDate.Date
+<% _t('ViewArchivedEmail.ss.HAVEASKED','You have asked to view the content of our site on',30,'Followed by a date') %> $ArchiveDate.Date

-<% _t('CANACCESS','You can access the archived site at this link:') %> $ArchiveURL
+<% _t('ViewArchivedEmail.ss.CANACCESS','You can access the archived site at this link:') %> $ArchiveURL
--- a/tests/controller/ModelAsControllerTest.php
+++ b/tests/controller/ModelAsControllerTest.php
@ -234,4 +234,32 @@ class ModelAsControllerTest extends FunctionalTest {
 		$this->assertEquals(false, $response );
 	}

+	/**
+	 * go to a page that's been published but is child of an unpublished page
+	 *
+	 * NOTE: This test requires nested_urls
+	 */
+	function testChildOfDraft() {
+		RootURLController::reset();
+		SiteTree::enable_nested_urls();
+
+		$draft = new Page();
+		$draft->Title = 'Root Leve Draft Page';
+		$draft->URLSegment = 'root';
+		$draft->write();
+
+		$published = new Page();
+		$published->Title = 'Published Page Under Draft Page';
+		$published->URLSegment = 'sub-root';
+		$published->write();
+		$published->publish('Stage', 'Live');
+		$response = $this->get('root/sub-root');
+
+		$this->assertEquals(
+		$response->getStatusCode(),
+			404,
+			'The page should not be found since its parent has not been published, in this case http://<yousitename>/root/sub-root or http://<yousitename>/sub-root'
+		);
+	}
+
 }