Merge branch '3.0'

code/controllers/CMSMain.php

@@ -245,74 +245,98 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		return $html;
 	}
 	
+	/**
+	 * Returns a Form for page searching for use in templates.
+	 * 
+	 * Can be modified from a decorator by a 'updateSearchForm' method
+	 *
+	 * @return Form
+	 */
 	public function SearchForm() {
-		// get all page types in a dropdown-compatible format
-		$pageTypeClasses = SiteTree::page_type_classes(); 
-		$pageTypes = array();
-		foreach ($pageTypeClasses as $pageTypeClass) {
-			$pageTypes[$pageTypeClass] = _t($pageTypeClass.'.SINGULARNAME', $pageTypeClass);
-		}
-		asort($pageTypes);
-		
-		// get all filter instances
-		$filters = ClassInfo::subclassesFor('CMSSiteTreeFilter');
-		$filterMap = array();
-		// remove base class
-		array_shift($filters);
-		// add filters to map
-		foreach($filters as $filter) {
-			$filterMap[$filter] = call_user_func(array($filter, 'title'));
-		}
-		// ensure that 'all pages' filter is on top position
-		uasort($filterMap, 
-			create_function('$a,$b', 'return ($a == "CMSSiteTreeFilter_Search") ? 1 : -1;')
+		// Create the fields
+		$content = new TextField('q[Term]', _t('CMSSearch.FILTERLABELTEXT', 'Content'));
+		$dateHeader = new HeaderField('q[Date]', _t('CMSSearch.FILTERDATEHEADING', 'Date'), 4);
+		$dateFrom = new DateField(
+			'q[LastEditedFrom]', 
+			_t('CMSSearch.FILTERDATEFROM', 'From')
 		);
+		$dateFrom->setConfig('showcalendar', true);
+		$dateTo = new DateField(
+			'q[LastEditedTo]',
+			_t('CMSSearch.FILTERDATETO', 'To')
+		);
+		$dateTo->setConfig('showcalendar', true);
+		$pageFilter = new DropdownField(
+			'q[FilterClass]', 
+			_t('CMSMain.PAGES', 'Pages'), 
+			CMSSiteTreeFilter::get_all_filters()
+		);
+		$pageClasses = new DropdownField(
+			'q[ClassName]', 
+			_t('CMSMain.PAGETYPEOPT', 'Page Type', 'Dropdown for limiting search to a page type'), 
+			$this->getPageTypes()
+		);
+		$pageClasses->setEmptyString(_t('CMSMain.PAGETYPEANYOPT','Any'));
 		
-		$fields = new FieldList(
-			new TextField('q[Term]', _t('CMSSearch.FILTERLABELTEXT', 'Content')),
-			$dateGroup = new FieldGroup(
-				new HeaderField('q[Date]', _t('CMSSearch.FILTERDATEHEADING', 'Date'), 4),
-				$dateFrom = new DateField('q[LastEditedFrom]', _t('CMSSearch.FILTERDATEFROM', 'From')),
-				$dateTo = new DateField('q[LastEditedTo]', _t('CMSSearch.FILTERDATETO', 'To'))
-			),
-			new DropdownField(
-				'q[FilterClass]',
-				_t('CMSMain.PAGES', 'Pages'),
-				$filterMap
-			),
-			$classDropdown = new DropdownField(
-				'q[ClassName]',
-				_t('CMSMain.PAGETYPEOPT','Page Type', 'Dropdown for limiting search to a page type'),
-				$pageTypes
-			)
-			// new TextField('MetaTags', _t('CMSMain.SearchMetaTags', 'Meta tags'))
+		// Group the Datefields
+		$dateGroup = new FieldGroup(
+			$dateHeader,
+			$dateFrom,
+			$dateTo
 		);
 		$dateGroup->setFieldHolderTemplate('FieldGroup_DefaultFieldHolder')->addExtraClass('stacked');
-		$dateFrom->setConfig('showcalendar', true);
-		$dateTo->setConfig('showcalendar', true);
-		$classDropdown->setEmptyString(_t('CMSMain.PAGETYPEANYOPT','Any'));
 		
+		// Create the Field list
+		$fields = new FieldList(
+			$content,
+			$dateGroup,
+			$pageFilter,
+			$pageClasses
+		);
+		
+		// Create the Search and Reset action
 		$actions = new FieldList(
 			FormAction::create('doSearch',  _t('CMSMain_left.ss.APPLY FILTER', 'Apply Filter'))
 			->addExtraClass('ss-ui-action-constructive'),
 			Object::create('ResetFormAction', 'clear', _t('CMSMain_left.ss.RESET', 'Reset'))
 		);
 
-		// Use <button> to allow full jQuery UI styling
-		foreach($actions->dataFields() as $action) $action->setUseButtonTag(true);
+		// Use <button> to allow full jQuery UI styling on the all of the Actions
+		foreach($actions->dataFields() as $action) {
+			$action->setUseButtonTag(true);
+		}
 		
+		// Create the form
 		$form = Form::create($this, 'SearchForm', $fields, $actions)
 			->addExtraClass('cms-search-form')
 			->setFormMethod('GET')
 			->setFormAction($this->Link())
 			->disableSecurityToken()
 			->unsetValidator();
+		
+		// Load the form with previously sent search data
 		$form->loadDataFrom($this->request->getVars());
 
+		// Allow decorators to modify the form
 		$this->extend('updateSearchForm', $form);
+		
 		return $form;
 	}
 	
+	/**
+	 * Returns a sorted array suitable for a dropdown with pagetypes and their translated name
+	 * 
+	 * @return array
+	 */
+	protected function getPageTypes() {
+		$pageTypes = array();
+		foreach(SiteTree::page_type_classes() as $pageTypeClass) {
+			$pageTypes[$pageTypeClass] = _t($pageTypeClass.'.SINGULARNAME', $pageTypeClass);
+		}
+		asort($pageTypes);
+		return $pageTypes;
+	}
+	
 	public function doSearch($data, $form) {
 		return $this->getsubtree($this->request);
 	}

code/controllers/CMSSiteTreeFilter.php

@@ -36,6 +36,30 @@ abstract class CMSSiteTreeFilter extends Object {
 	 */
 	protected $childrenMethod = null;
 	
+	/**
+	 * Returns a sorted array of all implementators of CMSSiteTreeFilter, suitable for use in a dropdown.
+	 * 
+	 * @return array
+	 */
+	public static function get_all_filters() {
+		// get all filter instances
+		$filters = ClassInfo::subclassesFor('CMSSiteTreeFilter');
+		// remove abstract CMSSiteTreeFilter class
+		array_shift($filters);
+		// add filters to map
+		$filterMap = array();
+		
+		foreach($filters as $filter) {
+			$filterMap[$filter] = call_user_func(array($filter, 'title'));
+		}
+		// ensure that 'all pages' filter is on top position
+		uasort($filterMap, 
+			create_function('$a,$b', 'return ($a == "CMSSiteTreeFilter_Search") ? 1 : -1;')
+		);
+		
+		return $filterMap;
+	}
+		
 	public function __construct($params = null) {
 		if($params) $this->params = $params;
 		

lang/af.yml

@@ -1,7 +1,6 @@
 af:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ af:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ af:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Navigation label'
     METADESC: 'Meta Description'
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Custom Meta Tags'
-    METAKEYWORDS: 'Meta Keywords'
-    METATITLE: 'Meta Title'
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/ar.yml

@@ -1,7 +1,6 @@
 ar:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ ar:
     PUBLISHEDSITE: 'موقع منشور'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'مشاهدة الصفحة في:'
   ErrorPage:
@@ -332,9 +331,9 @@ ar:
     LINKCHANGENOTE: 'تغيير هذا وصلة رابط الصفحة سوف تؤثر أيضًا على الوصلات لجميع صفحات الفرعية.'
     MENUTITLE: القائمة
     METADESC: الوصف
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'تخصيص Meta Tags'
-    METAKEYWORDS: 'الكلمات المفتاحية'
-    METATITLE: العنوان
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: معدل
     MetadataToggle: Metadata

lang/ast.yml

@@ -1,7 +1,6 @@
 ast:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ ast:
     PUBLISHEDSITE: 'Published Site'
     Password: Contraseña
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ ast:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Navigation label'
     METADESC: 'Meta Description'
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Custom Meta Tags'
-    METAKEYWORDS: 'Meta Keywords'
-    METATITLE: 'Meta Title'
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/az.yml

@@ -1,7 +1,6 @@
 az:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ az:
     PUBLISHEDSITE: 'Dərc olunmuş sayt'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'Səhifəni göstər:'
   ErrorPage:
@@ -332,9 +331,9 @@ az:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Naviqasiya nişanı'
     METADESC: 'Qısa təsvir'
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Meta teqlər'
-    METAKEYWORDS: 'Açar sözlər'
-    METATITLE: Başlıq
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/bg.yml

@@ -1,18 +1,17 @@
 bg:
   AssetAdmin:
     ADDFILES: 'Добави файлове'
-    ALLOWEDEXTS: 'Разрешени разширения'
     ActionAdd: 'Добави директория'
     AppCategoryArchive: Архив
     AppCategoryAudio: Аудио
     AppCategoryDocument: Document
     AppCategoryFlash: Flash
-    AppCategoryImage: Image
+    AppCategoryImage: Изображение
     AppCategoryVideo: Видео
     BackToFolder: 'Обратно към директорията'
     CREATED: 'Дата на създаване'
     CurrentFolderOnly: 'Ограничи в текущата директория?'
-    DetailsView: Details
+    DetailsView: Детайли
     FILES: Файлове
     FILESYSTEMSYNC: 'Sync files'
     FILESYSTEMSYNCTITLE: 'Актуализира базата данни с файловете от файловата система. Полезно когато файлове са били качени не през системата, а например през FTP.'
@@ -24,12 +23,12 @@ bg:
     NEWFOLDER: 'Нова директория'
     SIZE: Размер
     THUMBSDELETED: '{count} unused thumbnails have been deleted'
-    TreeView: 'Tree View'
+    TreeView: 'Дървовиден изглед'
     Upload: Upload
   AssetAdmin_DeleteBatchAction:
-    TITLE: 'Delete folders'
+    TITLE: 'Изтрити папки'
   AssetAdmin_Tools:
-    FILTER: 'Филтрирай по'
+    FILTER: Филтър
   AssetAdmin_left.ss:
     GO: Давай
   AssetTableField:
@@ -46,12 +45,12 @@ bg:
     ColumnDateLastModified: 'Дата на последна промяна'
     ColumnDateLastPublished: 'Дата на последно публикуване'
     ColumnProblemType: 'Тип на проблема'
-    ColumnURL: URL
+    ColumnURL: 'Неработещи линкове'
     HasBrokenFile: 'има развален файл'
     HasBrokenLink: 'има развален линк'
     HasBrokenLinkAndFile: 'има развален линк и файл'
     HoverTitleEditPage: 'Редактиране на страницата'
-    PageName: 'Page name'
+    PageName: 'Име на страница'
     ReasonDropdown: 'Проблем за проверка'
     ReasonDropdownBROKENFILE: 'Развален файл'
     ReasonDropdownBROKENLINK: 'развален линк'
@@ -76,12 +75,12 @@ bg:
     ACCESS: 'Достъп до ''{title}'' секция'
     ACCESS_HELP: 'Разреши излгед на раздела съдържащ структурното дърво и съдържанието. Правата за достъп и редактиране могат да бъдат променени през падащи менюта (dropdowns), както и чрез отделни права на съдържанието'
     AddNew: 'Добави страница'
-    AddNewButton: 'Add new'
+    AddNewButton: 'Добави нов бутон'
     ChoosePageParentMode: 'Избери къде да създадеш тази страница'
     ChoosePageType: 'Избери тип на стрианицата'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
+    Create: Създай
+    DELETE: 'Изтрий черновата и отиди на текущата публикувана страница'
+    DELETEFP: Изтрии
     DESCREMOVED: 'and {count} descendants'
     EMAIL: Email
     EditTree: 'Edit Tree'
@@ -89,31 +88,31 @@ bg:
     MENUTITLE: 'Редактиране на страницата'
     NEWPAGE: 'New {pagetype}'
     PAGENOTEXISTS: 'Тази страница не съществува'
-    PAGES: Pages
-    PAGETYPEANYOPT: Any
+    PAGES: Страници
+    PAGETYPEANYOPT: Всички
     PAGETYPEOPT: 'Page Type'
-    PUBALLCONFIRM: 'Please publish every page in the site, copying content stage to live'
+    PUBALLCONFIRM: 'Публикувай всяка страница в сайта'
     PUBALLFUN: '"Публикувай всичко" функционалност'
     PUBALLFUN2: 'Натискайки този бутон все едно, публикувате всяка страница по отделно. Идеята е тази функционалност да се използва при мащабна редакция на съдържанието, като например случая когато сайта бива първоначално попълнен.'
     PUBPAGES: 'Готово. Публикувани {count} броя страници'
     PageAdded: 'успешно създадена страница'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    REMOVED: 'Изтрити ''%s''%s от реалния сайт'
     REMOVEDPAGE: 'Примахнато ''{title}'' от публикувания сайт'
     REMOVEDPAGEFROMDRAFT: 'Премахната(и) ''%s'' от черновите'
-    RESTORE: Restore
+    RESTORE: Възтанови
     RESTORED: 'Успешно възтановен/а ''{title}'''
     ROLLBACK: 'Върни към тази версия'
     ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
     ROLLEDBACKVERSION: 'Върната на верися #%d. Новата версия е с номер #%d'
-    SAVE: Save
+    SAVE: Запис
     SAVEDRAFT: 'Запази чернова'
-    TabContent: Content
-    TabHistory: History
+    TabContent: Съдържание
+    TabHistory: История
     TabSettings: Настройки
     TreeFiltered: 'Filtered tree.'
     TreeFilteredClear: 'Нулирай филтъра'
   CMSMain_left.ss:
-    'APPLY FILTER': 'Apply Filter'
+    'APPLY FILTER': 'Приложи филтър'
     RESET: Reset
   CMSPageAddController:
     MENUTITLE: 'Добави страница'
@@ -176,13 +175,13 @@ bg:
     InstallSecurityWarning: 'For security reasons you should now delete the install files, unless you are planning to reinstall later (<em>requires admin login, see above</em>). The web server also now only needs write access to the "assets" folder, you can remove write access from all other folders. <a href="{link}" style="text-align: center;">Click here to delete the install files.</a>'
     InstallSuccessCongratulations: 'SilverStripe has been successfully installed!'
     LOGGEDINAS: 'Влязъл като'
-    LOGIN: Login
+    LOGIN: Вход
     LOGOUT: Изход
     NOTLOGGEDIN: 'Извън системата'
     PUBLISHEDSITE: 'Публикувани страници'
     Password: Парола
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Не може да бъдат изтрити инсталационните файлове. Моля изтриите ги "на ръка"'
     VIEWPAGEIN: 'Изглед на страница в:'
   ErrorPage:
@@ -228,27 +227,27 @@ bg:
     DELETED: Deleted.
     PreviewButton: Изглед
     SAVEDUP: Saved.
-    STATUSPUBLISHEDSUCCESS: 'Published ''{title}'' successfully'
+    STATUSPUBLISHEDSUCCESS: 'Успешно публикуван/а ''{title}'''
     SearchResults: 'Резултати от търсенето'
     VersionUnknown: Неизвестно
   Permission:
     CMS_ACCESS_CATEGORY: 'CMS Access'
   Permissions:
     CONTENT_CATEGORY: 'Права по съдържанието'
-    PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    PERMISSIONS_CATEGORY: 'Роли и права за достъп'
   RedirectorPage:
     DESCRIPTION: 'Препрати към друга вътрешна за сайта, страница'
     HASBEENSETUP: 'Създадена е страница за пренасочване без да има накъде да се пренасочи.'
     HEADER: 'Тази страница ще пренасочи потребители към друга страница'
     OTHERURL: 'Друг уебсайт URL'
-    PLURALNAME: 'Препратени страници'
+    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Пренасочи към'
     REDIRECTTOEXTERNAL: 'Друг уебсайт'
     REDIRECTTOPAGE: 'Страница на вашият уебсайт'
-    SINGULARNAME: 'Страница за пренасочване, сочеща към несъществуваща страница'
+    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Страница на вашият уебсайт'
   ReportAdmin:
-    MENUTITLE: Reports
+    MENUTITLE: 'Отчети за съдържание'
     ReportTitle: Title
   ReportAdminForm:
     FILTERBY: 'Филтрирай по'
@@ -257,16 +256,16 @@ bg:
     SEARCH: Търси
     SearchResults: 'Резултати от търсенето'
   SideReport:
-    BROKENFILES: 'Pages with broken files'
-    BROKENLINKS: 'Pages with broken links'
+    BROKENFILES: 'Страници с несъществуващи файлове'
+    BROKENLINKS: 'Страници съдържащи невалидни препратки.'
     BROKENREDIRECTORPAGES: 'RedirectorPages pointing to deleted pages'
-    BROKENVIRTUALPAGES: 'VirtualPages pointing to deleted pages'
-    BrokenLinksGroupTitle: 'Broken links reports'
-    ContentGroupTitle: 'Content reports'
-    EMPTYPAGES: 'Pages with no content'
-    LAST2WEEKS: 'Pages edited in the last 2 weeks'
-    OtherGroupTitle: Other
-    ParameterLiveCheckbox: 'Check live site'
+    BROKENVIRTUALPAGES: 'Виртуалните страници сочат към изтрити страници'
+    BrokenLinksGroupTitle: 'Отчет за страници съдържащи невалидни препратки.'
+    ContentGroupTitle: 'Отчети за съдържание'
+    EMPTYPAGES: 'Страници без съдържание'
+    LAST2WEEKS: 'Страници редактирани през последните 2 седмици'
+    OtherGroupTitle: собственник
+    ParameterLiveCheckbox: 'Провери реалния сайт'
     REPEMPTY: 'Отчетът {title}  е празен'
   SilverStripeNavigatorLink:
     ShareInstructions: 'За да споделиш тая страница, копирай и постави връзката по- долу'
@@ -283,7 +282,7 @@ bg:
     SITENAMEDEFAULT: 'Име на сайта'
     SITETAGLINE: 'Подзаглавие на сайта'
     SITETITLE: 'Заглавие на сайта'
-    TABACCESS: Access
+    TABACCESS: Достъп
     TABMAIN: Съдържание
     TAGLINEDEFAULT: Подзаглавие
     THEME: Тема
@@ -332,9 +331,9 @@ bg:
     LINKCHANGENOTE: 'Промяната на адреса на тази страница ще окаже влияние на всичките й подстраници'
     MENUTITLE: 'Етикет на навигация'
     METADESC: Описание
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Собствени етикети'
-    METAKEYWORDS: 'Ключови думи'
-    METATITLE: Заглавие
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Променен
     MetadataToggle: Meta-data
@@ -383,7 +382,7 @@ bg:
     EXPORTTO: 'Експорт на тази папка'
     NAME: 'Static exporter'
   TableListField:
-    SELECT: 'Select:'
+    SELECT: 'Избери:'
   TableListField.ss:
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Сортирай възходящо'
@@ -399,7 +398,7 @@ bg:
   TreeTools:
     DisplayLabel: 'Покажи:'
   ViewArchivedEmail.ss:
-    CANACCESS: 'You can access the archived site at this link:'
+    CANACCESS: 'Можете да достигнете архивирания сайт, чрез тази връзка'
     HAVEASKED: 'You have asked to view the content of our site on'
   VirtualPage:
     CHOOSE: 'Изберете страница към която да обвържете'

lang/bs.yml

@@ -1,7 +1,6 @@
 bs:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ bs:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ bs:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Oznaka navigacije'
     METADESC: Opis
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Prilagođene Meta oznake'
-    METAKEYWORDS: 'Ključne riječi'
-    METATITLE: Naslov
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/ca.yml

@@ -1,7 +1,6 @@
 ca:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ ca:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ ca:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Etiqueta de navegació'
     METADESC: Descripció
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Etiquetes Meta personalitzades'
-    METAKEYWORDS: 'Paraules clau'
-    METATITLE: Títol
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/cs.yml

@@ -1,7 +1,6 @@
 cs:
   AssetAdmin:
     ADDFILES: 'Přidat soubory'
-    ALLOWEDEXTS: 'Povolené extenze'
     ActionAdd: 'Přidat složku'
     AppCategoryArchive: Archív
     AppCategoryAudio: Zvuk
@@ -182,7 +181,7 @@ cs:
     PUBLISHEDSITE: 'Zveřejnen web'
     Password: Heslo
     PostInstallTutorialIntro: 'Tento web je zjednodušená verze SilverStripe 3. webu. Pro rozšíření, podívejte se na {link} prosím.'
-    StartEditing: 'Můžete začít editovat váš obsah webu otevřením <a href=\\"{link}\\">CMS</a>.'
+    StartEditing: 'Můžete začít editovat váš obsah webu otevřením <a href="{link}">CMS</a>.'
     UnableDeleteInstall: 'Nelze smazat instalační soubory. Prosím, odstraňte soubory níže ručně'
     VIEWPAGEIN: 'Zobrazit stránku v:'
   ErrorPage:
@@ -332,9 +331,9 @@ cs:
     LINKCHANGENOTE: 'Změnění tohoto odkazu stránky, bude mít také vliv na odkazy podřízených stránek.'
     MENUTITLE: 'Navigační popisek'
     METADESC: Popis
+    METADESCHELP: 'Vyhledávače používají tento obsah pro zobrazovaní výsledkův vyhledávaní (i když to nebude mít vlyv na jejich hodnocení).'
     METAEXTRA: 'Vlastní meta tagy'
-    METAKEYWORDS: 'Klíčová slova'
-    METATITLE: Název
+    METAEXTRAHELP: 'HTML tagy pro další meta informace. Například &lt;meta name="vlastnínazev" content="vlastní obsah zde" /&gt;'
     MODIFIEDONDRAFTHELP: 'Stránka má nezveřejněné změny'
     MODIFIEDONDRAFTSHORT: Změněno
     MetadataToggle: Metadata

lang/da.yml

@@ -1,7 +1,6 @@
 da:
   AssetAdmin:
     ADDFILES: 'Tilføj filer'
-    ALLOWEDEXTS: 'Tilladte filendelser'
     ActionAdd: 'Tilføj mappe'
     AppCategoryArchive: Arkiv
     AppCategoryAudio: Lyd
@@ -165,7 +164,7 @@ da:
   ContentControl:
     NOTEWONTBESHOWN: 'Bemærk: denne besked bliver ikke vist til dine besøgende '
   ContentController:
-    ARCHIVEDSITE: Forhåndsvisning
+    ARCHIVEDSITE: 'Preview version'
     ARCHIVEDSITEFROM: 'Arkiveret side fra'
     CMS: CMS
     DRAFTSITE: Kladdeside
@@ -182,7 +181,7 @@ da:
     PUBLISHEDSITE: 'Udgivet side'
     Password: Adgangskode
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'Du kan starte med at redigere dit websteds indhold ved at åbne <a href="{link}">CMS\\''en</a>.'
     UnableDeleteInstall: 'Var ikke i stand til at slette installationsfilerne. Slet venligst filerne herunder manuelt.'
     VIEWPAGEIN: 'Vis side i:'
   ErrorPage:
@@ -193,8 +192,8 @@ da:
     DEFAULTSERVERERRORPAGETITLE: Serverfejl
     DESCRIPTION: 'Brugerdefineret indhold for forskellige fejltyper (f.eks. "Siden blev ikke fundet")'
     ERRORFILEPROBLEM: 'Kunne ikke åbne filen "{filename}" til skrivning. Undersøg filrettighederne.'
-    PLURALNAME: Fejlsider
-    SINGULARNAME: Fejlside
+    PLURALNAME: 'Error Pags'
+    SINGULARNAME: 'Error Page'
     400: '400 - Bad Request'
     401: '401 - Unauthorized'
     403: '403 - Forbidden'
@@ -241,7 +240,7 @@ da:
     HASBEENSETUP: 'En omdirigeringsside er blevet sat op, uden et sted at omdirigere til.'
     HEADER: 'Denne side omdirigerer besøgende til en anden side'
     OTHERURL: 'Andet websteds URL'
-    PLURALNAME: 'Videresendende side'
+    PLURALNAME: 'Videresendende sider'
     REDIRECTTO: 'Omdiriger til'
     REDIRECTTOEXTERNAL: 'Et andet websted'
     REDIRECTTOPAGE: 'En side på dit websted'
@@ -278,8 +277,8 @@ da:
     EDITHEADER: 'Hvem kan redigere sider på dette websted ?'
     EDIT_PERMISSION: 'Administrer sideopsætningen'
     EDIT_PERMISSION_HELP: 'Mulighed for at ændre indstillingerne for global adgang / topniveauside tilladelser.'
-    PLURALNAME: Løsningskonfigurationer
-    SINGULARNAME: Løsningskonfiguration
+    PLURALNAME: 'Site Configs'
+    SINGULARNAME: 'Site Config'
     SITENAMEDEFAULT: 'Dit sidenavn'
     SITETAGLINE: 'Webstedets Tagline/Slogan'
     SITETITLE: Sidetitel
@@ -332,9 +331,9 @@ da:
     LINKCHANGENOTE: 'Ved at ændre denne sides link, ændrer du også linket til alle underliggende sider.'
     MENUTITLE: Navigationsetiket
     METADESC: Meta-beskrivelse
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Brugerdefinerede Meta Tags'
-    METAKEYWORDS: 'Meta nøgleord'
-    METATITLE: Meta-Titel
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Siden har ikke-udgivne ændringer'
     MODIFIEDONDRAFTSHORT: Ændret
     MetadataToggle: Metadata

lang/de.yml

@@ -1,7 +1,6 @@
 de:
   AssetAdmin:
     ADDFILES: 'Dateien hinzufügen'
-    ALLOWEDEXTS: 'Erlaubte Dateiendungen'
     ActionAdd: 'Ordner hinzufügen'
     AppCategoryArchive: Archivieren
     AppCategoryAudio: Audio
@@ -29,7 +28,7 @@ de:
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Ordner löschen'
   AssetAdmin_Tools:
-    FILTER: Filtern
+    FILTER: Filter
   AssetAdmin_left.ss:
     GO: Los
   AssetTableField:
@@ -182,7 +181,7 @@ de:
     PUBLISHEDSITE: 'Veröffentlichte Site'
     Password: Passwort
     PostInstallTutorialIntro: 'Diese Internetseite ist eine einfache Version einer SilverStripe 3 Seite. Wie man diese erweitert, erfährst Du in der {link}.'
-    StartEditing: 'Du kannst nun beginnen die Seiteninhalte zu bearbeiten in dem Du <a href=\\"{link}\\">das CMS</a> öffnest.'
+    StartEditing: 'Sie können mit der Bearbeitung der Inhalte Ihrer Site beginnen, indem Sie <a href="{link}">das CMS</a> öffnen.'
     UnableDeleteInstall: 'Die Installationsdateien konnten nicht gelöscht werden. Bitte löschen Sie die Dateien manuell.'
     VIEWPAGEIN: 'Seite anzeigen in:'
   ErrorPage:
@@ -193,8 +192,8 @@ de:
     DEFAULTSERVERERRORPAGETITLE: Serverfehler
     DESCRIPTION: 'Spezieller Inhalt für andere Fehlerfälle (z.B. "Seite nicht gefunden")'
     ERRORFILEPROBLEM: 'Die Datei "{filename}" konnte nicht zum Schreiben geöffnet werden. Bitte überprüfen Sie die Dateiberechtigungen.'
-    PLURALNAME: Fehlerseiten
-    SINGULARNAME: Fehlerseite
+    PLURALNAME: 'Error Pags'
+    SINGULARNAME: 'Error Page'
     400: '400 - Fehlerhafter Zugriff'
     401: '401 - Unerlaubter Zugriff'
     403: '403 - Verbotener Zugriff'
@@ -241,11 +240,11 @@ de:
     HASBEENSETUP: 'Eine Weiterleitungsseite wurde erstellt ohne das eine Weiterleitung definiert wurde.'
     HEADER: 'Diese Seite wird Nutzer auf eine andere Seite weiterleiten'
     OTHERURL: 'Andere Webseiten URL'
-    PLURALNAME: Umleitungsseite
+    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Weiterleiten zu'
     REDIRECTTOEXTERNAL: 'Andere Website'
     REDIRECTTOPAGE: 'Eine Seite auf Ihrer Website'
-    SINGULARNAME: Weiterleitungsseite
+    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Seite auf Ihrer Website'
   ReportAdmin:
     MENUTITLE: Berichte
@@ -332,9 +331,9 @@ de:
     LINKCHANGENOTE: 'Das Ändern des Links zu dieser Seite führt ebenfalls zur Änderungen aller Links der Unterseiten dieser Seite.'
     MENUTITLE: Navigationsbezeichnung
     METADESC: Beschreibung
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Benutzerdefinierte Meta-Tags'
-    METAKEYWORDS: Schlüsselwörter
-    METATITLE: Titel
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Die Seite hat unveröffentlichte Änderungen'
     MODIFIEDONDRAFTSHORT: 'Zuletzt geändert'
     MetadataToggle: Metadaten

lang/el.yml

@@ -1,7 +1,6 @@
 el:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ el:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ el:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Navigation label'
     METADESC: 'Meta Description'
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Custom Meta Tags'
-    METAKEYWORDS: 'Meta Keywords'
-    METATITLE: 'Meta Title'
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/en.yml

@@ -1,7 +1,6 @@
 en:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -174,7 +173,7 @@ en:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\"{link}\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -324,9 +323,9 @@ en:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Navigation label'
     METADESC: 'Meta Description'
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Custom Meta Tags'
-    METAKEYWORDS: 'Meta Keywords'
-    METATITLE: 'Meta Title'
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/en_GB.yml

@@ -1,7 +1,6 @@
 en_GB:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ en_GB:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually.'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -237,11 +236,11 @@ en_GB:
     CONTENT_CATEGORY: 'Content permissions'
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   RedirectorPage:
-    DESCRIPTION: 'Redirects to a different internal page'
+    DESCRIPTION: 'Redirects to another page'
     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'
+    PLURALNAME: 'Redirector Pages'
     REDIRECTTO: 'Redirect to'
     REDIRECTTOEXTERNAL: 'Another website'
     REDIRECTTOPAGE: 'A page on your website'
@@ -314,7 +313,7 @@ en_GB:
     DEFAULTHOMETITLE: Home
     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.'
+    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
@@ -332,9 +331,9 @@ en_GB:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Navigation label'
     METADESC: Description
+    METADESCHELP: 'Search engines use this content when displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Custom Meta Tags'
-    METAKEYWORDS: Keywords
-    METATITLE: Title
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
@@ -377,7 +376,7 @@ en_GB:
     many_many_ImageTracking: 'Image Tracking'
     many_many_LinkTracking: 'Link Tracking'
   SiteTreeURLSegmentField:
-    HelpChars: ' Special characters are automatically converted or removed.'
+    HelpChars: 'Special characters are automatically converted or removed.'
   StaticExporter:
     BASEURL: 'Base URL'
     EXPORTTO: 'Export to that folder'

lang/eo.yml

@@ -1,7 +1,6 @@
 eo:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ eo:
     PUBLISHEDSITE: 'Publikigita Retejo'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'Vidigi Paĝon en:'
   ErrorPage:
@@ -332,9 +331,9 @@ eo:
     LINKCHANGENOTE: 'Ŝanĝi la ligilon de ĉi tiu paĝo ankaŭ influas la ligilojn de ĉiuj idaj paĝoj.'
     MENUTITLE: 'Navigado etikedo'
     METADESC: Priskribo
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Propraj Meta-etikedoj '
-    METAKEYWORDS: Ĉefvortoj
-    METATITLE: Titolo
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/es.yml

@@ -1,7 +1,6 @@
 es:
   AssetAdmin:
     ADDFILES: 'Añadir Archivos'
-    ALLOWEDEXTS: 'Extensiones permitidas'
     ActionAdd: 'Añadir carpeta'
     AppCategoryArchive: Archivar
     AppCategoryAudio: Audio
@@ -29,7 +28,7 @@ es:
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Eliminar carpetas'
   AssetAdmin_Tools:
-    FILTER: Filtrar
+    FILTER: Filtro
   AssetAdmin_left.ss:
     GO: Ir
   AssetTableField:
@@ -165,7 +164,7 @@ es:
   ContentControl:
     NOTEWONTBESHOWN: 'Nota: este mensaje no se mostrará a tus visitantes'
   ContentController:
-    ARCHIVEDSITE: 'Versión de la vista previa'
+    ARCHIVEDSITE: 'Vista previa de la versión'
     ARCHIVEDSITEFROM: 'Sitio archivado desde'
     CMS: CMS
     DRAFTSITE: 'Sitio en Borrador'
@@ -182,7 +181,7 @@ es:
     PUBLISHEDSITE: 'Sitio Publicado'
     Password: Contraseña
     PostInstallTutorialIntro: 'Este sitio web es una versión simple de un sitio SilverStripe 3. Para ampliarlo, por favor echa un vistazo en {link}.'
-    StartEditing: 'Puedes empezar editando el contenido de tu sitio abriendo <a href=\\"{link}\\">el CMS</a>.'
+    StartEditing: 'Puedes empezar a editar el  contenido de tu sitio abriendo <a href="{link}">el CMS</a>.'
     UnableDeleteInstall: 'No se pueden eliminar los archivos de instalación. Por favor, elimina los siguientes archivos manualmente'
     VIEWPAGEIN: 'Ver página en:'
   ErrorPage:
@@ -245,7 +244,7 @@ es:
     REDIRECTTO: 'Redireccionar a'
     REDIRECTTOEXTERNAL: 'Otro sitio web'
     REDIRECTTOPAGE: 'Una página en su sitio web'
-    SINGULARNAME: 'Página de redirección'
+    SINGULARNAME: 'Página de redirección apuntando a una página que no existe'
     YOURPAGE: 'Página en su sitio web'
   ReportAdmin:
     MENUTITLE: Informes
@@ -332,9 +331,9 @@ es:
     LINKCHANGENOTE: 'Cambio el enlace de esta página también afectará a los enlaces de todas las páginas hijas.'
     MENUTITLE: 'Etiqueta de Navegación'
     METADESC: Descripción
+    METADESCHELP: 'Los motores de búsqueda usan este contenido para mostrar resultados de búsqueda (aunque no influirá en su ranking).'
     METAEXTRA: 'Meta Tags Personalizadas'
-    METAKEYWORDS: 'Palabras Clave'
-    METATITLE: Título
+    METAEXTRAHELP: 'Etiquetas HTML para meta información adicional. Por ejemplo &lt;meta name="nombrePersonalizado" content="tu contenido personalizado aquí" /&gt;'
     MODIFIEDONDRAFTHELP: 'La página tiene cambios sin publicar'
     MODIFIEDONDRAFTSHORT: Modificado
     MetadataToggle: Metadatos

lang/es_AR.yml

@@ -1,7 +1,6 @@
 es_AR:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ es_AR:
     PUBLISHEDSITE: 'Sitio publicado'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'Ver página en:'
   ErrorPage:
@@ -332,9 +331,9 @@ es_AR:
     LINKCHANGENOTE: 'Cambiar este enlace de la página también afectará los enlaces de todas las páginas dependientes.'
     MENUTITLE: 'Etiqueta de navegación'
     METADESC: Descripción
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Etiquetas Meta Personalizadas'
-    METAKEYWORDS: 'Palabras Clave'
-    METATITLE: Título
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/es_MX.yml

@@ -1,7 +1,6 @@
 es_MX:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ es_MX:
     PUBLISHEDSITE: 'Sitio Publicado'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'Ver página en:'
   ErrorPage:
@@ -332,9 +331,9 @@ es_MX:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Etiqueta de navegación'
     METADESC: Descripción
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Etiquetas meta personalizadas'
-    METAKEYWORDS: 'Palabras clave (Keywords)'
-    METATITLE: Título
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/et_EE.yml

@@ -1,7 +1,6 @@
 et_EE:
   AssetAdmin:
     ADDFILES: 'Lisa fail'
-    ALLOWEDEXTS: 'Lubatud laiendused'
     ActionAdd: 'Lisa kaust'
     AppCategoryArchive: Arhiiv
     AppCategoryAudio: Heli
@@ -29,7 +28,7 @@ et_EE:
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Kustuta kaustad'
   AssetAdmin_Tools:
-    FILTER: Filtreeri
+    FILTER: Filter
   AssetAdmin_left.ss:
     GO: Mine
   AssetTableField:
@@ -165,7 +164,7 @@ et_EE:
   ContentControl:
     NOTEWONTBESHOWN: 'Märkus. Seda teadet ei kuvata lehe külastajatele'
   ContentController:
-    ARCHIVEDSITE: 'Eelvaate versioon'
+    ARCHIVEDSITE: 'Preview version'
     ARCHIVEDSITEFROM: 'Arhiveeritud sait asukohast'
     CMS: CMS
     DRAFTSITE: 'Mustandi sait'
@@ -182,7 +181,7 @@ et_EE:
     PUBLISHEDSITE: 'Avaldatud sait'
     Password: Salasõna
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'Saate alustada oma saidi sisu redigeerimisega, kui avate <a href="{link}">CMS-i</a>.'
     UnableDeleteInstall: 'Installifaile ei olnud võimalik kustutada. Kustutage allolevad failid käsitsi.'
     VIEWPAGEIN: 'Kuva leht:'
   ErrorPage:
@@ -193,8 +192,8 @@ et_EE:
     DEFAULTSERVERERRORPAGETITLE: 'Serveri viga'
     DESCRIPTION: 'Kohandatud sisu erinevate tõrgete korral (nt "Lehte ei leitud")'
     ERRORFILEPROBLEM: 'Tõrge faili "{filename}" avamisel kirjutamiseks. Kontrollige faili õigusi.'
-    PLURALNAME: Vealehed
-    SINGULARNAME: Vealehed
+    PLURALNAME: 'Error Pags'
+    SINGULARNAME: 'Error Page'
     400: '400 - Halb päring'
     401: '401 - Volitamata ligipääs'
     403: '403 - Keelatud'
@@ -241,11 +240,11 @@ et_EE:
     HASBEENSETUP: 'Suunav lehekülg seati üles ilma, et ta kuhugile suunaks.'
     HEADER: 'See lehekülg suunab kasutajad teisele leheküljele'
     OTHERURL: 'Teise veebisaidi URL'
-    PLURALNAME: Ümbersuunamislehed
+    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Suuna ümber'
     REDIRECTTOEXTERNAL: 'Teisele veebisaidile'
     REDIRECTTOPAGE: 'Leheküljele sinu veebisaidil'
-    SINGULARNAME: Ümbersuunamisleht
+    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Lehekülg sinu veebisaidil'
   ReportAdmin:
     MENUTITLE: Aruanded
@@ -278,8 +277,8 @@ et_EE:
     EDITHEADER: 'Kes saavad sellel saidil lehti redigeerida?'
     EDIT_PERMISSION: 'Saidi konfiguratsiooni haldamine'
     EDIT_PERMISSION_HELP: 'Võimalus redigeerida üldiseid juurdepääsuseadeid / kõrgema taseme lehe õigusi.'
-    PLURALNAME: 'Saidi konfiguratsioonid'
-    SINGULARNAME: 'Saidi konfiguratsioon'
+    PLURALNAME: 'Site Configs'
+    SINGULARNAME: 'Site Config'
     SITENAMEDEFAULT: 'Teie saidi nimi'
     SITETAGLINE: 'Saidi reklaamlause'
     SITETITLE: 'Saidi pealkiri'
@@ -332,9 +331,9 @@ et_EE:
     LINKCHANGENOTE: 'Selle lehe lingi muutmine mõjutab ka kõigi alamlehtede linke.'
     MENUTITLE: 'Navigatsiooni silt'
     METADESC: Kirjeldus
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Kohandatud metamärgendid'
-    METAKEYWORDS: Märksõnad
-    METATITLE: Pealkiri
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Lehel on avaldamata muudatusi'
     MODIFIEDONDRAFTSHORT: Muudetud
     MetadataToggle: Metaandmed

lang/fa_IR.yml

@@ -1,7 +1,6 @@
 fa_IR:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -128,7 +127,7 @@ fa_IR:
     MENUTITLE: History
     REVERTTOTHISVERSION: 'Revert to this version'
     SHOWUNPUBLISHED: 'Show unpublished versions'
-    SHOWVERSION: 'Show Version'
+    SHOWVERSION: 'نمایش ویرایش'
     VIEW: view
     VIEWINGVERSION: 'Currently viewing version {version}.'
   CMSPageHistoryController_versions.ss:
@@ -140,7 +139,7 @@ fa_IR:
   CMSPageSettingsController:
     MENUTITLE: 'Edit Page'
   CMSPagesController:
-    GalleryView: 'Gallery View'
+    GalleryView: 'مشاهده گالری'
     ListView: 'List View'
     MENUTITLE: Pages
     TreeView: 'Tree View'
@@ -155,7 +154,7 @@ fa_IR:
     FILTERDATETO: به
     FILTERLABELTEXT: 'محتواي اصلي'
   CMSSettingsController:
-    MENUTITLE: Settings
+    MENUTITLE: تنظیمات
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Changed pages'
   CMSSiteTreeFilter_DeletedPages:
@@ -182,7 +181,7 @@ fa_IR:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -229,7 +228,7 @@ fa_IR:
     PreviewButton: Preview
     SAVEDUP: Saved.
     STATUSPUBLISHEDSUCCESS: 'Published ''{title}'' successfully'
-    SearchResults: 'Search Results'
+    SearchResults: 'نتایج جستجو'
     VersionUnknown: Unknown
   Permission:
     CMS_ACCESS_CATEGORY: 'CMS Access'
@@ -332,9 +331,9 @@ fa_IR:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'برچسب ناوبری'
     METADESC: توضیحات
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Custom Meta Tags'
-    METAKEYWORDS: کلیدواژه‌ها
-    METATITLE: عنوان
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/fi.yml

@@ -1,7 +1,6 @@
 fi:
   AssetAdmin:
     ADDFILES: 'Lisää tiedostoja'
-    ALLOWEDEXTS: 'Sallitut laajennukset'
     ActionAdd: 'Lisää kansio'
     AppCategoryArchive: Arkisto
     AppCategoryAudio: Ääni
@@ -29,7 +28,7 @@ fi:
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Poista kansiot'
   AssetAdmin_Tools:
-    FILTER: Suodin
+    FILTER: Suodatin
   AssetAdmin_left.ss:
     GO: Siirry
   AssetTableField:
@@ -182,7 +181,7 @@ fi:
     PUBLISHEDSITE: 'Julkaistu sivusto'
     Password: Salasana
     PostInstallTutorialIntro: 'Tämä sivusto on yksinkertaistettu versio SilverStripe 3 sivustosta. Laajentaaksesi tätä, ole hyvä ja tutustu: {link}.'
-    StartEditing: 'Voit aloittaa sivustosi sisällön muokkaamisen kirjautumalla <a href=\\"{link}\\">CMS-järjestelmään</a>.'
+    StartEditing: 'Voit aloittaa sivuston muokkauksen avaamalla <a href="{link}">CMS-järjestelmän</a>.'
     UnableDeleteInstall: 'Asennustiedostojen automaattinen poistaminen ei onnistunut. Ole hyvä ja poista seuraavat tiedostot manuaalisesti.'
     VIEWPAGEIN: 'Tarkastele sivua:'
   ErrorPage:
@@ -332,9 +331,9 @@ fi:
     LINKCHANGENOTE: 'Tämän sivun linkin muuttaminen vaikuttaa myös alasivujen linkkeihin.'
     MENUTITLE: 'Navigoinnin nimike'
     METADESC: Kuvaus
+    METADESCHELP: 'Hakukoneet näyttää tämä sisältö hakutuloksessa (tämä sisältö ei kuitenkin vaikuttaa sijaintia hakutuloksessa).'
     METAEXTRA: 'Omat meta-tagit'
-    METAKEYWORDS: Avainsanat
-    METATITLE: Otsikko
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Sivulla on tehty muutoksia, joita ei ole julkaistu'
     MODIFIEDONDRAFTSHORT: Muokattu
     MetadataToggle: Meta-tiedot

lang/fo.yml

@@ -1,7 +1,6 @@
 fo:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ fo:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ fo:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Navigation label'
     METADESC: Frágreiðing
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Serlig meta frámerki'
-    METAKEYWORDS: Lyklaorð
-    METATITLE: Heiti
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/fr.yml

@@ -1,7 +1,6 @@
 fr:
   AssetAdmin:
     ADDFILES: 'Ajouter des fichiers'
-    ALLOWEDEXTS: 'Extensions autorisées'
     ActionAdd: 'Ajouter un dossier'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -104,7 +103,7 @@ fr:
     RESTORED: '« {title} » restaurée avec succès'
     ROLLBACK: 'Retourner à cette version'
     ROLLEDBACKPUB: 'Retour à la version publiée. La nouvelle version est la nº {version}'
-    ROLLEDBACKVERSION: 'Retour à la version #%d. La nouvelle version est #%d'
+    ROLLEDBACKVERSION: 'Retour à la version nº %d. La nouvelle version est la nº %d.'
     SAVE: Sauvegarder
     SAVEDRAFT: 'Sauvegarder brouillon'
     TabContent: Contenu
@@ -127,9 +126,9 @@ fr:
     COMPARINGVERSION: 'Comparaison entre les versions {version1} et {version2}.'
     MENUTITLE: Historique
     REVERTTOTHISVERSION: 'Ändra till denna version'
-    SHOWUNPUBLISHED: 'Visa opublicerade versioner'
+    SHOWUNPUBLISHED: 'Afficher les versions non publiées'
     SHOWVERSION: 'Visa version'
-    VIEW: Visa
+    VIEW: Afficher
     VIEWINGVERSION: 'Version affichée : {version}.'
   CMSPageHistoryController_versions.ss:
     AUTHOR: Auteur
@@ -138,7 +137,7 @@ fr:
     UNKNOWN: Inconnu
     WHEN: Date
   CMSPageSettingsController:
-    MENUTITLE: 'Ändra sidan'
+    MENUTITLE: 'Éditer la page'
   CMSPagesController:
     GalleryView: Galerie
     ListView: Liste
@@ -165,7 +164,7 @@ fr:
   ContentControl:
     NOTEWONTBESHOWN: 'Note : ce message ne sera pas visible de vos visiteurs.'
   ContentController:
-    ARCHIVEDSITE: 'Version de l’aperçu'
+    ARCHIVEDSITE: 'Aperçu de cette version'
     ARCHIVEDSITEFROM: 'Site archivé depuis'
     CMS: CMS
     DRAFTSITE: 'Site Brouillon'
@@ -181,8 +180,8 @@ fr:
     NOTLOGGEDIN: Non-connecté
     PUBLISHEDSITE: 'Site Publié'
     Password: 'Mot de passe'
-    PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    PostInstallTutorialIntro: 'Ce site est une version simplifiée d’un site SilverStripe 3. Pour le développer, consultez {link}.'
+    StartEditing: 'Vous pouvez commencer à éditer votre site en ouvrant <a href="{link}">le CMS</a>.'
     UnableDeleteInstall: 'La suppression des fichiers d’installation a échoué ; faites-le manuellement pour les fichiers ci-dessous : '
     VIEWPAGEIN: 'Voir la page en :'
   ErrorPage:
@@ -269,7 +268,7 @@ fr:
     ParameterLiveCheckbox: 'Visiter le site de production'
     REPEMPTY: 'Le rapport {title} est vide'
   SilverStripeNavigatorLink:
-    ShareInstructions: 'Pour partager un page ''this-to-this'', copier et coller le lien ci-dessous.'
+    ShareInstructions: 'Pour partager un lien vers cette page, copiez et collez le lien ci-dessous.'
     ShareLink: 'Partager le lien'
   SilverStripeNavigatorLinkl:
     CloseLink: Fermer
@@ -332,9 +331,9 @@ fr:
     LINKCHANGENOTE: 'Changer le lien de cette page affectera aussi les liens des pages enfants.'
     MENUTITLE: 'Nom de navigation'
     METADESC: Description
+    METADESCHELP: 'Les moteurs de recherche reprennent cette description dans leurs résultats (bien qu’elle n’ait pas d’influence sur le classement).'
     METAEXTRA: 'Méta Balises Personnalisées'
-    METAKEYWORDS: 'Mots clés'
-    METATITLE: Titre
+    METAEXTRAHELP: 'Balises HTML pour des métadonnées supplémentaires. Par exemple &lt;meta name="monNom" content="Mon contenu" /&gt;'
     MODIFIEDONDRAFTHELP: 'La page comporte des modifications non publiées'
     MODIFIEDONDRAFTSHORT: Modifiée
     MetadataToggle: Métadonnées
@@ -369,7 +368,7 @@ fr:
     VIEW_ALL_DESCRIPTION: 'Voir toute la page'
     VIEW_ALL_HELP: 'Possibilité de voir toutes les pages du site, peu importe les réglages de l’onglet Accès. Nécessite la permission "Access to Site Content"'
     VIEW_DRAFT_CONTENT: 'Voir les brouillons'
-    VIEW_DRAFT_CONTENT_HELP: 'S''applique à la visualisation de page de manière externe au CMS en mode brouillon. Pratique pour les collaborateurs externes sans accès CMS.'
+    VIEW_DRAFT_CONTENT_HELP: 'Concerne l’affichage des pages de manière externe au CMS en mode brouillon. Pratique pour les collaborateurs externes sans accès au CMS.'
     Viewers: 'Groupes de visualisation'
     Visibility: Visibilité
     has_one_Parent: 'Page parente'
@@ -404,8 +403,8 @@ fr:
   VirtualPage:
     CHOOSE: 'Choisir le lien d''une page'
     DESCRIPTION: 'Affiche le contenu d’une autre page'
-    EDITCONTENT: 'cliquer ici pour modifier le contenu'
+    EDITCONTENT: 'Faites clic ici pour modifier le contenu'
     HEADER: 'Cette page est virtuelle'
-    PLURALNAME: 'Pages Virtuelles'
+    PLURALNAME: 'Pages virtuelles'
     PageTypNotAllowedOnRoot: 'Le type de page d’origine « {type} » n’est pas autorisé au niveau racine pour cette page virtuelle'
     SINGULARNAME: 'Page virtuelle'

lang/gl_ES.yml

@@ -1,7 +1,6 @@
 gl_ES:
   AssetAdmin:
     ADDFILES: 'Engadir Ficheiros'
-    ALLOWEDEXTS: 'Extensións permitidas'
     ActionAdd: 'Engadir cartafol'
     AppCategoryArchive: Arquivo
     AppCategoryAudio: Audio
@@ -29,7 +28,7 @@ gl_ES:
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Eliminar cartafoles'
   AssetAdmin_Tools:
-    FILTER: Filter
+    FILTER: Filtro
   AssetAdmin_left.ss:
     GO: Ir
   AssetTableField:
@@ -182,7 +181,7 @@ gl_ES:
     PUBLISHEDSITE: 'Sitio Publicado'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'Ver a Páxina en:'
   ErrorPage:
@@ -332,9 +331,9 @@ gl_ES:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Etiqueta Navegación'
     METADESC: 'Meta Descrición'
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Personalizar Meta Tags'
-    METAKEYWORDS: 'Meta Keywords'
-    METATITLE: 'Meta Title'
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modificado
     MetadataToggle: Metadata

lang/grk.yml

@@ -1,7 +1,6 @@
 grk:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ grk:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ grk:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Navigation label'
     METADESC: 'Meta Description'
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Custom Meta Tags'
-    METAKEYWORDS: 'Meta Keywords'
-    METATITLE: 'Meta Title'
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/he_IL.yml

@@ -1,7 +1,6 @@
 he_IL:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ he_IL:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ he_IL:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'תווית ניווט'
     METADESC: תיאור
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'תגי מטא נוספים'
-    METAKEYWORDS: 'מילות מפתח'
-    METATITLE: כותרת
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/hr.yml

@@ -1,7 +1,6 @@
 hr:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ hr:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ hr:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Oznaka navigacije'
     METADESC: Opis
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Podešeni Meta Tagovi'
-    METAKEYWORDS: 'Ključne riječi'
-    METATITLE: Naslov
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/hu.yml

@@ -1,7 +1,6 @@
 hu:
   AssetAdmin:
     ADDFILES: 'Állomány hozzáadása'
-    ALLOWEDEXTS: 'Engedélyezett kiterjesztések'
     ActionAdd: 'Mappa hozzáadása'
     AppCategoryArchive: Archív
     AppCategoryAudio: Audió
@@ -29,7 +28,7 @@ hu:
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Mappák törlése'
   AssetAdmin_Tools:
-    FILTER: Filter
+    FILTER: Szűrő
   AssetAdmin_left.ss:
     GO: Mehet
   AssetTableField:
@@ -182,7 +181,7 @@ hu:
     PUBLISHEDSITE: 'Publikált oldal'
     Password: Jelszó
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'A telepítő állományok törlése nem sikerült. Kérjük törölje az alábbi állományokat kézzel.'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ hu:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Navigációs cimke'
     METADESC: Leírás
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Saját meta címkék'
-    METAKEYWORDS: 'Meta kulcsszavak'
-    METATITLE: Cím
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Változtatva
     MetadataToggle: Metadata

lang/hy_AM.yml

@@ -1,7 +1,6 @@
 hy_AM:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ hy_AM:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ hy_AM:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Navigation label'
     METADESC: 'Meta Description'
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Custom Meta Tags'
-    METAKEYWORDS: 'Meta Keywords'
-    METATITLE: 'Meta Title'
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/id.yml

@@ -1,7 +1,6 @@
 id:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ id:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ id:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Label navigasi'
     METADESC: Deskripsi
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Custom Meta Tags'
-    METAKEYWORDS: 'Kata kunci'
-    METATITLE: Judul
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/is.yml

@@ -1,7 +1,6 @@
 is:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ is:
     PUBLISHEDSITE: 'Birt síða'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'Skoða síðu í:'
   ErrorPage:
@@ -332,9 +331,9 @@ is:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Navigation label'
     METADESC: Lýsing
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Sérnsniðin Meta tags'
-    METAKEYWORDS: Lykilorð
-    METATITLE: Titill
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/it.yml

@@ -1,7 +1,6 @@
 it:
   AssetAdmin:
     ADDFILES: 'Aggiungi File'
-    ALLOWEDEXTS: 'Estensioni consentite'
     ActionAdd: 'Aggiungi cartella'
     AppCategoryArchive: Archivia
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ it:
     PUBLISHEDSITE: 'Sito pubblicato'
     Password: Password
     PostInstallTutorialIntro: 'Il sito web è una versione semplificata di un sito SilverStripe 3. Per estenderlo, dai un''occhiata a {link}.'
-    StartEditing: 'Puoi iniziare a modificare il tuo sito aprendo <a href=\\"{link}\\">il CMS</a>.'
+    StartEditing: 'Puoi iniziare a modificare i contenuti del sito aprendo <a href="{link}">il CMS</a>.'
     UnableDeleteInstall: 'Impossibile eliminare i file di installazione. Cancella manualmente i file sotto indicati'
     VIEWPAGEIN: 'Mostra pagina in:'
   ErrorPage:
@@ -194,7 +193,7 @@ it:
     DESCRIPTION: 'Contenuto personalizzato per differenti casi di errore (es. "Pagina non trovata")'
     ERRORFILEPROBLEM: 'Errore nell''apertura del file "{filename}" per la scrittura. Controlla i permessi del file.'
     PLURALNAME: 'Pagine errore'
-    SINGULARNAME: 'Pagina errore'
+    SINGULARNAME: 'Pagine errore'
     400: '400 - Richiesta errata'
     401: '401 - Non Autorizzato'
     403: '403 - Accesso Negato'
@@ -332,9 +331,9 @@ it:
     LINKCHANGENOTE: 'Cambiare il link di questa pagina farà cambiare anche i link delle pagine figlio. '
     MENUTITLE: 'Etichetta di navigazione'
     METADESC: Descrizione
+    METADESCHELP: 'I motori di ricerca utilizzano questo contenuto per visualizzare i risultati (ma non ne influenza la posizione)'
     METAEXTRA: 'Meta tag personalizzati'
-    METAKEYWORDS: 'Parole chiavi'
-    METATITLE: Titolo
+    METAEXTRAHELP: 'Tag HTML per meta addizionali. Per esempio &lt;meta name="nomePersonalizzato" content="Il tuo contenuto personalizzato" /&gt;'
     MODIFIEDONDRAFTHELP: 'La pagina ha modifiche non pubblicate'
     MODIFIEDONDRAFTSHORT: Modificata
     MetadataToggle: Metadata

lang/ja_JP.yml

@@ -1,7 +1,6 @@
 ja_JP:
   AssetAdmin:
     ADDFILES: ファイルを追加
-    ALLOWEDEXTS: 利用可能な拡張子
     ActionAdd: フォルダを追加
     AppCategoryArchive: アーカイブ
     AppCategoryAudio: 音楽
@@ -29,7 +28,7 @@ ja_JP:
   AssetAdmin_DeleteBatchAction:
     TITLE: フォルダを削除
   AssetAdmin_Tools:
-    FILTER: Filter
+    FILTER: フィルタ
   AssetAdmin_left.ss:
     GO: Go
   AssetTableField:
@@ -182,7 +181,7 @@ ja_JP:
     PUBLISHEDSITE: 公開サイト
     Password: パスワード
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: '<a href="{link}">CMS</a>のリンクをクリックすることであなたのサイトのコンテンツの編集を開始することができます。'
     UnableDeleteInstall: インストールファイルを削除することができませんでした。次のファイルを手動で削除してください。
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ ja_JP:
     LINKCHANGENOTE: このページのリンクを変更するとすべての子ページのリンクに影響を与える可能性があります。
     MENUTITLE: 操作レベル
     METADESC: 説明
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: メタタグをカスタム
-    METAKEYWORDS: キーワード
-    METATITLE: タイトル
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 公開されていない変更がページにあります
     MODIFIEDONDRAFTSHORT: 更新日時
     MetadataToggle: メタデータ

lang/km.yml

@@ -1,7 +1,6 @@
 km:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ km:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ km:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Navigation label'
     METADESC: 'Meta Description'
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Custom Meta Tags'
-    METAKEYWORDS: 'Meta Keywords'
-    METATITLE: 'Meta Title'
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/ko.yml

@@ -1,7 +1,6 @@
 ko:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ ko:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ ko:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Navigation label'
     METADESC: 'Meta Description'
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Custom Meta Tags'
-    METAKEYWORDS: 'Meta Keywords'
-    METATITLE: 'Meta Title'
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/lt.yml

@@ -1,7 +1,6 @@
 lt:
   AssetAdmin:
     ADDFILES: 'Įkelti bylą/as'
-    ALLOWEDEXTS: 'Leidžiami plėtiniai'
     ActionAdd: 'Pridėti aplanką'
     AppCategoryArchive: Archyvas
     AppCategoryAudio: Garsas
@@ -165,7 +164,7 @@ lt:
   ContentControl:
     NOTEWONTBESHOWN: 'Pastaba: ši žinutė nebus matoma jūsų lankytojams'
   ContentController:
-    ARCHIVEDSITE: 'Peržiūrėti versiją'
+    ARCHIVEDSITE: 'Preview version'
     ARCHIVEDSITEFROM: 'Archyvuota svetainė iš'
     CMS: TVS
     DRAFTSITE: 'Juodraštinė svetainė'
@@ -182,7 +181,7 @@ lt:
     PUBLISHEDSITE: 'Publikuojama svetainė'
     Password: Slaptažodis
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'Jūs galite pradėti redaguoti svetainės turinį, atidarydami <a href="{link}">TVS</a>.'
     UnableDeleteInstall: 'Nepajėgiame ištrinti įdiegimo bylų. Prašome pašalinti bylas rankiniu būdu.'
     VIEWPAGEIN: 'Peržiūrėti puslapį:'
   ErrorPage:
@@ -193,8 +192,8 @@ lt:
     DEFAULTSERVERERRORPAGETITLE: 'Tarnybinės stoties klaida'
     DESCRIPTION: 'Savitas turinys, skirtingai klaidai apibrėžti (Pvz.: "Puslapis nerastas")'
     ERRORFILEPROBLEM: 'Klaida atveriant rašymui bylą "{filename}". Prašome patikrinti bylos leidimus.'
-    PLURALNAME: 'Klaidos puslapiai'
-    SINGULARNAME: 'Klaidos puslapis'
+    PLURALNAME: 'Error Pags'
+    SINGULARNAME: 'Error Page'
     400: '400 - Bloga užklausa'
     401: '401 - Leidimas neduotas'
     403: '403 - Uždrausta'
@@ -241,11 +240,11 @@ lt:
     HASBEENSETUP: 'Nukreipimo puslapis nustatytas be jokio nukreipimo.'
     HEADER: 'Šis puslapis nukreips lankytojus į kitą puslapį'
     OTHERURL: 'Kitos svetainės URL adresas'
-    PLURALNAME: 'Persiuntimo puslapiai'
+    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Nukreipti į'
     REDIRECTTOEXTERNAL: 'Kita svetainė'
     REDIRECTTOPAGE: 'Jūsų svetainės puslapis'
-    SINGULARNAME: 'Persiuntimo puslapis'
+    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Jūsų svetainės puslapis'
   ReportAdmin:
     MENUTITLE: Ataskaitos
@@ -278,8 +277,8 @@ lt:
     EDITHEADER: 'Kas gali redaguoti šį puslapį?'
     EDIT_PERMISSION: 'Tvarkyti svetainės parametrus'
     EDIT_PERMISSION_HELP: 'Galimybė tvarkyti globalias priėjimo, pagrindinio puslapio teises.'
-    PLURALNAME: 'Svetaines konfiguracijos'
-    SINGULARNAME: 'Svetaines konfigūracija'
+    PLURALNAME: 'Site Configs'
+    SINGULARNAME: 'Site Config'
     SITENAMEDEFAULT: 'Jūsų Svetainės Pavadinimas'
     SITETAGLINE: 'Svetainės šūkis'
     SITETITLE: 'Svetainės pavadinimas'
@@ -332,9 +331,9 @@ lt:
     LINKCHANGENOTE: 'Keičiant šio puslapio nuorodą, keisis ir jam priklausančių puslapių nuorodos.'
     MENUTITLE: 'Navigacijos pavadinimas'
     METADESC: Aprašymas
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Vartotojo meta žymės'
-    METAKEYWORDS: 'Meta raktažodžiai'
-    METATITLE: Pavadinimas
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Puslapyje yra nepublikuoto turinio'
     MODIFIEDONDRAFTSHORT: Pakeistas
     MetadataToggle: Metaduomenys

lang/lv.yml

@@ -1,7 +1,6 @@
 lv:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ lv:
     PUBLISHEDSITE: 'Publicētā vietne'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'Skatīt lapu:'
   ErrorPage:
@@ -332,9 +331,9 @@ lv:
     LINKCHANGENOTE: 'Izmainot šīs lapas saiti, tiks izmainītas saites arī visām tās bērnu lapām.'
     MENUTITLE: 'Navigācijas virsraksts'
     METADESC: Apraksts
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Lietotāja Meta-tagi'
-    METAKEYWORDS: Atslēgvārdi
-    METATITLE: Virsraksts
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/mi_NZ.yml

@@ -1,11 +1,10 @@
 mi_NZ:
   AssetAdmin:
     ADDFILES: 'Tāpiri Kōnae'
-    ALLOWEDEXTS: 'Ngā toronga ka whakaaetia'
     ActionAdd: 'Tāpiri kōpaki'
     AppCategoryArchive: Puranga
     AppCategoryAudio: Ororongo
-    AppCategoryDocument: Document
+    AppCategoryDocument: Tuhinga
     AppCategoryFlash: Flash
     AppCategoryImage: Atahanga
     AppCategoryVideo: Ataata
@@ -171,18 +170,18 @@ mi_NZ:
     DRAFTSITE: 'Pae Hukihuki'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Me takiuru mā tō kupuhipa CMS hei tiro i te hukihuki, ngā ihirangi putumōhio rānei.  <a href="%s">Pāwhiri ki konei kia hoki ki te pae kua whakaputaina.</a>'
     Email: Īmēra
-    INSTALL_SUCCESS: 'Installation Successful!'
+    INSTALL_SUCCESS: 'Kua oti pai te tāuta!'
     InstallFilesDeleted: 'Kua momoho te muku i ngā kōnae tāuta'
     InstallSecurityWarning: 'Me muku koe i ngā kōnae tāuta mō ngā pūtake haumaru, engari ia kei te whakaaro koe ki te tāuta ā muri atu (<em>ka hiahiatia te takiuru kaiwhakahaere, tirohia ki runga</em>). Ka hiahia te tūmau tukutuku ināianei i te uru tuhituhi anake ki te kōpaki "ngā rawa", ka taea te tango i te uru tuhituhi mai i ērā atu kōpaki katoa. <a href="{link}" style="text-align: center;">Pāwhiri ki konei ki te muku i ngā kōnae tāuta.</a>'
-    InstallSuccessCongratulations: 'SilverStripe has been successfully installed!'
+    InstallSuccessCongratulations: 'Kua tāuta momohotia te Silverstripe!'
     LOGGEDINAS: 'Kua takiuru hei'
     LOGIN: Takiuru
     LOGOUT: Takiputa
     NOTLOGGEDIN: 'Kāore anō kia taukiru'
     PUBLISHEDSITE: 'Pae Kua Whakaputaina'
     Password: Kupuhipa
-    PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    PostInstallTutorialIntro: 'He tauira rūnā tēnei paetukutuku o tētahi paetukutuku SilverStripe 3. Hei toro i tēnei, tirohia te {link}'
+    StartEditing: 'Ka taea te whakatika i ngā ihirangi o t/ō pae mā te whakatuwhera i <a href="{link}">te CMS</a>.'
     UnableDeleteInstall: 'Kāore i taea te muku i ngā kōnae tāuta. Mukua ā-ringa ngā kōnae kei raro'
     VIEWPAGEIN: 'Tiro Whārangi i'
   ErrorPage:
@@ -332,13 +331,13 @@ mi_NZ:
     LINKCHANGENOTE: 'Mā te huri i te hono o tēnei whārangi ka pāngia ngā hono o ngā whārangi tamariki katoa.'
     MENUTITLE: 'Tapanga whakatere'
     METADESC: 'Whakaahuatanga Meta'
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Ngā Tūtohu Meta Ritenga'
-    METAKEYWORDS: 'Ngā Kupu Matua Meta'
-    METATITLE: 'Taitara Meta'
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'He huringa kāore anō kia whakaputaina ō te whārangi'
     MODIFIEDONDRAFTSHORT: 'Kua Whakakētia'
     MetadataToggle: Raraungameta
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    OBSOLETECLASS: 'He neha {type} tēnei tūmomo whārangi. Mā te te tiaki ka tautuhi anō i te tūmomo, ka ngaro pea he raraunga'
     PAGELOCATION: Tauwāhi
     PAGETITLE: 'Ingoa whārangi'
     PAGETYPE: 'Tūmomo wharangi '

lang/ms.yml

@@ -1,7 +1,6 @@
 ms:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ ms:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ ms:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Label navigasi'
     METADESC: Keterangan
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Label-meta khas'
-    METAKEYWORDS: Katakunci
-    METATITLE: Tajuk
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/my.yml

@@ -1,7 +1,6 @@
 my:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ my:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ my:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Navigation label'
     METADESC: 'Meta Description'
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Custom Meta Tags'
-    METAKEYWORDS: 'Meta Keywords'
-    METATITLE: 'Meta Title'
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/nb.yml

@@ -1,7 +1,6 @@
 nb:
   AssetAdmin:
     ADDFILES: 'Legg til filer'
-    ALLOWEDEXTS: 'Tillatte utvidelser'
     ActionAdd: 'Legg til folder'
     AppCategoryArchive: Arkiv
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ nb:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ nb:
     LINKCHANGENOTE: 'Endring av denne sidens lenke vil også påvirke lenkene til alle underliggende sider.'
     MENUTITLE: 'Navigasjons etikett'
     METADESC: Beskrivelse
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Egendefinerte Meta Tags'
-    METAKEYWORDS: Nøkkelord
-    METATITLE: Tittel
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modifisert
     MetadataToggle: Metadata

lang/ne.yml

@@ -1,7 +1,6 @@
 ne:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ ne:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ ne:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'अबलोकन नाम '
     METADESC: विवरण
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Custom Meta Tags'
-    METAKEYWORDS: 'किवर्डहरु '
-    METATITLE: शिषक
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/nl.yml

@@ -1,7 +1,6 @@
 nl:
   AssetAdmin:
     ADDFILES: Bestanden
-    ALLOWEDEXTS: 'Toegestande extensies'
     ActionAdd: 'Map toevoegen'
     AppCategoryArchive: Archiveer
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ nl:
     PUBLISHEDSITE: 'Gepubliceerde site'
     Password: Wachtwoord
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'U kunt beginnen met het bewerken van uw site door <a href="{link}">het CMS</a> te openen.'
     UnableDeleteInstall: 'De installatiebestanden konden niet verwijderd worden. Verwijder onderstaande bestanden alstublieft handmatig.'
     VIEWPAGEIN: 'Bekijk pagina in:'
   ErrorPage:
@@ -332,9 +331,9 @@ nl:
     LINKCHANGENOTE: 'Het veranderen van de link van deze pagina beïnvloed de links van alle onderliggende pagina''s. '
     MENUTITLE: 'Navigatie label'
     METADESC: Omschrijving
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Aangepaste Meta Labels'
-    METAKEYWORDS: Sleutelwoorden
-    METATITLE: Titel
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Pagina heeft wijzigingen die nog niet gepubliceerd zijn'
     MODIFIEDONDRAFTSHORT: Aangepast
     MetadataToggle: Metadata

lang/pa.yml

@@ -1,7 +1,6 @@
 pa:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ pa:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ pa:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Navigation label'
     METADESC: ਵਰਣਨ
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Custom Meta Tags'
-    METAKEYWORDS: Keywords
-    METATITLE: ਟਾਈਟਲ
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/pes_IR.yml

@@ -0,0 +1,410 @@
+pes_IR:
+  AssetAdmin:
+    ADDFILES: 'Add Files'
+    ActionAdd: 'Add folder'
+    AppCategoryArchive: Archive
+    AppCategoryAudio: Audio
+    AppCategoryDocument: Document
+    AppCategoryFlash: Flash
+    AppCategoryImage: Image
+    AppCategoryVideo: Video
+    BackToFolder: 'Back to folder'
+    CREATED: Date
+    CurrentFolderOnly: 'Limit to current folder?'
+    DetailsView: Details
+    FILES: Files
+    FILESYSTEMSYNC: 'Sync files'
+    FILESYSTEMSYNCTITLE: 'Update the CMS database entries of files on the filesystem. Useful when new files have been uploaded outside of the CMS, e.g. through FTP.'
+    FROMTHEINTERNET: 'From the internet'
+    FROMYOURCOMPUTER: 'From your computer'
+    Filetype: 'File type'
+    ListView: 'List View'
+    MENUTITLE: Files
+    NEWFOLDER: NewFolder
+    SIZE: Size
+    THUMBSDELETED: '{count} unused thumbnails have been deleted'
+    TreeView: 'Tree View'
+    Upload: Upload
+  AssetAdmin_DeleteBatchAction:
+    TITLE: 'Delete folders'
+  AssetAdmin_Tools:
+    FILTER: Filter
+  AssetAdmin_left.ss:
+    GO: Go
+  AssetTableField:
+    BACKLINKCOUNT: 'Used on:'
+    PAGES: page(s)
+  BackLink_Button.ss:
+    Back: Back
+  BrokenLinksReport:
+    Any: Any
+    BROKENLINKS: 'Broken links report'
+    CheckSite: 'Check site'
+    CheckSiteDropdownDraft: 'Draft Site'
+    CheckSiteDropdownPublished: 'Published Site'
+    ColumnDateLastModified: 'Date last modified'
+    ColumnDateLastPublished: 'Date last published'
+    ColumnProblemType: 'Problem type'
+    ColumnURL: URL
+    HasBrokenFile: 'has broken file'
+    HasBrokenLink: 'has broken link'
+    HasBrokenLinkAndFile: 'has broken link and file'
+    HoverTitleEditPage: 'Edit page'
+    PageName: 'Page name'
+    ReasonDropdown: 'Problem to check'
+    ReasonDropdownBROKENFILE: 'Broken file'
+    ReasonDropdownBROKENLINK: 'Broken link'
+    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: 'Add page'
+  CMSBatchActions:
+    DELETED_DRAFT_PAGES: 'Deleted %d pages from draft site, %d failures'
+    DELETED_PAGES: 'Deleted %d pages from published site, %d failures'
+    DELETE_DRAFT_PAGES: 'Delete from draft site'
+    DELETE_PAGES: 'Delete from published site'
+    PUBLISHED_PAGES: 'Published %d pages, %d failures'
+    PUBLISH_PAGES: Publish
+    UNPUBLISHED_PAGES: 'Un-published %d pages'
+    UNPUBLISH_PAGES: Un-publish
+  CMSFileAddController:
+    MENUTITLE: Files
+  CMSMain:
+    ACCESS: 'Access to ''{title}'' section'
+    ACCESS_HELP: 'Allow viewing of the section containing page tree and content. View and edit permissions can be handled through page specific dropdowns, as well as the separate "Content permissions".'
+    AddNew: 'Add new page'
+    AddNewButton: 'Add new'
+    ChoosePageParentMode: 'Choose where to create this page'
+    ChoosePageType: 'Choose page type'
+    Create: Create
+    DELETE: 'Delete draft'
+    DELETEFP: Delete
+    DESCREMOVED: 'and {count} descendants'
+    EMAIL: Email
+    EditTree: 'Edit Tree'
+    ListFiltered: 'Filtered list.'
+    MENUTITLE: 'Edit Page'
+    NEWPAGE: 'New {pagetype}'
+    PAGENOTEXISTS: 'This page doesn''t exist'
+    PAGES: Pages
+    PAGETYPEANYOPT: Any
+    PAGETYPEOPT: 'Page Type'
+    PUBALLCONFIRM: 'Please publish every page in the site, copying content stage to live'
+    PUBALLFUN: '"Publish All" functionality'
+    PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
+    PUBPAGES: 'Done: Published {count} pages'
+    PageAdded: 'Successfully created page'
+    REMOVED: 'Deleted ''%s''%s from live site'
+    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
+    REMOVEDPAGEFROMDRAFT: 'Removed ''%s'' from the draft site'
+    RESTORE: Restore
+    RESTORED: 'Restored ''{title}'' successfully'
+    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
+    TabSettings: Settings
+    TreeFiltered: 'Filtered tree.'
+    TreeFilteredClear: 'Clear filter'
+  CMSMain_left.ss:
+    'APPLY FILTER': 'Apply Filter'
+    RESET: Reset
+  CMSPageAddController:
+    MENUTITLE: 'Add page'
+    ParentMode_child: 'Under another page'
+    ParentMode_top: 'Top level'
+  CMSPageEditController:
+    MENUTITLE: 'Edit Page'
+  CMSPageHistoryController:
+    COMPAREMODE: 'Compare mode (select two)'
+    COMPAREVERSIONS: 'Compare Versions'
+    COMPARINGVERSION: 'Comparing versions {version1} and {version2}.'
+    MENUTITLE: History
+    REVERTTOTHISVERSION: 'Revert to this version'
+    SHOWUNPUBLISHED: 'Show unpublished versions'
+    SHOWVERSION: 'Show Version'
+    VIEW: view
+    VIEWINGVERSION: 'Currently viewing version {version}.'
+  CMSPageHistoryController_versions.ss:
+    AUTHOR: Author
+    NOTPUBLISHED: 'Not published'
+    PUBLISHER: Publisher
+    UNKNOWN: Unknown
+    WHEN: When
+  CMSPageSettingsController:
+    MENUTITLE: 'Edit Page'
+  CMSPagesController:
+    GalleryView: 'Gallery View'
+    ListView: 'List View'
+    MENUTITLE: Pages
+    TreeView: 'Tree View'
+  CMSPagesController_ContentToolbar.ss:
+    ENABLEDRAGGING: 'Drag''n''drop'
+    MULTISELECT: Multi-selection
+  CMSPagesController_Tools.ss:
+    FILTER: Filter
+  CMSSearch:
+    FILTERDATEFROM: از
+    FILTERDATEHEADING: تاریخ
+    FILTERDATETO: به
+    FILTERLABELTEXT: محتوی
+  CMSSettingsController:
+    MENUTITLE: Settings
+  CMSSiteTreeFilter_ChangedPages:
+    Title: 'Changed pages'
+  CMSSiteTreeFilter_DeletedPages:
+    Title: 'All pages, including deleted'
+  CMSSiteTreeFilter_Search:
+    Title: 'All pages'
+  ContentControl:
+    NOTEWONTBESHOWN: 'Note: this message will not be shown to your visitors'
+  ContentController:
+    ARCHIVEDSITE: 'Preview version'
+    ARCHIVEDSITEFROM: 'Archived site from'
+    CMS: CMS
+    DRAFTSITE: 'Draft Site'
+    DRAFT_SITE_ACCESS_RESTRICTION: 'You must log in with your CMS password in order to view the draft or archived content.  <a href="%s">Click here to go back to the published site.</a>'
+    Email: Email
+    INSTALL_SUCCESS: 'Installation Successful!'
+    InstallFilesDeleted: 'Installation files have been successfully deleted.'
+    InstallSecurityWarning: 'For security reasons you should now delete the install files, unless you are planning to reinstall later (<em>requires admin login, see above</em>). The web server also now only needs write access to the "assets" folder, you can remove write access from all other folders. <a href="{link}" style="text-align: center;">Click here to delete the install files.</a>'
+    InstallSuccessCongratulations: 'SilverStripe has been successfully installed!'
+    LOGGEDINAS: 'Logged in as'
+    LOGIN: Login
+    LOGOUT: 'Log out'
+    NOTLOGGEDIN: 'Not logged in'
+    PUBLISHEDSITE: 'Published Site'
+    Password: Password
+    PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
+    UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
+    VIEWPAGEIN: 'View Page in:'
+  ErrorPage:
+    CODE: 'Error 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>'
+    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'
+    400: '400 - Bad Request'
+    401: '401 - Unauthorized'
+    403: '403 - Forbidden'
+    404: '404 - Not Found'
+    405: '405 - Method Not Allowed'
+    406: '406 - Not Acceptable'
+    407: '407 - Proxy Authentication Required'
+    408: '408 - Request Timeout'
+    409: '409 - Conflict'
+    410: '410 - Gone'
+    411: '411 - Length Required'
+    412: '412 - Precondition Failed'
+    413: '413 - Request Entity Too Large'
+    414: '414 - Request-URI Too Long'
+    415: '415 - Unsupported Media Type'
+    416: '416 - Request Range Not Satisfiable'
+    417: '417 - Expectation Failed'
+    500: '500 - Internal Server Error'
+    501: '501 - Not Implemented'
+    502: '502 - Bad Gateway'
+    503: '503 - Service Unavailable'
+    504: '504 - Gateway Timeout'
+    505: '505 - HTTP Version Not Supported'
+  Folder:
+    AddFolderButton: 'Add folder'
+    DELETEUNUSEDTHUMBNAILS: 'Delete unused thumbnails'
+    UNUSEDFILESTITLE: 'Unused files'
+    UNUSEDTHUMBNAILSTITLE: 'Unused thumbnails'
+    UploadFilesButton: Upload
+  LeftAndMain:
+    DELETED: Deleted.
+    PreviewButton: Preview
+    SAVEDUP: Saved.
+    STATUSPUBLISHEDSUCCESS: 'Published ''{title}'' successfully'
+    SearchResults: 'Search Results'
+    VersionUnknown: Unknown
+  Permission:
+    CMS_ACCESS_CATEGORY: 'CMS Access'
+  Permissions:
+    CONTENT_CATEGORY: 'Content permissions'
+    PERMISSIONS_CATEGORY: 'Roles and access permissions'
+  RedirectorPage:
+    DESCRIPTION: 'Redirects to a different internal page'
+    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'
+  ReportAdmin:
+    MENUTITLE: Reports
+    ReportTitle: Title
+  ReportAdminForm:
+    FILTERBY: 'Filter by'
+  SearchForm:
+    GO: برو
+    SEARCH: جستجو
+    SearchResults: 'نتایج جستجو'
+  SideReport:
+    BROKENFILES: 'Pages with broken files'
+    BROKENLINKS: 'Pages with broken links'
+    BROKENREDIRECTORPAGES: 'RedirectorPages pointing to deleted pages'
+    BROKENVIRTUALPAGES: 'VirtualPages pointing to deleted pages'
+    BrokenLinksGroupTitle: 'Broken links reports'
+    ContentGroupTitle: 'Content reports'
+    EMPTYPAGES: 'Pages with no content'
+    LAST2WEEKS: 'Pages edited in the last 2 weeks'
+    OtherGroupTitle: Other
+    ParameterLiveCheckbox: 'Check live site'
+    REPEMPTY: 'The {title} report is empty.'
+  SilverStripeNavigatorLink:
+    ShareInstructions: 'To share a this to this page, copy and paste the link below.'
+    ShareLink: 'Share link'
+  SilverStripeNavigatorLinkl:
+    CloseLink: Close
+  SiteConfig:
+    DEFAULTTHEME: '(Use default theme)'
+    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'
+    TABACCESS: Access
+    TABMAIN: Main
+    TAGLINEDEFAULT: 'your tagline here'
+    THEME: Theme
+    TOPLEVELCREATE: 'Who can create pages in the root of the site?'
+    VIEWHEADER: 'Who can view pages on this site?'
+  SiteTree:
+    ACCESSANYONE: Anyone
+    ACCESSHEADER: 'Who can view this page?'
+    ACCESSLOGGEDIN: 'Logged-in users'
+    ACCESSONLYTHESE: 'Only these people (choose from list)'
+    ADDEDTODRAFTHELP: 'Page has not been published yet'
+    ADDEDTODRAFTSHORT: Draft
+    ALLOWCOMMENTS: 'Allow comments on this page?'
+    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
+    BUTTONCANCELDRAFT: 'Cancel draft changes'
+    BUTTONCANCELDRAFTDESC: 'Delete your draft and revert to the currently published page'
+    BUTTONSAVEPUBLISH: 'Save & Publish'
+    BUTTONUNPUBLISH: Unpublish
+    BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
+    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: 'About Us'
+    DEFAULTCONTACTCONTENT: '<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>'
+    DEFAULTCONTACTTITLE: 'Contact Us'
+    DEFAULTHOMECONTENT: '<p>Welcome to SilverStripe! This is the default homepage. You can edit this page by opening <a href="admin/">the CMS</a>. You can now access the <a href="http://doc.silverstripe.org">developer documentation</a>, or begin <a href="http://doc.silverstripe.org/doku.php?id=tutorials">the tutorials.</a></p>'
+    DEFAULTHOMETITLE: Home
+    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: 'Anyone who can log-in to the CMS'
+    EDITHEADER: 'Who can edit this page?'
+    EDITONLYTHESE: 'Only these people (choose from list)'
+    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: 'This page has broken links.'
+    HTMLEDITORTITLE: Content
+    INHERIT: 'Inherit from parent page'
+    LASTUPDATED: 'Last Updated'
+    LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
+    MENUTITLE: 'Navigation label'
+    METADESC: 'Meta Description'
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
+    METAEXTRA: 'Custom Meta Tags'
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
+    MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
+    MODIFIEDONDRAFTSHORT: Modified
+    MetadataToggle: Metadata
+    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    PAGELOCATION: 'Page location'
+    PAGETITLE: 'Page name'
+    PAGETYPE: 'Page type'
+    PARENTID: 'Parent page'
+    PARENTTYPE: 'Page location'
+    PARENTTYPE_ROOT: 'Top-level page'
+    PARENTTYPE_SUBPAGE: 'Sub-page underneath a parent page'
+    PERMISSION_GRANTACCESS_DESCRIPTION: 'Manage access rights for content'
+    PERMISSION_GRANTACCESS_HELP: 'Allow setting of page-specific access restrictions in the "Pages" section.'
+    PLURALNAME: Pages
+    PageTypNotAllowedOnRoot: 'Page type "{type}" is not allowed on the root level'
+    PageTypeNotAllowed: 'Page type "{type}" not allowed as child of this parent page'
+    REMOVEDFROMDRAFTHELP: 'Page is published, but has been deleted from draft'
+    REMOVEDFROMDRAFTSHORT: 'Removed from draft'
+    REMOVE_INSTALL_WARNING: 'Warning: You should remove install.php from this SilverStripe install for security reasons.'
+    REORGANISE_DESCRIPTION: 'Change site structure'
+    REORGANISE_HELP: 'Rearrange pages in the site tree through drag&drop.'
+    SHOWINMENUS: 'Show in menus?'
+    SHOWINSEARCH: 'Show in search?'
+    SINGULARNAME: Page
+    TABBEHAVIOUR: Behavior
+    TABCONTENT: 'Main Content'
+    TABDEPENDENT: 'Dependent pages'
+    TOPLEVEL: 'Site Content (Top Level)'
+    TOPLEVELCREATORGROUPS: 'Top level creators'
+    URLSegment: 'URL Segment'
+    VIEWERGROUPS: 'Viewer Groups'
+    VIEW_ALL_DESCRIPTION: 'View any page'
+    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'
+    VIEW_DRAFT_CONTENT_HELP: 'Applies to viewing pages outside of the CMS in draft mode. Useful for external collaborators without CMS access.'
+    Viewers: 'Viewers Groups'
+    Visibility: Visibility
+    has_one_Parent: 'Parent Page'
+    many_many_BackLinkTracking: 'Backlink Tracking'
+    many_many_ImageTracking: 'Image Tracking'
+    many_many_LinkTracking: 'Link Tracking'
+  SiteTreeURLSegmentField:
+    HelpChars: ' Special characters are automatically converted or removed.'
+  StaticExporter:
+    BASEURL: 'Base URL'
+    EXPORTTO: 'Export to that folder'
+    NAME: 'Static exporter'
+  TableListField:
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
+    OF: of
+    TO: to
+    VIEWFIRST: 'View first'
+    VIEWLAST: 'View last'
+    VIEWNEXT: 'View next'
+    VIEWPREVIOUS: 'View previous'
+  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 a page to link to'
+    DESCRIPTION: 'Displays the content of another page'
+    EDITCONTENT: 'click here to edit the content'
+    HEADER: 'This is a virtual page'
+    PLURALNAME: 'Virtual Pags'
+    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
+    SINGULARNAME: 'Virtual Page'

lang/pl.yml

@@ -1,7 +1,6 @@
 pl:
   AssetAdmin:
     ADDFILES: 'Dodaj pliki'
-    ALLOWEDEXTS: 'Dozwolone rozszerzenia'
     ActionAdd: 'Dodaj katalog'
     AppCategoryArchive: Archiwum
     AppCategoryAudio: Dźwięk
@@ -29,7 +28,7 @@ pl:
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Usuń foldery'
   AssetAdmin_Tools:
-    FILTER: Filtruj
+    FILTER: Filtr
   AssetAdmin_left.ss:
     GO: Przejdź
   AssetTableField:
@@ -181,8 +180,8 @@ pl:
     NOTLOGGEDIN: 'Nie zalogowany'
     PUBLISHEDSITE: 'Opublikowana witryna'
     Password: Hasło
-    PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'Możesz zacząć edytować Twoją stronę otwierając <a href=\\"{link}\\">CMS</a>.'
+    PostInstallTutorialIntro: 'Ta strona jest uproszczoną wersją witryny SilverStripe 3. Aby ją rozszerzyć, zajrzyj proszę na stronę: {link}'
+    StartEditing: 'Możesz rozpocząć edycję zawartości witryn(y) otwierając <a href="{link}">CMS</a>.'
     UnableDeleteInstall: 'Nie można usunąć plików instalacyjnych. Proszę usunąć je ręcznie'
     VIEWPAGEIN: 'Zobacz stronę w:'
   ErrorPage:
@@ -194,7 +193,7 @@ pl:
     DESCRIPTION: 'Własna zawartość dla różnych błędów (np. "Strona nie została znaleziona")'
     ERRORFILEPROBLEM: 'Błąd podczas otwierania pliku "{filename}". Proszę sprawdzić uprawnienia do plików.'
     PLURALNAME: 'Strony błędów'
-    SINGULARNAME: 'Strona błędu'
+    SINGULARNAME: 'Strona błędów'
     400: '400 - Nieprawidłowe zapytanie'
     401: '401 - Nieautoryzowany Dostęp'
     403: '403 - Zabroniony'
@@ -332,13 +331,13 @@ pl:
     LINKCHANGENOTE: 'Zmiana linku na aktualnej stronie skutkuje zmianą w linkach stron potomnych.'
     MENUTITLE: 'Sekcja nawigacji'
     METADESC: Opis
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Własne Meta Tagi'
-    METAKEYWORDS: 'Słowa kluczowe'
-    METATITLE: Tytuł
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Na stronie znajdują się nieopublikowane zmiany'
     MODIFIEDONDRAFTSHORT: Zmodyfikowana
     MetadataToggle: Metadane
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    OBSOLETECLASS: 'Ta strona należy do zdezaktualizowanego typu {type}. Zapisanie jej spowoduje zresetowanie jej typu i możliwą utratę danych'
     PAGELOCATION: 'Lokalizacja strony'
     PAGETITLE: 'Nazwa strony'
     PAGETYPE: 'Rodzaj strony'

lang/pt.yml

@@ -1,11 +1,10 @@
 pt:
   AssetAdmin:
     ADDFILES: 'Adicionar ficheiros'
-    ALLOWEDEXTS: 'Extensões  permitidas'
     ActionAdd: 'Adicionar pasta'
     AppCategoryArchive: Arquivar
     AppCategoryAudio: Audio
-    AppCategoryDocument: Document
+    AppCategoryDocument: Documento
     AppCategoryFlash: 'Inserir flash'
     AppCategoryImage: Imagem
     AppCategoryVideo: Vídeo
@@ -14,7 +13,7 @@ pt:
     CurrentFolderOnly: 'Limitar à pasta actual?'
     DetailsView: Detalhes
     FILES: Ficheiros
-    FILESYSTEMSYNC: 'Sync files'
+    FILESYSTEMSYNC: 'Sincronizar ficheiros'
     FILESYSTEMSYNCTITLE: 'Actualize a base de dados de ficheiros do CMS. É recomendado quando são adicionados novos arquivos externamente, por exemplo, através de FTP.'
     FROMTHEINTERNET: 'Da internet'
     FROMYOURCOMPUTER: 'Do computador'
@@ -29,7 +28,7 @@ pt:
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Apagar pastas'
   AssetAdmin_Tools:
-    FILTER: Filter
+    FILTER: Filtro
   AssetAdmin_left.ss:
     GO: Ir
   AssetTableField:
@@ -87,7 +86,7 @@ pt:
     EditTree: 'Editar árvore'
     ListFiltered: 'Lista filtrada.'
     MENUTITLE: 'Editar página'
-    NEWPAGE: 'New {pagetype}'
+    NEWPAGE: 'Nova {pagetype}'
     PAGENOTEXISTS: 'Esta página não existe'
     PAGES: Páginas
     PAGETYPEANYOPT: Qualquer
@@ -165,24 +164,24 @@ pt:
   ContentControl:
     NOTEWONTBESHOWN: 'Nota: Esta mensagem não vai ser apresentada aos visitantes'
   ContentController:
-    ARCHIVEDSITE: 'Preview version'
+    ARCHIVEDSITE: Pré-visualização
     ARCHIVEDSITEFROM: 'Arquivar o site de'
     CMS: 'Gestor de Conteúdos'
     DRAFTSITE: 'Site Rascunho'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Tem de se autenticar para ver o conteúdo de rascunho ou arquivado. <a href="%s">Clique aqui para voltar ao site publicado</a>'
     Email: Email
-    INSTALL_SUCCESS: 'Installation Successful!'
+    INSTALL_SUCCESS: 'Instalação concluída com sucesso'
     InstallFilesDeleted: 'Ficheiros de instalação foram removidos com sucesso.'
     InstallSecurityWarning: 'Por razões de segurança deverá apagar os ficheiros de instalação, a menos que esteja a planear uma instalação futura (<em> requer acesso de administrador, ver acima </em>). O servidor apenas necessita de permissões de escrita na pasta "assets", poderá remover todos os acessos de escrita nas restantes pastas.<a href="{link}" style="text-align: Clique aqui para apagar os ficheiros de instalação.</a>'
-    InstallSuccessCongratulations: 'SilverStripe has been successfully installed!'
+    InstallSuccessCongratulations: 'SilverStripe foi instalado com sucesso'
     LOGGEDINAS: 'Autenticado como'
     LOGIN: Autenticar
     LOGOUT: Sair
     NOTLOGGEDIN: 'Não autenticado'
     PUBLISHEDSITE: 'Site Publicado'
     Password: Palavra-passe
-    PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    PostInstallTutorialIntro: 'Este site é uma versão simplificada do SilverStripe 3. Para adicionar novas funcionalidades visita {link}.'
+    StartEditing: 'Pode começar a editar o conteúdo do seu site acedendo ao <a href="{link}">CMS</a>.'
     UnableDeleteInstall: 'Impossível remover os ficheiros de instalação. Por favor, remova-os manualmente.'
     VIEWPAGEIN: 'Ver página em:'
   ErrorPage:
@@ -193,8 +192,8 @@ pt:
     DEFAULTSERVERERRORPAGETITLE: '500 - Erro do servidor'
     DESCRIPTION: 'Conteúdo personalizado para as diferentes possibilidades de erro (ex. página não encontrada)'
     ERRORFILEPROBLEM: 'Erro ao escrever no ficheiro "{filename}". Por favor, verifique as permissões do ficheiro.'
-    PLURALNAME: 'Error Pags'
-    SINGULARNAME: 'Error Page'
+    PLURALNAME: 'Página de erro'
+    SINGULARNAME: 'Página de erro'
     400: '400 - Bad Request'
     401: '401 - Não Autorizado'
     403: '403 - Proibido'
@@ -241,15 +240,15 @@ pt:
     HASBEENSETUP: 'Uma página de redireccionamento foi criada sem nenhum destino.'
     HEADER: 'Esta página irá redireccionar os utilizadores para outra página'
     OTHERURL: 'Outro Site'
-    PLURALNAME: 'Redirector Pags'
+    PLURALNAME: 'Página de redirecção'
     REDIRECTTO: 'Redireccionar para'
     REDIRECTTOEXTERNAL: 'Outro site'
     REDIRECTTOPAGE: 'Uma página no seu site'
-    SINGULARNAME: 'Redirector Page'
+    SINGULARNAME: 'A página redirecciona para uma que não existe'
     YOURPAGE: 'Página no seu Site'
   ReportAdmin:
     MENUTITLE: Relatórios
-    ReportTitle: Title
+    ReportTitle: Título
   ReportAdminForm:
     FILTERBY: 'Filtrar por'
   SearchForm:
@@ -278,8 +277,8 @@ pt:
     EDITHEADER: 'Quem pode editar páginas neste site?'
     EDIT_PERMISSION: 'Gerir configuração do site'
     EDIT_PERMISSION_HELP: 'Capacidade de editar as configurações de acesso global / permissões da página.'
-    PLURALNAME: 'Site Configs'
-    SINGULARNAME: 'Site Config'
+    PLURALNAME: 'Configurações do site'
+    SINGULARNAME: 'Configurações do site'
     SITENAMEDEFAULT: 'Nome do site'
     SITETAGLINE: 'Slogan do site'
     SITETITLE: 'Título do site'
@@ -332,13 +331,13 @@ pt:
     LINKCHANGENOTE: 'Alterar as ligação das páginas vai-se reflectir na ligação das páginas dependentes.'
     MENUTITLE: 'Nome na Navegação'
     METADESC: Descrição
+    METADESCHELP: 'Os motores de pesquisa utilizam este conteúdo para apresentar os seus resultados (no entanto não influencia o ranking do site). '
     METAEXTRA: 'Meta-Tags personalizáveis'
-    METAKEYWORDS: 'Palavras chave'
-    METATITLE: Título
+    METAEXTRAHELP: 'HTML tags para informações adicionais. Por exemplo &lt;meta name="nomeDaTag" content="o teu conteúdo personalizado" /&gt;'
     MODIFIEDONDRAFTHELP: 'A página contem alterações não publicadas'
     MODIFIEDONDRAFTSHORT: Modificado
     MetadataToggle: Meta-data
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    OBSOLETECLASS: 'O tipo de página {type} é obsuleto. Ao gravar esta página poderá perder alguns dos dados. '
     PAGELOCATION: 'Localização da página'
     PAGETITLE: 'Nome da página'
     PAGETYPE: 'Tipo de Página'
@@ -348,7 +347,7 @@ pt:
     PARENTTYPE_SUBPAGE: 'Página Parente'
     PERMISSION_GRANTACCESS_DESCRIPTION: 'Gestão de permissões de acesso para o conteúdo'
     PERMISSION_GRANTACCESS_HELP: 'Permitir criar restrições específicas na página.'
-    PLURALNAME: Pages
+    PLURALNAME: Páginas
     PageTypNotAllowedOnRoot: 'Páginas do tipo "{type}" não tem permissões para serem criadas a este nível.'
     PageTypeNotAllowed: 'A página do tipo "{type}" não é permitida como filho deste tipo de página'
     REMOVEDFROMDRAFTHELP: 'A página está publicada mas foi removida dos rascunhos'
@@ -358,7 +357,7 @@ pt:
     REORGANISE_HELP: 'Rearranjar páginas na árvore do site com drag&drop'
     SHOWINMENUS: 'Mostrar no Menu?'
     SHOWINSEARCH: 'Mostrar nas pesquisas?'
-    SINGULARNAME: Page
+    SINGULARNAME: Página
     TABBEHAVIOUR: Comportamento
     TABCONTENT: Conteúdo
     TABDEPENDENT: 'Páginas Dependentes'

lang/pt_BR.yml

@@ -1,7 +1,6 @@
 pt_BR:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ pt_BR:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ pt_BR:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Rótulo da navegação'
     METADESC: Descrição
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Meta tags personalizadas'
-    METAKEYWORDS: Palavras-chave
-    METATITLE: Título
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/ro.yml

@@ -1,7 +1,6 @@
 ro:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ ro:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ ro:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Navigation label'
     METADESC: Descriere
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Custom Meta Tags'
-    METAKEYWORDS: 'Cuvinte cheie'
-    METATITLE: Titlu
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/ru.yml

@@ -1,7 +1,6 @@
 ru:
   AssetAdmin:
     ADDFILES: 'Добавить файлы'
-    ALLOWEDEXTS: 'Допустимые расширения'
     ActionAdd: 'Добавить папку'
     AppCategoryArchive: Архив
     AppCategoryAudio: Аудио
@@ -182,7 +181,7 @@ ru:
     PUBLISHEDSITE: 'Опубликованный сайт'
     Password: Пароль
     PostInstallTutorialIntro: 'Это упрощенная версия сайта, созданного с помощью SilverStripe 3. О возможностях расширения сайта можно узнать, щелкнув эту ссылку: {link}.'
-    StartEditing: 'Вы можете приступить к редактированию содержимого сайта, открыв <a href=\\"{link}\\">CMS</a>.'
+    StartEditing: ' Вы можете приступить к редактированию сайта, открыв <a href="{link}">CMS</a>.'
     UnableDeleteInstall: 'Не удалось удалить инсталляционные файлы. Пожалуйста, удалите следующие файлы вручную'
     VIEWPAGEIN: 'Просмотреть страницу в:'
   ErrorPage:
@@ -332,9 +331,9 @@ ru:
     LINKCHANGENOTE: 'Изменение ссылки на эту страницу повлияет и на ссылки всех дочерних страниц.'
     MENUTITLE: 'Метка в навигации'
     METADESC: Описание
+    METADESCHELP: 'Поисковые системы используют этот контент для отображения результатов поиска (однако на рейтинг страницы он не влияет).'
     METAEXTRA: 'Пользовательские мета-тэги'
-    METAKEYWORDS: 'Ключевые слова'
-    METATITLE: Заголовок
+    METAEXTRAHELP: 'HTML-теги для дополнительной мета-информации. Например, &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'На этой странице есть неопубликованные изменения'
     MODIFIEDONDRAFTSHORT: Изменено
     MetadataToggle: Метаданные

lang/si.yml

@@ -1,7 +1,6 @@
 si:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ si:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ si:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'සංක්රමන ලේබලය'
     METADESC: අර්තකතනය
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'සැකසූ මෙටා ටැග්'
-    METAKEYWORDS: යතුරැ
-    METATITLE: මාතෘකා
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/sk.yml

@@ -1,7 +1,6 @@
 sk:
   AssetAdmin:
     ADDFILES: 'Pridať súbory'
-    ALLOWEDEXTS: 'Povolené extenzie'
     ActionAdd: 'Pridať priečinok'
     AppCategoryArchive: Archív
     AppCategoryAudio: Zvuk
@@ -29,7 +28,7 @@ sk:
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Vymazať priečinky'
   AssetAdmin_Tools:
-    FILTER: Filter
+    FILTER: Filtrovať
   AssetAdmin_left.ss:
     GO: Choď
   AssetTableField:
@@ -182,7 +181,7 @@ sk:
     PUBLISHEDSITE: 'Verejný web'
     Password: Heslo
     PostInstallTutorialIntro: 'Tento web je zjednodušená verzia SilverStripe 3. webu. Pre rošírenie, pozrite sa na {link}, prosím.'
-    StartEditing: 'Môžte začať editáciu vášho web obsahu otvorením <a href=\\"{link}\\">CMS</a>.'
+    StartEditing: 'Môžte začať editáciu vášho web obsahu otvorením <a href="{link}">CMS</a>.'
     UnableDeleteInstall: 'Nepodarilo sa smazať inštalačné súbory. Smažte ručne súbory uvedené dole'
     VIEWPAGEIN: 'Prezrieť stránku v:'
   ErrorPage:
@@ -194,7 +193,7 @@ sk:
     DESCRIPTION: 'Vlastný obsah pre rôzne prípady chýb (napr. "Stránka nenájdená")'
     ERRORFILEPROBLEM: 'Chyba otvorenia súboru "{filename}" pre zápis. Skontrolujte oprávnenia súboru, prosím.'
     PLURALNAME: 'Chybové stránky'
-    SINGULARNAME: 'Chybova stránka'
+    SINGULARNAME: 'Chybová stránka'
     400: '400 - Neplatná požiadavka'
     401: '401 - Neautorizovaný prístup'
     403: '403 - Zamietnuté'
@@ -332,9 +331,9 @@ sk:
     LINKCHANGENOTE: 'Zmenenie odkazu tejto stránky ovplyvní tiež odkazy všetkých podstránok.'
     MENUTITLE: 'Navigačná menovka'
     METADESC: Popis
+    METADESCHELP: 'Vyhľadávače používajú tento obsah pre zobrazovanie výsledkov vyhľadávania (aj keď to nebude mať vplyv na ich hodnotenie).'
     METAEXTRA: 'Vlastné Meta Tagy'
-    METAKEYWORDS: 'Meta kľúčové slová'
-    METATITLE: Titulok
+    METAEXTRAHELP: 'HTML tagy pre ďalšie meta informácie. Napríklad &lt;meta name="vlastnýnazov" content="vlastný obsah tu"  /&gt;'
     MODIFIEDONDRAFTHELP: 'Stránka má nezverejnené zmeny'
     MODIFIEDONDRAFTSHORT: Zmenené
     MetadataToggle: Metaúdaje

lang/sl.yml

@@ -1,7 +1,6 @@
 sl:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ sl:
     PUBLISHEDSITE: 'Objavljeno spletno mesto'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'Ogled strani v:'
   ErrorPage:
@@ -332,9 +331,9 @@ sl:
     LINKCHANGENOTE: 'Sprememba URL-naslova te strani bo povzročila spremembo URL-naslovov do vseh podrejenih strani.'
     MENUTITLE: 'Naziv navigacije'
     METADESC: Opis
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Meta tagi po meri'
-    METAKEYWORDS: 'Ključne besede'
-    METATITLE: Naslov
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/sr.yml

@@ -1,7 +1,6 @@
 sr:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ sr:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ sr:
     LINKCHANGENOTE: 'Promena linka ove stranice će uticati na linkove svih pod-stranica takođe.'
     MENUTITLE: 'Натпис за навигацију'
     METADESC: Опис
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Прилагођени мета тагови'
-    METAKEYWORDS: 'Кључне речи'
-    METATITLE: Наслов
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/sv.yml

@@ -1,7 +1,6 @@
 sv:
   AssetAdmin:
     ADDFILES: 'Lägg till filer'
-    ALLOWEDEXTS: 'Tillåtna filändelser'
     ActionAdd: 'Skapa mapp'
     AppCategoryArchive: Arkivera
     AppCategoryAudio: Ljud
@@ -29,7 +28,7 @@ sv:
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Radera mapparna'
   AssetAdmin_Tools:
-    FILTER: Filter
+    FILTER: Filtrera
   AssetAdmin_left.ss:
     GO: Kör
   AssetTableField:
@@ -165,7 +164,7 @@ sv:
   ContentControl:
     NOTEWONTBESHOWN: 'Observera: Detta meddelande kommer inte att visas för besökarna'
   ContentController:
-    ARCHIVEDSITE: 'Förhandsgranska version'
+    ARCHIVEDSITE: 'Utkast version'
     ARCHIVEDSITEFROM: 'Arkiverad sajt från'
     CMS: CMS
     DRAFTSITE: Utkast
@@ -182,7 +181,7 @@ sv:
     PUBLISHEDSITE: 'Publicerad sajt'
     Password: Lösenord
     PostInstallTutorialIntro: 'Denna webbplats är en enklare version av en Silverstripe 3 hemsida. För att bygga ut, ta en titt på {link}.'
-    StartEditing: 'Du kan börja redigera innehållet på din webbplats genom att öppna  <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'Du kan ändra din sajts innehåll genom <a href="{link}">publiceringsverktyget</a>.'
     UnableDeleteInstall: 'Lyckades inte radera installationsfilerna. Radera följande filer manuellt.'
     VIEWPAGEIN: 'titta på sidan i:'
   ErrorPage:
@@ -193,7 +192,7 @@ sv:
     DEFAULTSERVERERRORPAGETITLE: Serverfel
     DESCRIPTION: 'Anpassat innehåll för olika felärenden (t.ex. "Sidan kan inte hittas")'
     ERRORFILEPROBLEM: 'Kunde inte skriva filen "{filename}". Var vänlig kontrollera skrivrättigheterna.'
-    PLURALNAME: Felsidor
+    PLURALNAME: Felmeddelandesidor
     SINGULARNAME: Felsida
     400: '400 - Felaktig förfrågan'
     401: '401 - Obehörig'
@@ -241,7 +240,7 @@ sv:
     HASBEENSETUP: 'En omdirigeringssida har skapats utan att ha något mål.'
     HEADER: 'Den här sidan omdirigerar användare till en annan sida'
     OTHERURL: 'Andra sidans URL'
-    PLURALNAME: Omdirigeringssidor
+    PLURALNAME: 'Omdirigerings sidor'
     REDIRECTTO: 'Omdirigera till'
     REDIRECTTOEXTERNAL: 'En annan sajt'
     REDIRECTTOPAGE: 'En sida på din sajt'
@@ -278,8 +277,8 @@ sv:
     EDITHEADER: 'Vem kan redigera sidor på den här sajten?'
     EDIT_PERMISSION: 'Redigera sajtkonfiguration'
     EDIT_PERMISSION_HELP: 'Möjlighet att ändra den globala åtkomstinställningar / toppnivåbehörigheter.'
-    PLURALNAME: Sajtinställningar
-    SINGULARNAME: Sajtinställning
+    PLURALNAME: 'Sajt inställningar'
+    SINGULARNAME: 'Sajt inställning'
     SITENAMEDEFAULT: 'Din Sajts Namn'
     SITETAGLINE: 'Din sajts Slogan'
     SITETITLE: Sajttitel
@@ -332,9 +331,9 @@ sv:
     LINKCHANGENOTE: 'Om du ändrar sidans länkadress så kommer det också påverka länkarna på underliggande sidor'
     MENUTITLE: Navigationsetikett
     METADESC: Metabeskrivning
+    METADESCHELP: 'Sökmotorer använder detta innehåll vid visning av sökresultatet (rangordningen påverkas dock inte av detta innehåll).'
     METAEXTRA: 'Egna metataggar'
-    METAKEYWORDS: Metanyckelord
-    METATITLE: Metatitel
+    METAEXTRAHELP: 'HTML taggar för övrig meta information. Till exempel &lt;meta name="Namn" content="innehållet kommer här" /&gt;'
     MODIFIEDONDRAFTHELP: 'Sidan har ej publicerade ändringar'
     MODIFIEDONDRAFTSHORT: Ändrad
     MetadataToggle: Metadata

lang/th.yml

@@ -1,9 +1,8 @@
 th:
   AssetAdmin:
     ADDFILES: เพิ่มไฟล์
-    ALLOWEDEXTS: ส่วนเสริมที่อนุญาตให้ใช้งานได้
     ActionAdd: เพิ่มโฟลเดอร์
-    AppCategoryArchive: Archive
+    AppCategoryArchive: รายการ
     AppCategoryAudio: ไฟล์เสียง
     AppCategoryDocument: เอกสาร
     AppCategoryFlash: แฟลช
@@ -15,7 +14,7 @@ th:
     DetailsView: รายละเอียด
     FILES: ไฟล์
     FILESYSTEMSYNC: ผสานไฟล์
-    FILESYSTEMSYNCTITLE: 'Update the CMS database entries of files on the filesystem. Useful when new files have been uploaded outside of the CMS, e.g. through FTP.'
+    FILESYSTEMSYNCTITLE: 'อัพเดทรายการไฟลในฐานข้อมูล CMS ในระบบไฟล์ มีประโยชน์สำหรับการอัพโหลดไฟล์ใหม่นอกระบบ CMS เช่น ผ่านทาง FTP'
     FROMTHEINTERNET: จากอินเทอร์เน็ต
     FROMYOURCOMPUTER: จากเครื่องคอมพิวเตอร์ของคุณ
     Filetype: ชนิดของไฟล์
@@ -38,7 +37,7 @@ th:
   BackLink_Button.ss:
     Back: ย้อนกลับ
   BrokenLinksReport:
-    Any: Any
+    Any: ใดๆก็ได้
     BROKENLINKS: รายงานลิงค์เสีย
     CheckSite: ตรวจเว็บไซต์
     CheckSiteDropdownDraft: เว็บไซต์ฉบับร่าง
@@ -74,7 +73,7 @@ th:
     MENUTITLE: ไฟล์
   CMSMain:
     ACCESS: 'เข้าถึงเซ็กชั่น ''{title}'''
-    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".'
+    ACCESS_HELP: 'อนุญาตให้เปิดดูส่วนของเซ็กชั่นที่บรรจุรายการหน้าเว็บแบบทรีและเนื้อหาได้ สิทธิ์ในการเปิดดูและแก้ไขสามารถจัดการได้ผ่านทางหน้าเว็บทีระบุอยู่ในเมนูแบบดรอปดาวน์ เช่นเดียวกับ "สิทธิ์อนุญาตของเนื้อหา" ที่แยกออกมาต่างหากด้วยเช่นกัน'
     AddNew: เพิ่มหน้าใหม่
     AddNewButton: เพิ่มใหม่
     ChoosePageParentMode: เลือกว่าต้องการสร้างหน้าเว็บนี้ไว้ที่ไหน
@@ -82,7 +81,7 @@ th:
     Create: สร้าง
     DELETE: ลบออกจากเว็บไซต์ฉบับร่าง
     DELETEFP: ลบ
-    DESCREMOVED: 'and {count} descendants'
+    DESCREMOVED: 'และ {count} รายการลูก'
     EMAIL: อีเมล
     EditTree: 'แก้ไขรายการแบบ Tree'
     ListFiltered: แสดงรายการตามตัวกรองข้อมูล
@@ -90,11 +89,11 @@ th:
     NEWPAGE: 'ใหม่ {pagetype}'
     PAGENOTEXISTS: ไม่มีหน้านี้อยู่
     PAGES: หน้า
-    PAGETYPEANYOPT: Any
+    PAGETYPEANYOPT: ประเภทใดก็ได้
     PAGETYPEOPT: ประเภทหน้าเว็บ
     PUBALLCONFIRM: 'กรุณาเผยแพร่หน้าเว็บทุกหน้าในเว็บไซต์, คัดลอกเนื้อหาลงไปที่'
     PUBALLFUN: 'ฟังก์ชั่นการทำงาน "เผยแพร่ทั้งหมด"'
-    PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
+    PUBALLFUN2: "การกดปุ่มนี้จะเทียบเท่ากับการไปที่หน้าต่างๆทุกๆหน้าแล้วกด \"เผยแพร่\".  It's\\nปุ่มดังกล่าวมีไว้ด้วยความตั้งใจที่ต้องการให้นำไปใช้กับการแก้ไขเนื้อหาเป็นจำนวนมาก เช่น เมื่อเว็บไซต์\\nถูกสร้างขึ้นเป็นครั้งแรก."
     PUBPAGES: 'เผยแแพร่หน้าเว็บแล้ว {count} หน้า'
     PageAdded: หน้าเว็บที่สร้างเสร็จเรียบร้อยแล้ว
     REMOVED: 'ลบ ''%s''%s จากเว็บไซต์ที่ออนไลน์สดๆอยู่แล้ว'
@@ -103,7 +102,7 @@ th:
     RESTORE: คืนค่า
     RESTORED: 'เรียกคืนค่า ''{title}'' เสร็จเรียบร้อยแล้ว'
     ROLLBACK: ย้อนกลับไปที่รุ่นนี้
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUB: 'ย้อนกลับไปใช้รุ่นที่เผยแพร่อยู่ หมายเลขรุ่นใหม่คือ #{version}'
     ROLLEDBACKVERSION: 'ย้อนกลับไปเป็นรุ่น #%d แล้ว หมายเลขใหม่ของรุ่นคือ #%d'
     SAVE: บันทึก
     SAVEDRAFT: บันทึกเป็นฉบับร่าง
@@ -166,14 +165,14 @@ th:
     NOTEWONTBESHOWN: 'หมายเหตุ: ข้อความนี้จะไม่ถูกนำไปแสดงให้ผู้เยี่ยมชมเว็บไซต์ของคุณเห็น'
   ContentController:
     ARCHIVEDSITE: รุ่นสำหรับดูตัวอย่าง
-    ARCHIVEDSITEFROM: 'Archived site from'
+    ARCHIVEDSITEFROM: เว็บไซต์ที่จัดเก็บไว้ถาวรจาก
     CMS: CMS
     DRAFTSITE: เว็บไซต์ฉบับร่าง
     DRAFT_SITE_ACCESS_RESTRICTION: 'คุณต้องเข้าสู่ระบบด้วยรหัสผ่าน CMS ของคุณ หากต้องการเปิดดูฉบับร่าง หรือเนื้อหาย้อนหลัง.  <a href="%s">คลิกที่นี่เพื่อย้อนกลับไปที่เว็บไซต์ที่เผยแพร่อยู่.</a>'
     Email: อีเมล
     INSTALL_SUCCESS: การติดตั้งเสร็จสมบูรณ์
     InstallFilesDeleted: ไฟล์ติดตั้งได้ถูกลบทิ้งเรียบร้อยแล้ว
-    InstallSecurityWarning: 'For security reasons you should now delete the install files, unless you are planning to reinstall later (<em>requires admin login, see above</em>). The web server also now only needs write access to the "assets" folder, you can remove write access from all other folders. <a href="{link}" style="text-align: center;">Click here to delete the install files.</a>'
+    InstallSecurityWarning: 'ด้วยเหตุผลด้านการรักษาความปลอดภัย คุณควรลบไฟล์ติดตั้งทันที เว้นเสียแต่ว่าคุณกำลังวางแผนที่จะติดตั้งซ้ำใหม่ในภายหลัง (<em>จำเป็นต้องเข้าสู่ระบบในส่วนของผู้ดูแล, กรุณาดูได้จากด้านบน</em>). เว็บเซิร์ฟเวอร์ขณะนี้จำเป็นต้องได้รับการกำหนดสิทธิ์ให้สามารถเข้าถึงเพื่อเขียนข้อมูลที่โฟลเดอร์ "assets" ได้ด้วยเช่นกัน คุณสามารถลบสิทธิ์การเข้าถึงเพื่อเขียนข้อมูลจากโฟลเดอร์อื่นๆทั้งหมดได้ด้วยเช่นกัน. <a href="{link}" style="text-align: center;">คลิกที่นี่เพื่อลบไฟล์ติดตั้งออก.</a>'
     InstallSuccessCongratulations: 'SilverStripe ได้รับการติดตั้งเรียบร้อยแล้ว!'
     LOGGEDINAS: เข้าสู่ระบบในชื่อ
     LOGIN: เข้าสู่ระบบ
@@ -182,7 +181,7 @@ th:
     PUBLISHEDSITE: เว็บไซต์ที่เผยแพร่อยู่
     Password: รหัสผ่าน
     PostInstallTutorialIntro: 'เว็บไซต์นี้เป็นรุ่นอย่างง่ายของเว็บไซต์ที่สร้างจากรุ่น SiverStripe 3 หากต้องการขยายขีดความสามารถ กรุณาเข้าไปที่ {link}'
-    StartEditing: 'คุณสามารถเริ่มต้นแก้ไขเนื้อหาในเว็บไซต์ของคุณได้โดยการเปิด <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'ไม่สามารถลบไฟล์ติดตั้งได้ กรุณาลบไฟล์ดังกล่าวด้านล่างด้วยตนเอง'
     VIEWPAGEIN: 'เปิดดูหน้าเว็บใน:'
   ErrorPage:
@@ -193,31 +192,31 @@ th:
     DEFAULTSERVERERRORPAGETITLE: เซิร์ฟเวอร์เกิดข้อผิดพลาด
     DESCRIPTION: 'กำหนดเนื้อหาเองสำหรับข้อผิดพลาดต่างๆ (e.g. "ไม่พบหน้าเว็บที่ต้องการ")'
     ERRORFILEPROBLEM: 'เกิดข้อผิดพลาดในการเปิดไฟล์ "{filename}" เพื่อเขียนข้อมูล. กรุณาตรวจสอบสิทธิ์.'
-    PLURALNAME: หน้าแสดงข้อผิดพลาด
-    SINGULARNAME: หน้าแสดงข้อผิดพลาด
+    PLURALNAME: หน้าเว็บแสดงข้อผิดพลาด
+    SINGULARNAME: หน้าเว็บแสดงข้อผิดพลาด
     400: '400 - ข้อความร้องขอที่ส่งมามีความผิดพลาดทางไวยากรณ์ หรือไม่สามารถทำตามการร้องขอนั้นได้'
-    401: '401 - Unauthorized'
-    403: '403 - Forbidden'
-    404: '404 - Not Found'
-    405: '405 - Method Not Allowed'
-    406: '406 - Not Acceptable'
-    407: '407 - Proxy Authentication Required'
-    408: '408 - Request Timeout'
-    409: '409 - Conflict'
-    410: '410 - Gone'
-    411: '411 - Length Required'
-    412: '412 - Precondition Failed'
-    413: '413 - Request Entity Too Large'
-    414: '414 - Request-URI Too Long'
-    415: '415 - Unsupported Media Type'
-    416: '416 - Request Range Not Satisfiable'
-    417: '417 - Expectation Failed'
-    500: '500 - Internal Server Error'
-    501: '501 - Not Implemented'
-    502: '502 - Bad Gateway'
-    503: '503 - Service Unavailable'
-    504: '504 - Gateway Timeout'
-    505: '505 - HTTP Version Not Supported'
+    401: '401 - ไม่สามารถยืนยันตัวบุคคลได้'
+    403: '403 - ไม่สามารถดำเนินการตามที่ร้องขอได้'
+    404: '404 - ไม่พบทรัพยากรที่ร้องขอบนเครื่องแม่ข่าย'
+    405: '405 - ไม่อนุญาตให้ใช้รูปแบบวิธีการดังกล่าวได้'
+    406: '406 - ไม่สามารถยอมรับให้ดำเนินการตามที่ร้องขอได้'
+    407: '407 - จำเป็นต้องมีการพิสูจน์ตัวจริงบนพร็อกซีก่อน'
+    408: '408 - เครื่องให้บริการรอรับข้อความร้องขอจนหมดเวลา'
+    409: '409 - การร้องขอนั้นไม่สามารถประมวลผลได้ เนื่องจากเกิดข้อขัดแย้งในข้อความร้องขอ'
+    410: '410 - ทรัพยากรที่ร้องขอไม่มีอยู่ และจะไม่กลับมามีอีกต่อไป'
+    411: '411 - ข้อความร้องขอไม่ได้ระบุขนาดของเนื้อหามาในส่วนหัว '
+    412: '412 - เครื่องแม่ข่ายไม่สามารถทำตามเงื่อนไขอย่างใดอย่างหนึ่งที่ให้ไว้โดยผู้ทำการร้องขอได้'
+    413: '413 - ทรัพยากรที่ร้องขอใหญ่เกินกว่าที่จะส่งด้วยโพรโทคอลปัจจุบันได้'
+    414: '414 - ตัวระบุแหล่งทรัพยากรสากลยาวเกินกว่าที่เครื่องให้บริการจะประมวลผล'
+    415: '415 - ข้อความร้องขอไม่ได้ระบุแบบชนิดสื่ออินเทอร์เน็ตที่เครื่องแม่ข่ายหรือทรัพยากรนั้นรองรับ'
+    416: '416 - เครื่องลูกข่ายร้องขอเนื้อหาบางส่วนของไฟล์ แต่เครื่องแม่ข่ายไม่สามารถจัดหาช่วงข้อมูลนั้นได้ '
+    417: '417 - ส่วนหัว Expect ที่ส่งมาจากเครื่องลูกข่าย ยังไม่เพียงพอต่อความต้องการของเครื่องให้บริการ'
+    500: '500 - พบข้อผิดพลาดภายในเซิร์ฟเวอร์'
+    501: '501 - ยังไม่ได้ดำเนินการ'
+    502: '502 - เครื่องแม่ข่ายกำลังทำหน้าที่เป็นเกตเวย์หรือพร็อกซี และได้รับข้อความตอบรับที่ผิดพลาดจากเครื่องให้บริการเบื้องหลัง'
+    503: '503 - เครื่องแม่ข่ายยังไม่ให้บริการในปัจจุบัน '
+    504: '504 - หมดเวลารอรับข้อมูลจากเครื่องแม่ข่ายที่กำลังทำหน้าที่เป็นเกตเวย์หรือพร็อกซี่'
+    505: '505 - เครื่องแม่ข่ายไม่รองรับรุ่นของเอชทีทีพีที่ใช้ในข้อความร้องขอ'
   Folder:
     AddFolderButton: เพิ่มโฟลเดอร์
     DELETEUNUSEDTHUMBNAILS: ลบรูปย่อที่ไม่ได้ใช้งาน
@@ -277,15 +276,15 @@ th:
     DEFAULTTHEME: (ใช้ชุดธีมเริ่มต้น)
     EDITHEADER: 'ใครสามารถแก้ไขหน้าเว็บบนเว็บไซต์นี้ได้บ้าง?'
     EDIT_PERMISSION: การจัดการการกำหนดค่าของเว็บไซต์
-    EDIT_PERMISSION_HELP: 'Ability to edit global access settings/top-level page permissions.'
+    EDIT_PERMISSION_HELP: สามารถแก้ไขการตั้งค่าการเข้าถึงระบบโดยรวมได้/แก้ไขสิทธิ์หน้าเว็บในระดับสูงสุดได้
     PLURALNAME: กำหนดค่าเว็บไซต์
-    SINGULARNAME: ตั้งค่าเว็บไซต์
+    SINGULARNAME: กำหนดค่าเว็บไซต์
     SITENAMEDEFAULT: ชื่อเว็บไซต์ของคุณ
     SITETAGLINE: สโลแกนของเว็บไซต์
     SITETITLE: ชื่อเว็บไซต์
     TABACCESS: เข้าถึง
     TABMAIN: หน้าหลัก
-    TAGLINEDEFAULT: 'your tagline here'
+    TAGLINEDEFAULT: กรอกสโลแกนของคุณลงที่นี่
     THEME: ชุดธีม
     TOPLEVELCREATE: 'ใครบ้างที่สามารถสร้างหน้าเว็บที่ตำแหน่ง root ของเว็บไซต์ได้?'
     VIEWHEADER: 'ใครบ้่างที่สามารถเปิดดูหน้าเว็บบนเว็บไซต์นี้ได้?'
@@ -332,13 +331,13 @@ th:
     LINKCHANGENOTE: การเปลี่ยนลิงก์ของหน้าเว็บนี้จะส่งผลถึงลิงก์ต่างๆที่อยู่ในหน้าเว็บลูกด้วย
     MENUTITLE: ป้ายบอกทาง
     METADESC: รายละเอียด
+    METADESCHELP: 'เว็บไซต์ค้นหาข้อมูลใช้เนื้อหาในส่วนนี้เพื่อแสดงผลการค้นหา (แม้ว่าจะไม่มีผลกระทบกับการจัดอันดับก็ตาม).'
     METAEXTRA: 'Meta Tags แบบกำหนดเอง'
-    METAKEYWORDS: คีย์เวิร์ด
-    METATITLE: ชื่อ
+    METAEXTRAHELP: 'แท็กคำสั่ง HTML สำหรับใช้เป็นข้อมูล meta เพิ่มเติม. ตัวอย่างเพิ่มเติม &lt;meta name="ชื่อที่ต้องการ" content="กำหนดเนื้อหาของคุณเองที่นี่" /&gt;'
     MODIFIEDONDRAFTHELP: หน้าเว็บถูกเปลี่ยนค่าเป็นระงับการเผยแพร่แล้ว
     MODIFIEDONDRAFTSHORT: แก้ไขเมื่อ
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    OBSOLETECLASS: 'หน้าเว็บนี้เป็นหน้าเว็บประเภทที่เก่าแล้ว {type} การบันทึกข้อมูลจะรีเซ็ตค่าประเภทของหน้าดังกล่าว และอาจทำให้ข้อมูลสูญหายได้'
     PAGELOCATION: ตำแหน่งหน้าเว็บ
     PAGETITLE: ชื่อหน้าเว็บ
     PAGETYPE: 'ประเภท เอกสาร'

lang/tl.yml

@@ -1,7 +1,6 @@
 tl:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ tl:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ tl:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Navigation label'
     METADESC: 'Meta Description'
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Custom Meta Tags'
-    METAKEYWORDS: 'Meta Keywords'
-    METATITLE: 'Meta Title'
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/tr.yml

@@ -1,7 +1,6 @@
 tr:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ tr:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ tr:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Navigasyon etiketi'
     METADESC: Tanım
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Kişisel Meta Etiketleri'
-    METAKEYWORDS: 'Anahtar kelimeler'
-    METATITLE: Başlık
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Değiştirilmiş
     MetadataToggle: Metadata

lang/uk.yml

@@ -1,7 +1,6 @@
 uk:
   AssetAdmin:
     ADDFILES: 'Додати файли'
-    ALLOWEDEXTS: 'Допустимі розширення'
     ActionAdd: 'Додати папку'
     AppCategoryArchive: Архівувати
     AppCategoryAudio: Аудіо
@@ -29,7 +28,7 @@ uk:
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Видалені папки'
   AssetAdmin_Tools:
-    FILTER: Filter
+    FILTER: Фільтр
   AssetAdmin_left.ss:
     GO: Уперед
   AssetTableField:
@@ -182,7 +181,7 @@ uk:
     PUBLISHEDSITE: 'Публічний сайт'
     Password: Пароль
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'Ви можете почати редагувати вміст сайту перейшовши в <a href="{link}">CMS</a>.'
     UnableDeleteInstall: 'Не вдається видалити інсталяційні файли. Будь ласка, видаліть вручну наведені нижче файли'
     VIEWPAGEIN: 'Переглянути сторінку в:'
   ErrorPage:
@@ -332,9 +331,9 @@ uk:
     LINKCHANGENOTE: 'Зміна адреси цієї сторінки вплине на адреси всіх дочірніх сторінок'
     MENUTITLE: 'Мітка навігації'
     METADESC: Опис
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Власні Мета-теги'
-    METAKEYWORDS: 'Ключові вирази'
-    METATITLE: Назва
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Сторінка має неопубліковані зміни'
     MODIFIEDONDRAFTSHORT: Змінений
     MetadataToggle: Metadata

lang/uz.yml

@@ -1,7 +1,6 @@
 uz:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -151,7 +150,7 @@ uz:
     FILTER: Filter
   CMSSearch:
     FILTERDATEFROM: From
-    FILTERDATEHEADING: Date
+    FILTERDATEHEADING: তারিখ
     FILTERDATETO: To
     FILTERLABELTEXT: Content
   CMSSettingsController:
@@ -182,7 +181,7 @@ uz:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ uz:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 'Navigation label'
     METADESC: 'Meta Description'
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Custom Meta Tags'
-    METAKEYWORDS: 'Meta Keywords'
-    METATITLE: 'Meta Title'
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/vi_VN.yml

@@ -1,7 +1,6 @@
 vi_VN:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ vi_VN:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ vi_VN:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: Nhãn
     METADESC: 'Mô tả'
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'Thẻ thông tin bổ sung'
-    METAKEYWORDS: 'Từ khóa'
-    METATITLE: 'Tiêu đề'
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/zh_CN.yml

@@ -1,7 +1,6 @@
 zh_CN:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ zh_CN:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ zh_CN:
     LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
     MENUTITLE: 导航标签
     METADESC: 网页描述标签
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 自定义Meta标签
-    METAKEYWORDS: 网页关键词标签
-    METATITLE: Title标签
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata

lang/zh_TW.yml

@@ -1,7 +1,6 @@
 zh_TW:
   AssetAdmin:
     ADDFILES: 'Add Files'
-    ALLOWEDEXTS: 'Allowed extensions'
     ActionAdd: 'Add folder'
     AppCategoryArchive: Archive
     AppCategoryAudio: Audio
@@ -182,7 +181,7 @@ zh_TW:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site''s content by opening <a href=\\"{link}\\">the CMS</a>.'
+    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
@@ -332,9 +331,9 @@ zh_TW:
     LINKCHANGENOTE: 改變這個網頁鏈結將也會影響所有子網頁的鏈結
     MENUTITLE: 捷徑標籤
     METADESC: 敘述
+    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 自訂元標籤(meta-tags)
-    METAKEYWORDS: 關鍵詞
-    METATITLE: 標題
+    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: 已修改
     MetadataToggle: Metadata

templates/Includes/CMSPagesController_ContentToolActions.ss

@@ -1,4 +1,3 @@
 <div class="cms-actions-row">
 	<a class="cms-page-add-button ss-ui-button ss-ui-action-constructive" data-icon="add" href="$LinkPageAdd" data-url-addpage="{$LinkPageAdd('?ParentID=%s')}"><% _t('CMSMain.AddNewButton', 'Add new') %></a>
 </div>
-

templates/Includes/CMSPagesController_ContentToolbar.ss

@@ -1,18 +1,8 @@
 <div class="cms-content-batchactions">
+	<div class="view-mode-batchactions-wrapper">
+		<input id="view-mode-batchactions" name="view-mode-batchactions" type="checkbox" />
+		<label for="view-mode-batchactions"><% _t("CMSPagesController_ContentToolbar.ss.MULTISELECT","Multi-selection") %></label>
+	</div>
+
 	$BatchActionsForm
 </div>
-
-<div class="cms-tree-view-modes">
-	<span><% _t("TreeTools.DisplayLabel","Display:") %></span>
-	<% 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("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("CMSPagesController_ContentToolbar.ss.MULTISELECT","Multi-selection") %></label>
-	</div>
-</div>
-

templates/Includes/Install_successfullyinstalled.ss

@@ -10,7 +10,7 @@
 	<strong>&nbsp; &nbsp; <%t ContentController.Password "Password" %>: $Password</strong></p>
 
 <p>
-	<%t ContentController.StartEditing 'You can start editing your site\'s content by opening <a href="{link}">the CMS</a>.' link="admin/" %> 
+	<%t ContentController.StartEditing 'You can start editing your content by opening <a href="{link}">the CMS</a>.' link="admin/" %> 
 </p>
 
 <div style="background:#fcf8f2; border-radius:4px; border: 1px solid #ffc28b; padding:5px; margin:5px;">