diff --git a/.tx/config b/.tx/config
new file mode 100644
index 00000000..1db7d558
--- /dev/null
+++ b/.tx/config
@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[silverstripe-cms.master]
+file_filter = lang/<lang>.yml
+source_file = lang/en.yml
+source_lang = en
+type = YML
\ No newline at end of file
diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php
index a2ad5a00..e28256c1 100644
--- a/code/controllers/AssetAdmin.php
+++ b/code/controllers/AssetAdmin.php
@@ -375,9 +375,9 @@ JS
 
 		$fields = $context->getSearchFields();
 		$actions = new FieldList(
-			FormAction::create('doSearch',  _t('CMSMain_left.ss.APPLY FILTER', 'Apply Filter'))
+			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'))
+			Object::create('ResetFormAction', 'clear', _t('CMSMain_left_ss.RESET', 'Reset'))
 		);
 		
 		$form = new Form($this, 'filter', $fields, $actions);
@@ -401,7 +401,7 @@ JS
 				new HiddenField('ParentID', false, $this->request->getVar('ParentID'))
 			),
 			new FieldList(
-				FormAction::create('doAdd', _t('AssetAdmin_left.ss.GO','Go'))
+				FormAction::create('doAdd', _t('AssetAdmin_left_ss.GO','Go'))
 					->addExtraClass('ss-ui-action-constructive')->setAttribute('data-icon', 'accept')
 					->setTitle(_t('AssetAdmin.ActionAdd', 'Add folder'))
 			)
@@ -667,7 +667,7 @@ JS
  */
 class AssetAdmin_DeleteBatchAction extends CMSBatchAction {
 	public function getActionTitle() {
-		// _t('AssetAdmin_left.ss.SELECTTODEL','Select the folders that you want to delete and then click the button below')
+		// _t('AssetAdmin_left_ss.SELECTTODEL','Select the folders that you want to delete and then click the button below')
 		return _t('AssetAdmin_DeleteBatchAction.TITLE', 'Delete folders');
 	}
 
diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index 6ee6552f..8d2f96c1 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -296,9 +296,9 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		
 		// Create the Search and Reset action
 		$actions = new FieldList(
-			FormAction::create('doSearch',  _t('CMSMain_left.ss.APPLY FILTER', 'Apply Filter'))
+			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'))
+			Object::create('ResetFormAction', 'clear', _t('CMSMain_left_ss.RESET', 'Reset'))
 		);
 
 		// Use <button> to allow full jQuery UI styling on the all of the Actions
diff --git a/lang/af.yml b/lang/af.yml
index 43df1ed3..d5a27222 100644
--- a/lang/af.yml
+++ b/lang/af.yml
@@ -1,323 +1,48 @@
 af:
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: Epos
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Edit Page'
-    NEWPAGE: 'New {pagetype}'
     PAGENOTEXISTS: 'Hierdie bladsy bestaan nie'
-    PAGES: Pages
-    PAGETYPEANYOPT: Any
-    PAGETYPEOPT: 'Page Type'
     PUBALLCONFIRM: 'Publiseer asseblief elke bladsy in die werf en kopieër inhoud fase na lewendig'
-    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 ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
-    REMOVEDPAGEFROMDRAFT: 'Removed ''%s'' from the draft site'
-    RESTORE: Restore
-    RESTORED: 'Restored ''{title}'' successfully'
+    PUBALLFUN2: "Pressing this button will do the equivalent of going to every page and pressing \"publish\".  It's\n\t\t\t\tintended to be used after there have been massive edits of the content, such as when the site was\n\t\t\t\tfirst built.\n"
     ROLLBACK: 'Rol terug na hierdie weergawe'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: CMSPagesController
-    TreeView: 'Tree View'
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: 'Drag''n''drop'
-    MULTISELECT: Multi-selection
-  CMSPagesController_Tools.ss:
-    FILTER: Filter
-  CMSSearch:
-    FILTERDATEFROM: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    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'
-    PUBLISHED: Published
-    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 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 - Nie Geimplementeer'
     502: '502 - Slegte Deurgang'
     503: '503 - Diens Nie Beskikbaar'
-    504: '504 - Gateway Timeout'
     505: '505 - HTTP Weergawe Nie Ondersteun'
   Folder:
-    AddFolderButton: 'Add folder'
     DELETEUNUSEDTHUMBNAILS: 'Verwyder ongebruikte miniatuur prente'
     UNUSEDFILESTITLE: 'Ongebruikte lêers'
     UNUSEDTHUMBNAILSTITLE: 'Ongebruikte miniatuur prente'
-    UploadFilesButton: Upload
-  LeftAndMain:
-    DELETED: Deleted.
-    PreviewButton: Preview
-    SAVEDUP: Saved.
-    STATUSPUBLISHEDSUCCESS: 'Published ''{title}'' successfully'
-    SearchResults: 'Search Results'
-    VersionUnknown: Unknown
   Permission:
     CMS_ACCESS_CATEGORY: 'IBS Toegang'
   Permissions:
     CONTENT_CATEGORY: 'Inhoud permissies'
     PERMISSIONS_CATEGORY: 'Rolle en toegang permissies'
-  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'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  SearchForm:
-    GO: Go
-    SEARCH: Search
-    SearchResults: 'Search Results'
   SideReport:
     BROKENFILES: 'Bladsye met gebreekte lêers'
     BROKENLINKS: 'Bladsye met gebreekte skakels'
-    BROKENREDIRECTORPAGES: 'RedirectorPages pointing to deleted pages'
-    BROKENVIRTUALPAGES: 'VirtualPages pointing to deleted pages'
     BrokenLinksGroupTitle: 'Gebreekte skakels verslae'
     ContentGroupTitle: 'Inhoud verslae'
-    EMPTYPAGES: 'Pages with no content'
-    LAST2WEEKS: 'Pages edited in the last 2 weeks'
     OtherGroupTitle: Ander
     ParameterLiveCheckbox: 'Kies lewendige werf'
-    REPEMPTY: 'The {title} report is empty.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'To share a this to this page, copy and paste the link below.'
     ShareLink: 'Deel skakel'
   SilverStripeNavigatorLinkl:
-    CloseLink: 'Maak toe'
+    CloseLink: Maak toe
   SiteConfig:
     DEFAULTTHEME: '(Gebruik verstek tema)'
-    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: 'Enige iemand'
+    ACCESSANYONE: Enige iemand
     ACCESSHEADER: 'Wie mag hierdie bladsy sien?'
     ACCESSLOGGEDIN: 'Ingetekende gebruikers'
     ACCESSONLYTHESE: 'Slegs hierdie mense (kies uit lys)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'Laat aanmerkings toe op hierdie bladsy?'
-    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'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Onpubliseer
     BUTTONUNPUBLISHDESC: 'Verwyder hierdie bladsy van die gepubliseerde werf'
-    CREATED: 'Date Created'
-    Comments: Comments
     Content: Inhoud
     DEFAULTABOUTCONTENT: '<p>U kan hierdie bladsy invul met u eie inhoud, of dit verwyder en u eie bladsye skep.<br /></p>'
     DEFAULTABOUTTITLE: 'Oor Ons'
@@ -325,112 +50,31 @@ af:
     DEFAULTCONTACTTITLE: 'Kontak Ons'
     DEFAULTHOMECONTENT: '<p>Welkom by SilverStripe! Hierdie is die standaard huis-blad. U kan hierdie blad verander deur <a href="admin">the IBS</a> oop te maak. U het nou toegang tot die <a href="http://doc.silverstripe.org">ontwikkelaars dokumentasie</a>, of kan die <a href="http://doc.silverstripe.org/doku.php?id=tutorials">die tutoriale</a> begin.</p>'
     DEFAULTHOMETITLE: Huis
-    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: 'Enige iemand wat in die IBS kan inteken'
     EDITHEADER: 'Wie mag hierdie bladsy verander?'
     EDITONLYTHESE: 'Slegs hierdie mense (kies uit lys)'
-    EDITORGROUPS: 'Editor Groups'
     EDIT_ALL_DESCRIPTION: 'Verander enige bladsy'
-    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'
-    GroupPlaceholder: 'Click to select group'
-    HASBROKENLINKS: 'This page has broken links.'
     HTMLEDITORTITLE: Inhoud
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: 'Page location'
-    PAGETITLE: 'Page name'
     PAGETYPE: 'Blaai soort'
     PARENTID: 'Ouer Bladsy'
     PARENTTYPE: 'Bladsy plek'
     PARENTTYPE_ROOT: 'Bo-vlak bladsy'
     PARENTTYPE_SUBPAGE: 'Sub-bladsy onder ''n ouer bladsy (kies onder)'
-    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: 'Verander werf struktuur'
-    REORGANISE_HELP: 'Rearrange pages in the site tree through drag&drop.'
-    SHOWINMENUS: 'Show in menus?'
     SHOWINSEARCH: 'Wys in soektog?'
-    SINGULARNAME: Page
-    TABBEHAVIOUR: Behavior
-    TABCONTENT: Inhoud
-    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 ''Pages'' section" 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
+    TABCONTENT: 'Inhoud'
     has_one_Parent: 'Ouer Bladsy'
-    many_many_BackLinkTracking: 'Backlink Tracking'
-    many_many_ImageTracking: 'Image Tracking'
-    many_many_LinkTracking: 'Link Tracking'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    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'
+  TableListField_ss:
     SORTASC: 'Sorteer in stygende orde'
     SORTDESC: 'Sorteer in dalende orde'
-  TableListField_PageControls.ss:
-    DISPLAYING: Displaying
-    OF: of
-    TO: to
+  TableListField_PageControls_ss:
     VIEWFIRST: 'Wys eerste'
     VIEWLAST: 'Wys laaste'
     VIEWNEXT: 'Wys volgende'
     VIEWPREVIOUS: 'Wys vorige'
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
-    CANACCESS: 'You can access the archived site at this link:'
+  ViewArchivedEmail_ss:
     HAVEASKED: 'U het gevra om die inhoud van ons werf te sien op'
   VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Hierdie is ''n virtuele bladsy'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Wesenlik Bladsye'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Virtuele Bladsy'
diff --git a/lang/ar.yml b/lang/ar.yml
index 95350e6c..ae85d91f 100644
--- a/lang/ar.yml
+++ b/lang/ar.yml
@@ -1,41 +1,8 @@
 ar:
   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: 'مجلد جديد'
-    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:
+    NEWFOLDER: مجلد جديد
+  AssetAdmin_left_ss:
     GO: اذهب
-  AssetTableField:
-    BACKLINKCOUNT: 'Used on:'
-    PAGES: page(s)
-  BackLink_Button.ss:
-    Back: Back
   BrokenLinksReport:
     Any: أي
     BROKENLINKS: 'تقرير الروابط المكسورة'
@@ -58,148 +25,49 @@ ar:
     ReasonDropdownVPBROKENLINK: 'الصفحة الظاهرية تشير الى صفحة غير موجودة..'
     RedirectorNonExistent: 'معيد توجيه الصفحة يشير الى صفحة غير موجودة..'
     VirtualPageNonExistent: 'الصفحة الظاهرية تشير الى صفحة غير موجودة..'
-  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_PAGES: 'حذف من الصفحة المنشورة'
     PUBLISHED_PAGES: '%d من الصفحات المنشورة'
     PUBLISH_PAGES: النشر
     UNPUBLISHED_PAGES: '%d من الصفحات غير المنشورة'
-    UNPUBLISH_PAGES: 'غير منشور'
-  CMSFileAddController:
-    MENUTITLE: Files
+    UNPUBLISH_PAGES: غير منشور
   CMSMain:
-    ACCESS: 'Access to ''{title}'' section'
     ACCESS_HELP: 'سماح بعرض لقسم يحتوي على صفحة الشجرة والمحتوى. يمكن التعامل معها عرض وتحرير الأذونات من خلال القائمه المنسدله للروابط محددة صفحة، فضلا عن فصل "أذونات المحتوى".'
-    AddNew: 'Add new page'
-    AddNewButton: 'Add new'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
     DELETE: 'حذف من مسودة الموقع'
-    DELETEFP: 'حذف من الموقع المنشور'
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    EMAIL: 'البريد الإلكتروني'
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Edit Page'
-    NEWPAGE: 'New {pagetype}'
+    DELETEFP: حذف من الموقع المنشور
+    EMAIL: البريد الإلكتروني
     PAGENOTEXISTS: 'هذه الصفحة غير موجودة'
-    PAGES: Pages
-    PAGETYPEANYOPT: Any
-    PAGETYPEOPT: 'Page Type'
     PUBALLCONFIRM: 'فضلاً قم بنشر كل صفحة من صفحات الموقع'
     PUBALLFUN: '"نشر الجميع"خاصية '
-    PUBALLFUN2: 'الضغط على هذا الزر يعني الذهاب لكل صفحة و نشرها.  It''sintended to be used after there have been massive edits of the content, such as when the site wasfirst built.'
-    PUBPAGES: 'Done: Published {count} pages'
-    PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
+    PUBALLFUN2: "الضغط على هذا الزر يعني الذهاب لكل صفحة و نشرها.  It's\nintended to be used after there have been massive edits of the content, such as when the site was\nfirst built.\n"
     REMOVEDPAGEFROMDRAFT: '''%s'' محذوف من مسودة الموقع'
     RESTORE: تخزين
-    RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'عودة إلى هذا الإصدار'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     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: 'وضع المقارنة (أختر أثنين)ـ'
-    COMPAREVERSIONS: 'مقارنة النسخ'
-    COMPARINGVERSION: 'Comparing versions {version1} and {version2}.'
     MENUTITLE: السجل
-    REVERTTOTHISVERSION: 'العودة الى هذة النسخة'
-    SHOWUNPUBLISHED: 'عرض النسخ الغير منشورة'
-    SHOWVERSION: 'عرض النسخ'
-    VIEW: view
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    VIEWINGVERSION: 'Currently viewing version {version}.'
-  CMSPageHistoryController_versions.ss:
+  CMSPageHistoryController_versions_ss:
     AUTHOR: الكاتب
     NOTPUBLISHED: 'غير منشور'
     PUBLISHER: الناشر
-    UNKNOWN: 'غير معروف'
-    WHEN: 'متى'
-  CMSPageSettingsController:
-    MENUTITLE: 'تحرير صفحة'
-  CMSPagesController:
-    GalleryView: 'Gallery View'
-    ListView: 'قائمة العرض'
-    MENUTITLE: الصفحات
-    TreeView: 'شجرة العرض'
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: 'Drag''n''drop'
-    MULTISELECT: Multi-selection
-  CMSPagesController_Tools.ss:
-    FILTER: Filter
-  CMSSearch:
-    FILTERDATEFROM: 'من'
-    FILTERDATEHEADING: التاريخ
-    FILTERDATETO: إلى
-    FILTERLABELTEXT: 'المحتوى'
-  CMSSettingsController:
-    MENUTITLE: الإعدادات
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Changed pages'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'All pages, including deleted'
+    UNKNOWN: غير معروف
   CMSSiteTreeFilter_Search:
     Title: 'كل الصفحات'
   ContentControl:
     NOTEWONTBESHOWN: 'تنبيه: هذه الرسالة لن يتم عرضها لزوار موقعك'
   ContentController:
-    ARCHIVEDSITE: 'Preview version'
     ARCHIVEDSITEFROM: 'موقع تمت أرشفته منذ'
-    CMS: 'نظام إدارة المحتوى'
-    DRAFT: Draft
+    CMS: نظام إدارة المحتوى
     DRAFTSITE: 'موقع في المسودة'
     DRAFT_SITE_ACCESS_RESTRICTION: 'بجب تسجيل الدخول ببيانات نظام إدارة المحتوى للتمكن من مشاهدة المسودات أو محتوى الأرشيف. <a href="%s">اضغط هنا للرجوع إلى الموقع المنشور.</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: 'الدخول كـ'
     LOGIN: الدخول
-    LOGOUT: الخروج
+    LOGOUT: 'الخروج'
     NOTLOGGEDIN: 'لم يتم تسجيل الدخول'
-    PUBLISHED: Published
     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 content by opening <a href="{link}">the CMS</a>.'
-    UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually'
     VIEWPAGEIN: 'مشاهدة الصفحة في:'
   ErrorPage:
-    CODE: 'كود الخطأ'
-    DEFAULTERRORPAGECONTENT: '<p>عذراً ، يبدو أنك تحاول الدخول إلى صفحة غير موجودة.</p><p>فضلاً تأكد من الرابط و أعد محاولة الدخول مرة أخرى.</p>'
-    DEFAULTERRORPAGETITLE: 'الصفحة غير موجودة'
-    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 - طلب خاطئ'
     401: '401 - غير مصرح'
     403: '403 - ممنوع'
@@ -223,44 +91,28 @@ ar:
     503: '503 - خدمة غير متوفرة'
     504: '504 - انتهاء وقت البوابة'
     505: '505 - إصدار HTTP  غير مدعوم'
+    CODE: 'كود الخطأ'
+    DEFAULTERRORPAGECONTENT: '<p>عذراً ، يبدو أنك تحاول الدخول إلى صفحة غير موجودة.</p><p>فضلاً تأكد من الرابط و أعد محاولة الدخول مرة أخرى.</p>'
+    DEFAULTERRORPAGETITLE: 'الصفحة غير موجودة'
   Folder:
-    AddFolderButton: 'Add folder'
     DELETEUNUSEDTHUMBNAILS: 'حذف المصغرات غير المستخدمة'
     UNUSEDFILESTITLE: 'الملفات غير المستخدمة'
     UNUSEDTHUMBNAILSTITLE: 'المصغرات غير المستخدمة'
-    UploadFilesButton: Upload
-  LeftAndMain:
-    DELETED: Deleted.
-    PreviewButton: عرض
-    SAVEDUP: Saved.
-    STATUSPUBLISHEDSUCCESS: 'Published ''{title}'' successfully'
-    SearchResults: 'نتائج البحث'
-    VersionUnknown: 'غير معروف'
   Permission:
     CMS_ACCESS_CATEGORY: 'الوصل لنظام إدارة المحتوى'
   Permissions:
     CONTENT_CATEGORY: 'تصاريح المحتوى'
     PERMISSIONS_CATEGORY: 'تصريح الدخول والقواعد'
   RedirectorPage:
-    DESCRIPTION: 'إعادة توجية الى صفحة داخلية مختلفة '
     HASBEENSETUP: 'صفحة التحويل تم تهيئتها بدون تحديد وجهة التحويل'
     HEADER: 'هذه الصفحة سوف تقوم بتحويل الأعضاء إلى صفحة أخرى'
     OTHERURL: 'رابط موقع آخر'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'تحويل إلى'
     REDIRECTTOEXTERNAL: 'موقع آخر'
     REDIRECTTOPAGE: 'صفحة في موقعك الشخصي'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'صفحة في موقعك الشخصي'
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
   ReportAdminForm:
     FILTERBY: 'فرز عبر'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: اذهب
     SEARCH: بحث
@@ -276,9 +128,6 @@ ar:
     LAST2WEEKS: 'صفحات تم تعديلها في آخر أسبوعين'
     OtherGroupTitle: أخرى
     ParameterLiveCheckbox: 'التأكد من حيوية الموقع'
-    REPEMPTY: 'The {title} report is empty.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'لمشاركة هذا إلى هذه النسخة، انسخ وإلصق الرابط أدناه....'
     ShareLink: 'رابط مشترك'
@@ -288,47 +137,37 @@ ar:
     DEFAULTTHEME: '( استخدام الثيم الافتراضي )'
     EDITHEADER: 'من يستطيع تحرير الصفحات الموجودة على هذا الموقع؟'
     EDIT_PERMISSION: 'إدارة إعدادات الموقع'
-    EDIT_PERMISSION_HELP: 'القدرة على تحرير إعدادات الوصول العالمي / أذونات صفحة المستوى الأعلى.'
-    PLURALNAME: 'Site Configs'
-    SINGULARNAME: 'Site Config'
+    EDIT_PERMISSION_HELP: 'القدرة على تحرير إعدادات الوصول العالمي / أذونات صفحة المستوى الأعلى.
+
+      '
     SITENAMEDEFAULT: 'اسم عنوان موقعك'
     SITETAGLINE: 'علامة / شعار الموقع'
     SITETITLE: 'عنوان الموقع'
     TABACCESS: الوصول
     TABMAIN: الرئيسي
     TAGLINEDEFAULT: 'علامتك هنا'
-    THEME: 'الثيم'
+    THEME: الثيم
     TOPLEVELCREATE: 'من يستطيع إنشاء صفحات في جذر الموقع؟'
     VIEWHEADER: 'من يستطيع عرض الصفحات على هذا الموقع؟...'
   SiteTree:
-    ACCESSANYONE: 'الجميع'
+    ACCESSANYONE: الجميع
     ACCESSHEADER: 'من يستطيع مشاهدة هذه الصفحة ؟'
     ACCESSLOGGEDIN: 'الأعضاء المسجلين'
     ACCESSONLYTHESE: 'فقط هؤلاء الأشخاص ( اختر من القائمة)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'السماح بالتعليقات في هذه الصفحة ؟'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'إلغاء التغييرات في المسودة'
     BUTTONCANCELDRAFTDESC: 'إلغاء المسودة و العودة إلى الموقع المنشور حالياً'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'غير منشور'
+    BUTTONUNPUBLISH: غير منشور
     BUTTONUNPUBLISHDESC: 'حذف هذه الصفحة من الموقع المنشور'
-    CREATED: 'Date Created'
     Comments: التعليقات
-    Content: 'المحتوى'
+    Content: المحتوى
     DEFAULTABOUTCONTENT: '<p>يمكنك ملء هذه الصفحة بمحتوى خاص بك أو حذفها و إنشاء صفحات جديدة خاصة بك<br /></p>'
-    DEFAULTABOUTTITLE: حول
+    DEFAULTABOUTTITLE: 'حول'
     DEFAULTCONTACTCONTENT: '<p>يمكنك ملء هذه الصفحة بمحتوى خاص بك أو حذفها و إنشاء صفحات جديدة خاصة بك<br /></p>'
     DEFAULTCONTACTTITLE: 'اتصل بنا'
     DEFAULTHOMECONTENT: '<p>أهلاً بك في  SilverStripe! هذه هي الصفحة الرئيسة.يمكنك تعديل الصفحة عن طريق  <a href="admin/">نظام إدارة المحتوى</a>.يمكنك الآن الدخول إلى  <a href="http://doc.silverstripe.com">مستندات المطورين</a>, أو الدخول إلى  <a href="http://doc.silverstripe.com/doku.php?id=tutorials">الدروس التعليمية.</a></p>'
     DEFAULTHOMETITLE: الرئيسة
-    DELETEDPAGEHELP: 'Page is no longer published'
-    DELETEDPAGESHORT: Deleted
     DEPENDENT_NOTE: 'الصفحات التالية تعتمد على هذه الصفحة. وهذا يشمل صفحات الظاهري، وصفحات معيد التوجيه، والصفحات التي تحتوي على روابط المحتوى.'
-    DESCRIPTION: 'Generic content page'
     DependtPageColumnLinkType: 'نوع الرابط'
     DependtPageColumnURL: رابط
     EDITANYONE: 'أي شخص '
@@ -338,25 +177,14 @@ ar:
     EDIT_ALL_DESCRIPTION: 'Can edit any page on the site, bypassing page specific security'
     EDIT_ALL_HELP: 'القدرة على تحرير أي صفحة على الموقع ، بغض النظر عن الإعدادات على علامة تبويب الوصول. يتطلب تصريح "الوصول إلى محتوى الموقع" '
     Editors: 'مجموعات المحررين'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'هذه الصفحة تحتوي على روابط معطوبة'
-    HTMLEDITORTITLE: 'محتوى'
+    HTMLEDITORTITLE: محتوى
     INHERIT: 'استيراد من الصفحة المرجعية'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'أخر تحديث'
     LINKCHANGENOTE: 'تغيير هذا وصلة رابط الصفحة سوف تؤثر أيضًا على الوصلات لجميع صفحات الفرعية.'
     MENUTITLE: 'القائمة'
-    METADESC: الوصف
-    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
+    METADESC: 'الوصف'
     METAEXTRA: 'تخصيص 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: 'معدل'
-    MetadataToggle: Metadata
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
     PAGELOCATION: 'موقع الضفحة'
     PAGETITLE: 'اسم الصفحة'
     PAGETYPE: 'نوع الصفحة'
@@ -366,17 +194,12 @@ ar:
     PARENTTYPE_SUBPAGE: 'صفحة فرعية أسفل صفحة رئيسية (اختر أدناه)'
     PERMISSION_GRANTACCESS_DESCRIPTION: 'التحكم في المجموعات التي لها صلاحية الدخول أو التعديل على صفحات محددة'
     PERMISSION_GRANTACCESS_HELP: 'السماح بضع القيود على الوصول صفحة محددة في قسم "الصفحات".'
-    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: 'تحذير : يجب حذف الملف install.php من SilverStripe لاسباب أمنية '
     REORGANISE_DESCRIPTION: 'Can reorganise the site tree'
-    REORGANISE_HELP: 'إعادة ترتيب الصفحات في  شجرة الموقع من خلال السحب والإسقاط.'
+    REORGANISE_HELP: 'إعادة ترتيب الصفحات في  شجرة الموقع من خلال السحب والإسقاط.
+
+      '
     SHOWINMENUS: 'عرض في قوائم ؟'
     SHOWINSEARCH: 'عرض في البحث ؟'
-    SINGULARNAME: Page
     TABBEHAVIOUR: الشسلوك
     TABCONTENT: 'المحتوى'
     TABDEPENDENT: 'الصفحات المعتدة'
@@ -385,52 +208,35 @@ ar:
     URLSegment: 'جزء رابط الموقع'
     VIEWERGROUPS: 'مجموعات الزوار'
     VIEW_ALL_DESCRIPTION: 'Can view any page on the site, bypassing page specific security'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'عرض مسودة المحتوى'
     VIEW_DRAFT_CONTENT_HELP: 'ينطبق على عرض صفحات خارج اتفاقية إدارة  محتوى الموقع في وضع المسودة. مفيدة للمتعاونين من الخارجين بدون الحصول على اتفاقية إدارة محتوى الموقع'
     Viewers: 'مجموعات المشاهدين'
-    Visibility: Visibility
     has_one_Parent: 'الصفحة الرئيسة'
     many_many_BackLinkTracking: 'متابعة التعقيبات'
     many_many_ImageTracking: 'متابعة الصور'
     many_many_LinkTracking: 'متابعة الروابط'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
   StaticExporter:
     BASEURL: 'الرابط الأساسي'
     EXPORTTO: 'تصدير إلى مجلد'
     NAME: 'المصدر الثابت Exporter'
   TableListField:
-    SELECT: اختيار
-  TableListField.ss:
-    NOITEMSFOUND: 'No items found'
+    SELECT: 'اختيار'
+  TableListField_ss:
     SORTASC: 'ترتيب تصاعدي'
     SORTDESC: 'ترتيب تنازلي'
-  TableListField_PageControls.ss:
-    DISPLAYING: Displaying
-    OF: of
-    TO: to
+  TableListField_PageControls_ss:
     VIEWFIRST: 'عرض الأول'
     VIEWLAST: 'عرض الأخير'
     VIEWNEXT: 'عرض التالي'
     VIEWPREVIOUS: 'عرض السابق'
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'يمكنك الدخول إلى أرشيف الموقع عن طريق الرابط التالي :'
     HAVEASKED: 'تم طلب مشاهدة محتوى الموقع في'
   VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 'أعرض محتويات الصفحة الأخرى'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'هذه صفحة افتراضية'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'الصفحات الافتراضية'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'الصفحة الافتراضية'
+  CMSPageSettingsController:
+    MENUTITLE: 'تحرير صفحة'
+  CMSSettingsController:
+    MENUTITLE: الإعدادات
diff --git a/lang/ast.yml b/lang/ast.yml
index aad3a5a9..304fe451 100644
--- a/lang/ast.yml
+++ b/lang/ast.yml
@@ -1,436 +1,34 @@
 ast:
   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: Tamañu
-    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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    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 ''{title}''{description} 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'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%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: 'Comparar les versiones'
-    COMPARINGVERSION: 'Comparing versions {version1} and {version2}.'
-    MENUTITLE: Historial
-    REVERTTOTHISVERSION: 'Revert to this version'
-    SHOWUNPUBLISHED: 'Show unpublished versions'
     SHOWVERSION: 'Mostrar la versión'
-    VIEW: view
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    VIEWINGVERSION: 'Currently viewing version {version}.'
-  CMSPageHistoryController_versions.ss:
-    AUTHOR: Author
-    NOTPUBLISHED: 'Not published'
-    PUBLISHER: Publisher
-    UNKNOWN: Unknown
-    WHEN: When
-  CMSPageSettingsController:
-    MENUTITLE: 'Editar la páxina'
+    MENUTITLE: Historial
   CMSPagesController:
-    GalleryView: 'Gallery View'
-    ListView: 'List View'
     MENUTITLE: Páxines
-    TreeView: 'Tree View'
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: 'Drag''n''drop'
-    MULTISELECT: Multi-selection
-  CMSPagesController_Tools.ss:
-    FILTER: Filter
-  CMSSearch:
-    FILTERDATEFROM: From
-    FILTERDATEHEADING: Fecha
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    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'
-    PUBLISHED: Published
-    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 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: 'Páxina non alcontrada'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Sorry, there was a problem with handling your request.</p>'
     DEFAULTSERVERERRORPAGETITLE: 'Error del servidor'
-    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: Previsualización
-    SAVEDUP: Saved.
-    STATUSPUBLISHEDSUCCESS: 'Published ''{title}'' successfully'
     SearchResults: 'Resultaos de la busca'
-    VersionUnknown: Desconocío
-  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'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  SearchForm:
-    GO: Go
-    SEARCH: Buscar
-    SearchResults: 'Buscar resultaos'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'To share a this to this page, copy and paste the link below.'
-    ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Zarrar
-  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'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: Unpublish
-    BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
-    CREATED: 'Date Created'
-    Comments: Comments
     Content: Conteníu
-    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'
-    GroupPlaceholder: 'Click to select group'
-    HASBROKENLINKS: 'This page has broken links.'
     HTMLEDITORTITLE: Conteníu
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: 'Page location'
-    PAGETITLE: 'Page name'
     PAGETYPE: 'Triba de páxina'
     PARENTID: 'Páxina padre'
     PARENTTYPE: 'Llocalización de la páxina'
-    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: 'Segmentu URL'
-    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 ''Pages'' section" 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: 'Páxina padre'
-    many_many_BackLinkTracking: 'Backlink Tracking'
-    many_many_ImageTracking: 'Image Tracking'
-    many_many_LinkTracking: 'Link Tracking'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    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:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  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: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Esto ye una páxina virtual'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Páxines virtuales'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Páxina virtual'
+  CMSPageSettingsController:
+    MENUTITLE: 'Editar la páxina'
diff --git a/lang/az.yml b/lang/az.yml
index e377bbc6..5bb1a679 100644
--- a/lang/az.yml
+++ b/lang/az.yml
@@ -1,284 +1,46 @@
 az:
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
     DELETE: 'Qaralama saytdan sil'
-    DELETEFP: 'Dərc olunmuş saytdan sil'
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    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 ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
-    REMOVEDPAGEFROMDRAFT: 'Removed ''%s'' from the draft site'
-    RESTORE: 'Bərpa et'
-    RESTORED: 'Restored ''{title}'' successfully'
-    ROLLBACK: 'Roll back to this version'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
-    SAVE: 'Yadda saxla'
-    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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  CMSSettingsController:
-    MENUTITLE: Settings
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Changed pages'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'All pages, including deleted'
-  CMSSiteTreeFilter_Search:
-    Title: 'All pages'
+    DELETEFP: Dərc olunmuş saytdan sil
+    RESTORE: Bərpa et
+    SAVE: Yadda saxla
   ContentControl:
     NOTEWONTBESHOWN: 'Qeyd: Bu mesaj ziyarətçilər üçün görünməyəcək'
   ContentController:
-    ARCHIVEDSITE: 'Preview version'
     ARCHIVEDSITEFROM: 'Arxivləşmiş sayt'
-    CMS: CMS
-    DRAFT: Draft
     DRAFTSITE: 'Qaralama sayt'
-    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: 'Kimi daxil olmusan'
-    LOGIN: 'Daxil ol'
-    LOGOUT: Çıxış
+    LOGIN: Daxil ol
+    LOGOUT: 'Çıxış'
     NOTLOGGEDIN: 'Daxil olmayıb'
-    PUBLISHED: Published
     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 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:
-    CODE: 'Səhv kodu'
-    DEFAULTERRORPAGECONTENT: '<P> Üzr istəyirik, görünür siz mövcud olan səhifəyə giriş əldə etməyə cəhd edirdiniz. </p><p>Xahiş sizin giriş əldə etməyə və bir daha sınaqdan keçirməyə cəhd etdiyiniz URL-i yoxlayasınız </p>'
-    DEFAULTERRORPAGETITLE: 'Səhifə tapılmadı'
-    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 - Implementasiya olunmayıb'
-    502: '502 - Bad Gateway'
-    503: '503 - Service Unavailable'
-    504: '504 - Gateway Timeout'
-    505: '505 - HTTP Version Not Supported'
+    CODE: 'Səhv kodu'
+    DEFAULTERRORPAGECONTENT: '<P> Üzr istəyirik, görünür siz mövcud olan səhifəyə giriş əldə etməyə cəhd edirdiniz. </p><p>Xahiş sizin giriş əldə etməyə və bir daha sınaqdan keçirməyə cəhd etdiyiniz URL-i yoxlayasınız </p>
+
+      '
+    DEFAULTERRORPAGETITLE: 'Səhifə tapılmadı'
   Folder:
-    AddFolderButton: 'Add folder'
     DELETEUNUSEDTHUMBNAILS: 'İşlənməyən şəkilləri sil'
     UNUSEDFILESTITLE: 'İstifadəsiz fayllar'
     UNUSEDTHUMBNAILSTITLE: 'İşlənməyən şəkillər'
-    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: 'Məzmun səlahiyyətləri'
-    PERMISSIONS_CATEGORY: İcazələr
+    PERMISSIONS_CATEGORY: 'İcazələr'
   RedirectorPage:
-    DESCRIPTION: 'Redirects to a different internal page'
     HASBEENSETUP: 'Yönləndirmə səhifəsinə yönlənmə istiqaməti verilməyib.'
     HEADER: 'Bu səhifə istifadəçiləri başqa səhifəyə yönləndirəcək'
     OTHERURL: 'Başqa Web saytın URL-i'
-    PLURALNAME: 'Redirector Pags'
-    REDIRECTTO: Yönləndir
+    REDIRECTTO: 'Yönləndir'
     REDIRECTTOEXTERNAL: 'Başqa Web sayt'
     REDIRECTTOPAGE: 'web səhifənizdə olan səhifə'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Web saytınızda olan səhifə'
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Göndər
     SEARCH: Axtar
     SearchResults: 'Axtarış nəticələri'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Bu səhifəni paylaşmaq üçün , keçidi copy paste edin.'
     ShareLink: 'Linki Paylaş'
@@ -288,9 +50,6 @@ az:
     DEFAULTTHEME: '(Susmaya görə olan şablon)'
     EDITHEADER: 'Bu saytda səhifələri kim redaktə edə bilər?'
     EDIT_PERMISSION: 'Sayt konfigurasiyasını sazla'
-    EDIT_PERMISSION_HELP: 'Ability to edit global access settings/top-level page permissions.'
-    PLURALNAME: 'Site Configs'
-    SINGULARNAME: 'Site Config'
     SITENAMEDEFAULT: 'Saytın adı'
     SITETAGLINE: 'Saytın sloqanı'
     SITETITLE: 'Saytın başlığı'
@@ -301,136 +60,65 @@ az:
     TOPLEVELCREATE: 'Saytın kəlləsində kim səhifə yarada bilər?'
     VIEWHEADER: 'Bu saytda səhifələri kim görə bilir?'
   SiteTree:
-    ACCESSANYONE: 'Hər kəs'
+    ACCESSANYONE: Hər kəs
     ACCESSHEADER: 'Bu səhifəyə kimlər baxa bilər?'
     ACCESSLOGGEDIN: 'Daxil olmuş istifadəçilər'
     ACCESSONLYTHESE: 'Yalnız aşağıdakılar(siyahıdan seçin)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'Bu səhifədə şərhlərə icazə verilsin?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Qaralama dəyişiklikləri imtina et'
     BUTTONCANCELDRAFTDESC: 'Qaralamanı sil və cari dərc olunmuş versiyaya qaytar'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Dərci ləğv et'
+    BUTTONUNPUBLISH: Dərci ləğv et
     BUTTONUNPUBLISHDESC: 'Bu səhifəni dərc olunmuş saytdan sil'
-    CREATED: 'Date Created'
     Comments: Şərhlər
     Content: Məzmun
     DEFAULTABOUTCONTENT: '<p>Siz bu səhifəni öz məzmununzla doldura bilər, ya da səhifəni silib və pz səhifələrinizi yarada bilərsiniz.<br /></p>'
-    DEFAULTABOUTTITLE: Haqqımızda
+    DEFAULTABOUTTITLE: 'Haqqımızda'
     DEFAULTCONTACTCONTENT: '<p>Siz bu səhifəni öz məzmununzla doldura bilər, ya da səhifəni silib və pz səhifələrinizi yarada bilərsiniz.<br /></p>'
     DEFAULTCONTACTTITLE: 'Bizimlə əlaqə'
-    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: 'Baş səhifə'
-    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'
+    DEFAULTHOMETITLE: Baş səhifə
     DependtPageColumnLinkType: 'Keçid növü'
-    DependtPageColumnURL: URL
     EDITANYONE: 'CMS-ə login olan hər kəs'
     EDITHEADER: 'Bu səhifəni kimlər deyişə bilər?'
     EDITONLYTHESE: 'Yalnız aşağıdakılar(siyahıdan seçin)'
-    EDITORGROUPS: 'Editor Groups'
     EDIT_ALL_DESCRIPTION: 'İstənilən səhifəni redaktə et'
-    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: 'Redaktor qrupları'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Səhifədə xarab linklər var.'
     HTMLEDITORTITLE: Məzmun
     INHERIT: 'Valideyn səhifədən törəmə'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
-    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'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
     PAGELOCATION: 'Səhifənin yeri'
     PAGETITLE: 'Səhifənin adı'
     PAGETYPE: 'Səhifə tipi'
     PARENTID: 'Valideyn səhifə'
     PARENTTYPE: 'Səhifənin yeri'
-    PARENTTYPE_ROOT: 'Top-level page'
-    PARENTTYPE_SUBPAGE: 'Sub-page underneath a parent page'
     PERMISSION_GRANTACCESS_DESCRIPTION: 'Bu məzmun üçün icazələrə nəzarət et'
-    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: 'Səhifələri dart burax əməliyyatı ilə sırala.'
     SHOWINMENUS: 'Menyularda görünsün?'
     SHOWINSEARCH: 'Axtarışda görünsün?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: Davranış
-    TABCONTENT: Məzmun
+    TABCONTENT: 'Məzmun'
     TABDEPENDENT: 'Asılı səhifələr'
     TOPLEVEL: 'Saytın məzmunu (yuxarı səviyyə)'
     TOPLEVELCREATORGROUPS: 'Yuxarı səviyyə yaradıcıları'
     URLSegment: 'URL seqmenti'
-    VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'İstənilən səhifəyə bax'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'Qaralama məzmuna bax'
-    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: 'Valideyn səhifəsi'
-    many_many_BackLinkTracking: 'Backlink Tracking'
     many_many_ImageTracking: 'Şəkil izləmə'
     many_many_LinkTracking: 'Keçidin izlənməsi'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
-  StaticExporter:
-    BASEURL: 'Base URL'
-    EXPORTTO: 'Export to that folder'
-    NAME: 'Static exporter'
   TableListField:
     SELECT: 'Seç:'
-  TableListField.ss:
-    NOITEMSFOUND: 'No items found'
+  TableListField_ss:
     SORTASC: 'Artma sırası ilə sırala'
     SORTDESC: 'Azalma sırası ilə sırala'
-  TableListField_PageControls.ss:
-    DISPLAYING: Displaying
-    OF: of
-    TO: to
+  TableListField_PageControls_ss:
     VIEWFIRST: 'Birinciyə bax'
     VIEWLAST: 'Axırıncı baxılmış'
-    VIEWNEXT: Növbəti
+    VIEWNEXT: 'Növbəti'
     VIEWPREVIOUS: 'Əvvəlkinə bax'
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  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: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Bu virtual səhifədir'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Virtual səhifələr'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Virtual səhifə'
diff --git a/lang/bg.yml b/lang/bg.yml
index bf2b573c..2d3bd45e 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -2,50 +2,43 @@ bg:
   AssetAdmin:
     ADDFILES: 'Добави файлове'
     ActionAdd: 'Добави директория'
-    AppCategoryArchive: 'Архив'
+    AppCategoryArchive: Архив
     AppCategoryAudio: Аудио
-    AppCategoryDocument: Document
-    AppCategoryFlash: Flash
     AppCategoryImage: Изображение
     AppCategoryVideo: Видео
     BackToFolder: 'Обратно към директорията'
-    CREATED: 'Дата на създаване'
+    CREATED: Дата на създаване
     CurrentFolderOnly: 'Ограничи в текущата директория?'
     DetailsView: Детайли
     FILES: Файлове
-    FILESYSTEMSYNC: 'Sync files'
     FILESYSTEMSYNCTITLE: 'Актуализира базата данни с файловете от файловата система. Полезно когато файлове са били качени не през системата, а например през FTP.'
     FROMTHEINTERNET: 'От интернет'
-    FROMYOURCOMPUTER: 'От компютъра'
-    Filetype: 'Тип на файла'
     ListView: 'Изглед в списък'
-    MENUTITLE: Файлове
-    NEWFOLDER: 'Нова директория'
-    SIZE: 'Размер'
-    THUMBSDELETED: '{count} unused thumbnails have been deleted'
+    NEWFOLDER: Нова директория
+    SIZE: Размер
     TreeView: 'Дървовиден изглед'
-    Upload: 'Качи '
+    MENUTITLE: Файлове
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Изтрити папки'
   AssetAdmin_Tools:
     FILTER: Филтър
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Давай
   AssetTableField:
     BACKLINKCOUNT: 'Използвано от:'
     PAGES: Страница/и
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Назад
   BrokenLinksReport:
     Any: Всички
     BROKENLINKS: 'Списък на развалени линкове'
     CheckSite: 'Провери сайта'
-    CheckSiteDropdownDraft: Чернови
+    CheckSiteDropdownDraft: 'Чернови'
     CheckSiteDropdownPublished: 'Публикувани страници'
     ColumnDateLastModified: 'Дата на последна промяна'
     ColumnDateLastPublished: 'Дата на последно публикуване'
     ColumnProblemType: 'Тип на проблема'
-    ColumnURL: 'Неработещи линкове'
+    ColumnURL: Неработещи линкове
     HasBrokenFile: 'има развален файл'
     HasBrokenLink: 'има развален линк'
     HasBrokenLinkAndFile: 'има развален линк и файл'
@@ -68,99 +61,62 @@ bg:
     PUBLISHED_PAGES: 'Публикувани %d страници, %d грешки'
     PUBLISH_PAGES: Публикувай
     UNPUBLISHED_PAGES: 'Премахнати от публикация %d страници'
-    UNPUBLISH_PAGES: 'Премахни от публикация'
-  CMSFileAddController:
-    MENUTITLE: Файлове
+    UNPUBLISH_PAGES: Премахни от публикация
   CMSMain:
     ACCESS: 'Достъп до ''{title}'' секция'
     ACCESS_HELP: 'Разреши излгед на раздела съдържащ структурното дърво и съдържанието. Правата за достъп и редактиране могат да бъдат променени през падащи менюта (dropdowns), както и чрез отделни права на съдържанието'
     AddNew: 'Добави страница'
     AddNewButton: 'Добави нов бутон'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: 'Избери къде да създадеш тази страница'
     ChoosePageType: 'Избери тип на стрианицата'
     Create: Създай
     DELETE: 'Изтрий черновата и отиди на текущата публикувана страница'
     DELETEFP: Изтрии
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    EMAIL: Email
-    EditTree: 'Edit Tree'
     ListFiltered: 'Филтриран списък.'
-    MENUTITLE: 'Редактиране на страницата'
-    NEWPAGE: 'New {pagetype}'
     PAGENOTEXISTS: 'Тази страница не съществува'
     PAGES: Страници
     PAGETYPEANYOPT: Всички
-    PAGETYPEOPT: 'Тип на страницата'
     PUBALLCONFIRM: 'Публикувай всяка страница в сайта'
     PUBALLFUN: '"Публикувай всичко" функционалност'
-    PUBALLFUN2: 'Натискайки този бутон все едно, публикувате всяка страница по отделно. Идеята е тази функционалност да се използва при мащабна редакция на съдържанието, като например случая когато сайта бива първоначално попълнен.'
+    PUBALLFUN2: "Натискайки този бутон все едно, публикувате всяка страница по отделно. Идеята е тази функционалност да се използва при мащабна редакция на съдържанието, като например случая когато сайта бива първоначално попълнен."
     PUBPAGES: 'Готово. Публикувани {count} броя страници'
     PageAdded: 'успешно създадена страница'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Примахнато ''{title}'' от публикувания сайт'
     REMOVEDPAGEFROMDRAFT: 'Премахната(и) ''%s'' от черновите'
     RESTORE: Възтанови
     RESTORED: 'Успешно възтановен/а ''{title}'''
     ROLLBACK: 'Върни към тази версия'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Запис
-    SAVEDRAFT: 'Save draft'
     TabContent: Съдържание
     TabHistory: История
     TabSettings: Настройки
-    TreeFiltered: 'Filtered tree.'
     TreeFilteredClear: 'Нулирай филтъра'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Приложи филтър'
-    RESET: Reset
+    MENUTITLE: 'Редактиране на страницата'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Приложи филтър'
   CMSPageAddController:
-    MENUTITLE: 'Добави страница'
     ParentMode_child: 'Под друга страница'
     ParentMode_top: 'Най-високо ниво'
-  CMSPageEditController:
-    MENUTITLE: 'Редактиране на страницата'
+    MENUTITLE: 'Добави страница'
   CMSPageHistoryController:
     COMPAREMODE: 'Режим на сравнение (Избери два)'
     COMPAREVERSIONS: 'Сравни версиите'
-    COMPARINGVERSION: 'Comparing versions {version1} and {version2}.'
-    MENUTITLE: История
-    REVERTTOTHISVERSION: 'Върни тази версия'
     SHOWUNPUBLISHED: 'Покажи непублекуваната версия'
     SHOWVERSION: 'Покажи версията'
     VIEW: Изглед
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    VIEWINGVERSION: 'Currently viewing version {version}.'
-  CMSPageHistoryController_versions.ss:
+    MENUTITLE: История
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Автор
-    NOTPUBLISHED: Чернова
-    PUBLISHER: Автор
     UNKNOWN: Неизвестно
     WHEN: Когато
-  CMSPageSettingsController:
-    MENUTITLE: 'Редактиране на страницата'
-  CMSPagesController:
-    GalleryView: 'Изглед в галерия'
-    ListView: 'Изглед в списък'
-    MENUTITLE: Страници
-    TreeView: 'Дървовиден изглед'
-  CMSPagesController_ContentToolbar.ss:
+  CMSPagesController_ContentToolbar_ss:
     ENABLEDRAGGING: 'Drag''n''drop (теглене и пускане)'
-    MULTISELECT: 'Избиране на няколко'
-  CMSPagesController_Tools.ss:
+    MULTISELECT: Избиране на няколко
+  CMSPagesController_Tools_ss:
     FILTER: Филтър
   CMSSearch:
     FILTERDATEFROM: От
-    FILTERDATEHEADING: Дата
-    FILTERDATETO: Към
     FILTERLABELTEXT: Съдържание
-  CMSSettingsController:
-    MENUTITLE: Настройки
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Changed pages'
   CMSSiteTreeFilter_DeletedPages:
     Title: 'Всички страници, включително изтритите'
   CMSSiteTreeFilter_Search:
@@ -168,38 +124,20 @@ bg:
   ContentControl:
     NOTEWONTBESHOWN: 'Забележка: Това съобщение няма да се показва на Вашите посетители'
   ContentController:
-    ARCHIVEDSITE: 'Preview version'
     ARCHIVEDSITEFROM: 'Архивиран сайт от'
-    CMS: 'СУС (CMS)'
-    DRAFT: Draft
-    DRAFTSITE: Чернови
+    CMS: СУС (CMS)
+    DRAFTSITE: 'Чернови'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Трябва да влезете с вашата CMS парола, за да видите черновата или архивираното съдържание. <a href="%s">Натиснете тук, за да се върнете обратно към публикувания сайт.</a>'
-    Email: Email
-    INSTALL_SUCCESS: 'Installation Successful!'
     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>'
-    InstallSuccessCongratulations: 'SilverStripe has been successfully installed!'
     LOGGEDINAS: 'Влязъл като'
-    LOGIN: 'Вход'
+    LOGIN: Вход
     LOGOUT: 'Изход'
     NOTLOGGEDIN: 'Извън системата'
-    PUBLISHED: Published
     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 content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Не може да бъдат изтрити инсталационните файлове. Моля изтриите ги "на ръка"'
     VIEWPAGEIN: 'Изглед на страница в:'
   ErrorPage:
-    CODE: 'Грешка в кода'
-    DEFAULTERRORPAGECONTENT: '<p>Съжелявам, изглежда че се опитвате да влезните в страница която не съществува.</p><p>Моля проверете спелуването на адреса и опитайте отново. </p>'
-    DEFAULTERRORPAGETITLE: 'Не намерена страница'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Проблем при изпълнението на заявката.</p>'
-    DEFAULTSERVERERRORPAGETITLE: 'Грешка при сървъра'
-    DESCRIPTION: 'Специално съдържание при различни грешки (напр. "Страницата не съществува")'
-    ERRORFILEPROBLEM: 'Error opening file "{filename}" for writing. Please check file permissions.'
-    PLURALNAME: 'Error Pags'
-    SINGULARNAME: 'Error Page'
     400: '400 - Лошо Поискване'
     401: '401 - Неауторизирано'
     403: '403 - Забранено'
@@ -223,6 +161,12 @@ bg:
     503: '503 - Услугата не е налична'
     504: '504 - Gateway времето изтече'
     505: '505 - HTTP Версия не се поддържа'
+    CODE: 'Грешка в кода'
+    DEFAULTERRORPAGECONTENT: '<p>Съжелявам, изглежда че се опитвате да влезните в страница която не съществува.</p><p>Моля проверете спелуването на адреса и опитайте отново. </p>'
+    DEFAULTERRORPAGETITLE: 'Не намерена страница'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>Проблем при изпълнението на заявката.</p>'
+    DEFAULTSERVERERRORPAGETITLE: 'Грешка при сървъра'
+    DESCRIPTION: 'Специално съдържание при различни грешки (напр. "Страницата не съществува")'
   Folder:
     AddFolderButton: 'Добави папка'
     DELETEUNUSEDTHUMBNAILS: 'Изтрий неизползвани миниатури'
@@ -230,14 +174,10 @@ bg:
     UNUSEDTHUMBNAILSTITLE: 'Неизползвани миниатури'
     UploadFilesButton: 'Качи '
   LeftAndMain:
-    DELETED: Изтрито.
     PreviewButton: Изглед
-    SAVEDUP: Записано.
     STATUSPUBLISHEDSUCCESS: 'Успешно публикуван/а ''{title}'''
     SearchResults: 'Резултати от търсенето'
     VersionUnknown: Неизвестно
-  Permission:
-    CMS_ACCESS_CATEGORY: 'Достъп до CMS'
   Permissions:
     CONTENT_CATEGORY: 'Права по съдържанието'
     PERMISSIONS_CATEGORY: 'Роли и права за достъп'
@@ -246,21 +186,14 @@ bg:
     HASBEENSETUP: 'Създадена е страница за пренасочване без да има накъде да се пренасочи.'
     HEADER: 'Тази страница ще пренасочи потребители към друга страница'
     OTHERURL: 'Друг уебсайт URL'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Пренасочи към'
     REDIRECTTOEXTERNAL: 'Друг уебсайт'
     REDIRECTTOPAGE: 'Страница на вашият уебсайт'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Страница на вашият уебсайт'
   ReportAdmin:
-    MENUTITLE: 'Отчети за съдържание'
-    ReportTitle: Title
+    MENUTITLE: Отчети за съдържание
   ReportAdminForm:
     FILTERBY: 'Филтрирай по'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Давай
     SEARCH: Търси
@@ -268,7 +201,6 @@ bg:
   SideReport:
     BROKENFILES: 'Страници с несъществуващи файлове'
     BROKENLINKS: 'Страници съдържащи невалидни препратки.'
-    BROKENREDIRECTORPAGES: 'RedirectorPages pointing to deleted pages'
     BROKENVIRTUALPAGES: 'Виртуалните страници сочат към изтрити страници'
     BrokenLinksGroupTitle: 'Отчет за страници съдържащи невалидни препратки.'
     ContentGroupTitle: 'Отчети за съдържание'
@@ -277,11 +209,8 @@ bg:
     OtherGroupTitle: собственник
     ParameterLiveCheckbox: 'Провери реалния сайт'
     REPEMPTY: 'Отчетът {title}  е празен'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'За да споделиш тая страница, копирай и постави връзката по- долу'
-    ShareLink: 'Сподели линк'
   SilverStripeNavigatorLinkl:
     CloseLink: Затвори
   SiteConfig:
@@ -289,14 +218,12 @@ bg:
     EDITHEADER: 'Кой може да редактира страници по сайта?'
     EDIT_PERMISSION: 'Промяна на конфигурацията на сайта'
     EDIT_PERMISSION_HELP: 'Възможност за редакция на глобалните правила за достъп / правата на страниците, най-високо в йерархията'
-    PLURALNAME: 'Site Configs'
-    SINGULARNAME: 'Site Config'
     SITENAMEDEFAULT: 'Име на сайта'
     SITETAGLINE: 'Подзаглавие на сайта'
     SITETITLE: 'Заглавие на сайта'
     TABACCESS: Достъп
     TABMAIN: Съдържание
-    TAGLINEDEFAULT: Подзаглавие
+    TAGLINEDEFAULT: 'Подзаглавие'
     THEME: Тема
     TOPLEVELCREATE: 'Кой може да създава най-високо ниво страници?'
     VIEWHEADER: 'Кой може да достъпи страницата?'
@@ -305,16 +232,10 @@ bg:
     ACCESSHEADER: 'Кой има достъп до тази страница на моят сайт?'
     ACCESSLOGGEDIN: 'Влезнали потребители'
     ACCESSONLYTHESE: 'Само тези хора (изберете от списъка)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'Разрешавате ли коментари на тази страница?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Отмени промените в черновата'
     BUTTONCANCELDRAFTDESC: 'Изтрий черновата и отиди на текущата публикувана страница'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Премахни от публикация'
+    BUTTONUNPUBLISH: Премахни от публикация
     BUTTONUNPUBLISHDESC: 'Премахни тази страница от публикувания сайт'
     CREATED: 'Дата на създаване'
     Comments: Съдържание
@@ -323,52 +244,32 @@ bg:
     DEFAULTABOUTTITLE: 'За Нас'
     DEFAULTCONTACTCONTENT: '<p>Може да запълните тази страница със собствено съдържание, или да я изтриете и да създадете ваши собствени страници.<br /></p>'
     DEFAULTCONTACTTITLE: 'За Контакт'
-    DEFAULTHOMECONTENT: '<p>Добре дошли в SilverStripe! Това е началната страница подразбиране. Може да промените тази страница отваряйки a href="admin/">CMS системата</a>. Сега можете да влезните в <a href="http://doc.silverstripe.com">документацията на 	разработчика</a>, или започнете <a href="http://doc.silverstripe.com/doku.php?id=tutorials">уроците.</a></p'
+    DEFAULTHOMECONTENT: "<p>Добре дошли в SilverStripe! Това е началната страница подразбиране. Може да промените тази страница отваряйки a href=\"admin/\">CMS системата</a>. Сега можете да влезните в <a href=\"http://doc.silverstripe.com\">документацията на \t\nразработчика</a>, или започнете <a href=\"http://doc.silverstripe.com/doku.php?id=tutorials\">уроците.</a></p\n"
     DEFAULTHOMETITLE: Начало
-    DELETEDPAGEHELP: 'Page is no longer published'
     DELETEDPAGESHORT: Изтрит(а)
-    DEPENDENT_NOTE: 'Следните страници са зависими от тази. Това включва виртуални страници, пренасочвания и страници с линкове в съдържанието.'
-    DESCRIPTION: 'Generic content page'
     DependtPageColumnLinkType: 'Тип на връзката'
-    DependtPageColumnURL: URL
     EDITANYONE: 'Всеки, който може да влезе в CMS'
     EDITHEADER: 'Кой може да променя вътре в CMS?'
     EDITONLYTHESE: 'Само тези хора (изберете от списъка)'
-    EDITORGROUPS: Автори
+    EDITORGROUPS: 'Автори'
     EDIT_ALL_DESCRIPTION: 'Редактиране на всяка от странциите'
     EDIT_ALL_HELP: 'Възможност за редактиране на всяка страница на сайта, независимо от настройките в раздела за достъп. Изисква "Достъп до раздел" секция достъп'
     Editors: 'Групи на редактори'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Тази страница съдържа невалидни препратки.'
     HTMLEDITORTITLE: Съдържание
     INHERIT: 'Наследи от предишната в йерархията страница'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Последна промяна'
-    LINKCHANGENOTE: 'Промяната на адреса на тази страница ще окаже влияние на всичките й подстраници'
     MENUTITLE: 'Етикет на навигация'
-    METADESC: Описание
-    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
+    METADESC: 'Описание'
     METAEXTRA: 'Собствени етикети'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: 'Местонахождение на страницата'
     PAGETITLE: 'Име на страница'
     PAGETYPE: 'Вид страница'
-    PARENTID: 'Предишната в йерархията страница'
     PARENTTYPE: 'Местонахождение на страницата'
     PARENTTYPE_ROOT: 'Страница от най-високо ниво в йерархията'
-    PARENTTYPE_SUBPAGE: Подстраница
-    PERMISSION_GRANTACCESS_DESCRIPTION: 'Промени правата за достъп до съдържанието'
+    PARENTTYPE_SUBPAGE: 'Подстраница'
     PERMISSION_GRANTACCESS_HELP: 'Разреши настройката на специфични ограничения за достъп в раздела "Страници"'
-    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: 'Страницата  е публикувана, но е изтрита от черновата'
     REMOVEDFROMDRAFTSHORT: 'Изтрии от чернова'
     REMOVE_INSTALL_WARNING: 'Внимание: Изтрийте install.php от тази Silverstripe инсталация поради съображения за сигурност.'
@@ -376,61 +277,42 @@ bg:
     REORGANISE_HELP: 'Преорганизирай страниците в дървото чрез "drag&drop" (теглене и пускане)'
     SHOWINMENUS: 'Покажи в менютата?'
     SHOWINSEARCH: 'Покажи в търсене?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: Поведение
-    TABCONTENT: Съдържание
+    TABCONTENT: 'Съдържание'
     TABDEPENDENT: 'Зависими страници'
     TOPLEVEL: 'Съдържание на сайта (Top level)'
-    TOPLEVELCREATORGROUPS: 'Top level creators'
     URLSegment: 'URL - Сегмент'
-    VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'Достъп до всяка страница'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'Виж черновата'
     VIEW_DRAFT_CONTENT_HELP: 'Отнася се за преглед на страници извън CMS в режим на чернова. Полезно за външни сътрудници, без достъп на CMS.'
-    Viewers: 'Viewers Groups'
     Visibility: Видимост
     has_one_Parent: 'Предишната в йерархията страница'
     many_many_BackLinkTracking: 'Следене на "обратни линкове"'
     many_many_ImageTracking: 'Следене на снимките'
     many_many_LinkTracking: 'Следене на линовете'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Специалните символи са автоматично конвертирани или изтрити.'
-  StaticExporter:
-    BASEURL: 'Базов URL'
-    EXPORTTO: 'Експорт на тази папка'
-    NAME: 'Static exporter'
   TableListField:
     SELECT: 'Избери:'
-  TableListField.ss:
-    NOITEMSFOUND: 'No items found'
+  TableListField_ss:
     SORTASC: 'Сортирай възходящо'
     SORTDESC: 'Сортирай низходящо'
-  TableListField_PageControls.ss:
+  TableListField_PageControls_ss:
     DISPLAYING: Показани
     OF: от
-    TO: to
     VIEWFIRST: 'Преглед на първото'
     VIEWLAST: 'Преглед на последното'
     VIEWNEXT: 'Преглед на следващото'
     VIEWPREVIOUS: 'Преглед на предишното'
   TreeTools:
     DisplayLabel: 'Покажи:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Можете да достигнете архивирания сайт, чрез тази връзка'
-    HAVEASKED: 'You have asked to view the content of our site on'
   VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 'Показва съдържанието на друга страница'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Това е виртуална страница'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Виртуални страници'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Виртуална страница'
+  CMSPageEditController:
+    MENUTITLE: 'Редактиране на страницата'
+  CMSPageSettingsController:
+    MENUTITLE: 'Редактиране на страницата'
diff --git a/lang/bs.yml b/lang/bs.yml
index 4eac15f5..2aa60bb3 100644
--- a/lang/bs.yml
+++ b/lang/bs.yml
@@ -1,205 +1,21 @@
 bs:
   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: NoviDirektorij
-    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:
+  AssetAdmin_left_ss:
     GO: Idi
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
     DELETE: 'Izbriši sa privremenog nacrta stranice'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: E-mail
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Edit Page'
-    NEWPAGE: 'New {pagetype}'
     PAGENOTEXISTS: 'Ova stranica ne postoji'
-    PAGES: Pages
-    PAGETYPEANYOPT: Any
-    PAGETYPEOPT: 'Page Type'
     PUBALLCONFIRM: 'Molimo, objavite svaku stavku na ovoj stranici, kopiranjem sadržaja na aktivnu stranicu'
     PUBALLFUN: 'Funkcija "Objavi sve"'
-    PUBALLFUN2: 'Pritiskom na ovu tipku ostvarit ćete isti rezultat kao i odlaskom na svaku stranicu i pritiskom na tipku "Objavi". Namjenjena je za korištenje nakon velikih izmjena sadržaja (npr, prilikom početka izrade web stranice).'
-    PUBPAGES: 'Done: Published {count} pages'
-    PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
+    PUBALLFUN2: "Pritiskom na ovu tipku ostvarit ćete isti rezultat kao i odlaskom na svaku stranicu i pritiskom na tipku \"Objavi\". Namjenjena je za korištenje nakon velikih izmjena sadržaja (npr, prilikom početka izrade web stranice)."
     REMOVEDPAGEFROMDRAFT: 'Uklonjeno ''%s'' sa privremenog nacrta stranice'
-    RESTORE: Restore
-    RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Vrati na ovo izdanje'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Snimi
-    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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    DRAFTSITE: 'Draft Site'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Morate se prijaviti sa Vašom CMS šifrom kako biste pregledali privremeni ili arhivirani sadržaj. <a href="%s">Kliknite ovdje da biste se vratili na objavljenu stranicu.</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'
-    PUBLISHED: Published
-    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 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: 'Kod greške'
-    DEFAULTERRORPAGECONTENT: '<p>Žao nam je, pokušali ste pristupiti stranici koja ne postoji.</p><p>Molimo provjerite da li ste ispravno ukucali URL kojem ste pokušali pristupiti i pokušajte ponovo.</p>'
-    DEFAULTERRORPAGETITLE: 'Stranica nije pronađena'
-    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 - Pogrešan zahtjev'
     401: '401 - Neovlašteno'
     403: '403 - Zabranjeno'
@@ -223,214 +39,66 @@ bs:
     503: '503 - Nedostupan servis '
     504: '504 - Gateway zaustavljen'
     505: '505 - HTTP izdanje nije podržano'
+    CODE: 'Kod greške'
+    DEFAULTERRORPAGECONTENT: '<p>Žao nam je, pokušali ste pristupiti stranici koja ne postoji.</p><p>Molimo provjerite da li ste ispravno ukucali URL kojem ste pokušali pristupiti i pokušajte ponovo.</p>'
+    DEFAULTERRORPAGETITLE: 'Stranica nije pronađena'
   Folder:
-    AddFolderButton: 'Add folder'
     DELETEUNUSEDTHUMBNAILS: 'Izbriši neiskorištene sličice'
     UNUSEDFILESTITLE: 'Neiskorištene datoteke'
     UNUSEDTHUMBNAILSTITLE: 'Neiskorištene sličice'
-    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: 'Stranica za preusmjeravanje je podešena bez odredišta.'
     HEADER: 'Ova stranica će preusmjeriti korisnike na drugu stranicu'
     OTHERURL: 'URL druge web stranice'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Preusmjeri na'
     REDIRECTTOEXTERNAL: 'Drugu web stranicu'
     REDIRECTTOPAGE: 'Na stavku na Vašoj web stranici'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Stavku na Vašoj web stranici'
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Idi
     SEARCH: Pretraga
-    SearchResults: 'Search Results'
   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: 'Prazne stranice'
     LAST2WEEKS: 'Izmjenjene stranice u posljednje 2 sedmice'
-    OtherGroupTitle: Other
-    ParameterLiveCheckbox: 'Check live site'
-    REPEMPTY: 'The {title} report is empty.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   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: 'Svi korisnici'
+    ACCESSANYONE: Svi korisnici
     ACCESSHEADER: 'Ko može pregledati ovu stavku na mojoj stranici?'
     ACCESSLOGGEDIN: 'Prijavljeni korisnici'
     ACCESSONLYTHESE: 'Samo ovi korisnici (izaberite sa popisa)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'Dozvoli komentare na ovoj stranici?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Poništi promjene privremenog nacrta stranice'
     BUTTONCANCELDRAFTDESC: 'Izbrišite Vaš privremeni nacrt stranice i vratite se na trenutno objavljenu stranicu'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Opozovi objavljivanje'
+    BUTTONUNPUBLISH: Opozovi objavljivanje
     BUTTONUNPUBLISHDESC: 'Ukloni ovu stavku sa objavljene stranice'
-    CREATED: 'Date Created'
-    Comments: Comments
-    Content: Content
     DEFAULTABOUTCONTENT: '<p>Ovu stranicu možete popuniti sa vlastitim sadržajem, ili je izbrisati i kreirati svoje vlastite stranice.<br /></p>'
     DEFAULTABOUTTITLE: 'O nama'
     DEFAULTCONTACTCONTENT: '<p>Ovu stranicu možete popuniti sa vlastitim sadržajem, ili je izbrisati i kreirati svoje vlastite stranice.<br /></p>'
     DEFAULTCONTACTTITLE: 'Kontaktirajte nas'
     DEFAULTHOMECONTENT: '<p>Dobrodošli u SilverStripe! Ovo je standardna početna stranica. Možete je izmijeniti otvaranjem <a href="admin/">administracijskog odjela CMS-a</a>. Sada možete pristupiti <a href="http://doc.silverstripe.com">razvojnoj dokumentaciji</a> ili <a href="http://doc.silverstripe.com/doku.php?id=tutorials">vodičima</a>.</p>'
     DEFAULTHOMETITLE: Početna
-    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: 'Svi korisnici koji se mogu prijaviti u CMS'
     EDITHEADER: 'Ko može izmijeniti ovu stavku unutar CMS-a?'
     EDITONLYTHESE: 'Samo ovi korisnici (izaberite sa popisa)'
-    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'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Ova stranica ima neispravnih linkova.'
     HTMLEDITORTITLE: Sadržaj
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
-    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).'
+    METADESC: 'Opis'
     METAEXTRA: 'Prilagođene Meta oznake'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: 'Page location'
     PAGETITLE: 'Ime stranice'
     PAGETYPE: 'Tip stranice'
-    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: 'Prikaži u izbornicima?'
     SHOWINSEARCH: 'Prikaži u pretrazi?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: Ponašanje
-    TABCONTENT: Sadržaj
-    TABDEPENDENT: 'Dependent pages'
+    TABCONTENT: 'Sadržaj'
     TOPLEVEL: 'Sadržaj stranice (Glavni nivo)'
-    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 ''Pages'' section" 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:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
   StaticExporter:
     BASEURL: 'Osnovni URL'
     EXPORTTO: 'Izvezi u ovaj direktorij'
     NAME: 'Izvezi statični sadržaj'
-  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:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Arhiviranoj stranici možete pristupiti korištenjem ovog linka:'
     HAVEASKED: 'Zahtjevali ste pregled sadržaja naše stranice na'
   VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Ovo je virtualna stranica'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: 'Virtual Pags'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
-    SINGULARNAME: 'Virtual Page'
diff --git a/lang/ca.yml b/lang/ca.yml
index de2de0ed..c13857f8 100644
--- a/lang/ca.yml
+++ b/lang/ca.yml
@@ -1,205 +1,23 @@
 ca:
   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: NovaCarpeta
-    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:
+  AssetAdmin_left_ss:
     GO: Vés
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
     DELETE: 'Suprimeix del lloc esborrany'
-    DELETEFP: 'Suprimeix del lloc publicat'
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    EMAIL: 'Correu electrònic'
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Edit Page'
-    NEWPAGE: 'New {pagetype}'
+    DELETEFP: Suprimeix del lloc publicat
+    EMAIL: Correu electrònic
     PAGENOTEXISTS: 'Aquesta pàgina no existeix'
-    PAGES: Pages
-    PAGETYPEANYOPT: Any
-    PAGETYPEOPT: 'Page Type'
     PUBALLCONFIRM: 'Publica cada pàgina del lloc web, copiant el contingut cap a la versió publicada'
     PUBALLFUN: 'Funcionalitat de "Publica-ho tot"'
-    PUBALLFUN2: 'Prémer aquest botó farà l''equivalent a anar a cada pàgina i prémer "Publica". És pràctic d''usar quan hi ha hagut edicions massives del contingut, com ara quan el lloc web s''ha fet per primer cop.'
-    PUBPAGES: 'Done: Published {count} pages'
-    PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
+    PUBALLFUN2: "Prémer aquest botó farà l'equivalent a anar a cada pàgina i prémer \"Publica\". És pràctic d'usar quan hi ha hagut edicions massives del contingut, com ara quan el lloc web s'ha fet per primer cop."
     REMOVEDPAGEFROMDRAFT: 'S''ha suprimit  ''%s'' del lloc esborrany'
     RESTORE: Restaura
-    RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Torna a aquesta versió'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Desa
-    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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    DRAFTSITE: 'Draft Site'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Heu d''entrar amb la vostra contrasenya per a veure l''esborrany o contingut arxivat. <a href="%s">Premeu aquí per a tornar al lloc publicat.</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'
-    PUBLISHED: Published
-    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 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: 'Codi d''error'
-    DEFAULTERRORPAGECONTENT: '<p>Sembla que intenteu accedir a una pàgina que no existeix.</p><p>Si us plau, reviseu com heu escrit la URL que intenteu accedir i proveu-ho de nou.</p>'
-    DEFAULTERRORPAGETITLE: 'Pàgina no trobada'
-    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 - Mala petició'
     401: '401 - Sense autorització'
     403: '403 - Prohibit'
@@ -223,100 +41,39 @@ ca:
     503: '503 - Servei no disponible'
     504: '504 - Temps excedit de la pasarel·la'
     505: '505 - Versió HTTP no suportada'
+    CODE: 'Codi d''error'
+    DEFAULTERRORPAGECONTENT: '<p>Sembla que intenteu accedir a una pàgina que no existeix.</p><p>Si us plau, reviseu com heu escrit la URL que intenteu accedir i proveu-ho de nou.</p>'
+    DEFAULTERRORPAGETITLE: 'Pàgina no trobada'
   Folder:
-    AddFolderButton: 'Add folder'
     DELETEUNUSEDTHUMBNAILS: 'Suprimeix les miniatures no usades'
     UNUSEDFILESTITLE: 'Fitxers no usats'
     UNUSEDTHUMBNAILSTITLE: 'Miniatures no usades'
-    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: 'S''ha definit una pàgina redirectora sense cap lloc on redirigir.'
     HEADER: 'Aquesta pàgina redirigirà usuaris a una altra pàgina'
     OTHERURL: 'URL del lloc web'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Redirigeix a'
     REDIRECTTOEXTERNAL: 'Un altre lloc web'
     REDIRECTTOPAGE: 'Una pàgina del vostre lloc web'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Pàgina del vostre lloc web'
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Vés
     SEARCH: Cerca
-    SearchResults: 'Search Results'
   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: 'Pàgines buides'
     LAST2WEEKS: 'Pàgines editades les dues darreres setmanes'
-    OtherGroupTitle: Other
-    ParameterLiveCheckbox: 'Check live site'
-    REPEMPTY: 'The {title} report is empty.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   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: Qualsevol
     ACCESSHEADER: 'Qui pot veure aquesta pàgina al meu lloc web?'
     ACCESSLOGGEDIN: 'Usuaris connectats'
     ACCESSONLYTHESE: 'Només aquesta gent (trieu de la llista)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'Permet comentaris en aquesta pàgina?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancel·la els canvis de l''esborrany'
     BUTTONCANCELDRAFTDESC: 'Suprimeix el vostre esborrany i reverteix a la pàgina actualment publicada'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Despublica
     BUTTONUNPUBLISHDESC: 'Suprimeix aquesta pàgina del lloc publicat'
-    CREATED: 'Date Created'
     Comments: Comentaris
     Content: Contingut
     DEFAULTABOUTCONTENT: '<p>Podeu omplir aquesta pàgina amb el vostre propi contingut, o eliminar-la i crear les vostres pròpies pàgines.<br/></p>'
@@ -325,112 +82,43 @@ ca:
     DEFAULTCONTACTTITLE: 'Contacteu amb nosaltres'
     DEFAULTHOMECONTENT: '<p>Benvingut a SilverStripe! Aquesta és la portada per defecte. Podeu editar aquesta pàgina obrint <a href="admin/">el SGC</a>. Podeu accedir a la <a href="http://doc.silverstripe.com">documentació del desenvolupador</a>, o començar <a href="http://doc.silverstripe.com/doku.php?id=tutorials">els tutorials.</a></p>'
     DEFAULTHOMETITLE: Portada
-    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: 'Qualsevol que pot entrar al SGC'
     EDITHEADER: 'Qui pot editar-la des del SGC?'
     EDITONLYTHESE: 'Només aquesta gent (trieu d''una llista)'
-    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: 'Grups d''editors'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Aquesta pàgina té enllaços trencats'
     HTMLEDITORTITLE: Contingut
     INHERIT: 'Hereda de la pàgina pare'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
-    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).'
+    METADESC: 'Descripció'
     METAEXTRA: 'Etiquetes Meta personalitzades'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: 'Page location'
     PAGETITLE: 'Nom de la pàgina'
     PAGETYPE: 'Tipus de pàgina'
-    PARENTID: 'Parent page'
-    PARENTTYPE: 'Page location'
-    PARENTTYPE_ROOT: 'Top-level page'
-    PARENTTYPE_SUBPAGE: 'Sub-page underneath a parent page'
     PERMISSION_GRANTACCESS_DESCRIPTION: 'Controla quins grups poden accedir o editar certes pàgines'
-    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: 'Mostra als menús?'
     SHOWINSEARCH: 'Mostra en cerques?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: Comportament
-    TABCONTENT: Contingut
-    TABDEPENDENT: 'Dependent pages'
+    TABCONTENT: 'Contingut'
     TOPLEVEL: 'Contingut del lloc (Nivell principal)'
-    TOPLEVELCREATORGROUPS: 'Top level creators'
     URLSegment: 'Segment URL'
-    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 ''Pages'' section" 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: 'Grups de visitadors'
-    Visibility: Visibility
     has_one_Parent: 'Pàgina pare'
     many_many_BackLinkTracking: 'Seguiment d''enllaços retroactius'
     many_many_ImageTracking: 'Seguiment d''imatges'
     many_many_LinkTracking: 'Seguiment d''enllaços'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
   StaticExporter:
     BASEURL: 'URL Base'
     EXPORTTO: 'Exporta a aquella carpeta'
     NAME: 'Exportador estàtic'
-  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
+  TableListField_PageControls_ss:
     VIEWFIRST: 'Veure el primer'
     VIEWLAST: 'Veure el darrer'
     VIEWNEXT: 'Veure el següent'
     VIEWPREVIOUS: 'Veure l''anterior'
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Podeu accedir al lloc arxivat en aquesta adreça:'
     HAVEASKED: 'Heu demanat de veure el contingut del nostre lloc el'
   VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Aquesta és una pàgina virtual'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Pàgines virtuals'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Pàgina virtual'
diff --git a/lang/cs.yml b/lang/cs.yml
index d648319f..1da927d1 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -5,22 +5,17 @@ cs:
     AppCategoryArchive: Archív
     AppCategoryAudio: Zvuk
     AppCategoryDocument: Dokument
-    AppCategoryFlash: Flash
     AppCategoryImage: Obrázek
-    AppCategoryVideo: Video
     BackToFolder: 'Zpět na složku'
-    CREATED: Datum
     CurrentFolderOnly: 'Omezit na aktuální složku?'
-    DetailsView: Detaily
     FILES: Soubory
     FILESYSTEMSYNC: 'Synchronizovat soubory'
     FILESYSTEMSYNCTITLE: 'Aktualizace záznamů souborů databáze CMS na souborovém systému. Užitečné, když byly nové soubory nahrány mimo CMS, např. přes FTP.'
     FROMTHEINTERNET: 'Z internetu'
     FROMYOURCOMPUTER: 'Z vašeho počítače'
     Filetype: 'Typ souboru'
-    ListView: Seznam
-    MENUTITLE: Soubory
-    NEWFOLDER: 'Nová složka'
+    ListView: 'Seznam'
+    NEWFOLDER: Nová složka
     SIZE: Velikost
     THUMBSDELETED: '{count} nepoužitých miniatur bylo smazáno'
     TreeView: 'Zobrazit strom'
@@ -29,12 +24,12 @@ cs:
     TITLE: 'Smazat složky'
   AssetAdmin_Tools:
     FILTER: Filtr
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Proveď
   AssetTableField:
     BACKLINKCOUNT: 'Použito na:'
     PAGES: stránka(y)
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Zpět
   BrokenLinksReport:
     Any: Jakékoliv
@@ -45,7 +40,6 @@ cs:
     ColumnDateLastModified: 'Datum poslední změny'
     ColumnDateLastPublished: 'Datum posledního zveřejnění'
     ColumnProblemType: 'Problém typu'
-    ColumnURL: URL
     HasBrokenFile: 'porušen soubor'
     HasBrokenLink: 'porušen odkaz'
     HasBrokenLinkAndFile: 'porušen odkaz a soubor'
@@ -69,26 +63,21 @@ cs:
     PUBLISH_PAGES: Zveřejnit
     UNPUBLISHED_PAGES: 'Nezveřejněných %d stránek'
     UNPUBLISH_PAGES: Nezveřejnit
-  CMSFileAddController:
-    MENUTITLE: Soubory
   CMSMain:
     ACCESS: 'Přístup k ''{title}'' sekci'
     ACCESS_HELP: 'Povolit prohlížení sekce obsahující strukturu a obsah webu. Oprávnění na prohlížení a úpravu mohou být nastavena skrze menu pro samostatnou stránku, také jako jednotlivé oprávnění pro obsah.'
     AddNew: 'Přidat novou stránku'
     AddNewButton: 'Přidat nový'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: 'Vyberte, kde vytvořit tuto stránku'
     ChoosePageType: 'Vyberte typ stránky'
     Create: Vytvořit
     DELETE: 'Smazat koncept'
-    DELETEFP: 'Smazat z publikovaných stránek'
+    DELETEFP: Smazat z publikovaných stránek
     DESCREMOVED: 'a {count} potomků'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    EMAIL: Email
+    DUPLICATED: 'Duplikováno ''{title}'' úspěšně'
+    DUPLICATEDWITHCHILDREN: 'Duplikováno ''{title}'' a potomci úspěšně'
     EditTree: 'Upravit strom'
     ListFiltered: 'Filtrovaný seznam.'
-    MENUTITLE: 'Upravit stránku'
     NEWPAGE: 'Nová {pagetype}'
     PAGENOTEXISTS: 'Tato stránka neexistuje'
     PAGES: Stránky
@@ -96,110 +85,87 @@ cs:
     PAGETYPEOPT: 'Typ stránky'
     PUBALLCONFIRM: 'Prosím zveřejněte veškeré stránky z úschovny'
     PUBALLFUN: 'Funkce "Publikovat vše"'
-    PUBALLFUN2: 'Stisknutí tohoto tlačítka se rovná zveřejnění každé jednotlivé stránky. Toto tlačítko má být použito, pokud se vyskytly rozsáhlé úpravy obsahu, jako např. když poprvé sestavujete stránky.'
+    PUBALLFUN2: "Stisknutí tohoto tlačítka se rovná zveřejnění každé jednotlivé stránky. Toto tlačítko má být použito, pokud se vyskytly rozsáhlé úpravy obsahu, jako např. když poprvé sestavujete stránky."
     PUBPAGES: 'Hotovo: Zveřejněno {count} stránek'
     PageAdded: 'Stránka vytvořena úspěšně'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
+    REMOVED: 'Smazáno ''{title}''{description} z webu'
     REMOVEDPAGE: 'Odstraněno ''{title}'' ze zveřejněného webu'
     REMOVEDPAGEFROMDRAFT: 'Odstraněno ''%s'' z konceptu webu'
     RESTORE: Obnovit
     RESTORED: 'Obnoveno ''{title}'' úspěšně'
     ROLLBACK: 'Vrátit se zpět na tuto verzi'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
+    ROLLEDBACKPUBv2: 'Vráceno zpět na zveřejněnou verzi.'
+    ROLLEDBACKVERSIONv2: 'Vráceno zpět na verzi #%d.'
     SAVE: Uložit
-    SAVEDRAFT: 'Save draft'
+    SAVEDRAFT: 'Uložit koncept'
     TabContent: Obsah
     TabHistory: Historie
     TabSettings: Nastavení
     TreeFiltered: 'Filtrovaný strom.'
     TreeFilteredClear: 'Vyčistit filtr'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Použít filtr'
+    MENUTITLE: 'Upravit stránku'
+    AddPageRestriction: 'Poznámka: Některé typy stránek nejsou povoleny při tomto výběru'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Použít filtr'
     RESET: Resetovat
   CMSPageAddController:
-    MENUTITLE: 'Přidat stránku'
     ParentMode_child: 'Pod jinou stránku'
     ParentMode_top: 'Nejvyšší úroveň'
-  CMSPageEditController:
-    MENUTITLE: 'Upravit stránku'
+    MENUTITLE: 'Přidat stránku'
   CMSPageHistoryController:
-    COMPAREMODE: 'Mód porovnání (vyberte dva)'
-    COMPAREVERSIONS: 'Porovnat verze'
     COMPARINGVERSION: 'Porovnání verzí {version1} a {version2}.'
-    MENUTITLE: Historie
     REVERTTOTHISVERSION: 'Zpět na tuto verzi'
     SHOWUNPUBLISHED: 'Zobrazit nezveřejněné verze'
     SHOWVERSION: 'Zobrazit verzi'
     VIEW: zobrazit
-    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Právě prohlížíte verzi číslo {version}.'
-  CMSPageHistoryController_versions.ss:
+    VIEWINGLATEST: 'Právě se zobrazuje poslední verze.'
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Autor
-    NOTPUBLISHED: Nezveřejněno
+    NOTPUBLISHED: 'Nezveřejněno'
     PUBLISHER: Vydavatel
     UNKNOWN: Neznámý
     WHEN: Když
-  CMSPageSettingsController:
-    MENUTITLE: 'Editovat stránku'
   CMSPagesController:
-    GalleryView: Galerie
-    ListView: Seznam
     MENUTITLE: Stránky
-    TreeView: Strom
-  CMSPagesController_ContentToolbar.ss:
+  CMSPagesController_ContentToolbar_ss:
     ENABLEDRAGGING: 'Táhni a pusť'
-    MULTISELECT: 'Multi výběr'
-  CMSPagesController_Tools.ss:
+    MULTISELECT: Multi výběr
+  CMSPagesController_Tools_ss:
     FILTER: Filtr
   CMSSearch:
     FILTERDATEFROM: Od
     FILTERDATEHEADING: Datum
     FILTERDATETO: Do
     FILTERLABELTEXT: Obsah
-  CMSSettingsController:
-    MENUTITLE: Možnosti
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Změněné stránky'
   CMSSiteTreeFilter_DeletedPages:
     Title: 'Všechny stránky, včetně odstraněných'
-  CMSSiteTreeFilter_Search:
-    Title: 'Všechny stránky'
   ContentControl:
     NOTEWONTBESHOWN: 'Poznámka: tato zpráva nebude zobrazena vašim návštěvníkům'
   ContentController:
     ARCHIVEDSITE: 'Náhled verze'
     ARCHIVEDSITEFROM: 'Archivován web z'
-    CMS: CMS
-    DRAFT: Draft
     DRAFTSITE: 'Koncept webu'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Abyste mohli prohlížet archiv nebo koncepty, musíte být přihlášeni se svým CMS heslem. <a href="%s">Klikněte sem pro návrat na zveřejněné stránky.</a>'
-    Email: Email
     INSTALL_SUCCESS: 'Instalace úspěšná!'
     InstallFilesDeleted: 'Instalační soubory byly odstraněny úspěšně.'
     InstallSecurityWarning: 'Z bezpečnostních důvodů byste měli nyní odstranit instalační soubory, pokud se nechystáte přeinstalovat později (<em>vyžaduje admin přihlášení, viz výše </em>). Webový server nyní potřebuje pouze přístup pro zápis do složky "assets", můžete odstranit práva zápisu ze všech ostatních složek. <a href="{link}" style="text-align: center;"> Klikněte sem pro smazání instalačních souborů.</a>'
     InstallSuccessCongratulations: 'SilverStripe byl nainstalován úspěšně!'
     LOGGEDINAS: 'Přihlášen jako'
     LOGIN: Přihlášení
-    LOGOUT: Odhlášení
+    LOGOUT: 'Odhlášení'
     NOTLOGGEDIN: 'Není přihlášen'
-    PUBLISHED: Published
     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: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
+    StartEditing: 'Můžete začít editovat váš obsah 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:'
+    DRAFT: Koncept
+    PUBLISHED: Zveřejněno
   ErrorPage:
-    CODE: 'Chybový kód'
-    DEFAULTERRORPAGECONTENT: '<p>Omlouváme se, zdá se, že jste se pokoušeli o přístup na stránku, která neexistuje.</p><p>Zkontrolujte prosím pravopis požadované URL adresy, ke které jste se pokoušeli přistoupit a zkuste to znovu.</p>'
-    DEFAULTERRORPAGETITLE: 'Stránka nenelazena'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Je nám to líto, ale nastal problém se zpracováním Vašeho poždavku.</p>'
-    DEFAULTSERVERERRORPAGETITLE: 'Chyba serveru'
-    DESCRIPTION: 'Vlastní obsah pro různé případy chyb (např. "Stránka nenalezena")'
-    ERRORFILEPROBLEM: 'Chyba otevření souboru "{filename}" pro zápis. Zkontrolujte oprávnění souboru, prosím.'
-    PLURALNAME: 'Chybové stránky'
-    SINGULARNAME: 'Chybová stránka'
     400: '400 - Špatný požadavek'
     401: '401 - Neautorizováno'
     403: '403 - Zakázáno'
@@ -223,15 +189,20 @@ cs:
     503: '503 - Nedostupná služba'
     504: '504 - Vypršel čas Gateway'
     505: '505 - HTTP verze není podporována'
+    CODE: 'Chybový kód'
+    DEFAULTERRORPAGECONTENT: '<p>Omlouváme se, zdá se, že jste se pokoušeli o přístup na stránku, která neexistuje.</p><p>Zkontrolujte prosím pravopis požadované URL adresy, ke které jste se pokoušeli přistoupit a zkuste to znovu.</p>'
+    DEFAULTERRORPAGETITLE: 'Stránka nenelazena'
+    DESCRIPTION: 'Vlastní obsah pro různé případy chyb (např. "Stránka nenalezena")'
+    ERRORFILEPROBLEM: 'Chyba otevření souboru "{filename}" pro zápis. Zkontrolujte oprávnění souboru, prosím.'
+    PLURALNAME: 'Chybové stránky'
+    SINGULARNAME: 'Chybová stránka'
   Folder:
-    AddFolderButton: 'Přidat složku'
     DELETEUNUSEDTHUMBNAILS: 'Smazat nepoužité miniatury'
     UNUSEDFILESTITLE: 'Nepoužité soubory'
     UNUSEDTHUMBNAILSTITLE: 'Nepoužité miniatury'
     UploadFilesButton: Nahrát
   LeftAndMain:
     DELETED: Smazáno.
-    PreviewButton: Náhled
     SAVEDUP: Uloženo.
     STATUSPUBLISHEDSUCCESS: 'Publikováno ''{title}'' úspěšně'
     SearchResults: 'Výsledky hledání'
@@ -242,7 +213,6 @@ cs:
     CONTENT_CATEGORY: 'Oprávnění obsahu'
     PERMISSIONS_CATEGORY: 'Role a přístupová práva'
   RedirectorPage:
-    DESCRIPTION: 'Přesměrovat na jinou interní stránku'
     HASBEENSETUP: 'Přesměrovací stránka byla nastavena bez cíle.'
     HEADER: 'Tato stránka přesměruje uživatele na jinou stránku'
     OTHERURL: 'Jiná web adresa'
@@ -253,14 +223,10 @@ cs:
     SINGULARNAME: 'Přesměrovací stránka'
     YOURPAGE: 'Stránka na vašem webu'
   ReportAdmin:
-    MENUTITLE: Výkazy
     ReportTitle: Titulek
+    MENUTITLE: Výkazy
   ReportAdminForm:
     FILTERBY: 'Filtrovat dle'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Hledat
     SEARCH: Hledat
@@ -277,8 +243,6 @@ cs:
     OtherGroupTitle: Jiné
     ParameterLiveCheckbox: 'Zkontrolovat web'
     REPEMPTY: '{title} výkaz je prázdný.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'K sdílení této stránky, odkaz zkopírujte a vložte dolů.'
     ShareLink: 'Sdílet odkaz'
@@ -311,12 +275,9 @@ cs:
     APPEARSVIRTUALPAGES: 'Tento obsah se také zobrazí na virtuálních stránkáchy v sekcích {title}.'
     BUTTONCANCELDRAFT: 'Zrušit změny v konceptu'
     BUTTONCANCELDRAFTDESC: 'Odstranit koncept a vrátit se k aktuálně zveřejněné stránce'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
+    BUTTONSAVEPUBLISH: 'Uložit & zveřehnit'
     BUTTONUNPUBLISH: Nezveřejňovat
     BUTTONUNPUBLISHDESC: 'Odstranit tuto stránku z publikovaných na webu'
-    CREATED: 'Datum vytvoření'
     Comments: Komentáře
     Content: Obsah
     DEFAULTABOUTCONTENT: '<p>Můžete tuto stránku vyplnit vlastním obsahem, nebo ji smazat a vytvořit si vlastní stránky. <br /> </p>'
@@ -324,13 +285,11 @@ cs:
     DEFAULTCONTACTCONTENT: '<p>Můžete tuto stránku vyplnit vlastním obsahem, nebo ji smazat a vytvořit si vlastní stránky. <br /> </p>'
     DEFAULTCONTACTTITLE: 'Kontaktujte nás'
     DEFAULTHOMECONTENT: '<p>Vítejte v CMS SilverStripe! Toto je úvodní stránka. Tuto i jiné stránky můžete změnit <a href="admin/">přihlášením do systému</a>. Můžete také navštívit <a href="http://doc.silverstripe.com">vývojářskou dokumentaci (EN)</a>, nebo <a href="http://doc.silverstripe.com/doku.php?id=tutorials">návody (EN)</a></p>'
-    DEFAULTHOMETITLE: 'Úvodní strana'
+    DEFAULTHOMETITLE: Úvodní strana
     DELETEDPAGEHELP: 'Stránka už není více zveřejněna'
-    DELETEDPAGESHORT: Smazáno
     DEPENDENT_NOTE: 'Následující stránky závisí na této stránce. Tyto obsahují virtuální stránky, přesměrovací stránky a stránky s odkazy obsahu.'
     DESCRIPTION: 'Obecný obsah stránky'
     DependtPageColumnLinkType: 'Typ odkazu'
-    DependtPageColumnURL: URL
     EDITANYONE: 'Kdokoliv, kdo se do CMS může přihlásit'
     EDITHEADER: 'Kdo může tuto stránku editovat?'
     EDITONLYTHESE: 'Jenom tito lidé (vyberte ze seznamu)'
@@ -338,25 +297,18 @@ cs:
     EDIT_ALL_DESCRIPTION: 'Může editovat jakoukoli stránku webu, obcházeje bezpečnostní specifikaci stránky'
     EDIT_ALL_HELP: 'Možnost upravit libovolnou stránku na webu, bez ohledu na nastavení na kartě Přístup. Vyžaduje povolení "Přístup k sekci ''Stránky''"'
     Editors: 'Skupiny editorů'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Tato stránka obsahuje neplatné odkazy.'
     HTMLEDITORTITLE: Obsah
     INHERIT: 'Zděděno po rodičovské stránce'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Poslední změna'
     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
+    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'
     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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
+    OBSOLETECLASS: 'Tato stránka je zastaralého typu {type}. Uložení zpúsobí zrušení svého typu a múžete tak ztratit data'
     PAGELOCATION: 'Umístění stránky'
     PAGETITLE: 'Název stránky'
     PAGETYPE: 'Typ stránky'
@@ -378,14 +330,14 @@ cs:
     SHOWINSEARCH: 'Zobrazovat ve vyhledávání?'
     SINGULARNAME: Stránka
     TABBEHAVIOUR: Chování
-    TABCONTENT: Obsah
+    TABCONTENT: 'Obsah'
     TABDEPENDENT: 'Závislé stránky'
     TOPLEVEL: 'Obsah Webu (Nejvyšší úroveň)'
     TOPLEVELCREATORGROUPS: 'Tvůrci nejvyšší úrovně'
     URLSegment: 'Segment URL'
     VIEWERGROUPS: 'Prohlížeč skupin'
     VIEW_ALL_DESCRIPTION: 'Může vidět jakoukoli stránku webu, obcházeje bezpečnostní specifikaci stránky'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
+    VIEW_ALL_HELP: 'Možnost zobrazit libovolnou stránku na webu, bez ohledu na nastevení kartě Přístup. Vyžaduje povolení "Přístup k  sekci ''Stránky''"'
     VIEW_DRAFT_CONTENT: 'Zobrazit obsah konceptu'
     VIEW_DRAFT_CONTENT_HELP: 'Vztahuje se na prohlížení stránek mimo CMS, v koncept módu. Užitečné pro externí spolupracovníky bez přístupu do CMS.'
     Viewers: 'Skupiny návštěvníků'
@@ -394,20 +346,27 @@ cs:
     many_many_BackLinkTracking: 'Stopování zpětných odkazů'
     many_many_ImageTracking: 'Stopování obrázku'
     many_many_LinkTracking: 'Stopování odkazu'
+    BUTTONPUBLISHED: Zveřejněno
+    BUTTONSAVED: Uloženo
+    GroupPlaceholder: 'Klikni pro vybrání skupiny'
+    LASTPUBLISHED: 'Posledně zveřejněno'
+    LASTSAVED: 'Posledně uloženo'
+    MoreOptions: 'Více voleb'
+    NOTPUBLISHED: 'Nezveřejněno'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Zvláštní znaky jsou automaticky zkonvertovány nebo odstraněny'
+    EMPTY: 'Zadejte prosím URL segment nebo klikněte zrušit'
   StaticExporter:
     BASEURL: 'Základní URL'
     EXPORTTO: 'Exportovat do této složky'
     NAME: 'Statický exportér'
   TableListField:
     SELECT: 'Vybrat:'
-  TableListField.ss:
+  TableListField_ss:
     NOITEMSFOUND: 'Nenalezeny žádné záznamy'
     SORTASC: 'Třídit v vzestupném pořadí'
     SORTDESC: 'Třídit v sestupném pořadí'
-  TableListField_PageControls.ss:
+  TableListField_PageControls_ss:
     DISPLAYING: Zobrazuji
     OF: z
     TO: do
@@ -417,20 +376,34 @@ cs:
     VIEWPREVIOUS: 'Zobrazit předchozí'
   TreeTools:
     DisplayLabel: 'Zobrazení:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Můžete přistupovat k archivu pomocí tohoto odkazu:'
     HAVEASKED: 'Požadovali jste prohlížet obsah našich stránek během'
   VirtualPage:
-    CHOOSE: 'Linked Page'
+    CHOOSE: 'Odkazovaná stránka'
     DESCRIPTION: 'Zobrazit obsah jiné stránky'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
+    EDITCONTENT: 'Editovat obsah na odkazované stránce'
     HEADER: 'Toto je virtuální stránka'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Virtuální stránky'
     PageTypNotAllowedOnRoot: 'Původní stránka typu "{type}" není povolena na nejvyšší úrovni pro tuto virtuální stránku'
     SINGULARNAME: 'Virtuální stránka'
+    EditLink: editovat
+    HEADERWITHLINK: 'Toto je virtuální stránka, kopíruje se obsah z "{title}" ({link})'
+  CMSFileAddController:
+    MENUTITLE: Soubory
+  CMSPageEditController:
+    MENUTITLE: 'Upravit stránku'
+  CMSPageSettingsController:
+    MENUTITLE: 'Editovat stránku'
+  CMSSettingsController:
+    MENUTITLE: Možnosti
+  SITETREE:
+    VIRTUALPAGEDRAFTWARNING: 'Zveřejněte prosím odkazovanou stránku pro zveřejnění virtuální stránky'
+    VIRTUALPAGEWARNING: 'Zvolte prosím odkazovanou stránku a předem uložte před zveřejněním této stránky'
+    VIRTUALPAGEWARNINGSETTINGS: 'Zvolte prosím odkazovanou stránku v polích hlavního obsahu pro zveřejnění'
+  SilverStripeNavigator:
+    ARCHIVED: Archivováno
+  URLSegmentField:
+    Cancel: Storno
+    Edit: Editovat
+    OK: Ok
diff --git a/lang/da.yml b/lang/da.yml
index a6be4219..aaffeac4 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -4,10 +4,7 @@ da:
     ActionAdd: 'Tilføj mappe'
     AppCategoryArchive: Arkiv
     AppCategoryAudio: Lyd
-    AppCategoryDocument: Document
-    AppCategoryFlash: Flash
     AppCategoryImage: Billeder
-    AppCategoryVideo: Video
     BackToFolder: 'Tilbage til mappen'
     CREATED: Dato
     CurrentFolderOnly: 'Begræns til den nuværende mappe'
@@ -17,40 +14,35 @@ da:
     FILESYSTEMSYNCTITLE: 'Opdater poster over filer i filsystemet i CMS-databasen. Dette kan være nyttigt når nye filer er blevet overført uden for CMS, f.eks. via FTP.'
     FROMTHEINTERNET: 'Fra internettet'
     FROMYOURCOMPUTER: 'Fra din computer'
-    Filetype: Filtype
-    ListView: Listevisning
-    MENUTITLE: Filer
-    NEWFOLDER: 'Ny mappe'
+    Filetype: 'Filtype'
+    ListView: 'Listevisning'
+    NEWFOLDER: Ny mappe
     SIZE: Størrelse
     THUMBSDELETED: '{count} ubrugte miniaturer er blevet slettet'
-    TreeView: Trævisning
+    TreeView: 'Trævisning'
     Upload: Overfør
+    MENUTITLE: Filer
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Slet mapper'
-  AssetAdmin_Tools:
-    FILTER: Filter
-  AssetAdmin_left.ss:
-    GO: Go
   AssetTableField:
     BACKLINKCOUNT: 'Brugt på:'
     PAGES: side(r)
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Tilbage
   BrokenLinksReport:
     Any: Alle
     BROKENLINKS: 'Rapport over brudte links'
     CheckSite: 'Undersøg websted'
-    CheckSiteDropdownDraft: Kladdeside
+    CheckSiteDropdownDraft: 'Kladdeside'
     CheckSiteDropdownPublished: 'Udgivet side'
     ColumnDateLastModified: 'Dato for seneste ændring'
     ColumnDateLastPublished: 'Dato for seneste udgivelse'
-    ColumnProblemType: Problemtype
-    ColumnURL: URL
+    ColumnProblemType: 'Problemtype'
     HasBrokenFile: 'har en ødelagt fil'
     HasBrokenLink: 'har et dårligt link'
     HasBrokenLinkAndFile: 'har et dårligt link og en ødelagt fil'
     HoverTitleEditPage: 'Rediger siden'
-    PageName: Sidenavn
+    PageName: 'Sidenavn'
     ReasonDropdown: 'Problem der skal undersøges'
     ReasonDropdownBROKENFILE: 'Ødelagt fil'
     ReasonDropdownBROKENLINK: 'Dårligt link'
@@ -69,96 +61,79 @@ da:
     PUBLISH_PAGES: Publisér
     UNPUBLISHED_PAGES: 'U-publiserede %d sider'
     UNPUBLISH_PAGES: U-publisér
-  CMSFileAddController:
-    MENUTITLE: Filer
   CMSMain:
     ACCESS: 'Adgang til ''{title}'' sektionen'
     ACCESS_HELP: 'Tillad visning af den sektion, som indeholder sidetræet og indhold. Visnings- og redigeringstilladelser kan håndteres gennem sidespecifikke rullemenuer, såvel som de enkelte "Inholdstilladelser".'
     AddNew: 'Tilføj ny side'
     AddNewButton: 'Tilføj ny'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: 'Vælg hvor denne side skal oprettes'
     ChoosePageType: 'Vælg sidetype'
     Create: Opret
     DELETE: 'Slet fra fra udkast-sitet'
     DELETEFP: Slet
     DESCREMOVED: 'og {count} efterkommere'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    EMAIL: Email
     EditTree: 'Rediger sidetræ'
     ListFiltered: 'Filtreret liste.'
-    MENUTITLE: 'Rediger side'
     NEWPAGE: 'Ny {pagetype}'
     PAGENOTEXISTS: 'Denne side eksisterer ikke'
     PAGES: Sider
     PAGETYPEANYOPT: Enhver
-    PAGETYPEOPT: Sidetype
+    PAGETYPEOPT: 'Sidetype'
     PUBALLCONFIRM: 'Udgiv alle sider på sitet. Kopierer indhold fra kladde til offentlig'
     PUBALLFUN: '"Udgiv alle" funktionalitet'
-    PUBALLFUN2: 'Hvis du trykker på denne knap, svarer det til at gå til hver enkel side og vælge udgiv. Det er hensigten at denne funktion benyttes når der er blevet lavet mange ændringer på flere sider, som f.eks da websitet blev påbegyndt.'
+    PUBALLFUN2: "Hvis du trykker på denne knap, svarer det til at gå til hver enkel side og vælge udgiv. Det er hensigten at denne funktion benyttes når der er blevet lavet mange ændringer på flere sider, som f.eks da websitet blev påbegyndt."
     PUBPAGES: 'Færdig: Udgav {count} sider'
     PageAdded: 'Siden blev oprettet med succes'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Fjernede ''{title}'' fra den udgivne side'
     REMOVEDPAGEFROMDRAFT: '''%s''  fjernet fra udkast-sitet'
     RESTORE: Genskab
     RESTORED: 'Genskabte ''{title}'' korrekt'
     ROLLBACK: 'Rul tilbage til denne version'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Gem
-    SAVEDRAFT: 'Save draft'
     TabContent: Indhold
     TabHistory: Historik
     TabSettings: Indstillinger
     TreeFiltered: 'Filtreret sidetræ.'
     TreeFilteredClear: 'Nulstil filter'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Anvend filter'
+    MENUTITLE: 'Rediger side'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Anvend filter'
     RESET: Nulstil
   CMSPageAddController:
-    MENUTITLE: 'Tilføj side'
     ParentMode_child: 'Under en anden side'
     ParentMode_top: 'Højeste niveau'
-  CMSPageEditController:
-    MENUTITLE: 'Rediger side'
+    MENUTITLE: 'Tilføj side'
   CMSPageHistoryController:
     COMPAREMODE: 'Sammenligningstilstand (vælg to)'
     COMPAREVERSIONS: 'Sammenlign versioner'
     COMPARINGVERSION: 'Sammenligner versionerne {version1} og {version2}.'
-    MENUTITLE: Historik
     REVERTTOTHISVERSION: 'Genskab denne version'
     SHOWUNPUBLISHED: 'Vis versioner der ikke er udgivne'
     SHOWVERSION: 'Vis version'
     VIEW: Visning
-    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Lige nu vises version {version}.'
-  CMSPageHistoryController_versions.ss:
+    MENUTITLE: Historik
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Forfatter
     NOTPUBLISHED: 'Ikke udgivet'
     PUBLISHER: Udgiver
     UNKNOWN: Ukendt
     WHEN: Hvornår
-  CMSPageSettingsController:
-    MENUTITLE: 'Rediger side'
   CMSPagesController:
-    GalleryView: Gallerivisning
-    ListView: Listevisning
+    GalleryView: 'Gallerivisning'
+    ListView: 'Listevisning'
     MENUTITLE: Sider
-    TreeView: Trævisning
-  CMSPagesController_ContentToolbar.ss:
+    TreeView: 'Trævisning'
+  CMSPagesController_ContentToolbar_ss:
     ENABLEDRAGGING: 'Træk&slip'
     MULTISELECT: Multivalg
-  CMSPagesController_Tools.ss:
+  CMSPagesController_Tools_ss:
     FILTER: Filtre
   CMSSearch:
     FILTERDATEFROM: Fra
     FILTERDATEHEADING: Dato
     FILTERDATETO: Til
     FILTERLABELTEXT: Indhold
-  CMSSettingsController:
-    MENUTITLE: Indstillinger
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Ændrede sider'
   CMSSiteTreeFilter_DeletedPages:
@@ -168,61 +143,27 @@ da:
   ContentControl:
     NOTEWONTBESHOWN: 'Bemærk: denne besked bliver ikke vist til dine besøgende '
   ContentController:
-    ARCHIVEDSITE: 'Preview version'
     ARCHIVEDSITEFROM: 'Arkiveret side fra'
-    CMS: CMS
-    DRAFT: Draft
-    DRAFTSITE: Kladdeside
+    DRAFTSITE: 'Kladdeside'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Du skal være logget ind med din CMS adgangskode for se indhold af kladder eller arkiv. <a href="%s">Klik her for at komme tilbage til den udgivne side.</a>'
-    Email: Email
-    INSTALL_SUCCESS: 'Installation Successful!'
     InstallFilesDeleted: 'Installationsfilerne blev slettet korrekt.'
     InstallSecurityWarning: 'Af sikkerhedmæssige årsager bør du slette installationsfilerne, medmindre du planlægger at installere igen på et senere tidspunkt (<em>kræver admin login, se det ovenstående</em>). Webserveren behøver også kun skriverettigheder til mappen "assets", du kan fjerne skriverettigheder til alle de andre mapper. <a href="{link}" style="text-align: center;">Klik her for at slette installationsfilerne.</a>'
-    InstallSuccessCongratulations: 'SilverStripe has been successfully installed!'
     LOGGEDINAS: 'Logget på som'
-    LOGIN: 'Log ind'
+    LOGIN: Log ind
     LOGOUT: 'Log ud'
     NOTLOGGEDIN: 'Ikke logget ind'
-    PUBLISHED: Published
     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 content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Var ikke i stand til at slette installationsfilerne. Slet venligst filerne herunder manuelt.'
     VIEWPAGEIN: 'Vis side i:'
   ErrorPage:
-    CODE: Fejlkode
+    CODE: 'Fejlkode'
     DEFAULTERRORPAGECONTENT: '<p>Det lader til at du har forsøgt at få vist en side som ikke findes</p><p>Undersøg venligst om URL''en er korrekt stavet og forsøg derefter igen.</p>'
     DEFAULTERRORPAGETITLE: 'Siden blev ikke fundet'
     DEFAULTSERVERERRORPAGECONTENT: '<p>Der opstod desværre et problem med at håndtere din forespørgsel.</p>'
-    DEFAULTSERVERERRORPAGETITLE: Serverfejl
+    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: '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: 'Tilføj mappe'
     DELETEUNUSEDTHUMBNAILS: 'Slet ubrugte miniaturer'
@@ -234,12 +175,12 @@ da:
     PreviewButton: Forhåndsvisning
     SAVEDUP: Gemt.
     STATUSPUBLISHEDSUCCESS: 'Udgav ''{title}'' med succes'
-    SearchResults: Søgeresultater
+    SearchResults: 'Søgeresultater'
     VersionUnknown: Ukendt
   Permission:
     CMS_ACCESS_CATEGORY: 'CMS Adgang'
   Permissions:
-    CONTENT_CATEGORY: Indholdsrettigheder
+    CONTENT_CATEGORY: 'Indholdsrettigheder'
     PERMISSIONS_CATEGORY: 'Roller og adgangstilladelser'
   RedirectorPage:
     DESCRIPTION: 'Omdirigerer til en anden intern side'
@@ -253,32 +194,26 @@ da:
     SINGULARNAME: 'Viderestillende side'
     YOURPAGE: 'Side på dit websted'
   ReportAdmin:
-    MENUTITLE: Rapporter
     ReportTitle: Titel
+    MENUTITLE: Rapporter
   ReportAdminForm:
     FILTERBY: 'Filtrer ved'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Send
     SEARCH: Søg
-    SearchResults: Søgeresultater
+    SearchResults: 'Søgeresultater'
   SideReport:
     BROKENFILES: 'Sider med ødelagt filer'
     BROKENLINKS: 'Sider med links der ikke virker'
     BROKENREDIRECTORPAGES: 'Viderestillingssider der henviser til slettede sider'
     BROKENVIRTUALPAGES: 'Virtuelle sider der henviser til slettede sider'
     BrokenLinksGroupTitle: 'Rapporteringer om links der ikke virker'
-    ContentGroupTitle: Indholdsrapporter
+    ContentGroupTitle: 'Indholdsrapporter'
     EMPTYPAGES: 'Tomme sider'
     LAST2WEEKS: 'Sider ændret indenfor de sidste 2 uger'
     OtherGroupTitle: Anden
     ParameterLiveCheckbox: 'Tjek det udgivne websted'
     REPEMPTY: '{title}rapporten er tom.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Kopier linket herunder for at dele denne side.'
     ShareLink: 'Del link'
@@ -289,11 +224,9 @@ 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: 'Site Configs'
-    SINGULARNAME: 'Site Config'
     SITENAMEDEFAULT: 'Dit sidenavn'
     SITETAGLINE: 'Webstedets Tagline/Slogan'
-    SITETITLE: Sidetitel
+    SITETITLE: 'Sidetitel'
     TABACCESS: Adgang
     TABMAIN: Primær
     TAGLINEDEFAULT: 'din tagline her'
@@ -311,10 +244,7 @@ da:
     APPEARSVIRTUALPAGES: 'Dette indhold er også på de virtuelle sider i {title}sektionerne'
     BUTTONCANCELDRAFT: 'Annuller ændringer i kladden '
     BUTTONCANCELDRAFTDESC: 'Slet kladden og benyt istedet den nuværende side'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Annuller udgivelse'
+    BUTTONUNPUBLISH: Annuller udgivelse
     BUTTONUNPUBLISHDESC: 'Fjern denne side fra det udgivne websted'
     CREATED: 'Dato for oprettelse'
     Comments: Kommentarer
@@ -323,45 +253,31 @@ da:
     DEFAULTABOUTTITLE: 'Om os'
     DEFAULTCONTACTCONTENT: '<p>Du kan udfylde denne side med dit eget indhold, eller slette den og oprette dine egne sider.<br /></p>'
     DEFAULTCONTACTTITLE: 'Kontakt os'
-    DEFAULTHOMECONTENT: "<p>Velkommen til  SilverStripe! Dette er en standard forside. Du kan redigere den ved at åbne <a href=\"admin/\">CMS</a>. Du kan læse <a href=\"http://doc.silverstripe.org\">udviklerdokumentationen</a>, eller påbegynde en af  <a href=\"http://doc.silverstripe.org/doku.php?id=tutorials\">selvstudierne.</a></p>\\n"
+    DEFAULTHOMECONTENT: '<p>Velkommen til  SilverStripe! Dette er en standard forside. Du kan redigere den ved at åbne <a href="admin/">CMS</a>. Du kan læse <a href="http://doc.silverstripe.org">udviklerdokumentationen</a>, eller påbegynde en af  <a href="http://doc.silverstripe.org/doku.php?id=tutorials">selvstudierne.</a></p>\n'
     DEFAULTHOMETITLE: Forside
     DELETEDPAGEHELP: 'Siden er ikke længere udgiven'
     DELETEDPAGESHORT: Slettet
-    DEPENDENT_NOTE: 'De følgende sider afhænger af denne side. Dette omfatter virtuelle sider, omstillingssider og sider med indholdshenvisninger.'
     DESCRIPTION: 'Standard indholdsside'
-    DependtPageColumnLinkType: Linktype
-    DependtPageColumnURL: URL
+    DependtPageColumnLinkType: 'Linktype'
     EDITANYONE: 'Enhver der kan logge ind på CMS'
     EDITHEADER: 'Hvem kan redigere denne side ?'
     EDITONLYTHESE: 'Kun disse personer (vælg fra liste)'
-    EDITORGROUPS: Redaktionsgrupper
+    EDITORGROUPS: 'Redaktionsgrupper'
     EDIT_ALL_DESCRIPTION: 'Rediger enhver side'
-    EDIT_ALL_HELP: 'Mulighed for at redigere enhver side på webstedet, uanset indstillingerne på fanen Adgang. Kræver tilladelsen "Adgang til ''Sider'' sektionen"'
-    Editors: 'Redaktørenes grupper'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Denne side har links der ikke virker.'
     HTMLEDITORTITLE: Indhold
     INHERIT: 'Nedarv fra overliggende side'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Sidst opdateret'
     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).'
+    MENUTITLE: 'Navigationsetiket'
+    METADESC: 'Meta-beskrivelse'
     METAEXTRA: 'Brugerdefinerede Meta Tags'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: Sideplacering
-    PAGETITLE: Sidenavn
-    PAGETYPE: Sidetype
+    PAGETITLE: 'Sidenavn'
+    PAGETYPE: 'Sidetype'
     PARENTID: 'Overliggende side'
-    PARENTTYPE: Sideplacering
+    PARENTTYPE: 'Sideplacering'
     PARENTTYPE_ROOT: 'Side på højeste niveau'
     PARENTTYPE_SUBPAGE: 'Underside fra en overliggende side'
     PERMISSION_GRANTACCESS_DESCRIPTION: 'Administrer adgangsrettigheder for indhold'
@@ -382,32 +298,27 @@ da:
     TABDEPENDENT: 'Afhængige sider'
     TOPLEVEL: 'Sideindhold (Top niveau)'
     TOPLEVELCREATORGROUPS: 'Top level skabere'
-    URLSegment: 'URL Segment'
-    VIEWERGROUPS: Visningsgrupper
+    VIEWERGROUPS: 'Visningsgrupper'
     VIEW_ALL_DESCRIPTION: 'Vis enhver side'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'Vis indhold af kladde'
-    VIEW_DRAFT_CONTENT_HELP: 'Gælder for visning af sider uden for CMS i kladdetilstand. Nyttigt for eksterne samarbejdspartnere uden CMS adgang.'
-    Viewers: Visningsgrupper
+    Viewers: 'Visningsgrupper'
     Visibility: Synlighed
     has_one_Parent: 'Overliggende side'
     many_many_BackLinkTracking: 'Bagud rettet sporing '
     many_many_ImageTracking: 'Sporing af billeder'
     many_many_LinkTracking: 'Sporing af links'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Specialkarakterer bliver automatisk konverteret eller fjernet.'
   StaticExporter:
-    BASEURL: 'Base URL'
     EXPORTTO: 'Eksporter til den mappe'
     NAME: 'Statisk eksportør'
   TableListField:
     SELECT: 'Vælg:'
-  TableListField.ss:
+  TableListField_ss:
     NOITEMSFOUND: '404 - Not Found'
     SORTASC: 'Sorter efter stigende orden'
     SORTDESC: 'Sorter efter faldende orden'
-  TableListField_PageControls.ss:
+  TableListField_PageControls_ss:
     DISPLAYING: Viser
     OF: af
     TO: til
@@ -415,22 +326,20 @@ da:
     VIEWLAST: 'Vis Sidste'
     VIEWNEXT: 'Vis n&aelig;ste'
     VIEWPREVIOUS: 'Vis forrige'
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Du kan tilgå¨den arkiverede side på dette link:'
     HAVEASKED: 'Du har spurgt om at se indholdet af vores side på'
   VirtualPage:
-    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Viser indholdet fra en anden side'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Dette er en virtuel side'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Virtuelle sider'
     PageTypNotAllowedOnRoot: 'Original side type "{type}" er ikke tilladt på rodniveau for denne virtuelle side'
     SINGULARNAME: 'Virtuel side'
+  CMSFileAddController:
+    MENUTITLE: Filer
+  CMSPageEditController:
+    MENUTITLE: 'Rediger side'
+  CMSPageSettingsController:
+    MENUTITLE: 'Rediger side'
+  CMSSettingsController:
+    MENUTITLE: Indstillinger
diff --git a/lang/de.yml b/lang/de.yml
index fabb7d2f..bdc630d5 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -17,40 +17,40 @@ de:
     FILESYSTEMSYNCTITLE: 'Aktualisiere die CMS Datenbankeinträge zu Dateien auf dem Server. Dies ist dann hilfreich, wenn Dateien ausserhalb des CMS hochgeladen wurden, z.B. mit FTP.'
     FROMTHEINTERNET: 'Aus dem Internet'
     FROMYOURCOMPUTER: 'Von Ihrem Computer'
-    Filetype: Dateityp
-    ListView: Listenansicht
-    MENUTITLE: Dateien
-    NEWFOLDER: 'Neuer Ordner'
+    Filetype: 'Dateityp'
+    ListView: 'Listenansicht'
+    NEWFOLDER: Neuer Ordner
     SIZE: Größe
     THUMBSDELETED: '{count} unbenutzte Vorschaubilder wurden gelöscht'
-    TreeView: Baumansicht
+    TreeView: 'Baumansicht'
     Upload: Hochladen
+    MENUTITLE: Dateien
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Ordner löschen'
   AssetAdmin_Tools:
     FILTER: Filter
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Los
   AssetTableField:
     BACKLINKCOUNT: 'Verwendet auf:'
     PAGES: Seite(n)
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Zurück
   BrokenLinksReport:
     Any: Alle
     BROKENLINKS: 'Defekte Links'
     CheckSite: 'Site überprüfen'
-    CheckSiteDropdownDraft: Vorschau-Site
+    CheckSiteDropdownDraft: 'Vorschau-Site'
     CheckSiteDropdownPublished: 'Veröffentlichte Site'
     ColumnDateLastModified: 'Zuletzt geändert'
     ColumnDateLastPublished: 'Zuletzt veröffentlicht'
-    ColumnProblemType: Problemtyp
+    ColumnProblemType: 'Problemtyp'
     ColumnURL: URL
     HasBrokenFile: 'Defekter Dateilink'
     HasBrokenLink: 'Defekter Link'
     HasBrokenLinkAndFile: 'Defekter Link und defekter Dateilink'
     HoverTitleEditPage: 'Seite bearbeiten'
-    PageName: Seitenname
+    PageName: 'Seitenname'
     ReasonDropdown: 'Zu überprüfendes Problem'
     ReasonDropdownBROKENFILE: 'Defekte Datei'
     ReasonDropdownBROKENLINK: 'Defekter Link'
@@ -68,97 +68,82 @@ de:
     PUBLISHED_PAGES: '%d Seiten veröffentlicht, %d Fehler'
     PUBLISH_PAGES: Veröffentlichen
     UNPUBLISHED_PAGES: 'Veröffentlichung von %d Seiten zurückgenommen'
-    UNPUBLISH_PAGES: 'Veröffentlichung zurücknehmen'
-  CMSFileAddController:
-    MENUTITLE: Dateien
+    UNPUBLISH_PAGES: Veröffentlichung zurücknehmen
   CMSMain:
     ACCESS: 'Zugang zum Bereich ''{title}'''
     ACCESS_HELP: 'Seiteninhalt im CMS anzeigen. Anzeige- und Bearbeitungsberechtigungen können sowohl seitenspezifische als auch über die globalen Inhaltsberechtigungen gesetzt werden.'
     AddNew: 'Neue Seite hinzufügen'
-    AddNewButton: Hinzufügen
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
+    AddNewButton: 'Hinzufügen'
     ChoosePageParentMode: 'Wo soll diese Seite erstellt werden?'
     ChoosePageType: 'Seitentyp auswählen'
     Create: Erstellen
     DELETE: 'Von Entwurf-Seite löschen'
     DELETEFP: Löschen
     DESCREMOVED: 'und {count} untergeordnete Seiten'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
+    DUPLICATED: '''{title}''  wurde erfolgreich dupliziert'
+    DUPLICATEDWITHCHILDREN: '''{title}'' und alle Unterseiten wurden erfolgreich dupliziert'
     EMAIL: E-Mail
     EditTree: 'Seitenbaum bearbeiten'
     ListFiltered: 'Gefilterte Liste'
-    MENUTITLE: 'Seite bearbeiten'
     NEWPAGE: 'Neue {pagetype}'
     PAGENOTEXISTS: 'Diese Seite existiert nicht'
     PAGES: Seiten
     PAGETYPEANYOPT: Alle
-    PAGETYPEOPT: Seitentyp
+    PAGETYPEOPT: 'Seitentyp'
     PUBALLCONFIRM: 'Veröffentlicht jede Seite des Seitenbaumes und kopiert den Inhalt von Entwurf zu Live.'
     PUBALLFUN: '"Alle veröffentlichen"-Funktion'
-    PUBALLFUN2: 'Dieser Button bewirkt dasselbe wie auf jeder Seite "veröffentlichen" zu wählen. Sie sollten diese Funktion nutzen, wenn grössere Inhaltsänderungen stattgefunden haben, zum Beispiel wenn die Seite erstellt wurde.'
+    PUBALLFUN2: "Dieser Button bewirkt dasselbe wie auf jeder Seite \"veröffentlichen\" zu wählen. Sie sollten diese Funktion nutzen, wenn grössere Inhaltsänderungen stattgefunden haben, zum Beispiel wenn die Seite erstellt wurde."
     PUBPAGES: 'Abgeschlossen: {count} Seiten wurden veröffentlicht'
     PageAdded: 'Seite erfolgreich erstellt'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
+    REMOVED: 'Lösche ''{title}''{description} von Live Umgebung'
     REMOVEDPAGE: '''{title}'' wurde von der veröffentlichten Site entfernt'
     REMOVEDPAGEFROMDRAFT: 'Lösche ''%s'' von der Entwurfs-Site'
     RESTORE: Wiederherstellen
     RESTORED: '''{title}'' wurde wiederhergestellt'
     ROLLBACK: 'Diese Version wiederherstellen'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Speichern
-    SAVEDRAFT: 'Save draft'
     TabContent: Inhalt
     TabHistory: Historie
     TabSettings: Einstellungen
     TreeFiltered: 'Seitenbaum gefiltert'
     TreeFilteredClear: 'Filter zurücksetzen'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Filter anwenden'
+    MENUTITLE: 'Seite bearbeiten'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Filter anwenden'
     RESET: Zurücksetzen
   CMSPageAddController:
-    MENUTITLE: 'Seite hinzufügen'
     ParentMode_child: 'Einer anderen Seite untergeordnet'
     ParentMode_top: 'Auf der obersten Ebene'
-  CMSPageEditController:
-    MENUTITLE: 'Seite bearbeiten'
+    MENUTITLE: 'Seite hinzufügen'
   CMSPageHistoryController:
     COMPAREMODE: 'Vergleichsmodus (wähle zwei)'
     COMPAREVERSIONS: 'Versionen vergleichen'
     COMPARINGVERSION: 'Vergleiche Versionen {version1} und {version2}.'
-    MENUTITLE: Historie
     REVERTTOTHISVERSION: 'Zurück zu dieser Version'
     SHOWUNPUBLISHED: 'Zeige unveröffentlichte Versionen'
     SHOWVERSION: 'Zeige Version'
     VIEW: anzeigen
-    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Momentan angezeigte Version: {version}.'
-  CMSPageHistoryController_versions.ss:
+    MENUTITLE: Historie
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Autor
     NOTPUBLISHED: 'Nicht veröffentlicht'
     PUBLISHER: Herausgeber
     UNKNOWN: Unbekannt
     WHEN: Wann
-  CMSPageSettingsController:
-    MENUTITLE: 'Seite bearbeiten'
   CMSPagesController:
     GalleryView: 'Galerieansicht '
-    ListView: Listenansicht
+    ListView: 'Listenansicht'
     MENUTITLE: Seiten
-    TreeView: Baumansicht
-  CMSPagesController_ContentToolbar.ss:
+    TreeView: 'Baumansicht'
+  CMSPagesController_ContentToolbar_ss:
     ENABLEDRAGGING: 'Drag & Drop'
     MULTISELECT: Mehrfachauswahl
-  CMSPagesController_Tools.ss:
-    FILTER: Filter
   CMSSearch:
     FILTERDATEFROM: Von
     FILTERDATEHEADING: Datum
     FILTERDATETO: Bis
     FILTERLABELTEXT: Inhalt
-  CMSSettingsController:
-    MENUTITLE: Einstellungen
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Veränderte Seiten'
   CMSSiteTreeFilter_DeletedPages:
@@ -168,38 +153,24 @@ de:
   ContentControl:
     NOTEWONTBESHOWN: 'Achtung: Diese Nachricht wird Ihren Besuchern nicht gezeigt.'
   ContentController:
-    ARCHIVEDSITE: Vorschauversion
+    ARCHIVEDSITE: 'Vorschauversion'
     ARCHIVEDSITEFROM: 'Site archiviert von'
-    CMS: CMS
-    DRAFT: Draft
-    DRAFTSITE: Vorschau-Site
+    DRAFTSITE: 'Vorschau-Site'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Sie müssen sich mit Ihrem CMS Passwort einloggen, um den Entwurf oder den archivierten Inhalt zu sehen. <a href="%s">Zurück zur veröffentlichten Seite.</a>'
     Email: E-Mail
-    INSTALL_SUCCESS: 'Die Installation war erfolgreich!'
     InstallFilesDeleted: 'Die Installationsdateien wurden erfolgreich gelöscht.'
     InstallSecurityWarning: 'Zu Ihrer Sicherheit löschen Sie jetzt bitte die Installationsdateien, es sei denn Sie möchten zu einem späteren Zeitpunkt erneut installieren. (<em>Dies erfordert den Administrator-Zugang (siehe oben)</em>). Der Webserver benötigt nun nur noch Schreibrechte auf das "assets" Verzeichnis und Sie können die Schreibrechte für alle anderen Ordner entfernen. <a href="{link}" style="text-align: center;">Die Installationsdaten jetzt löschen.</a> '
-    InstallSuccessCongratulations: 'SilverStripe wurde erfolgreich installiert!'
     LOGGEDINAS: 'Angemeldet als'
     LOGIN: Anmelden
-    LOGOUT: Abmelden
+    LOGOUT: 'Abmelden'
     NOTLOGGEDIN: 'Nicht angemeldet'
-    PUBLISHED: Published
     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: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Die Installationsdateien konnten nicht gelöscht werden. Bitte löschen Sie die Dateien manuell.'
     VIEWPAGEIN: 'Seite anzeigen in:'
+    DRAFT: Entwurf
+    PUBLISHED: Veröffentlicht
   ErrorPage:
-    CODE: Fehlercode
-    DEFAULTERRORPAGECONTENT: '<p>Entschuldigung, möglicherweise versuchen Sie eine Seite zu erreichen die nicht existiert.</p><p>Bitte überprüfen Sie die Schreibweise der URL die Sie versucht haben zu erreichen und versuchen Sie es noch einmal.</p>'
-    DEFAULTERRORPAGETITLE: 'Seite nicht gefunden'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Entschuldigung, bei der Bearbeitung ihrer Anfrage ist ein Problem aufgetreten.</p>'
-    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
     400: '400 - Fehlerhafter Zugriff'
     401: '401 - Unerlaubter Zugriff'
     403: '403 - Verbotener Zugriff'
@@ -223,6 +194,13 @@ de:
     503: '503 - Dienst oder Dienstmerkmal nicht möglich'
     504: '504 - Zeitüberschreitung am Gateway'
     505: '505 - HTTP Version wird nicht unterstützt'
+    CODE: 'Fehlercode'
+    DEFAULTERRORPAGECONTENT: '<p>Entschuldigung, möglicherweise versuchen Sie eine Seite zu erreichen die nicht existiert.</p><p>Bitte überprüfen Sie die Schreibweise der URL die Sie versucht haben zu erreichen und versuchen Sie es noch einmal.</p>'
+    DEFAULTERRORPAGETITLE: 'Seite nicht gefunden'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>Entschuldigung, bei der Bearbeitung ihrer Anfrage ist ein Problem aufgetreten.</p>'
+    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.'
   Folder:
     AddFolderButton: 'Ordner hinzufügen'
     DELETEUNUSEDTHUMBNAILS: 'Unbenutzte Vorschaubilder löschen'
@@ -234,51 +212,43 @@ de:
     PreviewButton: Vorschau
     SAVEDUP: Gespeichert.
     STATUSPUBLISHEDSUCCESS: '''{title}'' wurde erfolgreich veröffentlicht'
-    SearchResults: Suchergebnisse
+    SearchResults: 'Suchergebnisse'
     VersionUnknown: Unbekannt
   Permission:
     CMS_ACCESS_CATEGORY: 'CMS Zugriff'
   Permissions:
-    CONTENT_CATEGORY: Inhaltsberechtigungen
+    CONTENT_CATEGORY: 'Inhaltsberechtigungen'
     PERMISSIONS_CATEGORY: 'Rollen- und Zugriffsberechtigungen'
   RedirectorPage:
     DESCRIPTION: 'Leitet zu einer anderen internen Seite weiter'
     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: 'Umleitungsseite'
     REDIRECTTO: 'Weiterleiten zu'
     REDIRECTTOEXTERNAL: 'Andere Website'
     REDIRECTTOPAGE: 'Eine Seite auf Ihrer Website'
-    SINGULARNAME: Weiterleitungsseite
     YOURPAGE: 'Seite auf Ihrer Website'
   ReportAdmin:
     MENUTITLE: Berichte
-    ReportTitle: Titel
   ReportAdminForm:
     FILTERBY: 'Filtern nach'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Los
     SEARCH: Suche
-    SearchResults: Suchergebnisse
+    SearchResults: 'Suchergebnisse'
   SideReport:
     BROKENFILES: 'Seiten mit defekten Dateiverknüpfungen'
     BROKENLINKS: 'Seiten mit defekten Links'
     BROKENREDIRECTORPAGES: 'Weiterleitungen, die auf gelöschte Seiten verweisen'
     BROKENVIRTUALPAGES: 'Virtuelle Seiten, die auf gelöschte Seiten verweisen'
     BrokenLinksGroupTitle: 'Defekte Links'
-    ContentGroupTitle: Inhaltsberichte
+    ContentGroupTitle: 'Inhaltsberichte'
     EMPTYPAGES: 'Leere Seiten'
     LAST2WEEKS: 'Seiten die in den letzten zwei Wochen bearbeitet wurden'
     OtherGroupTitle: Andere
     ParameterLiveCheckbox: 'Veröffentlichte Seite überprüfen'
     REPEMPTY: 'Der Bericht ''{title}'' ist leer.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Kopieren Sie den folgenden Link um diesen jemanden mitzuteilen.'
     ShareLink: 'Link teilen'
@@ -289,15 +259,12 @@ de:
     EDITHEADER: 'Wer kann Seiten auf dieser Website bearbeiten?'
     EDIT_PERMISSION: 'Websiteeinstellungen editieren'
     EDIT_PERMISSION_HELP: 'Möglichkeit, die globalen Zugrifsseinstellungen sowie die Berechtigungen für die Hauptebene zu editieren.'
-    PLURALNAME: Seitenkonfigurationen
-    SINGULARNAME: Seitenkonfiguration
     SITENAMEDEFAULT: 'Name Ihrer Website'
     SITETAGLINE: 'Ihr Websiteslogan'
     SITETITLE: 'Titel der Site'
     TABACCESS: Zugriff
     TABMAIN: Hauptteil
     TAGLINEDEFAULT: 'Ihr Websiteslogan'
-    THEME: Theme
     TOPLEVELCREATE: 'Wer kann Seiten auf der Hauptebene erstellen?'
     VIEWHEADER: 'Wer kann Seiten auf dieser Website sehen?'
   SiteTree:
@@ -311,10 +278,7 @@ de:
     APPEARSVIRTUALPAGES: 'Dieser Inhalt erscheint außerdem auf virtuellen Seiten im {title} Bereich.'
     BUTTONCANCELDRAFT: 'Verwerfe Entwurfsänderungen'
     BUTTONCANCELDRAFTDESC: 'Löschen Sie Ihren Entwurf und kehren Sie zur derzeit veröffentlichten Seite zurück.'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Veröffentlichung zurücknehmen'
+    BUTTONUNPUBLISH: Veröffentlichung zurücknehmen
     BUTTONUNPUBLISHDESC: 'Entferne diese Seite aus der veröffentlichten Website'
     CREATED: 'Datum der Erstellung'
     Comments: Kommentare
@@ -322,51 +286,40 @@ de:
     DEFAULTABOUTCONTENT: '<p>Sie können diese Seite mit Ihren eigenen Inhalten füllen, oder sie löschen und Ihre eigenen Seiten erstellen.<br /></p>'
     DEFAULTABOUTTITLE: 'Über uns'
     DEFAULTCONTACTCONTENT: '<p>Sie können diese Seite mit Ihren eigenen Inhalten füllen, oder sie löschen und Ihre eigenen Seiten erstellen.<br /></p>'
-    DEFAULTCONTACTTITLE: Kontakt
+    DEFAULTCONTACTTITLE: 'Kontakt'
     DEFAULTHOMECONTENT: '<p>Willkommen bei SilverStripe! Dies ist die Standard-Startseite. Sie können diese Seite bearbeiten, indem Sie <a href="admin/">das CMS</a> öffnen. Sie können außerdem die  <a href="http://doc.silverstripe.com">Entwicker-Dokumentation</a> oder die <a href="http://doc.silverstripe.com/doku.php?id=tutorials">Einführungskurse und Tutorien</a> aufrufen.</p>'
     DEFAULTHOMETITLE: Startseite
     DELETEDPAGEHELP: 'Die Seite ist nicht länger veröffentlicht'
     DELETEDPAGESHORT: Gelöscht
     DEPENDENT_NOTE: 'Die folgenden Seiten hängen von dieser Seite ab. Dies schließt Virtuelle Seiten, Weiterleitungen und Seiten mit Links im Inhalt ein.'
     DESCRIPTION: 'Allgemeine Inhaltsseite'
-    DependtPageColumnLinkType: Linktyp
-    DependtPageColumnURL: URL
+    DependtPageColumnLinkType: 'Linktyp'
     EDITANYONE: 'Jeder der sich in das CMS einloggen kann'
     EDITHEADER: 'Wer kann diese Seite im CMS verändern?'
     EDITONLYTHESE: 'Nur folgende Personen (aus der der Liste wählen)'
-    EDITORGROUPS: Bearbeitergruppen
+    EDITORGROUPS: 'Bearbeitergruppen'
     EDIT_ALL_DESCRIPTION: 'Kann beliebige Seiten bearbeiten'
     EDIT_ALL_HELP: 'Kann beliebige Seiten auf der Site bearbeiten; seitenspezifische Sicherheitseinstellungen werden ignoriert.'
     Editors: 'Bearbeiter Gruppen'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Diese Seite enthält ungültige Verweise.'
     HTMLEDITORTITLE: Inhalt
     INHERIT: 'Von der übergeordneten Seite erben'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Letzte Änderung'
     LINKCHANGENOTE: 'Das Ändern des Links zu dieser Seite führt ebenfalls zur Änderung aller Links der Unterseiten dieser Seite.'
-    MENUTITLE: Navigationsbezeichnung
-    METADESC: 'Meta Description'
-    METADESCHELP: Suchergebnisse
+    MENUTITLE: 'Navigationsbezeichnung'
     METAEXTRA: 'Benutzerdefinierte Meta-Tags'
-    METAEXTRAHELP: 'Benutzerdefinierte Meta-Tags'
     MODIFIEDONDRAFTHELP: 'Die Seite hat unveröffentlichte Änderungen'
-    MODIFIEDONDRAFTSHORT: 'Zuletzt geändert'
+    MODIFIEDONDRAFTSHORT: Zuletzt geändert
     MetadataToggle: Metadaten
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: Seitenposition
-    PAGETITLE: Seitenname
-    PAGETYPE: Seitentyp
+    PAGELOCATION: 'Seitenposition'
+    PAGETITLE: 'Seitenname'
+    PAGETYPE: 'Seitentyp'
     PARENTID: 'Übergeordnete Seite'
-    PARENTTYPE: Seitenposition
+    PARENTTYPE: 'Seitenposition'
     PARENTTYPE_ROOT: 'Seite auf der obersten Ebene'
     PARENTTYPE_SUBPAGE: 'Seite unterhalb einer übergeordneten Seite'
     PERMISSION_GRANTACCESS_DESCRIPTION: 'Zugriffsrechte für Inhalte verwalten'
     PERMISSION_GRANTACCESS_HELP: 'Einstellung von seitenspezifischen Zugriffsbeschränkungen im Bereich "Seiteninhalt" erlauben'
-    PLURALNAME: Seiten
     PageTypNotAllowedOnRoot: 'Der Seitentyp "{type}" darf nicht auf der Grundebene verwendet werden.'
     PageTypeNotAllowed: 'Der Seitentyp "{type}" kann nicht als Kind dieser übergeordneten Seite verwendet werden'
     REMOVEDFROMDRAFTHELP: 'Die Seite ist veröffentlicht, wurde aber von der Entwurf Seite gelöscht.'
@@ -378,24 +331,27 @@ de:
     SHOWINSEARCH: 'In der Suche anzeigen?'
     SINGULARNAME: Seite
     TABBEHAVIOUR: Verhalten
-    TABCONTENT: Haupt-Inhalt
+    TABCONTENT: 'Haupt-Inhalt'
     TABDEPENDENT: 'Abhängige Seiten'
     TOPLEVEL: 'Seiten Inhalt (Top Level)'
-    TOPLEVELCREATORGROUPS: Bearbeitergruppen
-    URLSegment: URL-Segment
-    VIEWERGROUPS: Betrachtergruppen
+    TOPLEVELCREATORGROUPS: 'Bearbeitergruppen'
+    URLSegment: 'URL-Segment'
+    VIEWERGROUPS: 'Betrachtergruppen'
     VIEW_ALL_DESCRIPTION: 'Kann beliebige Seiten betrachten'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'Entwurfsinhalt anzeigen'
     VIEW_DRAFT_CONTENT_HELP: 'Zugriff auf die Vorschau-Site auch ohne Zugriff auf das CMS. Sinnvoll für externe Mitarbeiter ohne CMS-Zugang.'
     Viewers: 'Betrachter Gruppen'
     Visibility: Sichtbarkeit
     has_one_Parent: 'Übergeordnete Seite'
-    many_many_BackLinkTracking: Rückverweis-Verfolgung
-    many_many_ImageTracking: Bild-Verfolgung
-    many_many_LinkTracking: Link-Verfolgung
+    many_many_BackLinkTracking: 'Rückverweis-Verfolgung'
+    many_many_ImageTracking: 'Bild-Verfolgung'
+    many_many_LinkTracking: 'Link-Verfolgung'
+    BUTTONPUBLISHED: Veröffentlicht
+    BUTTONSAVED: Gespeichert
+    GroupPlaceholder: 'Klicken, um Gruppe auszuwählen'
+    MoreOptions: 'Weitere Optionen'
+    NOTPUBLISHED: 'Nicht veröffentlicht'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Sonderzeichen werden automatisch umgewandelt oder entfernt.'
   StaticExporter:
     BASEURL: 'Ausgangs URL'
@@ -403,34 +359,39 @@ de:
     NAME: 'statischer Exporter'
   TableListField:
     SELECT: 'Auswählen:'
-  TableListField.ss:
+  TableListField_ss:
     NOITEMSFOUND: 'Keine Einträge gefunden.'
     SORTASC: 'Aufsteigend sortieren'
     SORTDESC: 'Absteigend sortieren'
-  TableListField_PageControls.ss:
+  TableListField_PageControls_ss:
     DISPLAYING: Zeige
     OF: von
     TO: bis
-    VIEWFIRST: Erster
-    VIEWLAST: Letzter
-    VIEWNEXT: Nächster
-    VIEWPREVIOUS: Vorheriger
+    VIEWFIRST: 'Erster'
+    VIEWLAST: 'Letzter'
+    VIEWNEXT: 'Nächster'
+    VIEWPREVIOUS: 'Vorheriger'
   TreeTools:
     DisplayLabel: 'Anzeigen:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Sie können unter folgendem Verweis auf die archivierte Seite zugreifen:'
     HAVEASKED: 'Sie haben darum gebeten, den Inhalt unserer Site zu sehen, am'
   VirtualPage:
-    CHOOSE: 'Linked Page'
+    CHOOSE: 'Verknüpfte Seite'
     DESCRIPTION: 'Zeigt den Inhalt einer anderen Seite'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
+    EDITCONTENT: 'Inhalt der verknüpften Seite bearbeiten'
     HEADER: 'Dies ist eine virtuelle Seite'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Virtuelle Seiten'
     PageTypNotAllowedOnRoot: 'Der ursprüngliche Seitentyp "{type}" ist nicht zulässig für diese virtuelle Seite. '
     SINGULARNAME: 'Virtuelle Seite'
+    HEADERWITHLINK: 'Dies ist eine virtuelle Seite, die den Inhalt von "{title}" ({link}) kopiert'
+  CMSFileAddController:
+    MENUTITLE: Dateien
+  CMSPageEditController:
+    MENUTITLE: 'Seite bearbeiten'
+  CMSPageSettingsController:
+    MENUTITLE: 'Seite bearbeiten'
+  CMSSettingsController:
+    MENUTITLE: Einstellungen
+  SilverStripeNavigator:
+    ARCHIVED: Archiviert
diff --git a/lang/el.yml b/lang/el.yml
index d316199d..b4388529 100644
--- a/lang/el.yml
+++ b/lang/el.yml
@@ -1,436 +1,7 @@
 el:
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    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 ''{title}''{description} 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'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
-    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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    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'
-    PUBLISHED: Published
-    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 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'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  SearchForm:
-    GO: Go
-    SEARCH: Search
-    SearchResults: 'Search Results'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
+    SAVE: Αποθήκευση
   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'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    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'
-    GroupPlaceholder: 'Click to select group'
-    HASBROKENLINKS: 'This page has broken links.'
-    HTMLEDITORTITLE: Content
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its 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 ''Pages'' section" 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:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    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:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
-    CANACCESS: 'You can access the archived site at this link:'
+  ViewArchivedEmail_ss:
     HAVEASKED: 'Επιθυμείται να εμφανιστεί το περιεχόμενο του ιστοχώρου σας την '
-  VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
-    HEADER: 'This is a virtual page'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: 'Virtual Pags'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
-    SINGULARNAME: 'Virtual Page'
diff --git a/lang/en.yml b/lang/en.yml
index 2a2d5c4e..80561d9b 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -29,12 +29,12 @@ en:
     TITLE: 'Delete folders'
   AssetAdmin_Tools:
     FILTER: Filter
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Go
   AssetTableField:
     BACKLINKCOUNT: 'Used on:'
     PAGES: page(s)
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Back
   BrokenLinksReport:
     Any: Any
@@ -112,8 +112,8 @@ en:
     TreeFilteredClear: 'Clear filter'
     MENUTITLE: 'Edit Page'
     AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Apply Filter'
+  CMSMain_left_ss:
+    'APPLY_FILTER': 'Apply Filter'
     RESET: Reset
   CMSPageAddController:
     ParentMode_child: 'Under another page'
@@ -130,7 +130,7 @@ en:
     VIEWINGVERSION: 'Currently viewing version {version}.'
     MENUTITLE: History
     VIEWINGLATEST: 'Currently viewing the latest version.'
-  CMSPageHistoryController_versions.ss:
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Author
     NOTPUBLISHED: 'Not published'
     PUBLISHER: Publisher
@@ -141,10 +141,10 @@ en:
     ListView: 'List View'
     MENUTITLE: Pages
     TreeView: 'Tree View'
-  CMSPagesController_ContentToolbar.ss:
+  CMSPagesController_ContentToolbar_ss:
     ENABLEDRAGGING: 'Drag''n''drop'
     MULTISELECT: Multi-selection
-  CMSPagesController_Tools.ss:
+  CMSPagesController_Tools_ss:
     FILTER: Filter
   CMSSearch:
     FILTERDATEFROM: From
@@ -389,11 +389,11 @@ en:
     NAME: 'Static exporter'
   TableListField:
     SELECT: 'Select:'
-  TableListField.ss:
+  TableListField_ss:
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Sort in ascending order'
     SORTDESC: 'Sort in descending order'
-  TableListField_PageControls.ss:
+  TableListField_PageControls_ss:
     DISPLAYING: Displaying
     OF: of
     TO: to
@@ -403,7 +403,7 @@ en:
     VIEWPREVIOUS: 'View previous'
   TreeTools:
     DisplayLabel: 'Display:'
-  ViewArchivedEmail.ss:
+  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:
diff --git a/lang/en_GB.yml b/lang/en_GB.yml
index 9e355262..5b971464 100644
--- a/lang/en_GB.yml
+++ b/lang/en_GB.yml
@@ -1,436 +1,28 @@
 en_GB:
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
     DELETE: 'Delete from the draft site'
-    DELETEFP: 'Delete from the published site'
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    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 wasfirst built.'
-    PUBPAGES: 'Done: Published {count} pages'
-    PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''{title}''{description} 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'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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'
+    DELETEFP: Delete from the published site
+    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\nfirst built.\n"
   ContentController:
-    ARCHIVEDSITE: 'Preview version'
-    ARCHIVEDSITEFROM: 'Archived site from'
-    CMS: CMS
-    DRAFT: Draft
-    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'
-    PUBLISHED: Published
-    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 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 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 Pages'
-    SINGULARNAME: 'Error Page'
-    400: '400 - Bad Request'
     401: '401 - Unauthorised'
-    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'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>Sorry, there was a problem handling your request.</p>'
+    PLURALNAME: 'Error Pages'
   RedirectorPage:
     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 Pages'
-    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'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  SearchForm:
-    GO: Go
-    SEARCH: Search
-    SearchResults: 'Search Results'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'To share a link 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'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    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 home page. 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'
-    GroupPlaceholder: 'Click to select group'
-    HASBROKENLINKS: 'This page has broken links.'
-    HTMLEDITORTITLE: Content
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
-    LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
-    MENUTITLE: 'Navigation label'
-    METADESC: Description
+    METADESC: 'Description'
     METADESCHELP: 'Search engines use this content when 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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its 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: Behaviour
-    TABCONTENT: 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 ''Pages'' section" 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'
+    TABCONTENT: 'Content'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     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:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  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: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
-    HEADER: 'This is a virtual page'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Virtual Pages'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
-    SINGULARNAME: 'Virtual Page'
diff --git a/lang/eo.yml b/lang/eo.yml
index 71af2089..544c0c99 100644
--- a/lang/eo.yml
+++ b/lang/eo.yml
@@ -5,9 +5,7 @@ eo:
     AppCategoryArchive: Arkivo
     AppCategoryAudio: Sono
     AppCategoryDocument: Dokumento
-    AppCategoryFlash: Flash
     AppCategoryImage: Bildo
-    AppCategoryVideo: Video
     BackToFolder: 'Retroe al dosierujo'
     CREATED: Dato
     CurrentFolderOnly: 'Limigo de aktuala dosierujo'
@@ -19,22 +17,21 @@ eo:
     FROMYOURCOMPUTER: 'El via komputilo'
     Filetype: 'Tipo de dosiero'
     ListView: 'Lista vido'
-    MENUTITLE: Dosieroj
-    NEWFOLDER: NewFolder
     SIZE: Grando
     THUMBSDELETED: '{count} neuzitaj miniaturoj estas forigitaj'
     TreeView: 'Arba vido'
     Upload: Alŝuti
+    MENUTITLE: Dosieroj
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Forigi dosierujojn'
   AssetAdmin_Tools:
     FILTER: Filtrilo
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Ek
   AssetTableField:
     BACKLINKCOUNT: 'Uzite ĉe:'
     PAGES: paĝo(j)
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Retro
   BrokenLinksReport:
     Any: Ajna
@@ -44,8 +41,7 @@ eo:
     CheckSiteDropdownPublished: 'Publika retejo'
     ColumnDateLastModified: 'Dato de lasta modifo'
     ColumnDateLastPublished: 'Dato de lasta publikigo'
-    ColumnProblemType: Problemtipo
-    ColumnURL: URL
+    ColumnProblemType: 'Problemtipo'
     HasBrokenFile: 'havas rompitan dosieron'
     HasBrokenLink: 'havas rompitan ligilon'
     HasBrokenLinkAndFile: 'havas rompitan ligilon kaj dosieron'
@@ -64,101 +60,86 @@ eo:
     DELETED_DRAFT_PAGES: 'Forigis %d paĝojn el malneta retejo, %d malsukcesoj'
     DELETED_PAGES: 'Forigis %d paĝojn el publikigita retejo, %d malsukcesoj'
     DELETE_DRAFT_PAGES: 'Forigi el malneta retejo'
-    DELETE_PAGES: 'Forigi el publikigita retejo.'
-    PUBLISHED_PAGES: 'Publikigis %d paĝojn'
+    DELETE_PAGES: 'Forigi el publikigita retejo'
+    PUBLISHED_PAGES: 'Publikigis %d paĝojn, %d malsukcesojn'
     PUBLISH_PAGES: Publikigi
     UNPUBLISHED_PAGES: 'Malpublikigis %d paĝojn'
     UNPUBLISH_PAGES: Malpublikigi
-  CMSFileAddController:
-    MENUTITLE: Dosieroj
   CMSMain:
     ACCESS: 'Aliro al sekcio ''{title}'''
     ACCESS_HELP: 'Permesi vidigi la sekcion kiu enhavas paĝarbon kaj enhavon. Vidigaj kaj redaktaj permesoj estas trakteblaj per paĝspecifaj fallistoj, kaj ankaŭ la apartaj "Enhavaj permesoj".'
     AddNew: 'Aldoni novan paĝon'
     AddNewButton: 'Aldoni novan'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: 'Elekti kie krei ĉi tiun paĝon'
     ChoosePageType: 'Elekti tipon de paĝo'
     Create: Krei
-    DELETE: 'Forigi el la malneta retejo'
-    DELETEFP: 'Forigi el la publika retejo'
+    DELETE: 'Forigi la malnetan'
+    DELETEFP: Forigi
     DESCREMOVED: 'kaj {count} posteuloj'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
+    DUPLICATED: 'Sukcese duobligis je ''{title}'''
+    DUPLICATEDWITHCHILDREN: 'Sukcese duobligis je ''{title}'' kaj idoj'
     EMAIL: Retpoŝto
     EditTree: 'Redakta arbo'
     ListFiltered: 'Filtrita listo.'
-    MENUTITLE: 'Redakti paĝon'
     NEWPAGE: 'Nova {pagetype}'
     PAGENOTEXISTS: 'Ĉi tiu paĝo ne ekzistas'
     PAGES: Paĝoj
     PAGETYPEANYOPT: Ajna
     PAGETYPEOPT: 'Tipo de paĝo'
-    PUBALLCONFIRM: 'Bonvolu eldoni ĉiun paĝon en la retejo, kopiante enhavan stadion al realtempa'
-    PUBALLFUN: '"Eldoni Ĉiujn" funkcio'
-    PUBALLFUN2: 'Premi ĉi tiun butonon estas same kiel viziti al ĉiu paĝo kaj premi je "eldoni". La intenco estas ke oni uzu ĝin post multnombraj redaktoj de la enhavo, ekzemple kiam oni unue konstruis la retejon.'
+    PUBALLCONFIRM: 'Bonvolu eldoni ĉiun paĝon en la retejo, kopiante enhavan stadion al la publika'
+    PUBALLFUN: 'Funkcio "Eldoni Ĉiujn"'
+    PUBALLFUN2: "Premi ĉi tiun butonon estas same kiel viziti al ĉiu paĝo kaj premi je \"eldoni\". La intenco estas ke oni uzu ĝin post multnombraj redaktoj de la enhavo, ekzemple kiam oni unue konstruis la retejon."
     PUBPAGES: 'Farite: publikigis {count} paĝojn'
     PageAdded: 'Sukcese kreis paĝon'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
+    REMOVED: 'Forigis je ''{title}''{description} el la publikigita retejo'
     REMOVEDPAGE: 'Forigis je ''{title}'' el la publikigita retejo'
     REMOVEDPAGEFROMDRAFT: 'Forigis je ''%s'' el la malneta retejo'
     RESTORE: Restaŭri
     RESTORED: 'Sukcese restaŭris je ''{title}'''
     ROLLBACK: 'Malfari al ĉi tiu versio'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
+    ROLLEDBACKPUBv2: 'Malfaris ŝanĝojn ĝis la publikigita versio.'
+    ROLLEDBACKVERSIONv2: 'Malfaris ŝanĝojn ĝis versio #%d.'
     SAVE: Konservi
-    SAVEDRAFT: 'Save draft'
+    SAVEDRAFT: 'Konservi malneton'
     TabContent: Enhavo
     TabHistory: Historio
     TabSettings: Agordoj
     TreeFiltered: 'Filtrita arbo.'
     TreeFilteredClear: 'Vakigi filtrilon'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Apliki filtrilon'
+    MENUTITLE: 'Redakti paĝon'
+    AddPageRestriction: 'Noto: iuj tipoj de paĝoj ne estas permesataj por ĉi tiu elektaĵo.'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Apliki filtrilon'
     RESET: Restartigi
   CMSPageAddController:
-    MENUTITLE: 'Enmeti paĝon'
     ParentMode_child: 'Sub alia paĝo'
     ParentMode_top: 'Supra nivelo'
-  CMSPageEditController:
-    MENUTITLE: 'Redakti paĝon'
+    MENUTITLE: 'Enmeti paĝon'
   CMSPageHistoryController:
     COMPAREMODE: 'Kompara reĝimo (elektu du)'
     COMPAREVERSIONS: 'Kompari versiojn'
     COMPARINGVERSION: 'Komparas versiojn {version1} kaj {version2}.'
-    MENUTITLE: Historio
     REVERTTOTHISVERSION: 'Malfari al ĉi tiu versio'
     SHOWUNPUBLISHED: 'Vidigi nepublikigitajn versiojn'
     SHOWVERSION: 'Vidigi version'
     VIEW: vido
-    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Aktuale vidiĝas versio {version}.'
-  CMSPageHistoryController_versions.ss:
+    MENUTITLE: Historio
+    VIEWINGLATEST: 'Aktuale vidiĝas la lasta versio.'
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Aŭtoro
-    NOTPUBLISHED: Nepublikigita
+    NOTPUBLISHED: 'Nepublikigita'
     PUBLISHER: Publikiginto
     UNKNOWN: Nekonata
     WHEN: Kiam
-  CMSPageSettingsController:
-    MENUTITLE: 'Redakti paĝon'
   CMSPagesController:
     GalleryView: 'Galeria vido'
-    ListView: 'Lista vido'
     MENUTITLE: Paĝoj
-    TreeView: 'Arba vido'
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: Ŝovi-demeti
+  CMSPagesController_ContentToolbar_ss:
+    ENABLEDRAGGING: 'Ŝovi-demeti'
     MULTISELECT: Plurelekto
-  CMSPagesController_Tools.ss:
+  CMSPagesController_Tools_ss:
     FILTER: Filtri
-  CMSSearch:
-    FILTERDATEFROM: De
-    FILTERDATEHEADING: Dato
-    FILTERDATETO: Al
-    FILTERLABELTEXT: Enhavo
-  CMSSettingsController:
-    MENUTITLE: Agordoj
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Ŝanĝitaj paĝoj'
   CMSSiteTreeFilter_DeletedPages:
@@ -170,29 +151,51 @@ eo:
   ContentController:
     ARCHIVEDSITE: 'Antaŭvida versio'
     ARCHIVEDSITEFROM: 'Enarkivigita retejo el'
-    CMS: CMS
-    DRAFT: Draft
-    DRAFTSITE: 'Malneta Retejo'
+    DRAFTSITE: 'Malneta retejo'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Vi devas ensaluti per via CMS-pasvorto por vidi la projektan aŭ enarkivigitan enhavon.  <a href="%s">Alklaku ĉi tie por reiri al la publika retejo.</a>'
     Email: Retpoŝto
     INSTALL_SUCCESS: 'Instalis sukcese!'
     InstallFilesDeleted: 'Sukcesis forigi instalajn dosierojn.'
-    InstallSecurityWarning: 'Por sekureco vi devus nun forigi la instalajn dosierojn, krom se vi planas reinstali poste  (<em>necesas ensaluti kiel administranto, vidu supre</em>). La reta servilo nun bezonas skriban aliron nur al la dosierujo "assets", do vi povas forigi skriban aliron de ĉiuj aliaj dosierujoj. <a href="{link}" style="text-align: center;">Alklaku ĉi tie por forigi l instalajn dosierojn.</a>'
+    InstallSecurityWarning: 'Por sekureco vi devus nun forigi la instalajn dosierojn, krom se vi planas reinstali poste  (<em>necesas ensaluti kiel administranto, vidu supre</em>). La reta servilo nun bezonas skriban aliron nur al la dosierujo "assets", do vi povas forigi skriban aliron de ĉiuj aliaj dosierujoj. <a href="{link}" style="text-align: center;">Alklaku ĉi tie por forigi la instalajn dosierojn.</a>'
     InstallSuccessCongratulations: 'SilverStripe estas sukcese instalita!'
     LOGGEDINAS: 'Ensalutis kiel'
     LOGIN: Ensaluti
-    LOGOUT: Elsaluti
+    LOGOUT: 'Elsaluti'
     NOTLOGGEDIN: 'Ne ensalutinte'
-    PUBLISHED: Published
-    PUBLISHEDSITE: 'Publikigita Retejo'
+    PUBLISHEDSITE: 'Publikigita retejo'
     Password: Pasvorto
     PostInstallTutorialIntro: 'Ĉi tiu retejo estas tro simpla versio de retejo de SilverStripe 3. Por etendi ĝin, bonvolu rigardi al {link}.'
-    StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
+    StartEditing: 'Vi povas ekredakti vian enhavon malfermante je <a href="{link}">la CMS</a>.'
     UnableDeleteInstall: 'Ne eblas forigi instalajn dosierojn. Bonvolu mane forigi la jenajn dosierojn'
     VIEWPAGEIN: 'Vidigi Paĝon en:'
+    DRAFT: Malneta
+    PUBLISHED: Publikigita
   ErrorPage:
-    CODE: 'Eraro kodo'
-    DEFAULTERRORPAGECONTENT: '<p>Bedaŭrinde ŝajne vi provis aliri paĝon kiu ne ekzistas.</p><p>Bonvole kontrolu la literumadon de la URL alirota kaj provu denove.</p>'
+    400: '400 - Nevalida Peto'
+    401: '401- Nepermesita'
+    403: '403 - Nepermesebla'
+    404: '404 - Netrovita'
+    405: '405 - Metodo nepermesita'
+    406: '406 - Ne akceptebla'
+    407: '407 - Bezonas prokuran aŭtentokontrolon'
+    408: '408 - Pasis tempolimo de peto'
+    409: '409 - Konflikto'
+    410: '410 - For'
+    411: '411 - Longo bezonata'
+    412: '412 - Antaŭkondiĉo malsukcesis'
+    413: '413 - Petaĵo tro granda'
+    414: '414 - Petita URI tro longa'
+    415: '415 - Nesubtenata spekta tipo'
+    416: '416 - Peta amplekso ne plenumebla'
+    417: '417 - Atendo malsukcesis'
+    500: '500 - Eraro de interna servilo'
+    501: '501 - Ne realigita'
+    502: '502 - Malbona kluzo'
+    503: '503 - Servo nehavebla'
+    504: '504 - Kluza tempolimo'
+    505: '505 - HTTP-Versio ne subtenata'
+    CODE: 'Erarokodo'
+    DEFAULTERRORPAGECONTENT: '<p>Bedaŭrinde, ŝajne vi provis aliri paĝon kiu ne ekzistas.</p><p>Bonvole kontrolu la literumadon de la URL alirota kaj provu denove.</p>'
     DEFAULTERRORPAGETITLE: 'Ne trovis paĝon'
     DEFAULTSERVERERRORPAGECONTENT: '<p>Bedaŭrinde, estis problemo pri via peto.</p>'
     DEFAULTSERVERERRORPAGETITLE: 'Servila eraro'
@@ -200,29 +203,6 @@ eo:
     ERRORFILEPROBLEM: 'Eraro okazis malfermante dosieron "{filename}" por skribi. Bonvolu kontroli permesojn.'
     PLURALNAME: 'Prieraraj paĝoj'
     SINGULARNAME: 'Prierara paĝo'
-    400: '400 - Nevalida Peto'
-    401: '401- Nepermesita'
-    403: '403 - Nepermesebla'
-    404: '404 - Netrovita'
-    405: '405 - Metodo Malpermesita'
-    406: '406 - Ne Akceptebla'
-    407: '407 - Bezonas Prokuran Aŭtentokontrolon'
-    408: '408 - Pasis Tempolimon de Peto'
-    409: '409 - Konflikto'
-    410: '410 - For'
-    411: '411 - Longo Bezonata'
-    412: '412 - Antaŭkondiĉo Malsukcesis'
-    413: '413 - Petaĵo Tro Granda'
-    414: '414 - Peto-URI Tro Longa'
-    415: '415 - Nesubtenata Spekta Tipo'
-    416: '416 - Peta Amplekso Ne Plenumebla'
-    417: '417 - Atendo Malsukcesis'
-    500: '500 - Eraro de Interna Servilo'
-    501: '501 - Ne realigita'
-    502: '502 - Malbona Kluzo'
-    503: '503 - Servo Nehavebla'
-    504: '504 - Kluza Tempolimo'
-    505: '505 - HTTP-Versio Ne Subtenata'
   Folder:
     AddFolderButton: 'Aldoni dosierujon'
     DELETEUNUSEDTHUMBNAILS: 'Forigi neuzitajn miniaturojn'
@@ -230,16 +210,13 @@ eo:
     UNUSEDTHUMBNAILSTITLE: 'Neuzitaj miniaturoj'
     UploadFilesButton: Alŝuti
   LeftAndMain:
-    DELETED: Forigita
-    PreviewButton: Antaŭvido
+    DELETED: Forigita.
     SAVEDUP: Konservita.
     STATUSPUBLISHEDSUCCESS: 'Sukcese publikigis je ''{title}'''
-    SearchResults: Serĉrezultoj
-    VersionUnknown: Nekonata
   Permission:
-    CMS_ACCESS_CATEGORY: CMS-aliro
+    CMS_ACCESS_CATEGORY: 'CMS-aliro'
   Permissions:
-    CONTENT_CATEGORY: Enhavopermesoj
+    CONTENT_CATEGORY: 'Enhavopermesoj'
     PERMISSIONS_CATEGORY: 'Roloj kaj aliraj permesoj'
   RedirectorPage:
     DESCRIPTION: 'Alidirektas al malsama interna paĝo'
@@ -253,42 +230,35 @@ eo:
     SINGULARNAME: 'Alidirekta paĝo'
     YOURPAGE: 'Paĝo en via retejo'
   ReportAdmin:
-    MENUTITLE: Raportoj
     ReportTitle: Titolo
+    MENUTITLE: Raportoj
   ReportAdminForm:
     FILTERBY: 'Filtri laŭ'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Ek
     SEARCH: Serĉi
-    SearchResults: Serĉrezultoj
   SideReport:
     BROKENFILES: 'Paĝoj kun rompitaj dosieroj'
     BROKENLINKS: 'Paĝoj kun rompitaj ligiloj'
-    BROKENREDIRECTORPAGES: 'RedirektoPaĝoj indikantaj forigitajn paĝojn'
+    BROKENREDIRECTORPAGES: 'Redirektaj paĝoj indikantaj forigitajn paĝojn'
     BROKENVIRTUALPAGES: 'VirtualajPaĝoj indikantaj forigitajn paĝojn'
     BrokenLinksGroupTitle: 'Raporto pri rompitaj ligiloj'
-    ContentGroupTitle: 'Raporto pri enhavo'
+    ContentGroupTitle: 'Raportoj pri enhavo'
     EMPTYPAGES: 'Malplenaj paĝoj'
     LAST2WEEKS: 'Paĝoj redaktitaj dum la lastaj 2 semajnoj'
     OtherGroupTitle: Alia
     ParameterLiveCheckbox: 'Kontroli publikan retejon'
     REPEMPTY: 'La raporto {title} estas malplena.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Por dividi al ĉi tiu paĝo, kopiu kaj algluu la suban ligilon.'
     ShareLink: 'Komunigi ligilon'
   SilverStripeNavigatorLinkl:
     CloseLink: Fermi
   SiteConfig:
-    DEFAULTTHEME: '(Uzi defaŭltan etoson)'
+    DEFAULTTHEME: '(Uzi aprioran etoson)'
     EDITHEADER: 'Kiu povas redakti paĝojn en ĉi tiu retejo?'
     EDIT_PERMISSION: 'Agordi konfiguron de retejo'
-    EDIT_PERMISSION_HELP: 'Eblo agordi alirajn agordojn/supranivelajn paĝajn permesojn.'
+    EDIT_PERMISSION_HELP: 'Eblo agordi ĉieajn alirajn agordojn/supronivelajn paĝajn permesojn.'
     PLURALNAME: 'Retejaj agordaroj'
     SINGULARNAME: 'Agordi retejon'
     SITENAMEDEFAULT: 'Nomo de via retejo'
@@ -304,17 +274,15 @@ eo:
     ACCESSANYONE: Iu
     ACCESSHEADER: 'Kiuj povas vidi ĉi tiun paĝon?'
     ACCESSLOGGEDIN: 'Ensalutintaj uzantoj'
-    ACCESSONLYTHESE: 'Nur ĉi tiuj homoj (elektu de listo)'
+    ACCESSONLYTHESE: 'Nur ĉi tiuj homoj (elektu el listo)'
     ADDEDTODRAFTHELP: 'Paĝo ankoraŭ estas ne publikigita'
     ADDEDTODRAFTSHORT: Malneto
     ALLOWCOMMENTS: 'Permesi rimarkojn en ĉi tiu paĝo?'
     APPEARSVIRTUALPAGES: 'Ĉi tiu enhavo ankaŭ aperas en la virtualaj paĝoj en la sekcioj {title}.'
-    BUTTONCANCELDRAFT: 'Nuligu projekton ŝanĝojn'
-    BUTTONCANCELDRAFTDESC: 'Forigu vian projekton kaj reven al la aktuale eldon paĝo'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: Maleldonu
+    BUTTONCANCELDRAFT: 'Nuligi malnetajn ŝanĝojn'
+    BUTTONCANCELDRAFTDESC: 'Forigi vian malneton kaj reveni al la aktuale eldonita paĝo'
+    BUTTONSAVEPUBLISH: 'Konservi kaj publikigi'
+    BUTTONUNPUBLISH: Malpublikigi
     BUTTONUNPUBLISHDESC: 'Forigi ĉi tiun paĝon de la publikigita retejo'
     CREATED: 'Dato de kreo'
     Comments: Komentoj
@@ -323,91 +291,92 @@ eo:
     DEFAULTABOUTTITLE: 'Pri ni'
     DEFAULTCONTACTCONTENT: '<p>Vi povas plenigi ĉi tiun paĝon per via materialo, aŭ forigi ĝin kaj krei viajn proprajn paĝojn.<br /></p>'
     DEFAULTCONTACTTITLE: 'Kontakti nin'
-    DEFAULTHOMECONTENT: '<p>Bonvenon al SilverStripe! Jen la defaŭlta hejmpaĝo. Vi povas redakti ĉi tiun paĝon malfermante je <a href="admin/">la CMS</a>. Tiam vi povas aliri al la <a href="http://doc.silverstripe.com">dokumentaro por evoluigistoj</a>, aŭ ekuzi <a href="http://doc.silverstripe.com/doku.php?id=tutorials">la instruilojn.</a></p>'
+    DEFAULTHOMECONTENT: '<p>Bonvenon al SilverStripe! Jen la apriora hejmpaĝo. Vi povas redakti ĉi tiun paĝon malfermante je <a href="admin/">la CMS</a>. Tiam vi povas aliri al la <a href="http://doc.silverstripe.com">dokumentaro por evoluigistoj</a>, aŭ ekuzi <a href="http://doc.silverstripe.com/doku.php?id=tutorials">la instruilojn.</a></p>'
     DEFAULTHOMETITLE: Hejmo
     DELETEDPAGEHELP: 'Paĝo ne plu estas publikigita'
     DELETEDPAGESHORT: Forigita
-    DEPENDENT_NOTE: 'La sekvaj paĝoj dependas de ĉi tiu paĝo. Tio inkluzivas virtualajn paĝojn, alidirektaj paĝoj, kaj paĝoj kun enhavaj ligiloj.'
+    DEPENDENT_NOTE: 'La sekvaj paĝoj dependas de ĉi tiu paĝo. Tio inkluzivas virtualajn paĝojn, alidirektajn paĝojn, kaj paĝojn kun enhavaj ligiloj.'
     DESCRIPTION: 'Ĝenerala paĝo por enhavo'
     DependtPageColumnLinkType: 'Ligila tipo'
-    DependtPageColumnURL: URL
-    EDITANYONE: 'Tiu, kiu povas ensaluti en la CMSO'
+    EDITANYONE: 'Tiu, kiu povas ensaluti en la CMS'
     EDITHEADER: 'Kiuj povas redakti ĉi tiun paĝon?'
     EDITONLYTHESE: 'Nur ĉi tiuj homoj (elektu de listo)'
-    EDITORGROUPS: 'Redaktaj grupoj'
-    EDIT_ALL_DESCRIPTION: 'Povas redakti ajnan paĝon en la retejo, preterpasante paĝspecifan sekurecon'
+    EDITORGROUPS: 'Grupoj de redaktantoj'
+    EDIT_ALL_DESCRIPTION: 'Redakti ajnan paĝon'
     EDIT_ALL_HELP: 'Eblo redakti ajnan paĝon en la retejo, senkonsidere de la agordoj en la langeto Aliro. Necesas la permeso "Aliro al sekcio ''Paĝoj'' "'
     Editors: 'Redaktaj Grupoj'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Ĉi tiu paĝo havas rompitajn ligilojn.'
     HTMLEDITORTITLE: Enhavo
     INHERIT: 'Heredi de patra paĝo'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Lastfoje ĝisdatigita'
     LINKCHANGENOTE: 'Ŝanĝi la ligilon de ĉi tiu paĝo ankaŭ influas la ligilojn de ĉiuj idaj paĝoj.'
-    MENUTITLE: 'Navigado etikedo'
-    METADESC: Priskribo
+    MENUTITLE: 'Navigada etikedo'
+    METADESC: 'Metapriskribo'
     METADESCHELP: 'Serĉiloj uzas ĉi tiun enhavon por vidigi serĉajn rezultojn (kvankam ĝi ne influos ilian rangon).'
     METAEXTRA: 'Propraj Meta-etikedoj '
     METAEXTRAHELP: 'HTML-etikedoj por plua metainformo. Ekzemple &lt;meta name="customName" content="via propra enhavo ĉi tie" /&gt;'
-    MODIFIEDONDRAFTHELP: 'Paĝo havas nepublikigitajn paĝojn'
+    MODIFIEDONDRAFTHELP: 'Paĝo enhavas nepublikigitajn ŝanĝojn'
     MODIFIEDONDRAFTSHORT: Ŝanĝita
     MetadataToggle: Metadatumoj
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
+    OBSOLETECLASS: 'Ĉi tiu paĝo estas de malaktuala tipo {type}. Konservi ĝin reagordos ĝian tipon kaj vi eble perdos datumojn.'
     PAGELOCATION: 'Situo de paĝo'
     PAGETITLE: 'Nomo de paĝo'
     PAGETYPE: 'Tipo de paĝo'
     PARENTID: 'Praa paĝo'
     PARENTTYPE: 'Situo de paĝo'
     PARENTTYPE_ROOT: 'Supronivela paĝo'
-    PARENTTYPE_SUBPAGE: 'Subpaĝo sub patra paĝo (elektu sube)'
-    PERMISSION_GRANTACCESS_DESCRIPTION: 'Regi kiuj grupoj povas aliri aŭ redakti specifajn paĝojn'
+    PARENTTYPE_SUBPAGE: 'Subpaĝo sub patra paĝo'
+    PERMISSION_GRANTACCESS_DESCRIPTION: 'Regi alirajn rajtojn por enhavo'
     PERMISSION_GRANTACCESS_HELP: 'Permesi agordi paĝspecifajn alirajn limigojn en la sekcio "Paĝoj".'
     PLURALNAME: Paĝoj
-    PageTypNotAllowedOnRoot: 'Paĝa tipo "{type}" ne estas permesita ĉe la root-nivelo'
-    PageTypeNotAllowed: 'Paĝa tipo "{type}" ne estas permesita kiel ido de ĉi tiu praa paĝo'
+    PageTypNotAllowedOnRoot: 'Paĝa tipo "{type}" ne estas permesita ĉe la radika nivelo'
+    PageTypeNotAllowed: 'Paĝa tipo "{type}" ne estas permesita kiel ido de ĉi tiu patra paĝo'
     REMOVEDFROMDRAFTHELP: 'Paĝo estas publikigita, sed ĝi estas forigita el malneto'
     REMOVEDFROMDRAFTSHORT: 'Forigita el malneta'
     REMOVE_INSTALL_WARNING: 'Averto: vi devus forigi je install.php el ĉi tiu Silverstripe-instalaĵo por sekureco.'
-    REORGANISE_DESCRIPTION: 'Povas reorganizi la retejan arbon'
-    REORGANISE_HELP: 'Rearanĝi paĝojn en la reteja arbo per ŝovo.'
+    REORGANISE_DESCRIPTION: 'Reorganizi la retejan arbon'
+    REORGANISE_HELP: 'Rearanĝi paĝojn en la reteja arbo per ŝovado.'
     SHOWINMENUS: 'Vidigi en menuoj?'
     SHOWINSEARCH: 'Vidigi en serĉo?'
     SINGULARNAME: Paĝo
     TABBEHAVIOUR: Konduto
-    TABCONTENT: Enhavo
+    TABCONTENT: 'Ĉefa enhavo'
     TABDEPENDENT: 'Dependaj paĝoj'
     TOPLEVEL: 'Enhavo de Retejo (Supra Nivelo)'
     TOPLEVELCREATORGROUPS: 'Supranivelaj kreiloj'
-    URLSegment: URL-Segmento
+    URLSegment: 'URL-segmento'
     VIEWERGROUPS: 'Grupoj de vidantoj'
-    VIEW_ALL_DESCRIPTION: 'Povas vidigi ajnan paĝon en la retejo, preterpasante paĝspecifan sekurecon'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
+    VIEW_ALL_DESCRIPTION: 'Vidigi ajnan paĝon'
+    VIEW_ALL_HELP: 'Povo vidigi ajnan paĝon en la retejo, senkonsidere la agordaĵojn en la langeto Aliro. Bezonatas la permeso "Aliro al sekcio ''Paĝoj''"'
     VIEW_DRAFT_CONTENT: 'Vidigi malnetan enhavon'
     VIEW_DRAFT_CONTENT_HELP: 'Aplikas por vidigi paĝojn ekster la CMS en malneta reĝimo. Utila por eksteraj kunlaborantoj sen aliro al la CMS.'
-    Viewers: 'Grupoj de Vidantoj'
+    Viewers: 'Grupoj de vidantoj'
     Visibility: Videblo
-    has_one_Parent: 'Patra Paĝo'
-    many_many_BackLinkTracking: 'Spuri Retroligilojn'
+    has_one_Parent: 'Patra paĝo'
+    many_many_BackLinkTracking: 'Spuri retroligilojn'
     many_many_ImageTracking: 'Spuri Bildojn'
     many_many_LinkTracking: 'Spuri Ligilojn'
+    BUTTONPUBLISHED: Publikigita
+    BUTTONSAVED: Konservita
+    GroupPlaceholder: 'Alklaku por elekti grupon'
+    LASTPUBLISHED: 'Lasta publikigo'
+    LASTSAVED: 'Laste konservita'
+    MoreOptions: 'Pliaj agordoj'
+    NOTPUBLISHED: 'Ne publikigita'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Aŭtomate konvertas aŭ forigas specialajn signojn.'
+    EMPTY: 'Bonvolu enigi URL-segmenton aŭ alklaki al Rezigni'
   StaticExporter:
     BASEURL: 'Baza URL'
     EXPORTTO: 'Eksporti al tiu dosierujo'
     NAME: 'Statika eksportilo'
   TableListField:
     SELECT: 'Elekti:'
-  TableListField.ss:
+  TableListField_ss:
     NOITEMSFOUND: 'Ne trovis erojn'
     SORTASC: 'Ordigi kreske'
     SORTDESC: 'Ordigi malkreske'
-  TableListField_PageControls.ss:
+  TableListField_PageControls_ss:
     DISPLAYING: Vidigas
     OF: de
     TO: al
@@ -417,20 +386,34 @@ eo:
     VIEWPREVIOUS: 'Vidigi antaŭan'
   TreeTools:
     DisplayLabel: 'Vido:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Vi povas aliri la enarkivigitan retejon je ĉi tiu ligilo:'
-    HAVEASKED: 'Vi petis vidi la enhavon de nia retejo je'
+    HAVEASKED: 'Vi petis vidi la enhavon de nia retejo en'
   VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 'Vidigi la enhavon de alia paĝo'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
+    CHOOSE: 'Ligita paĝo'
+    DESCRIPTION: 'Vidigas la enhavon de alia paĝo'
+    EDITCONTENT: 'Redakti enhavon en ligita paĝo.'
     HEADER: 'Ĉi tiu estas virtuala paĝo'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: 'Virtual Pags'
+    PLURALNAME: 'Virtualaj paĝoj'
     PageTypNotAllowedOnRoot: 'Origina paĝa tipo "{type}" ne estas permesita ĉe la root-nivelo por ĉi tiu virtuala paĝo.'
     SINGULARNAME: 'Virtuala paĝo'
+    EditLink: redakti
+    HEADERWITHLINK: 'Ĉi tiu estas virtuala paĝo kopianta enhavon el "{title}" ({link})'
+  CMSFileAddController:
+    MENUTITLE: Dosieroj
+  CMSPageEditController:
+    MENUTITLE: 'Redakti paĝon'
+  CMSPageSettingsController:
+    MENUTITLE: 'Redakti paĝon'
+  CMSSettingsController:
+    MENUTITLE: Agordoj
+  SITETREE:
+    VIRTUALPAGEDRAFTWARNING: 'Bonvolu publikigi la ligitan paĝon por publikigi la virtualan paĝon'
+    VIRTUALPAGEWARNING: 'Bonvolu elekti ligitan paĝon kaj unue konservi ĝin por publikigi ĉi tiun paĝon'
+    VIRTUALPAGEWARNINGSETTINGS: 'Bonvolu elekti ligitan paĝon en la ĉefaj enhavaj kampoj por publikigi'
+  SilverStripeNavigator:
+    ARCHIVED: Enarkivigita
+  URLSegmentField:
+    Cancel: Rezigni
+    Edit: Redakti
+    OK: Akcepti
diff --git a/lang/es.yml b/lang/es.yml
index 34002c74..352d3248 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -3,9 +3,7 @@ es:
     ADDFILES: 'Añadir Archivos'
     ActionAdd: 'Añadir carpeta'
     AppCategoryArchive: Archivar
-    AppCategoryAudio: Audio
     AppCategoryDocument: Documento
-    AppCategoryFlash: Flash
     AppCategoryImage: Imagen
     AppCategoryVideo: Vídeo
     BackToFolder: 'Volver a la carpeta'
@@ -19,22 +17,22 @@ es:
     FROMYOURCOMPUTER: 'Desde tu ordenador'
     Filetype: 'Tipo de archivo'
     ListView: 'Vista de Lista'
-    MENUTITLE: Archivos
     NEWFOLDER: NuevaCarpeta
     SIZE: Tamaño
     THUMBSDELETED: '{count} miniaturas no utilizadas han sido eliminadas'
     TreeView: 'Vista en árbol'
     Upload: Subir
+    MENUTITLE: Archivos
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Eliminar carpetas'
   AssetAdmin_Tools:
     FILTER: Filtro
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Ir
   AssetTableField:
     BACKLINKCOUNT: 'Usado en:'
     PAGES: página(s)
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Atras
   BrokenLinksReport:
     Any: Cualquiera
@@ -45,7 +43,6 @@ es:
     ColumnDateLastModified: 'Fecha de última modificación'
     ColumnDateLastPublished: 'Fecha de última publicación'
     ColumnProblemType: 'Tipo de problema'
-    ColumnURL: URL
     HasBrokenFile: 'tiene un archivo roto'
     HasBrokenLink: 'tiene un enlace roto'
     HasBrokenLinkAndFile: 'tiene un enlace y archivo roto'
@@ -68,27 +65,19 @@ es:
     PUBLISHED_PAGES: 'Publicadas %d páginas, %d fallos'
     PUBLISH_PAGES: Publicar
     UNPUBLISHED_PAGES: 'No publicadas %d páginas'
-    UNPUBLISH_PAGES: 'Sin Publicar'
-  CMSFileAddController:
-    MENUTITLE: Archivos
+    UNPUBLISH_PAGES: Sin Publicar
   CMSMain:
     ACCESS: 'Acceso a la sección ''{title}'''
     ACCESS_HELP: 'Permitir la visualización de la sección que contiene el árbol de la página y el contenido. Ver y editar permisos puede ser gestionado a través de menús desplegables específicos de las páginas, así como los "permisos de contenido" separados.'
     AddNew: 'Añadir nueva página'
     AddNewButton: 'Añadir nuevo'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: 'Elegir donde crear esta página'
     ChoosePageType: 'Elegir tipo de página'
     Create: Crear
     DELETE: 'Eliminar del borrador de la web'
-    DELETEFP: 'Eliminar de la web publicada'
+    DELETEFP: Eliminar de la web publicada
     DESCREMOVED: 'y {count} descendientes'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: E-mail
-    EditTree: 'Editar árbol'
-    ListFiltered: 'Lista filtrada'
-    MENUTITLE: 'Editar página'
     NEWPAGE: 'Nuevo {pagetype}'
     PAGENOTEXISTS: 'Esta página no existe'
     PAGES: Páginas
@@ -96,69 +85,49 @@ es:
     PAGETYPEOPT: 'Tipo de Página'
     PUBALLCONFIRM: 'Por favor publica todas las páginas del sitio, copiando el contenido del borrador al sitio público'
     PUBALLFUN: 'Función "Publicar Todo"'
-    PUBALLFUN2: 'Pulsando este botón es el equivalente de ir a cada página y pulsar "Publicar". Está pensado para ser usado en ediciones masivas del contenido, por ejemplo cuando el sitio se construye por primera vez.'
+    PUBALLFUN2: "Pulsando este botón es el equivalente de ir a cada página y pulsar \"Publicar\". Está pensado para ser usado en ediciones masivas del contenido, por ejemplo cuando el sitio se construye por primera vez."
     PUBPAGES: 'Hecho: Publicadas {count} páginas'
     PageAdded: 'Página creada correctamente'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Eliminado ''{title}'' del sitio publicado'
     REMOVEDPAGEFROMDRAFT: 'Borrado ''%s''%s desde el sitio no publicado'
     RESTORE: Restaurar
     RESTORED: 'Restablecido ''{title}'' correctamente'
     ROLLBACK: 'Restaurar esta versión'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Guardar
-    SAVEDRAFT: 'Save draft'
     TabContent: Contenido
     TabHistory: Historial
     TabSettings: Ajustes
-    TreeFiltered: 'Árbol filtrado'
-    TreeFilteredClear: 'Limpiar filtro'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Aplicar filtro'
+    MENUTITLE: 'Editar página'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Aplicar filtro'
     RESET: Restablecer
   CMSPageAddController:
-    MENUTITLE: 'Añadir página'
     ParentMode_child: 'Debajo de otra página'
     ParentMode_top: 'Nivel superior'
-  CMSPageEditController:
-    MENUTITLE: 'Editar página'
+    MENUTITLE: 'Añadir página'
   CMSPageHistoryController:
     COMPAREMODE: 'Modo comparación (seleccionar dos)'
     COMPAREVERSIONS: 'Comparar Versiones'
     COMPARINGVERSION: 'Comparando versiones {version1} y {version2}'
-    MENUTITLE: Historial
     REVERTTOTHISVERSION: 'Volver a esta versión'
     SHOWUNPUBLISHED: 'Mostrar versiones no publicadas'
     SHOWVERSION: 'Mostrar Versión'
     VIEW: vista
-    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Actualmente viendo la versión {version}.'
-  CMSPageHistoryController_versions.ss:
+    MENUTITLE: Historial
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Autor
-    NOTPUBLISHED: 'No publicado'
-    PUBLISHER: Editor
     UNKNOWN: Desconocido
-    WHEN: Cuando
-  CMSPageSettingsController:
-    MENUTITLE: 'Editar página'
   CMSPagesController:
-    GalleryView: 'Vista de Galería'
-    ListView: 'Vista de Lista'
     MENUTITLE: Paginas
-    TreeView: 'Vista en árbol'
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: 'Drag''n''drop'
+  CMSPagesController_ContentToolbar_ss:
     MULTISELECT: Multi-selecciñón
-  CMSPagesController_Tools.ss:
+  CMSPagesController_Tools_ss:
     FILTER: Filtro
   CMSSearch:
     FILTERDATEFROM: De
     FILTERDATEHEADING: Fecha
     FILTERDATETO: Hasta
-    FILTERLABELTEXT: Contenido
-  CMSSettingsController:
-    MENUTITLE: Ajustes
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Páginas cambiadas'
   CMSSiteTreeFilter_DeletedPages:
@@ -170,36 +139,23 @@ es:
   ContentController:
     ARCHIVEDSITE: 'Vista previa de la versión'
     ARCHIVEDSITEFROM: 'Sitio archivado desde'
-    CMS: CMS
-    DRAFT: Draft
     DRAFTSITE: 'Sitio en Borrador'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Debe iniciar sesión para poder acceder a los contenidos archivados o al borrador. <a href="%s">De un click aquí para regresar al sitio publicado.</a>'
-    Email: 'Correo electrónico'
+    Email: Correo electrónico
     INSTALL_SUCCESS: '¡Instalación Correcta!'
     InstallFilesDeleted: 'Los archivos de instalación han sido borrados correctamente.'
     InstallSecurityWarning: 'Por razones de seguridad ahora debes eliminar los archivos de instalación, a menos que estés planeando reinstalar más tarde (<em>requiere inicio de sesión de administrador, ver arriba</em>). El servidor web ahora tan sólo necesita acceso de escritura a la carpeta "assets", puedes quitar el acceso de escritura de todas las demás carpetas. <a href="{link}" style="text-align: center;">Haz clic aquí para borrar los archivos de instalación.</a>'
     InstallSuccessCongratulations: '¡SilverStripe ha sido instalado con éxito!'
     LOGGEDINAS: 'Conectado como'
-    LOGIN: 'Iniciar sesión'
-    LOGOUT: Desconectar
+    LOGIN: Iniciar sesión
+    LOGOUT: 'Desconectar'
     NOTLOGGEDIN: 'No conectado'
-    PUBLISHED: Published
     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: 'You can start editing your content by opening <a href="{link}">the 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:
-    CODE: 'Código de error'
-    DEFAULTERRORPAGECONTENT: '<p>Lo sentimos, parece que intentaste acceder a una página que no existe.</p><p>Por favor, comprueba que la URL que intentabas acceder está bien escrita e inténtalo de nuevo.</p>'
-    DEFAULTERRORPAGETITLE: 'Página no encontrada'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Lo sentimos, hubo un problema al gestionar tu solicitud.</p>'
-    DEFAULTSERVERERRORPAGETITLE: 'Error de servidor'
-    DESCRIPTION: 'Contenido personalizado para los distintos casos de error (p.e. "Página no encontrada")'
-    ERRORFILEPROBLEM: 'Error abriendo el archivo "{filename}" para escritura. Por favor comprueba los permisos del archivo.'
-    PLURALNAME: 'Páginas de error'
-    SINGULARNAME: 'Página de error'
     400: '400 - Petición incorrecta (Bad Request)'
     401: '401 - No autorizado (Unauthorized)'
     403: '403 - Prohibido (Forbidden)'
@@ -223,6 +179,15 @@ es:
     503: '503 - Servicio no Disponible'
     504: '504- La pasarela de comunicación claudicó '
     505: '505- Versión HTTP no cubierta'
+    CODE: 'Código de error'
+    DEFAULTERRORPAGECONTENT: '<p>Lo sentimos, parece que intentaste acceder a una página que no existe.</p><p>Por favor, comprueba que la URL que intentabas acceder está bien escrita e inténtalo de nuevo.</p>'
+    DEFAULTERRORPAGETITLE: 'Página no encontrada'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>Lo sentimos, hubo un problema al gestionar tu solicitud.</p>'
+    DEFAULTSERVERERRORPAGETITLE: 'Error de servidor'
+    DESCRIPTION: 'Contenido personalizado para los distintos casos de error (p.e. "Página no encontrada")'
+    ERRORFILEPROBLEM: 'Error abriendo el archivo "{filename}" para escritura. Por favor comprueba los permisos del archivo.'
+    PLURALNAME: 'Páginas de error'
+    SINGULARNAME: 'Página de error'
   Folder:
     AddFolderButton: 'Añadir carpeta'
     DELETEUNUSEDTHUMBNAILS: 'Borrar miniaturas sin usar'
@@ -231,7 +196,6 @@ es:
     UploadFilesButton: Subir
   LeftAndMain:
     DELETED: Borrado.
-    PreviewButton: 'Vista previa'
     SAVEDUP: Guardado
     STATUSPUBLISHEDSUCCESS: 'Publicado ''{title}'' correctamente'
     SearchResults: 'Resultados de la búsqueda'
@@ -253,14 +217,10 @@ es:
     SINGULARNAME: 'Página de redirección apuntando a una página que no existe'
     YOURPAGE: 'Página en su sitio web'
   ReportAdmin:
-    MENUTITLE: Informes
     ReportTitle: Título
+    MENUTITLE: Informes
   ReportAdminForm:
     FILTERBY: 'Filtrar por'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: IR
     SEARCH: Buscar
@@ -277,8 +237,6 @@ es:
     OtherGroupTitle: Otro
     ParameterLiveCheckbox: 'Comprobar sitio activo'
     REPEMPTY: 'El informe {title} está vacío.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Para compartir ésta a esta página, copiar y pegar el enlace de abajo.'
     ShareLink: 'Compartir enlace'
@@ -311,10 +269,7 @@ es:
     APPEARSVIRTUALPAGES: 'Este contenido también aparece en las páginas virtuales en las secciones {title}.'
     BUTTONCANCELDRAFT: 'Cancelar los cambios en el borrador'
     BUTTONCANCELDRAFTDESC: 'Elimine el borrador y regrese a la página que se encuentra publicada actualmente'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Sin Publicar'
+    BUTTONUNPUBLISH: Sin Publicar
     BUTTONUNPUBLISHDESC: 'Elimine esta página del sitio publicado'
     CREATED: 'Fecha de creación'
     Comments: Comentarios
@@ -328,9 +283,7 @@ es:
     DELETEDPAGEHELP: 'La página ya no está publicada'
     DELETEDPAGESHORT: Borrado
     DEPENDENT_NOTE: 'Las siguientes páginas dependen de esta página. Esto incluye páginas virtuales, páginas de redireccionamiento, y las páginas con enlaces de contenido.'
-    DESCRIPTION: 'Página de contenido genérico'
     DependtPageColumnLinkType: 'Tipo de enlace'
-    DependtPageColumnURL: URL
     EDITANYONE: 'Cualquiera que pueda iniciar sesión en el CMS'
     EDITHEADER: '¿Quién puede editar esta página?'
     EDITONLYTHESE: 'Solo estas personas (elija de la lista)'
@@ -338,25 +291,18 @@ es:
     EDIT_ALL_DESCRIPTION: 'Editar cualquier página'
     EDIT_ALL_HELP: 'Posibilidad de editar cualquier página en el sitio, independientemente de la configuración de la pestaña de Acceso. Requiere permiso "Acceso a la sección ''Páginas''"'
     Editors: 'Grupo de Editores'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Esta página contiene enlaces rotos.'
     HTMLEDITORTITLE: Contenido
     INHERIT: 'Heredar de página padre'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Última actualización'
     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
+    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'
     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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
     PAGELOCATION: 'Localización de la página'
     PAGETITLE: 'Nombre de la página'
     PAGETYPE: 'Tipo de Página'
@@ -378,14 +324,13 @@ es:
     SHOWINSEARCH: '¿Mostrar en la búsqueda?'
     SINGULARNAME: Página
     TABBEHAVIOUR: Comportamiento
-    TABCONTENT: Contenido
+    TABCONTENT: 'Contenido'
     TABDEPENDENT: 'Páginas dependientes'
     TOPLEVEL: 'Contenido del Sitio (Top Level)'
     TOPLEVELCREATORGROUPS: 'Creadores de nivel superior'
     URLSegment: 'Segmento de URL'
     VIEWERGROUPS: 'Visor de Grupos'
     VIEW_ALL_DESCRIPTION: 'Ver cualquier página'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'Ver contenido en borrador'
     VIEW_DRAFT_CONTENT_HELP: 'Se aplica a la visualización de las páginas fuera del CMS en modo borrador. Útil para los colaboradores externos que no tienen acceso al CMS.'
     Viewers: 'Grupos de Observadores'
@@ -395,42 +340,35 @@ es:
     many_many_ImageTracking: 'Rastreo de Imágenes'
     many_many_LinkTracking: 'Rastreo de Enlaces'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Los caracteres especiales son automáticamente convertidos o eliminados.'
   StaticExporter:
     BASEURL: 'URL base'
     EXPORTTO: 'Exportar a esa carpeta'
     NAME: 'Exportador estático'
   TableListField:
-    SELECT: Seleccionar
-  TableListField.ss:
-    NOITEMSFOUND: 'No se encontraron elementos'
+    SELECT: 'Seleccionar'
+  TableListField_ss:
     SORTASC: 'Ordenar de forma ascendente'
     SORTDESC: 'Ordenar de forma descendente'
-  TableListField_PageControls.ss:
-    DISPLAYING: Mostrando
-    OF: de
-    TO: a
+  TableListField_PageControls_ss:
     VIEWFIRST: 'Ver primero'
     VIEWLAST: 'Ver último'
     VIEWNEXT: 'Ver siguiente'
     VIEWPREVIOUS: 'Ver anterior'
   TreeTools:
     DisplayLabel: 'Mostrar:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Puede acceder al sitio archivado con este enlace:'
     HAVEASKED: 'Ha pedido ver el contenido de nuestro sitio el'
   VirtualPage:
-    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Muestra el contenido de otra página'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Esta es una página virtual'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Páginas Virtuales'
     PageTypNotAllowedOnRoot: 'Tipo de página original "{type}" no se permite en el nivel raíz para esta página virtual'
     SINGULARNAME: 'Página Virtual'
+  CMSFileAddController:
+    MENUTITLE: Archivos
+  CMSPageEditController:
+    MENUTITLE: 'Editar página'
+  CMSPageSettingsController:
+    MENUTITLE: 'Editar página'
diff --git a/lang/es_AR.yml b/lang/es_AR.yml
index f087c885..569466e1 100644
--- a/lang/es_AR.yml
+++ b/lang/es_AR.yml
@@ -1,41 +1,8 @@
 es_AR:
   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: 'Nueva Carpeta'
-    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:
+    NEWFOLDER: Nueva Carpeta
+  AssetAdmin_left_ss:
     GO: Ir
-  AssetTableField:
-    BACKLINKCOUNT: 'Used on:'
-    PAGES: page(s)
-  BackLink_Button.ss:
-    Back: Back
   BrokenLinksReport:
     Any: Cualquiera
     BROKENLINKS: 'Informe de enlaces rotos'
@@ -45,7 +12,6 @@ es_AR:
     ColumnDateLastModified: 'Fecha de última modificación'
     ColumnDateLastPublished: 'Fecha de última publicación'
     ColumnProblemType: 'Tipo de problema'
-    ColumnURL: URL
     HasBrokenFile: 'tiene un archivo roto'
     HasBrokenLink: 'tiene un enlace roto'
     HasBrokenLinkAndFile: 'tiene enlace y archivo rotos'
@@ -58,148 +24,37 @@ es_AR:
     ReasonDropdownVPBROKENLINK: 'Página virtual apuntando a una página no existente'
     RedirectorNonExistent: 'la página de redireccionamiento apunta a una página inexistente'
     VirtualPageNonExistent: 'página virtual apuntando a una página no existente'
-  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: 'Eliminado del sitio borrador'
     DELETE_PAGES: 'Eliminar del sitio publicado'
     PUBLISHED_PAGES: 'Se publicaron %d páginas, %d fallas'
     PUBLISH_PAGES: Publicar
     UNPUBLISHED_PAGES: 'Se despublicaron %d páginas'
     UNPUBLISH_PAGES: Despublicar
-  CMSFileAddController:
-    MENUTITLE: Files
   CMSMain:
-    ACCESS: 'Access to ''{title}'' section'
     ACCESS_HELP: 'Permitir la visualización de la sección que contiene el árbol de páginas y el contenido. Ver y editar permisos que se pueden manejar mediante listas desplegables específicas de la página, así como el apartado "Permisos del contenido".'
-    AddNew: 'Add new page'
-    AddNewButton: 'Add new'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
     DELETE: 'Eliminar del sitio borrador'
-    DELETEFP: 'Eliminar del sitio publicado'
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    EMAIL: Email
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Edit Page'
-    NEWPAGE: 'New {pagetype}'
+    DELETEFP: Eliminar del sitio publicado
     PAGENOTEXISTS: 'Esta página no existe'
-    PAGES: Pages
-    PAGETYPEANYOPT: Any
-    PAGETYPEOPT: 'Page Type'
     PUBALLCONFIRM: 'Por favor publica todas las páginas del sitio, copiando el contenido del boceto al sitio público'
     PUBALLFUN: 'Funcionalidad "Publicar Todo"'
-    PUBALLFUN2: 'Pulsar este botón hará el equivalente de ir a cada página y pulsar "Publicar". Está pensado para ser usado en edición masiva de contenido, por ejemplo cuando se construye el sitio por primera vez.'
-    PUBPAGES: 'Done: Published {count} pages'
-    PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
+    PUBALLFUN2: "Pulsar este botón hará el equivalente de ir a cada página y pulsar \"Publicar\". Está pensado para ser usado en edición masiva de contenido, por ejemplo cuando se construye el sitio por primera vez."
     REMOVEDPAGEFROMDRAFT: 'Quitados ''%s'' del borrador del sitio'
     RESTORE: Restaurar
-    RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Restaurar a ésta versión'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Guardar
-    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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: Para
-    FILTERLABELTEXT: Contenido
-  CMSSettingsController:
-    MENUTITLE: Settings
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Changed pages'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'All pages, including deleted'
-  CMSSiteTreeFilter_Search:
-    Title: 'All pages'
   ContentControl:
     NOTEWONTBESHOWN: 'Nota: este mensage no se mostrará a sus visitantes'
   ContentController:
-    ARCHIVEDSITE: 'Preview version'
-    ARCHIVEDSITEFROM: 'Archived site from'
-    CMS: CMS
-    DRAFT: Draft
     DRAFTSITE: 'Sitio borrador'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Debes iniciar sesión con tu contraseña CMS para poder ver el contenido del borrador archivado . <a href="%s">Haz click aquí para regresar al sitio publicado.</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: 'Conectado como'
-    LOGIN: 'Iniciar sesión'
-    LOGOUT: Desconectarse
+    LOGIN: Iniciar sesión
+    LOGOUT: 'Desconectarse'
     NOTLOGGEDIN: 'No conectado'
-    PUBLISHED: Published
     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 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:
-    CODE: 'Código de Error'
-    DEFAULTERRORPAGECONTENT: '<p>Disculpa, parece que estás tratando de ingresar a una página que no existe.</p><p>Por favor verifica la escritura de la URL que deseas visitar e inténtalo de nuevo.</p>'
-    DEFAULTERRORPAGETITLE: 'Página inexistente'
-    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 - Petición Incorrecta'
     401: '401 - No estás autorizado'
     403: '403 - Acceso Restringido'
@@ -223,44 +78,28 @@ es_AR:
     503: '503 - Fuera de Servicio'
     504: '504 - Tiempo Excedido en Puerta de Acceso'
     505: '505 - Versión HTTP Sin Soporte'
+    CODE: 'Código de Error'
+    DEFAULTERRORPAGECONTENT: '<p>Disculpa, parece que estás tratando de ingresar a una página que no existe.</p><p>Por favor verifica la escritura de la URL que deseas visitar e inténtalo de nuevo.</p>'
+    DEFAULTERRORPAGETITLE: 'Página inexistente'
   Folder:
-    AddFolderButton: 'Add folder'
     DELETEUNUSEDTHUMBNAILS: 'Eliminar  miniaturas sin utilizar'
     UNUSEDFILESTITLE: 'Archivos sin utilizar'
     UNUSEDTHUMBNAILSTITLE: 'Miniaturas sin utilizar'
-    UploadFilesButton: Upload
-  LeftAndMain:
-    DELETED: Deleted.
-    PreviewButton: Preview
-    SAVEDUP: Saved.
-    STATUSPUBLISHEDSUCCESS: 'Published ''{title}'' successfully'
-    SearchResults: 'Search Results'
-    VersionUnknown: Unknown
   Permission:
     CMS_ACCESS_CATEGORY: 'Acceso al CMS'
   Permissions:
     CONTENT_CATEGORY: 'Permisos de contenido'
     PERMISSIONS_CATEGORY: 'Roles y permisos de acceso'
   RedirectorPage:
-    DESCRIPTION: 'Redirects to a different internal page'
     HASBEENSETUP: 'Se ha instalado una página de redirección  sin algún lugar a donde redireccionar.'
     HEADER: 'Esta página dirigirá al usuarios a otra página'
     OTHERURL: 'Otro URL del sitio web'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Redirigir a'
     REDIRECTTOEXTERNAL: 'Otro sitio web'
     REDIRECTTOPAGE: 'Una página en tu sitio web'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Página en tu sitio web'
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
   ReportAdminForm:
     FILTERBY: 'Filtrar por'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Ir
     SEARCH: Buscar
@@ -276,9 +115,6 @@ es_AR:
     LAST2WEEKS: 'Páginas editadas en las últimas 2 semanas'
     OtherGroupTitle: Otro
     ParameterLiveCheckbox: 'Verificar el sitio en vivo'
-    REPEMPTY: 'The {title} report is empty.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Para compartir esta página, copiar y pegar el enlace inferior.'
     ShareLink: 'Compartir enlace'
@@ -288,9 +124,6 @@ es_AR:
     DEFAULTTHEME: '(Usar tema por defecto)'
     EDITHEADER: '¿Quien puede editar páginas en este sitio?'
     EDIT_PERMISSION: 'Administrar la configuración del sitio'
-    EDIT_PERMISSION_HELP: 'Ability to edit global access settings/top-level page permissions.'
-    PLURALNAME: 'Site Configs'
-    SINGULARNAME: 'Site Config'
     SITENAMEDEFAULT: 'Nombre de su sitio'
     SITETAGLINE: 'Lema/slogan del sitio'
     SITETITLE: 'Título del sitio'
@@ -305,132 +138,76 @@ es_AR:
     ACCESSHEADER: '¿Quién puede ver ésta página?'
     ACCESSLOGGEDIN: 'Usuarios registrados'
     ACCESSONLYTHESE: 'Únicamente estas personas (selecciona de la lista)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: '¿Permitir comentarios en ésta página?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancelar cambios al borrador'
     BUTTONCANCELDRAFTDESC: 'Eliminar el borrador y regresar a la página actualmente publicada'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'No Publicar'
+    BUTTONUNPUBLISH: No Publicar
     BUTTONUNPUBLISHDESC: 'Quitar ésta página del sitio público'
-    CREATED: 'Date Created'
     Comments: Comentarios
     Content: Contenido
     DEFAULTABOUTCONTENT: '<p>Puedes llenar esta páigna con tu propio contenido, o eliminarla y crear tus propias páginas.<br /></p>'
     DEFAULTABOUTTITLE: 'de Nosotros'
     DEFAULTCONTACTCONTENT: '<p>Puedes llenar esta página con tu propio contenido, o eliminarla y crear tus propias páginas.<br /></p>'
-    DEFAULTCONTACTTITLE: Contactenos
+    DEFAULTCONTACTTITLE: 'Contactenos'
     DEFAULTHOMECONTENT: '<p>¡Bienvenido a SilverStripe! Esta es la página inicial por defecto. Puede editar esta página al abrir <a href="admin/">el CMS</a>. Ahora puede acceder a la <a href="http://doc.silverstripe.org">documentación del desarrollador</a>, o comenzar <a href="http://doc.silverstripe.org/doku.php?id=tutorials">tos tutoriales.</a></p>'
     DEFAULTHOMETITLE: Inicio
-    DELETEDPAGEHELP: 'Page is no longer published'
-    DELETEDPAGESHORT: Deleted
     DEPENDENT_NOTE: 'Las siguientes páginas dependen de esta página. Esto incluye páginas virtuales, páginas de redireccionamiento y páginas con enlaces de contenido.'
-    DESCRIPTION: 'Generic content page'
     DependtPageColumnLinkType: 'Tipo de enlace'
-    DependtPageColumnURL: URL
     EDITANYONE: 'Cualquiera que pueda ingresar al CMS'
     EDITHEADER: '¿Quién puede editar ésta página?'
     EDITONLYTHESE: 'Únicamente éstas personas (selecciona de la lista)'
-    EDITORGROUPS: 'Editor Groups'
     EDIT_ALL_DESCRIPTION: 'Editar cualquier página'
     EDIT_ALL_HELP: 'Capacidad para editar cualquier página en el sitio, independientemente de la configuración en la pestaña Acceso. Necesita del permiso "Acceder al contenido del sitio".'
     Editors: 'Grupos de Editores'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Esta página tiene enlaces rotos.'
     HTMLEDITORTITLE: Contenido
     INHERIT: 'heredar de página superior'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
     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).'
+    METADESC: 'Descripción'
     METAEXTRA: 'Etiquetas Meta Personalizadas'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
     PAGELOCATION: 'Ubicación de la página'
     PAGETITLE: 'Nombre de página'
     PAGETYPE: 'Tipo de Página'
     PARENTID: 'Página padre'
     PARENTTYPE: 'Ubicación de la página'
-    PARENTTYPE_ROOT: 'Top-level page'
-    PARENTTYPE_SUBPAGE: 'Sub-page underneath a parent page'
     PERMISSION_GRANTACCESS_DESCRIPTION: 'Administrar los derechos de acceso para el contenido'
     PERMISSION_GRANTACCESS_HELP: 'Permitir el establecimiento de restricciones de acceso específicas de la página en la sección "Páginas".'
-    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: 'Cambiar la estructura del sitio'
     REORGANISE_HELP: 'Reorganizar las páginas en el árbol del sitio mediante arrastrar y soltar.'
     SHOWINMENUS: '¿Mostrar en menús?'
     SHOWINSEARCH: '¿Mostrar en búsqueda?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: Compotamiento
-    TABCONTENT: Contenido
+    TABCONTENT: 'Contenido'
     TABDEPENDENT: 'Páginas dependientes'
     TOPLEVEL: 'Contenido del Sitio (Nivel Superior)'
     TOPLEVELCREATORGROUPS: 'Creadores de alto nivel'
     URLSegment: 'Segmento del URL'
-    VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'Ver cualquier página'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'Ver contenido borrador'
-    VIEW_DRAFT_CONTENT_HELP: 'Applies to viewing pages outside of the CMS in draft mode. Useful for external collaborators without CMS access.'
     Viewers: 'Grupos de Observadores'
-    Visibility: Visibility
     has_one_Parent: 'Página Superior'
     many_many_BackLinkTracking: 'Seguimiento de Backlink'
     many_many_ImageTracking: 'Seguimiento de Imágen'
     many_many_LinkTracking: 'Seguimiento de Enlace'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
   StaticExporter:
     BASEURL: 'URL base'
     EXPORTTO: 'Exportar a esa carpeta'
     NAME: 'Exportador estático'
   TableListField:
     SELECT: 'Seleccionar:'
-  TableListField.ss:
-    NOITEMSFOUND: 'No items found'
+  TableListField_ss:
     SORTASC: 'Ordenar en orden ascendente'
     SORTDESC: 'Ordenar en orden descendente'
-  TableListField_PageControls.ss:
-    DISPLAYING: Displaying
-    OF: of
-    TO: to
+  TableListField_PageControls_ss:
     VIEWFIRST: 'Ver primero'
     VIEWLAST: 'Ver último'
     VIEWNEXT: 'Ver siguiente'
     VIEWPREVIOUS: 'Ver anterior'
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Puedes acceder al sitio archivado con este enlace:'
     HAVEASKED: 'Has solicitado ver el contenido de nuestro sitio en'
   VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Esta es una página virtual'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Págs. Virtuales'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Página Virtual'
diff --git a/lang/es_MX.yml b/lang/es_MX.yml
index c95ed913..fcb1e388 100644
--- a/lang/es_MX.yml
+++ b/lang/es_MX.yml
@@ -1,41 +1,8 @@
 es_MX:
   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: 'Nueva Carpeta'
-    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:
+    NEWFOLDER: Nueva Carpeta
+  AssetAdmin_left_ss:
     GO: Ir
-  AssetTableField:
-    BACKLINKCOUNT: 'Used on:'
-    PAGES: page(s)
-  BackLink_Button.ss:
-    Back: Back
   BrokenLinksReport:
     Any: Cualquiera
     BROKENLINKS: 'Informe de enlaces rotos'
@@ -45,7 +12,6 @@ es_MX:
     ColumnDateLastModified: 'Fecha de última modificación'
     ColumnDateLastPublished: 'Fecha de última publicación'
     ColumnProblemType: 'Tipo de problema'
-    ColumnURL: URL
     HasBrokenFile: 'tiene un archivo en mal estado'
     HasBrokenLink: 'tiene un enlace roto'
     HasBrokenLinkAndFile: 'tiene un enlace roto y un archivo en mal estado'
@@ -58,148 +24,38 @@ es_MX:
     ReasonDropdownVPBROKENLINK: 'La página virtual apunta a una página inexistente'
     RedirectorNonExistent: 'la redirección de página apunta a una página inexistente'
     VirtualPageNonExistent: 'la página virtual apunta a una página inexistente'
-  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: 'Eliminar del boceto del sitio'
     DELETE_PAGES: 'Eliminada del sito público'
     PUBLISHED_PAGES: 'Se publicaron %d páginas, %d fallos'
     PUBLISH_PAGES: Publicar
     UNPUBLISHED_PAGES: '%d páginas no publicadas'
-    UNPUBLISH_PAGES: 'No publicadas'
-  CMSFileAddController:
-    MENUTITLE: Files
+    UNPUBLISH_PAGES: No publicadas
   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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
     DELETE: 'Eliminar del boceto del sitio'
-    DELETEFP: 'Eliminar del sitio público'
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    EMAIL: 'Correo Electrónico'
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Edit Page'
-    NEWPAGE: 'New {pagetype}'
+    DELETEFP: Eliminar del sitio público
+    EMAIL: Correo Electrónico
     PAGENOTEXISTS: 'Esta página no existe'
-    PAGES: Pages
-    PAGETYPEANYOPT: Any
-    PAGETYPEOPT: 'Page Type'
     PUBALLCONFIRM: 'Por favor publique todas las páginas del sitio, copiando el contenido del boceto al sitio público'
     PUBALLFUN: 'Funcionalidad "Publicar todo"'
-    PUBALLFUN2: 'Al precionar este botón hará el equivalente de ir a cada página y precionar "Publicar". Está pensado para ser usado en edición masiva de contenido, por ejemplo cuando se construye el sitio por primera vez.'
-    PUBPAGES: 'Done: Published {count} pages'
-    PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
+    PUBALLFUN2: "Al precionar este botón hará el equivalente de ir a cada página y precionar \"Publicar\". Está pensado para ser usado en edición masiva de contenido, por ejemplo cuando se construye el sitio por primera vez."
     REMOVEDPAGEFROMDRAFT: 'Se ha eliminado ''%s'' del boceto del sitio'
     RESTORE: Restaurar
-    RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Restaurar a ésta versión'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Guardar
-    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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  CMSSettingsController:
-    MENUTITLE: Settings
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Changed pages'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'All pages, including deleted'
-  CMSSiteTreeFilter_Search:
-    Title: 'All pages'
   ContentControl:
     NOTEWONTBESHOWN: 'Nota: este mensaje no será mostrado a sus visitantes'
   ContentController:
-    ARCHIVEDSITE: 'Preview version'
     ARCHIVEDSITEFROM: 'Sito archivado de'
-    CMS: CMS
-    DRAFT: Draft
     DRAFTSITE: 'Proyecto del Sitio'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Usted debe iniciar sesión con su contraseña CMS para poder ver el contenido del boceto archivado. <a href="%s">Haga clic aquí para regresar al sitio publicado.</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: 'Conectado cómo'
-    LOGIN: 'Iniciar sesión'
+    LOGIN: Iniciar sesión
     LOGOUT: 'Cerrar sesión'
     NOTLOGGEDIN: 'No ha iniciado sesión'
-    PUBLISHED: Published
     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 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:
-    CODE: 'Código de Error'
-    DEFAULTERRORPAGECONTENT: '<p>Disculpe, parece que está tratando de ingresar a una página que no existe.</p><p>Por favor verifique la URL que desea visitar e inténtelo de nuevo.</p>'
-    DEFAULTERRORPAGETITLE: 'Página inexistente'
-    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 - Petición Incorrecta'
     401: '401 - No estás autorizado'
     403: '403 - Acceso Restringido'
@@ -223,44 +79,28 @@ es_MX:
     503: '503 - Fuera de Servicio'
     504: '504 - Excesivo Tiempo en la Puerta de Acceso'
     505: '505 - Versión HTTP Sin Soporte'
+    CODE: 'Código de Error'
+    DEFAULTERRORPAGECONTENT: '<p>Disculpe, parece que está tratando de ingresar a una página que no existe.</p><p>Por favor verifique la URL que desea visitar e inténtelo de nuevo.</p>'
+    DEFAULTERRORPAGETITLE: 'Página inexistente'
   Folder:
-    AddFolderButton: 'Add folder'
     DELETEUNUSEDTHUMBNAILS: 'Eliminar  miniaturas de imágenes sin utilizar'
     UNUSEDFILESTITLE: 'Archivo sin utilizar'
     UNUSEDTHUMBNAILSTITLE: 'Miniaturas de imágenes sin utilizar'
-    UploadFilesButton: Upload
-  LeftAndMain:
-    DELETED: Deleted.
-    PreviewButton: Preview
-    SAVEDUP: Saved.
-    STATUSPUBLISHEDSUCCESS: 'Published ''{title}'' successfully'
-    SearchResults: 'Search Results'
-    VersionUnknown: Unknown
   Permission:
     CMS_ACCESS_CATEGORY: 'Acceder al CMS'
   Permissions:
     CONTENT_CATEGORY: 'Permisos de contenido'
     PERMISSIONS_CATEGORY: 'Roles y permisos de acceso'
   RedirectorPage:
-    DESCRIPTION: 'Redirects to a different internal page'
     HASBEENSETUP: 'Se ha instalado una página de redirección  sin algún lugar a donde redireccionar.'
     HEADER: 'Esta página dirigirá al usuarios a otra página'
     OTHERURL: 'Otro URL del sitio web'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Redirigir a'
     REDIRECTTOEXTERNAL: 'Otro sitio web'
     REDIRECTTOPAGE: 'Una página en tu sitio web'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Página en tu sitio web'
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
   ReportAdminForm:
     FILTERBY: 'Filtrar por'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Ir
     SEARCH: Buscar
@@ -276,9 +116,6 @@ es_MX:
     LAST2WEEKS: 'Páginas editadas en las últimas 2 semanas'
     OtherGroupTitle: Otro
     ParameterLiveCheckbox: 'Comprobar el sitio vivo'
-    REPEMPTY: 'The {title} report is empty.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Para compartir ésto a esta página, copie y pegue el enlace de abajo.'
     ShareLink: 'Compartir enlace'
@@ -288,9 +125,6 @@ es_MX:
     DEFAULTTHEME: '(Usar tema predeterminado)'
     EDITHEADER: '¿Quién puede editar páginas en este sitio?'
     EDIT_PERMISSION: 'Administrar la configuración del sitio'
-    EDIT_PERMISSION_HELP: 'Ability to edit global access settings/top-level page permissions.'
-    PLURALNAME: 'Site Configs'
-    SINGULARNAME: 'Site Config'
     SITENAMEDEFAULT: 'Nombre de su sitio'
     SITETAGLINE: 'Lema/Slogan del Sitio'
     SITETITLE: 'Título del sitio'
@@ -298,39 +132,31 @@ es_MX:
     TABMAIN: Principal
     TAGLINEDEFAULT: 'su lema aquí'
     THEME: Tema
-    TOPLEVELCREATE: 'Who can create pages in the root of the site?'
     VIEWHEADER: '¿Quién puede ver las páginas en este sitio?'
   SiteTree:
     ACCESSANYONE: Cualquiera
     ACCESSHEADER: '¿Quién puede ver ésta página?'
     ACCESSLOGGEDIN: 'Usuarios registrados'
     ACCESSONLYTHESE: 'Únicamente estas personas (seleccione de la lista)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: '¿Permitir comentarios en ésta página?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancelar cambios al boceto'
     BUTTONCANCELDRAFTDESC: 'Eliminar el boceto y regresar a la página publicada actualmente'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Ocultar al público'
+    BUTTONUNPUBLISH: Ocultar al público
     BUTTONUNPUBLISHDESC: 'Quitar ésta página del sitio público'
-    CREATED: 'Date Created'
     Comments: Comentarios
     Content: Contenido
     DEFAULTABOUTCONTENT: '<p>Usted puede llenar esta págna con su propio contenido, o eliminarla y crear sus propias páginas.<br /></p>'
     DEFAULTABOUTTITLE: 'Sobre nosotros'
     DEFAULTCONTACTCONTENT: '<p>Usted puede llenar esta págna con su propio contenido, o eliminarla y crear sus propias páginas.<br /></p>'
-    DEFAULTCONTACTTITLE: Contacto
-    DEFAULTHOMECONTENT: '<p>¡Bienvenido a SilverStripe! Ésta es la página de Inicio predeterminada. Usted puede modificar esta página abriendo el <a href="admin/">CMS</a>. Ahora puede navegar por la<a href="http://doc.silverstripe.com">documentación del desarrollador</a>, o comenzar los <a href="href="http://doc.silverstripe.com/doku.php?id=tutorials">tutoriales</a></p>.'
+    DEFAULTCONTACTTITLE: 'Contacto'
+    DEFAULTHOMECONTENT: '<p>¡Bienvenido a SilverStripe! Ésta es la página de Inicio predeterminada. Usted puede modificar esta página abriendo el <a href="admin/">CMS</a>. Ahora puede navegar por la
+
+      <a href="http://doc.silverstripe.com">documentación del desarrollador</a>, o comenzar los <a href="href="http://doc.silverstripe.com/doku.php?id=tutorials">tutoriales</a></p>.
+
+      '
     DEFAULTHOMETITLE: Inicio
-    DELETEDPAGEHELP: 'Page is no longer published'
-    DELETEDPAGESHORT: Deleted
     DEPENDENT_NOTE: 'Las siguientes páginas depender de esta página. Esto incluye páginas virtuales, redirección de páginas y páginas con enlaces de contenido.'
-    DESCRIPTION: 'Generic content page'
     DependtPageColumnLinkType: 'Tipo de enlace'
-    DependtPageColumnURL: URL
     EDITANYONE: 'Cualquiera que pueda ingresar al CMS'
     EDITHEADER: '¿Quién puede modificar esta página?'
     EDITONLYTHESE: 'Únicamente éstas personas (selecciona de la lista)'
@@ -338,99 +164,55 @@ es_MX:
     EDIT_ALL_DESCRIPTION: 'Editar cualquier página'
     EDIT_ALL_HELP: 'La capacidad para editar cualquier página en el sitio, independientemente de la configuración en la ficha Acceso. Requiere el permiso de "Acceso al contenido del sitio".'
     Editors: 'Grupos de Editores'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Esta página tiene enlaces rotos.'
     HTMLEDITORTITLE: Contenido
     INHERIT: 'Hereda de la página ascendiente'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
-    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).'
+    METADESC: 'Descripción'
     METAEXTRA: 'Etiquetas meta personalizadas'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
     PAGELOCATION: 'Ubicación de la página'
     PAGETITLE: 'Nombre de página'
     PAGETYPE: 'Tipo de página'
     PARENTID: 'Página padre'
     PARENTTYPE: 'Ubicación de página'
     PARENTTYPE_ROOT: 'Página de nivel superior'
-    PARENTTYPE_SUBPAGE: 'Sub-page underneath a parent page'
     PERMISSION_GRANTACCESS_DESCRIPTION: 'Controlar los derechos de acceso al contenido'
-    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: 'Cambiar la estructura del sitio'
     REORGANISE_HELP: 'Reorganizar páginas en el árbol del sitio arrastrando y soltando.'
     SHOWINMENUS: '¿Mostrar en menús?'
     SHOWINSEARCH: '¿Mostrar en búsqueda?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: Compotamiento
-    TABCONTENT: Contenido
+    TABCONTENT: 'Contenido'
     TABDEPENDENT: 'Páginas dependientes'
     TOPLEVEL: 'Contenido del sitio (Nivel Superior)'
     TOPLEVELCREATORGROUPS: 'Creadores de nivel superior'
     URLSegment: 'Segmento de la URL'
     VIEWERGROUPS: 'Ver grupos'
     VIEW_ALL_DESCRIPTION: 'Ver cualquier página'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'Ver el contenido del boceto'
-    VIEW_DRAFT_CONTENT_HELP: 'Applies to viewing pages outside of the CMS in draft mode. Useful for external collaborators without CMS access.'
     Viewers: 'Grupos de Espectadores'
-    Visibility: Visibility
     has_one_Parent: 'Página ascendiente'
     many_many_BackLinkTracking: 'Seguimiento en retrospectiva'
     many_many_ImageTracking: 'Seguir la Imagen'
     many_many_LinkTracking: 'Seguir el Enlace'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
   StaticExporter:
     BASEURL: 'URL base'
     EXPORTTO: 'Exportar a esa carpeta'
     NAME: 'Exportador estático'
   TableListField:
     SELECT: 'Seleccione:'
-  TableListField.ss:
-    NOITEMSFOUND: 'No items found'
+  TableListField_ss:
     SORTASC: 'Organizar en orden ascendente'
     SORTDESC: 'Organizar en orden descendente'
-  TableListField_PageControls.ss:
-    DISPLAYING: Displaying
-    OF: of
-    TO: to
+  TableListField_PageControls_ss:
     VIEWFIRST: 'Ver primero'
     VIEWLAST: 'Ver último'
     VIEWNEXT: 'Ver siguiente'
     VIEWPREVIOUS: 'Ver anterior'
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Puedes acceder al sitio archivado con este enlace:'
     HAVEASKED: 'Has solicitado ver el contenido de nuestro sitio en'
   VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Esta es una página virtual'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Páginas virtuales'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Página virtual'
diff --git a/lang/et_EE.yml b/lang/et_EE.yml
index 11191edd..091dbaa3 100644
--- a/lang/et_EE.yml
+++ b/lang/et_EE.yml
@@ -5,9 +5,7 @@ et_EE:
     AppCategoryArchive: Arhiiv
     AppCategoryAudio: Heli
     AppCategoryDocument: Dokument
-    AppCategoryFlash: Flash
     AppCategoryImage: Pilt
-    AppCategoryVideo: Video
     BackToFolder: 'Tagasi kausta'
     CREATED: Kuupäev
     CurrentFolderOnly: 'Kas lubada juurdepääs ainult praegusele kaustale?'
@@ -15,26 +13,26 @@ et_EE:
     FILES: Failid
     FILESYSTEMSYNC: 'Sünkrooni failid'
     FILESYSTEMSYNCTITLE: 'Uuenda failisüsteemis CMS-andmebaasi failisisendeid. Kasulik, kui uued failid on laaditud üles väljaspool CMS-i, näiteks FTP vahendusel.'
-    FROMTHEINTERNET: Internetist
+    FROMTHEINTERNET: 'Internetist'
     FROMYOURCOMPUTER: 'Teie arvutist'
     Filetype: 'Faili tüüp'
-    ListView: Loendivaade
-    MENUTITLE: Failid
-    NEWFOLDER: 'Uus kaust'
+    ListView: 'Loendivaade'
+    NEWFOLDER: Uus kaust
     SIZE: Suurus
     THUMBSDELETED: '{count} kasutamata pisipilti on kustutatud'
-    TreeView: Puuvaade
-    Upload: 'Laadi üles'
+    TreeView: 'Puuvaade'
+    Upload: Laadi üles
+    MENUTITLE: Failid
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Kustuta kaustad'
   AssetAdmin_Tools:
     FILTER: Filtreeri
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Mine
   AssetTableField:
     BACKLINKCOUNT: 'Kasutatakse:'
-    PAGES: 'leht (lehed)'
-  BackLink_Button.ss:
+    PAGES: leht (lehed)
+  BackLink_Button_ss:
     Back: Tagasi
   BrokenLinksReport:
     Any: Kõik
@@ -45,7 +43,6 @@ et_EE:
     ColumnDateLastModified: 'Viimane muutmiskuupäev'
     ColumnDateLastPublished: 'Viimane avaldamiskuupäev'
     ColumnProblemType: 'Probleemi tüüp'
-    ColumnURL: URL
     HasBrokenFile: 'sisaldab katkist faili'
     HasBrokenLink: 'sisaldab katkist linki'
     HasBrokenLinkAndFile: 'sisaldab katkist linki ja faili'
@@ -68,27 +65,21 @@ et_EE:
     PUBLISHED_PAGES: 'Avaldatud %d lehte, %d tõrget'
     PUBLISH_PAGES: Avalda
     UNPUBLISHED_PAGES: 'Tühistati %d lehe avaldamine'
-    UNPUBLISH_PAGES: 'Tühista avaldamine'
-  CMSFileAddController:
-    MENUTITLE: Failid
+    UNPUBLISH_PAGES: Tühista avaldamine
   CMSMain:
     ACCESS: 'Juurdepääs jaotisele ''{title}'''
     ACCESS_HELP: 'Luba lehepuud ja sisu hõlmava jaotise vaatamine. Vaatamis- ja redigeerimisõigusi on võimalik hallata nii lehepõhiselt kui ka eraldi jaotise "Sisu õigused" abil.'
     AddNew: 'Lisa uus leht'
     AddNewButton: 'Lisa uus'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: 'Valige, kuhu see leht luua'
     ChoosePageType: 'Valige lehe tüüp'
     Create: Loo
     DELETE: 'Kustuta mustand'
-    DELETEFP: 'Kustuta avaldatud leht'
+    DELETEFP: Kustuta avaldatud leht
     DESCREMOVED: 'ja {count} järglast'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: E-post
-    EditTree: Redigeeri
+    EditTree: 'Redigeeri'
     ListFiltered: 'Filtreeritud loend'
-    MENUTITLE: 'Redigeeri lehte'
     NEWPAGE: 'Uus {pagetype}'
     PAGENOTEXISTS: 'Antud lehekülge ei eksisteeri'
     PAGES: Lehed
@@ -96,69 +87,55 @@ et_EE:
     PAGETYPEOPT: 'Lehe tüüp'
     PUBALLCONFIRM: 'Palun avaldage iga leht selles saidis'
     PUBALLFUN: '"Avalda Kõik" funktsionaalsus'
-    PUBALLFUN2: 'Sellele nupule vajutamine on sama, kui käia igal lehel ja vajutada igal lehel "Avalda" nuppu. Nuppu on soovitatav kasutada, kui oled muutnud mitmeid lehti - see salvestab igal lehel toimunud muudatused.'
+    PUBALLFUN2: "Sellele nupule vajutamine on sama, kui käia igal lehel ja vajutada igal lehel \"Avalda\" nuppu. Nuppu on soovitatav kasutada, kui oled muutnud mitmeid lehti - see salvestab igal lehel toimunud muudatused."
     PUBPAGES: 'Valmis: {count} lehte avaldatud'
     PageAdded: 'Lehekülje loomine õnnestus'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Leht ''{title}'' eemaldati avaldatud saitide hulgast'
     REMOVEDPAGEFROMDRAFT: '''%s'' eemaldatud visandi lehelt'
     RESTORE: Taasta
     RESTORED: '''{title}'' taastati edukalt'
     ROLLBACK: 'Pööra tagasi sellesse versiooni'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Salvesta
-    SAVEDRAFT: 'Save draft'
     TabContent: Sisu
     TabHistory: Ajalugu
     TabSettings: Seaded
     TreeFiltered: 'Filtreeritud puu.'
     TreeFilteredClear: 'Eemalda filtreering'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Aktiveeri filter'
+    MENUTITLE: 'Redigeeri lehte'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Aktiveeri filter'
     RESET: Lähtesta
   CMSPageAddController:
-    MENUTITLE: 'Lisa leht'
     ParentMode_child: 'Teise lehe all'
     ParentMode_top: 'Kõrgem tase'
-  CMSPageEditController:
-    MENUTITLE: 'Muuda lehte'
+    MENUTITLE: 'Lisa leht'
   CMSPageHistoryController:
     COMPAREMODE: 'Võrdlusrežiim (valige kaks)'
     COMPAREVERSIONS: 'Võrdle versioone'
     COMPARINGVERSION: 'Versioonide {version1} ja {version2} võrdlus.'
-    MENUTITLE: Ajalugu
     REVERTTOTHISVERSION: 'Taasta valitud versioon'
     SHOWUNPUBLISHED: 'Näita ka avaldamata versioone'
     SHOWVERSION: 'Näita versiooni'
     VIEW: vaade
-    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Hetkel kuvatud versioon {version}.'
-  CMSPageHistoryController_versions.ss:
-    AUTHOR: Autor
-    NOTPUBLISHED: Avaldamata
+    MENUTITLE: Ajalugu
+  CMSPageHistoryController_versions_ss:
+    NOTPUBLISHED: 'Avaldamata'
     PUBLISHER: Avaldaja
     UNKNOWN: Tundmatu
-    WHEN: Millal
-  CMSPageSettingsController:
-    MENUTITLE: 'Muuda lehte'
   CMSPagesController:
-    GalleryView: Galeriivaade
-    ListView: Loendivaade
+    GalleryView: 'Galeriivaade'
+    ListView: 'Loendivaade'
     MENUTITLE: Lehed
-    TreeView: Puuvaade
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: Pukseeri
+    TreeView: 'Puuvaade'
+  CMSPagesController_ContentToolbar_ss:
+    ENABLEDRAGGING: 'Pukseeri'
     MULTISELECT: Mitmikvalik
-  CMSPagesController_Tools.ss:
+  CMSPagesController_Tools_ss:
     FILTER: Filtreeri
   CMSSearch:
-    FILTERDATEFROM: Alates
-    FILTERDATEHEADING: Kuupäev
     FILTERDATETO: Kuni
     FILTERLABELTEXT: Sisu
-  CMSSettingsController:
-    MENUTITLE: Seaded
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Muudetud lehed'
   CMSSiteTreeFilter_DeletedPages:
@@ -170,8 +147,6 @@ et_EE:
   ContentController:
     ARCHIVEDSITE: 'Eelvaate versioon'
     ARCHIVEDSITEFROM: 'Arhiveeritud sait asukohast'
-    CMS: CMS
-    DRAFT: Draft
     DRAFTSITE: 'Mustandi sait'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Pead olema sisse logitud oma sisuhalduse parooliga, et vaadata mustandeid ja arhiveeritud sisu. <a href="%s">Vajuta siia, et minna tagasi avaldatud lehe juurde.</a>'
     Email: E-post
@@ -180,26 +155,15 @@ et_EE:
     InstallSecurityWarning: 'Turvalisuse põhjustel soovitame nüüd installifailid kustutada, juhul kui te ei plaani hiljem uuesti installida (<em>nõuab administraatorina sisselogimist, vt ülevalt</em>). Edaspidi vajab veebiserver juurdepääsu kirjutamiseks ainult kaustale "assets". Võite eemaldada kõigi teiste kaustade kirjutusõigused. <a href="{link}" style="text-align: center;">Klõpsake siin installifailide kustutamiseks.</a>'
     InstallSuccessCongratulations: 'SilverStripe edukalt paigaldatud!'
     LOGGEDINAS: 'Sisse logitud kui'
-    LOGIN: 'Logi sisse'
+    LOGIN: Logi sisse
     LOGOUT: 'Logi välja'
     NOTLOGGEDIN: 'Pole sisse logitud'
-    PUBLISHED: Published
     PUBLISHEDSITE: 'Avaldatud sait'
     Password: Salasõna
     PostInstallTutorialIntro: 'See veebisait on SilverStripe 3 lihtsustatud versioon. Lehe laiendamiseks külastage aadressi {link}.'
-    StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Installifaile ei olnud võimalik kustutada. Kustutage allolevad failid käsitsi.'
     VIEWPAGEIN: 'Kuva leht:'
   ErrorPage:
-    CODE: Veakood
-    DEFAULTERRORPAGECONTENT: '<p>Vabandust aga tundub, et proovid ligipääseda lehele mida pole olemas.</p><p>Palun kontrolli uuesti aadressi kuhu proovid ligi pääseda.</p>'
-    DEFAULTERRORPAGETITLE: 'Lehekülge ei leitud'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Vabandust, teie taotluse töötlemisel ilmnes probleem.</p>'
-    DEFAULTSERVERERRORPAGETITLE: 'Serveri viga'
-    DESCRIPTION: 'Kohandatud sisu erinevate tõrgete korral (nt "Lehte ei leitud")'
-    ERRORFILEPROBLEM: 'Tõrge faili "{filename}" avamisel kirjutamiseks. Kontrollige faili õigusi.'
-    PLURALNAME: Vealeheküljed
-    SINGULARNAME: Vealehekülg
     400: '400 - Halb päring'
     401: '401 - Volitamata ligipääs'
     403: '403 - Keelatud'
@@ -223,21 +187,29 @@ et_EE:
     503: '503 - Teenus puudub'
     504: '504 - Sissepääsutee aegmaas'
     505: '505 - HTTP versioon ei ole kasutusel'
+    CODE: 'Veakood'
+    DEFAULTERRORPAGECONTENT: '<p>Vabandust aga tundub, et proovid ligipääseda lehele mida pole olemas.</p><p>Palun kontrolli uuesti aadressi kuhu proovid ligi pääseda.</p>'
+    DEFAULTERRORPAGETITLE: 'Lehekülge ei leitud'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>Vabandust, teie taotluse töötlemisel ilmnes probleem.</p>'
+    DEFAULTSERVERERRORPAGETITLE: 'Serveri viga'
+    DESCRIPTION: 'Kohandatud sisu erinevate tõrgete korral (nt "Lehte ei leitud")'
+    ERRORFILEPROBLEM: 'Tõrge faili "{filename}" avamisel kirjutamiseks. Kontrollige faili õigusi.'
+    PLURALNAME: 'Vealeheküljed'
+    SINGULARNAME: 'Vealehekülg'
   Folder:
     AddFolderButton: 'Lisa kaust'
     DELETEUNUSEDTHUMBNAILS: 'Kustuta kasutamata väikepildid'
     UNUSEDFILESTITLE: 'Kasutamata failid'
     UNUSEDTHUMBNAILSTITLE: 'Kasutamata väikepildid'
-    UploadFilesButton: 'Laadi üles'
+    UploadFilesButton: Laadi üles
   LeftAndMain:
     DELETED: Kustutatud.
-    PreviewButton: Eelvaade
     SAVEDUP: Salvestatud.
     STATUSPUBLISHEDSUCCESS: '''{title}'' on edukalt avaldatud'
-    SearchResults: Otsingutulemused
+    SearchResults: 'Otsingutulemused'
     VersionUnknown: Tundmatu
   Permission:
-    CMS_ACCESS_CATEGORY: CMS-juurdepääs
+    CMS_ACCESS_CATEGORY: 'CMS-juurdepääs'
   Permissions:
     CONTENT_CATEGORY: 'Sisu õigused'
     PERMISSIONS_CATEGORY: 'Rollid ja juurdepääsuõigused'
@@ -246,39 +218,33 @@ et_EE:
     HASBEENSETUP: 'Suunav lehekülg seati üles ilma, et ta kuhugile suunaks.'
     HEADER: 'See lehekülg suunab kasutajad teisele leheküljele'
     OTHERURL: 'Teise veebisaidi URL'
-    PLURALNAME: Ümbersuunamisleheküljed
+    PLURALNAME: 'Ümbersuunamisleheküljed'
     REDIRECTTO: 'Suuna ümber'
     REDIRECTTOEXTERNAL: 'Teisele veebisaidile'
     REDIRECTTOPAGE: 'Leheküljele sinu veebisaidil'
-    SINGULARNAME: Ümbersuunamisleht
+    SINGULARNAME: 'Ümbersuunamisleht'
     YOURPAGE: 'Lehekülg sinu veebisaidil'
   ReportAdmin:
-    MENUTITLE: Aruanded
     ReportTitle: Pealkiri
+    MENUTITLE: Aruanded
   ReportAdminForm:
-    FILTERBY: Filtreeri
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
+    FILTERBY: 'Filtreeri'
   SearchForm:
     GO: Mine
     SEARCH: Otsi
-    SearchResults: Otsingutulemused
+    SearchResults: 'Otsingutulemused'
   SideReport:
     BROKENFILES: 'Katkiste failidega lehed'
     BROKENLINKS: 'Katkiste linkidega lehed'
     BROKENREDIRECTORPAGES: 'Ümbersuunamislehed, mis suunavad kustutatud lehtedele'
     BROKENVIRTUALPAGES: 'Virtuaallehed, mis suunavad kustutatud lehtedele'
     BrokenLinksGroupTitle: 'Katkiste linkide aruanded'
-    ContentGroupTitle: Sisuaruanded
+    ContentGroupTitle: 'Sisuaruanded'
     EMPTYPAGES: 'Tühjad leheküljed'
     LAST2WEEKS: 'Viimase kahe nädala jooksul muudetud leheküljed'
     OtherGroupTitle: Muu
     ParameterLiveCheckbox: 'Kontrolli avaldatud saiti'
     REPEMPTY: 'Lehe {title} aruanne on tühi.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Selle lehe jagamiseks kopeerige ja kleepige allolev link.'
     ShareLink: 'Jaga linki'
@@ -311,18 +277,15 @@ et_EE:
     APPEARSVIRTUALPAGES: 'Sisu on kuvatud ka virtuaalsetel lehtedel jaotistes {title}.'
     BUTTONCANCELDRAFT: 'Tühista visandi muudatused'
     BUTTONCANCELDRAFTDESC: 'Kustuta oma visand ja pöördu tagasi hetkel avaldatud lehekülje kujule'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Võta maha'
+    BUTTONUNPUBLISH: Võta maha
     BUTTONUNPUBLISHDESC: 'Eemalda see lehekülg avalikult saidilt'
-    CREATED: Loomiskuupäev
+    CREATED: 'Loomiskuupäev'
     Comments: Komentaarid
     Content: Sisu
     DEFAULTABOUTCONTENT: '<p>Saad selle lehe sisu muuta või selle lehe kustutada.<br /></p>'
-    DEFAULTABOUTTITLE: Meist
+    DEFAULTABOUTTITLE: 'Meist'
     DEFAULTCONTACTCONTENT: '<p>võid selle lehe sisu muuta või selle ära kustutada.<br /></p>'
-    DEFAULTCONTACTTITLE: Kontakt
+    DEFAULTCONTACTTITLE: 'Kontakt'
     DEFAULTHOMECONTENT: '<p>Tere tulemast kasutama SilverStripe! sisuhaldust, see on algne avaleht.<br>Saad seda muuta <a href="admin/">Sisuhalduse lehel</a>. <br>Abiks on ka <a href="http://doc.silverstripe.com">Sisuhalduse dokumentatsioon</a> või <a href="http://doc.silverstripe.com/doku.php?id=tutorials">õppetus leht.</a></p>'
     DEFAULTHOMETITLE: Avaleht
     DELETEDPAGEHELP: 'Leht ei ole enam avaldatud'
@@ -330,37 +293,30 @@ et_EE:
     DEPENDENT_NOTE: 'Alljärgnevad lehed sõltuvad sellest lehest. See hõlmab virtuaalseid lehti, ümbersuunamislehti ja sisulinkidega lehti.'
     DESCRIPTION: 'Üldine sisuleht'
     DependtPageColumnLinkType: 'Lingi tüüp'
-    DependtPageColumnURL: URL
     EDITANYONE: 'Igaüks, kes sisuhaldussüsteemi sisse võib logida'
     EDITHEADER: 'Kes tohib seda sisuhaldussüsteemi kaudu muuta?'
     EDITONLYTHESE: 'Ainult järgnevad isikud (vali nimekirjast)'
-    EDITORGROUPS: Muutjagrupid
+    EDITORGROUPS: 'Muutjagrupid'
     EDIT_ALL_DESCRIPTION: 'Redigeeri mis tahes lehte'
-    EDIT_ALL_HELP: "Võimalus redigeerida mis tahes lehte sellel saidil, hoolimata vahekaardi Juurdepääs seadetest. Vajab jaotise \"Juurdepääs  lehtedele\" õigusi\\n"
+    EDIT_ALL_HELP: 'Võimalus redigeerida mis tahes lehte sellel saidil, hoolimata vahekaardi Juurdepääs seadetest. Vajab jaotise "Juurdepääs  lehtedele" õigusi\n'
     Editors: 'Toimetajate gruppid'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Sellel lehel on katkiseid linke.'
     HTMLEDITORTITLE: Sisu
     INHERIT: 'Päring vanemalt lehelt'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Viimati uuendatud'
     LINKCHANGENOTE: 'Selle lehe lingi muutmine mõjutab ka kõigi alamlehtede linke.'
     MENUTITLE: 'Navigatsiooni silt'
-    METADESC: Kirjeldus
+    METADESC: 'Kirjeldus'
     METADESCHELP: 'Otsingumootor kasutab seda sisu otsingutulemuste kuvamiseks (kuigi see ei mõjuta nende järjestust).'
     METAEXTRA: 'Kohandatud metamärgendid'
     METAEXTRAHELP: 'HTML-sildid täiendavate metaandmete jaoks. Nt &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Lehel on avaldamata muudatusi'
     MODIFIEDONDRAFTSHORT: Muudetud
     MetadataToggle: Metaandmed
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
     PAGELOCATION: 'Lehe asukoht'
     PAGETITLE: 'Lehekülje nimi'
     PAGETYPE: 'Lehe tüüp'
-    PARENTID: Vanemleht
+    PARENTID: 'Vanemleht'
     PARENTTYPE: 'Lehe asukoht'
     PARENTTYPE_ROOT: 'Kõrgema taseme leht'
     PARENTTYPE_SUBPAGE: 'Vanemlehe all olev alamleht'
@@ -378,14 +334,13 @@ et_EE:
     SHOWINSEARCH: 'Näita otsingus?'
     SINGULARNAME: Leht
     TABBEHAVIOUR: Käitumine
-    TABCONTENT: Sisu
+    TABCONTENT: 'Sisu'
     TABDEPENDENT: 'Sõltuvad lehed'
     TOPLEVEL: 'Lehe sisu (kõrgeim tase)'
     TOPLEVELCREATORGROUPS: 'Kõrgema taseme loojad'
     URLSegment: 'URL-i jagu'
-    VIEWERGROUPS: Vaatajagrupid
+    VIEWERGROUPS: 'Vaatajagrupid'
     VIEW_ALL_DESCRIPTION: 'Kuva mis tahes leht'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'Kuva mustandi sisu'
     VIEW_DRAFT_CONTENT_HELP: 'Rakendub lehe vaatamisel väljaspool CMS-i mustandirežiimis. Kasulik välistele kaastöötajatele, kellel puudub juurdepääs CMS-ile.'
     Viewers: 'Vaatajate gruppid'
@@ -395,19 +350,18 @@ et_EE:
     many_many_ImageTracking: 'Pildi jälgimine'
     many_many_LinkTracking: 'Lingi jälgimine'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Erimärgid teisendatakse või eemaldatakse automaatselt.'
   StaticExporter:
-    BASEURL: Baas-URL
+    BASEURL: 'Baas-URL'
     EXPORTTO: 'Ekspordi sellesse kausta'
     NAME: 'Staatiline eksportija'
   TableListField:
     SELECT: 'Vali:'
-  TableListField.ss:
+  TableListField_ss:
     NOITEMSFOUND: 'Ei leitud ühtegi kirjet'
     SORTASC: 'Sordi kasvavas järjekorras'
     SORTDESC: 'Sordi kahanevas järjekorras'
-  TableListField_PageControls.ss:
+  TableListField_PageControls_ss:
     DISPLAYING: Kuvatakse
     OF: /
     TO: kuni
@@ -417,20 +371,18 @@ et_EE:
     VIEWPREVIOUS: 'Vaata eelmist'
   TreeTools:
     DisplayLabel: 'Kuva:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Arhiveeritud lehele pääsed ligi selle lingi kaudu:'
     HAVEASKED: 'Soovid vaadata meie lehe sisu kuupäeval'
   VirtualPage:
-    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Kuvab sisu teiselt lehelt'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'See on virtuaalne leht'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Virtuaalsed lehed'
     PageTypNotAllowedOnRoot: 'Lehe originaaltüüp "{type}" ei ole selle virtuaalse lehe juurtasandil lubatud.'
     SINGULARNAME: 'Virtuaalne leht'
+  CMSFileAddController:
+    MENUTITLE: Failid
+  CMSPageEditController:
+    MENUTITLE: 'Muuda lehte'
+  CMSPageSettingsController:
+    MENUTITLE: 'Muuda lehte'
diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml
index 489fdc47..e688868b 100644
--- a/lang/fa_IR.yml
+++ b/lang/fa_IR.yml
@@ -1,436 +1,110 @@
 fa_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: 'پوشه جديد'
-    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
+    NEWFOLDER: پوشه جديد
   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: آدرس
-    HasBrokenFile: 'has broken file'
-    HasBrokenLink: 'has broken link'
-    HasBrokenLinkAndFile: 'has broken link and file'
     HoverTitleEditPage: 'ویرایش صفحه'
     PageName: 'نام صفحه'
     ReasonDropdown: 'مشکل در بررسی'
-    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: انتشار
-    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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
     DELETE: 'حذف کردن از پیشنویس سایت'
-    DELETEFP: 'حذف کردن از منتشر شده های سایت'
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    EMAIL: 'پست الکترونیک'
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Edit Page'
-    NEWPAGE: 'New {pagetype}'
+    DELETEFP: حذف کردن از منتشر شده های سایت
+    EMAIL: پست الکترونیک
     PAGENOTEXISTS: 'این صفحه وجود ندارد'
-    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 ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
-    REMOVEDPAGEFROMDRAFT: 'Removed ''%s'' from the draft site'
     RESTORE: بازنشاندن
-    RESTORED: 'Restored ''{title}'' successfully'
-    ROLLBACK: 'Roll back to this version'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     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: 'نمایش ویرایش'
-    VIEW: view
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: 'مشاهده گالری'
-    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: 'تنظیمات'
-  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
-    DRAFT: Draft
     DRAFTSITE: 'تارگاه چرکنویس'
-    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'
-    PUBLISHED: Published
-    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 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: 'شماره ایراد'
-    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: 'برگ پیدا نشد'
-    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 - درخواست نادرست'
     401: '401 - بدون مجوز'
-    403: '403 - Forbidden'
     404: '404 - یافت نشد'
-    405: '405 - Method Not Allowed'
     406: '406 - پذیرفتنی نیست'
-    407: '407 - Proxy Authentication Required'
     408: '408 - زمان درخواست گذشت'
-    409: '409 - Conflict'
     410: '410 - از دست رفت'
-    411: '411 - Length Required'
     412: '412 - پیش شرط درست نبود'
-    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 - درگاه نادرست'
-    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: 'نتایج جستجو'
-    VersionUnknown: Unknown
-  Permission:
-    CMS_ACCESS_CATEGORY: 'CMS Access'
+    CODE: 'شماره ایراد'
+    DEFAULTERRORPAGETITLE: 'برگ پیدا نشد'
   Permissions:
     CONTENT_CATEGORY: 'دسترسی محتوا'
     PERMISSIONS_CATEGORY: 'مجوز دسترسی ها و وظایف'
   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: 'نشانی تارگاه دیگر'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'بازگردانی به'
     REDIRECTTOEXTERNAL: 'یک تارگاه دیگر'
     REDIRECTTOPAGE: 'یک برگ روی تارگاه شما'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'برگ روی تارگاه شما'
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
   ReportAdminForm:
     FILTERBY: 'فیلتر به وسیله'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   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: 'صفحات بدون مطلب'
-    LAST2WEEKS: 'Pages edited in the last 2 weeks'
     OtherGroupTitle: سایر
     ParameterLiveCheckbox: 'بررسی سایت به صورت زنده'
-    REPEMPTY: 'The {title} report is empty.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'To share a this to this page, copy and paste the link below.'
-    ShareLink: 'Share link'
-  SilverStripeNavigatorLinkl:
-    CloseLink: Close
   SiteConfig:
     DEFAULTTHEME: '(استفاده از پوسته پیشفرض)'
     EDITHEADER: 'چه کسی میتواند صفحات را در این سایت ویرایش کند؟'
     EDIT_PERMISSION: 'مدیریت پیکربندی سایت'
-    EDIT_PERMISSION_HELP: 'Ability to edit global access settings/top-level page permissions.'
-    PLURALNAME: 'Site Configs'
-    SINGULARNAME: 'Site Config'
     SITENAMEDEFAULT: 'نام سایت شما'
-    SITETAGLINE: 'Site Tagline/Slogan'
     SITETITLE: 'عنوان سایت'
     TABACCESS: دسترسی
     TABMAIN: اصلی
-    TAGLINEDEFAULT: 'your tagline here'
     THEME: پوسته
     TOPLEVELCREATE: 'چه کسی میتواند صفحه جدیدی در ریشه(root) سایت ایجاد کند؟'
     VIEWHEADER: 'چه کسی میتواند صفحات سایت را مشاهده کند؟'
   SiteTree:
-    ACCESSANYONE: 'همه'
+    ACCESSANYONE: همه
     ACCESSHEADER: 'چه کسی بتواند این صفحه را مشاهده کنید ؟'
     ACCESSLOGGEDIN: 'کاربران وارد شده'
     ACCESSONLYTHESE: 'فقط این افراد (انتخاب از لیست)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'پذیرفتن نظرات در این صفحه ؟'
-    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'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: Unpublish
-    BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
-    CREATED: 'Date Created'
-    Comments: Comments
-    Content: 'درون مایه'
-    DEFAULTABOUTCONTENT: '<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>'
-    DEFAULTABOUTTITLE: 'درباره ما'
-    DEFAULTCONTACTCONTENT: '<p>می‌توانید محتوی این صفحه را به دلخواه تغییر دهید یا کلا آن را حذف کرده و خودتان صفخات جدیدی ایجاد کنید.</p>'
+    Content: درون مایه
     DEFAULTCONTACTTITLE: 'تماس با ما'
-    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: خانه
-    DELETEDPAGEHELP: 'Page is no longer published'
-    DELETEDPAGESHORT: Deleted
     DEPENDENT_NOTE: 'صفحات زیر وابسته به این صفحه هستند. شامل صفحات مجازی، انتقال دهنده و صفحاتی با محتوای لینک'
-    DESCRIPTION: 'Generic content page'
-    DependtPageColumnLinkType: 'Link type'
-    DependtPageColumnURL: 'نشانی اینترنتی'
+    DependtPageColumnURL: نشانی اینترنتی
     EDITANYONE: 'هر کسی بتواند به سیستم مدیریت محتوا وارد شود'
     EDITHEADER: 'چه کسی بتواند این صفحه را ویرایش کند ؟'
     EDITONLYTHESE: 'فقط این افراد (انتخاب از لیست)'
-    EDITORGROUPS: 'Editor Groups'
-    EDIT_ALL_DESCRIPTION: 'Edit any page'
-    EDIT_ALL_HELP: 'Ability to edit any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
-    Editors: 'Editors Groups'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'لینک این صفحه شکسته است.'
-    HTMLEDITORTITLE: 'درون‌مایه'
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
-    LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
+    HTMLEDITORTITLE: درون‌مایه
     MENUTITLE: 'برچسب ناوبری'
-    METADESC: توضیحات
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
+    METADESC: 'توضیحات'
     PAGELOCATION: 'موقعیت صفحه'
     PAGETITLE: 'نام برگ'
     PAGETYPE: 'نوع برگ'
     PARENTID: 'برگ مادر'
     PARENTTYPE: 'جایگاه برگ'
-    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: 'تغییر ساختار سایت'
-    REORGANISE_HELP: 'Rearrange pages in the site tree through drag&drop.'
-    SHOWINMENUS: 'Show in menus?'
     SHOWINSEARCH: 'نمایش در جستجو ؟'
-    SINGULARNAME: Page
-    TABBEHAVIOUR: Behavior
     TABCONTENT: 'مطلب'
-    TABDEPENDENT: 'صفحات مرتبط'
-    TOPLEVEL: 'Site Content (Top Level)'
-    TOPLEVELCREATORGROUPS: 'Top level creators'
     URLSegment: 'بخش آدرس URL'
-    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 ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'مشاهده محتوای پیشنویس'
-    VIEW_DRAFT_CONTENT_HELP: 'Applies to viewing pages outside of the CMS in draft mode. Useful for external collaborators without CMS access.'
-    Viewers: 'Viewers Groups'
-    Visibility: Visibility
     has_one_Parent: 'برگ مادر'
-    many_many_BackLinkTracking: 'Backlink Tracking'
-    many_many_ImageTracking: 'Image Tracking'
-    many_many_LinkTracking: 'Link Tracking'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
   StaticExporter:
     BASEURL: 'URI پایه'
-    EXPORTTO: 'استخراج به پوشه'
-    NAME: 'خروجي پايدار'
   TableListField:
-    SELECT: انتخاب
-  TableListField.ss:
-    NOITEMSFOUND: 'No items found'
+    SELECT: 'انتخاب'
+  TableListField_ss:
     SORTASC: 'چینش صعودی'
     SORTDESC: 'چینش نزولی'
-  TableListField_PageControls.ss:
-    DISPLAYING: Displaying
-    OF: of
-    TO: to
+  TableListField_PageControls_ss:
     VIEWFIRST: 'نشان دادن نخست'
     VIEWLAST: 'نشان دادن پایان'
     VIEWNEXT: 'نشان دادن پسین'
     VIEWPREVIOUS: 'نشان دادن پیشین'
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
-    CANACCESS: 'You can access the archived site at this link:'
+  ViewArchivedEmail_ss:
     HAVEASKED: 'شما خواسته اید که درون‌مایه تارگاه ما را ببینید در'
   VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'این یک صفحه مجازی است'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'صفحه های مجازی'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'صفحه مجازی'
diff --git a/lang/fi.yml b/lang/fi.yml
index ba5307e5..3d3667c6 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -5,9 +5,7 @@ fi:
     AppCategoryArchive: Arkisto
     AppCategoryAudio: Ääni
     AppCategoryDocument: Asiakirja
-    AppCategoryFlash: Flash
     AppCategoryImage: Kuva
-    AppCategoryVideo: Video
     BackToFolder: 'Takaisin kansioon'
     CREATED: Pvm
     CurrentFolderOnly: 'Rajoita tähän kansioon?'
@@ -15,41 +13,41 @@ fi:
     FILES: Tiedostot
     FILESYSTEMSYNC: 'Synkronoi tiedostot'
     FILESYSTEMSYNCTITLE: 'Päivitä palvelimella olevat tiedostot CMS-järjestelmän tietokantaan. Kätevä toiminto, kun olet siirtänyt tiedostoja suoraa palvelimelle ohi CMS-järjestelmän esim. FTP-ohjelmalla.'
-    FROMTHEINTERNET: Internetistä
+    FROMTHEINTERNET: 'Internetistä'
     FROMYOURCOMPUTER: 'Omalta tietokoneelta'
-    Filetype: Tiedostotyyppi
-    ListView: Listanäkymä
-    MENUTITLE: Tiedostot
-    NEWFOLDER: 'Uusi kansio'
+    Filetype: 'Tiedostotyyppi'
+    ListView: 'Listanäkymä'
+    NEWFOLDER: Uusi kansio
     SIZE: Koko
     THUMBSDELETED: '{count} käyttämätöntä esikatselukuvaa poistettiin'
-    TreeView: Puunäkymä
+    TreeView: 'Puunäkymä'
     Upload: Siirrä
+    MENUTITLE: Tiedostot
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Poista kansiot'
   AssetAdmin_Tools:
     FILTER: Suodatin
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Siirry
   AssetTableField:
     BACKLINKCOUNT: 'Linkitetty:'
     PAGES: sivu(t)
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Takaisin
   BrokenLinksReport:
     Any: Yhtään
     BROKENLINKS: 'Rikkinäisten linkkien raportti'
-    CheckSite: Tarkistussivusto
-    CheckSiteDropdownDraft: Luonnossivu
+    CheckSite: 'Tarkistussivusto'
+    CheckSiteDropdownDraft: 'Luonnossivu'
     CheckSiteDropdownPublished: 'Julkaistu sivu'
     ColumnDateLastModified: 'Päivitetty viimeksi'
     ColumnDateLastPublished: 'Julkaistu viimeksi'
-    ColumnProblemType: Ongelmatyyppi
+    ColumnProblemType: 'Ongelmatyyppi'
     ColumnURL: URL-osoite
     HasBrokenFile: 'sisältää rikkinäisen tiedoston'
     HasBrokenLink: 'sisältää rikkinäisen linkin'
     HasBrokenLinkAndFile: 'sisältää rikkinäisen linkin ja tiedoston'
-    HoverTitleEditPage: Muokkaussivu
+    HoverTitleEditPage: 'Muokkaussivu'
     PageName: 'Sivun nimi'
     ReasonDropdown: 'Ongelma tarkistettavaksi'
     ReasonDropdownBROKENFILE: 'Rikkinäinen tiedosto'
@@ -68,97 +66,89 @@ fi:
     PUBLISHED_PAGES: 'Julkaistu %d sivua, %d epäonnistumista'
     PUBLISH_PAGES: Julkaise
     UNPUBLISHED_PAGES: 'Julkaisemattomat %d sivut'
-    UNPUBLISH_PAGES: 'Poista julkaisu'
-  CMSFileAddController:
-    MENUTITLE: Tiedostot
+    UNPUBLISH_PAGES: Poista julkaisu
   CMSMain:
     ACCESS: 'Pääsy ''{title}'' -osioon'
     ACCESS_HELP: 'Oikeuttaa katsella osiota, joka sisältää sivurakenteen ja sisällön. Katselu- ja muokkausoikeuksia voidaan käsitellä sivukohtaisten pudotusvalikoiden kautta kuten myös erillisiä "sisällön oikeuksia".'
     AddNew: 'Lisää uusi sivu'
     AddNewButton: 'Lisää uusi'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: 'Valitse kohde, minne sivu luodaan'
     ChoosePageType: 'Valitse sivutyyppi'
     Create: Luo
     DELETE: 'Poista luonnossivulta'
-    DELETEFP: 'Poista julkaistulta sivulta'
+    DELETEFP: Poista julkaistulta sivulta
     DESCREMOVED: 'ja {count} alasivua'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
+    DUPLICATED: '''{title}''  monistettu onnistuneesti'
+    DUPLICATEDWITHCHILDREN: '''{title}'' ja alasivu monistettiin onnistuneesti'
     EMAIL: Sähköposti
     EditTree: 'Muokkaa rakennepuuta'
     ListFiltered: 'Suodatettu lista.'
-    MENUTITLE: 'Muokkaa sivua'
     NEWPAGE: 'Uusi {pagetype}'
     PAGENOTEXISTS: 'Tätä sivua ei ole olemassa'
     PAGES: Sivut
-    PAGETYPEANYOPT: 'Mikä tahansa'
-    PAGETYPEOPT: Sivutyyppi
+    PAGETYPEANYOPT: Mikä tahansa
+    PAGETYPEOPT: 'Sivutyyppi'
     PUBALLCONFIRM: 'Julkaise jokainen sivu tällä sivustolla kopioiden luonnosten sisältö julkiselle sivustolle'
     PUBALLFUN: 'Julkaise kaikki -toiminto'
-    PUBALLFUN2: 'Painamalla tätä nappia, tekee se saman kuin kävisit painamassa joka sivulla "julkaise". Se on käytännöllinen, jos on tehnyt isoja muutoksia sisältöön, esim. kun sivusto luotiin.'
+    PUBALLFUN2: "Painamalla tätä nappia, tekee se saman kuin kävisit painamassa joka sivulla \"julkaise\". Se on käytännöllinen, jos on tehnyt isoja muutoksia sisältöön, esim. kun sivusto luotiin."
     PUBPAGES: 'Valmis: julkaistiin {count} sivu(a)'
     PageAdded: 'Sivun luonti onnistui'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
+    REMOVED: 'Poista ''{title}''{description} näkyvältä sivustolta'
     REMOVEDPAGE: '''{title}'' poistettiin julkaistulta sivustolta'
     REMOVEDPAGEFROMDRAFT: 'Poistettu ''%s'' luonnossivustolta'
     RESTORE: Palauta
     RESTORED: '''{title}'' palautettiin onnistuneesti'
     ROLLBACK: 'Siirry takaisin tähän versioon.'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
+    ROLLEDBACKPUBv2: 'Palattiin takaisin julkaistuun versioon'
+    ROLLEDBACKVERSIONv2: 'Palautettu versioon #%d.'
     SAVE: Tallenna
-    SAVEDRAFT: 'Save draft'
+    SAVEDRAFT: 'Tallenna luonnos'
     TabContent: Sisältö
     TabHistory: Historia
     TabSettings: Asetukset
     TreeFiltered: 'Suodatettu hakemistopuu.'
     TreeFilteredClear: 'Nollaa suodatin'
-  CMSMain_left.ss:
-    'APPLY FILTER': Suodata
+    MENUTITLE: 'Muokkaa sivua'
+    AddPageRestriction: 'Huomio: jotkut sivutyypit eivät ole sallittuja tässä valinnassa.'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Suodata'
     RESET: Nollaa
   CMSPageAddController:
-    MENUTITLE: 'Lisää sivu'
     ParentMode_child: 'Toisen sivun alla'
-    ParentMode_top: Ylätaso
-  CMSPageEditController:
-    MENUTITLE: 'Muokkaa sivua'
+    ParentMode_top: 'Ylätaso'
+    MENUTITLE: 'Lisää sivu'
   CMSPageHistoryController:
     COMPAREMODE: 'Vertailutila (valitse kaksi)'
     COMPAREVERSIONS: 'Vertaa versioita'
     COMPARINGVERSION: 'Vertaillaan versioita {version1} ja {version2}'
-    MENUTITLE: Historia
     REVERTTOTHISVERSION: 'Palaa tähän versioon'
     SHOWUNPUBLISHED: 'Näytä julkaisemattomat versiot'
     SHOWVERSION: 'Näytä versionumero'
     VIEW: näkymä
-    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Katsot versiota {version}.'
-  CMSPageHistoryController_versions.ss:
+    MENUTITLE: Historia
+    VIEWINGLATEST: 'Katsot viimeisintä versiota.'
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Tekijä
-    NOTPUBLISHED: Julkaisematon
+    NOTPUBLISHED: 'Julkaisematon'
     PUBLISHER: Julkaisija
     UNKNOWN: Tuntematon
     WHEN: Milloin
-  CMSPageSettingsController:
-    MENUTITLE: 'Muokkaa sivua'
   CMSPagesController:
     GalleryView: 'Suuret ikonit'
-    ListView: Listanäkymä
+    ListView: 'Listanäkymä'
     MENUTITLE: Sivut
-    TreeView: Puunäkymä
-  CMSPagesController_ContentToolbar.ss:
+    TreeView: 'Puunäkymä'
+  CMSPagesController_ContentToolbar_ss:
     ENABLEDRAGGING: 'Vedä ja pudota'
     MULTISELECT: Monivalinta
-  CMSPagesController_Tools.ss:
+  CMSPagesController_Tools_ss:
     FILTER: Suodata
   CMSSearch:
     FILTERDATEFROM: Alkaen
     FILTERDATEHEADING: Pvm
     FILTERDATETO: Päättyen
     FILTERLABELTEXT: Sisältö
-  CMSSettingsController:
-    MENUTITLE: Asetukset
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Muuttuneet sivut'
   CMSSiteTreeFilter_DeletedPages:
@@ -170,9 +160,7 @@ fi:
   ContentController:
     ARCHIVEDSITE: 'Esikatselu versio'
     ARCHIVEDSITEFROM: 'Arkistoitu sivusto lähteestä:'
-    CMS: CMS
-    DRAFT: Draft
-    DRAFTSITE: Luonnossivusto
+    DRAFTSITE: 'Luonnossivusto'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Voidaksesi katsella luonnoksia tai arkistoitua sisältöä sinun täytyy kirjautua sisään CMS:n salasanallasi. <a href="%s">Palataksesi julkiselle sivulle paina tästä</a>.'
     Email: Sähköposti
     INSTALL_SUCCESS: 'Asennus onnistui!'
@@ -180,26 +168,18 @@ fi:
     InstallSecurityWarning: 'Tietoturvan takia, kannattaa poistaa asennustiedostot palvelimelta, ellet aio asentaa järjestelmää uudelleen. (<em>Vaaditaan pääkäyttäjän kirjautuminen: katso ylempää</em>). Palvelimella kirjoitusoikeudet tarvitaan vain "assets"-kansioon. Voit poistaa kirjoitusoikeudet kaikista muista kansioista. <br /> <a href="{link}" style="text-align: center;">Napsauta tästä poistaaksesi kaikki asennustiedostot.</a>'
     InstallSuccessCongratulations: 'SilverStripe asennettu onnistuneesti!'
     LOGGEDINAS: 'Kirjautuneena sisään nimimerkillä'
-    LOGIN: 'Kirjaudu sisään'
+    LOGIN: Kirjaudu sisään
     LOGOUT: 'Kirjaudu ulos'
     NOTLOGGEDIN: 'Ei kirjautuneena sisään'
-    PUBLISHED: Published
     PUBLISHEDSITE: 'Julkaistu sivusto'
     Password: Salasana
     PostInstallTutorialIntro: 'Tämä sivusto on yksinkertaistettu versio SilverStripe 3 sivustosta. Laajentaaksesi tätä, ole hyvä ja tutustu: {link}.'
-    StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
+    StartEditing: 'Voit aloittaa sisällön muokkauksen avaamalla <a href="{link}">sisällönhallintajärjestelmän</a>'
     UnableDeleteInstall: 'Asennustiedostojen automaattinen poistaminen ei onnistunut. Ole hyvä ja poista seuraavat tiedostot manuaalisesti.'
     VIEWPAGEIN: 'Tarkastele sivua:'
+    DRAFT: Luonnos
+    PUBLISHED: Julkaistu
   ErrorPage:
-    CODE: Virhekoodi
-    DEFAULTERRORPAGECONTENT: '<p>Valitettavasti sivua johon yritit päästä ei löytynyt.</p><p>Tarkista haluamasi kohteen URLin kirjoitusasu ja yritä uudelleen.</p>'
-    DEFAULTERRORPAGETITLE: 'Sivua ei löytynyt'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Pahoittelut, mutta pyyntösi aiheutti virheen.</p>'
-    DEFAULTSERVERERRORPAGETITLE: Palvelinvirhe
-    DESCRIPTION: 'Omat virheilmoitukset (sivuille, kuten "Sivua ei löytynyt")'
-    ERRORFILEPROBLEM: 'Virhe tiedostoa "{filename}" avattaessa ja kirjoittettaessa palvelimelle. Tarkista tiedoston kirjoitusoikeudet.'
-    PLURALNAME: Virhesivut
-    SINGULARNAME: Virhesivu
     400: '400 - Virheellinen Pyyntö'
     401: '401 - Luvaton'
     403: '403 - Kielletty'
@@ -223,6 +203,15 @@ fi:
     503: '503 - Palvelu ei ole käytettävissä'
     504: '504 - Välitysaikakatkaisu'
     505: '505 - HTTP Versio Ei Tuettu'
+    CODE: 'Virhekoodi'
+    DEFAULTERRORPAGECONTENT: '<p>Valitettavasti sivua johon yritit päästä ei löytynyt.</p><p>Tarkista haluamasi kohteen URLin kirjoitusasu ja yritä uudelleen.</p>'
+    DEFAULTERRORPAGETITLE: 'Sivua ei löytynyt'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>Pahoittelut, mutta pyyntösi aiheutti virheen.</p>'
+    DEFAULTSERVERERRORPAGETITLE: 'Palvelinvirhe'
+    DESCRIPTION: 'Omat virheilmoitukset (sivuille, kuten "Sivua ei löytynyt")'
+    ERRORFILEPROBLEM: 'Virhe tiedostoa "{filename}" avattaessa ja kirjoittettaessa palvelimelle. Tarkista tiedoston kirjoitusoikeudet.'
+    PLURALNAME: 'Virhesivut'
+    SINGULARNAME: 'Virhesivu'
   Folder:
     AddFolderButton: 'Lisää kansio'
     DELETEUNUSEDTHUMBNAILS: 'Poista käyttämättömät pikkukuvat'
@@ -234,10 +223,10 @@ fi:
     PreviewButton: Esikatselu
     SAVEDUP: Tallennettu.
     STATUSPUBLISHEDSUCCESS: '''{title}'' julkaistiin onnistuneesti'
-    SearchResults: Hakutulokset
+    SearchResults: 'Hakutulokset'
     VersionUnknown: Tuntematon
   Permission:
-    CMS_ACCESS_CATEGORY: CMS-pääsy
+    CMS_ACCESS_CATEGORY: 'CMS-pääsy'
   Permissions:
     CONTENT_CATEGORY: 'Sisällön käyttöoikeudet'
     PERMISSIONS_CATEGORY: 'Roolit ja käyttöoikeudet'
@@ -253,32 +242,26 @@ fi:
     SINGULARNAME: 'Uudelleenohjaava sivu'
     YOURPAGE: 'Sivu verkkosivustollasi'
   ReportAdmin:
-    MENUTITLE: Raportit
     ReportTitle: Otsikko
+    MENUTITLE: Raportit
   ReportAdminForm:
-    FILTERBY: Suodata
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
+    FILTERBY: 'Suodata'
   SearchForm:
-    GO: Mene
+    GO: Siirry
     SEARCH: Haku
-    SearchResults: Hakutulokset
+    SearchResults: 'Hakutulokset'
   SideReport:
     BROKENFILES: 'Sivut joissa rikkinäisiä tiedostoja'
     BROKENLINKS: 'Sivut joissa rikkinäisiä linkkejä'
     BROKENREDIRECTORPAGES: 'Uudelleenohjatut sivut, jotka osoittavat poistettuihin sivuhin'
     BROKENVIRTUALPAGES: 'Virtuaaliset sivut, jotka osoittavat poistettuihin sivuihin'
     BrokenLinksGroupTitle: 'Rikkinäisten linkkien raportit'
-    ContentGroupTitle: Sisältöraportit
+    ContentGroupTitle: 'Sisältöraportit'
     EMPTYPAGES: 'Sivut, joilla ei ole sisältöä'
     LAST2WEEKS: 'Sivut, joita on muokattu viimeisen kahden viikon aikana'
     OtherGroupTitle: Muu
     ParameterLiveCheckbox: 'Tarkista live-sivusto'
     REPEMPTY: '{title}:n raportti on tyhjä.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Jakaaksesi tämän tällä sivulla, kopioi ja liitä alapuolella oleva linkki.'
     ShareLink: 'Jaa linkki'
@@ -295,7 +278,7 @@ fi:
     SITETAGLINE: 'Sivuston mainoslause/slogan'
     SITETITLE: 'Sivuston otsikko'
     TABACCESS: Oikeudet
-    TABMAIN: 'Yleiset asetukset'
+    TABMAIN: Yleiset asetukset
     TAGLINEDEFAULT: 'sinun mainoslauseesi tähän'
     THEME: Teema
     TOPLEVELCREATE: 'Kuka voi luoda sivuja sivuston juureen?'
@@ -311,12 +294,10 @@ fi:
     APPEARSVIRTUALPAGES: 'Tämä sisältö on käytössä myös virtuaalisivuilla osioissa {title}'
     BUTTONCANCELDRAFT: 'Peruuta muutokset, jotka teit luonnokseen'
     BUTTONCANCELDRAFTDESC: 'Poista luonnoksesi ja palauta julkaistu sivu'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Poista julkaisu'
+    BUTTONSAVEPUBLISH: 'Tallenna ja julkaise'
+    BUTTONUNPUBLISH: Poista julkaisu
     BUTTONUNPUBLISHDESC: 'Poista tämä sivu julkaistulta sivustolta'
-    CREATED: Luotu
+    CREATED: 'Luotu'
     Comments: Kommentit
     Content: Sisältö
     DEFAULTABOUTCONTENT: '<p>Voit täyttää tämän sivun omalla sisällölläsi tai poistaa sen ja luoda omia sivujasi.<br /></p>'
@@ -330,20 +311,16 @@ fi:
     DEPENDENT_NOTE: 'Seuraavat sivut riippuvat tästä sivusta. Tämä pitää sisällään virtuaaliset sivut, uudelleenohjaussivut ja sivut sisältölinkkien kanssa.'
     DESCRIPTION: 'Yleinen sisältösivu'
     DependtPageColumnLinkType: 'Linkin tyyppi'
-    DependtPageColumnURL: URL
     EDITANYONE: 'Jokainen, joka voi kirjautua sisään CMS:ään.'
     EDITHEADER: 'Kuka voi muokata tätä CMS:ssä?'
     EDITONLYTHESE: 'Vain seuraavat henkilöt (valitse listasta)'
     EDITORGROUPS: 'Muokkaa ryhmiä'
     EDIT_ALL_DESCRIPTION: 'Muokkaa mitä tahansa sivua'
     EDIT_ALL_HELP: 'Mahdollisuus muokata mitä tahansa sivua sivustosta, riippumatta Käyttöoikeus-välilehden asetuksista. Vaatii "Käyttöoikeus sivuston sisältöön" -lupaa'
-    Editors: Toimittajaryhmät
-    GroupPlaceholder: 'Click to select group'
+    Editors: 'Toimittajaryhmät'
     HASBROKENLINKS: 'Tällä sivulla on rikkinäisiä linkkejä'
     HTMLEDITORTITLE: Sisältö
     INHERIT: 'Sama kuin ylätason sivulla'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Viimeksi päivitetty'
     LINKCHANGENOTE: 'Tämän sivun linkin muuttaminen vaikuttaa myös alasivujen linkkeihin.'
     MENUTITLE: 'Navigoinnin nimike'
@@ -354,13 +331,11 @@ fi:
     MODIFIEDONDRAFTHELP: 'Sivulla on tehty muutoksia, joita ei ole julkaistu'
     MODIFIEDONDRAFTSHORT: Muokattu
     MetadataToggle: Meta-tiedot
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
+    OBSOLETECLASS: 'Tämä sivu on vanhentunutta tyyppiä ({type}). Tallentaminen nollaa tyypin ja saatat menettää tietoja.'
     PAGELOCATION: 'Sivun sijainti'
     PAGETITLE: 'Sivun nimi'
     PAGETYPE: 'Sivun tyyppi'
-    PARENTID: Yläsivu
+    PARENTID: 'Yläsivu'
     PARENTTYPE: 'Sivun sijainti'
     PARENTTYPE_ROOT: 'Ylätason sivu'
     PARENTTYPE_SUBPAGE: 'Alasivu ylätason sivulle (valitse ylätaso)'
@@ -378,36 +353,43 @@ fi:
     SHOWINSEARCH: 'Näytetäänkö hauissa?'
     SINGULARNAME: Sivu
     TABBEHAVIOUR: Käyttäytyminen
-    TABCONTENT: Sisältö
+    TABCONTENT: 'Sisältö'
     TABDEPENDENT: 'Riippuvaiset sivut'
     TOPLEVEL: 'Sivuston sisältö (ylin taso)'
     TOPLEVELCREATORGROUPS: 'Huipputason tekijät'
-    URLSegment: URL-osoite
-    VIEWERGROUPS: Katsojaryhmät
+    URLSegment: 'URL-osoite'
+    VIEWERGROUPS: 'Katsojaryhmät'
     VIEW_ALL_DESCRIPTION: 'Näytä mikä tahansa sivu'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
+    VIEW_ALL_HELP: 'Mahdollisuus nähdä mikä tahansa sivu, huolimatta Käyttöoikeudet-välilehden asetuksista. Vaatii "Käyttöoikeus ''Sivuihin''" -oikeudet.'
     VIEW_DRAFT_CONTENT: 'Näytä luonnoksen sisältö'
     VIEW_DRAFT_CONTENT_HELP: 'Koskee sivujen näyttämistä CMS:n ulkopuolella vedoslaadulla. Hyödyllinen ulkopuolisille yhteistyökumppaneille ilman CMS-yhteyttä.'
-    Viewers: Katselijaryhmät
+    Viewers: 'Katselijaryhmät'
     Visibility: Näkyvyys
-    has_one_Parent: Sivupohja
+    has_one_Parent: 'Sivupohja'
     many_many_BackLinkTracking: 'Käänteinen seuranta'
     many_many_ImageTracking: 'Kuvan seuranta'
     many_many_LinkTracking: 'Linkin seuranta'
+    BUTTONPUBLISHED: Julkaistu
+    BUTTONSAVED: Tallennettu
+    GroupPlaceholder: 'Valitse ryhmä napsauttamalla'
+    LASTPUBLISHED: 'Viimeksi julkaistu'
+    LASTSAVED: 'Viimeksi tallennettu'
+    MoreOptions: 'Lisää valintoja'
+    NOTPUBLISHED: 'Julkaisematon'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Erikoismerkit muunnetaan automaattisesti tai poistetaan.'
+    EMPTY: 'Anna URL-osoite tai napsauta peruuta'
   StaticExporter:
     BASEURL: 'Kannan URL-osoite'
     EXPORTTO: 'Vie tähän kansioon'
     NAME: 'Staattinen viejä'
   TableListField:
     SELECT: 'Valitse:'
-  TableListField.ss:
+  TableListField_ss:
     NOITEMSFOUND: 'Tietoja ei löytynyt'
     SORTASC: 'Järjestä nousevasti'
     SORTDESC: 'Järjestä laskevasti'
-  TableListField_PageControls.ss:
+  TableListField_PageControls_ss:
     DISPLAYING: Näytetään
     OF: /
     TO: -»
@@ -417,20 +399,33 @@ fi:
     VIEWPREVIOUS: 'Näytä edellinen'
   TreeTools:
     DisplayLabel: 'Näytä:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Pääset arkistoidulle sivulle tällä linkillä:'
     HAVEASKED: 'Sinua on pyydetty katsomaan sivun sisältöä '
   VirtualPage:
-    CHOOSE: 'Linked Page'
+    CHOOSE: 'Linkitetty sivu'
     DESCRIPTION: 'Näytä toisen sivun sisältö'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
-    HEADER: 'Tämä on virtuaalinen sivu'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: 'Virtuaaliset sivut'
+    EDITCONTENT: 'Muokkaa linkitetyn sivun sisältöä'
+    HEADER: 'Tämä on virtuaalisivu'
+    PLURALNAME: 'Virtuaalisivut'
     PageTypNotAllowedOnRoot: 'Alkuperäinen sivutyyppi "{type}" ei ole sallittu tämän virtuaalisen sivun päätasolla'
-    SINGULARNAME: 'Virtuaalinen sivu'
+    SINGULARNAME: 'Virtuaalisivu'
+    EditLink: muokkaa
+    HEADERWITHLINK: 'Tämä on virtuaalisivu, joka kopioi sisällön kohteesta "{title}" ({link})'
+  CMSFileAddController:
+    MENUTITLE: Tiedostot
+  CMSPageEditController:
+    MENUTITLE: 'Muokkaa sivua'
+  CMSPageSettingsController:
+    MENUTITLE: 'Muokkaa sivua'
+  CMSSettingsController:
+    MENUTITLE: Asetukset
+  SITETREE:
+    VIRTUALPAGEDRAFTWARNING: 'Ole hyvä ja julkaise linkitetty sivu, jotta virtuaalisivun julkaisu on mahdollista'
+    VIRTUALPAGEWARNING: 'Ole hyvä ja valitse linkitetty sivu ja tallenna se ensin, jotta tämän sivun julkaiseminen olisi mahdollista'
+    VIRTUALPAGEWARNINGSETTINGS: 'Ole hyvä ja valitse linkitetty sivu sisältö kentästä, jotta julkaisu on mahdollista'
+  SilverStripeNavigator:
+    ARCHIVED: Arkistoitu
+  URLSegmentField:
+    Cancel: Peruuta
+    Edit: Muokkaa
diff --git a/lang/fo.yml b/lang/fo.yml
index 4e656cff..f70dcd14 100644
--- a/lang/fo.yml
+++ b/lang/fo.yml
@@ -1,436 +1,77 @@
 fo:
   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: 'Nýggj skjátta'
-    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:
+    NEWFOLDER: Nýggj skjátta
+  AssetAdmin_left_ss:
     GO: Víðari
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
     DELETE: 'Strika frá kladdu heimasíðuni'
-    DELETEFP: 'Strika frá tí almennu heimasíðuni'
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
+    DELETEFP: Strika frá tí almennu heimasíðuni
     EMAIL: Teldupostur
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Edit Page'
-    NEWPAGE: 'New {pagetype}'
     PAGENOTEXISTS: 'Hendan síðan finst ikki.'
-    PAGES: Pages
-    PAGETYPEANYOPT: Any
-    PAGETYPEOPT: 'Page Type'
     PUBALLCONFIRM: 'Vinarliga almenna kunngerð allar síðurnar á heimasíðuni,  avrita innihaldsstøðið til beinleiðis'
     PUBALLFUN: '"Ger alt alment" funka'
-    PUBALLFUN2: 'Við at trýsta á knøttin við tað sama henda, sum at fara inn á allar síðurnar og trýsta á "Ger alment". Endamálið við knøttunum er at hann skal brúkast, tá ið nógv innihald er blivið broytt, t.d. á einari nýggjari heimasíðu.'
-    PUBPAGES: 'Done: Published {count} pages'
-    PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
+    PUBALLFUN2: "Við at trýsta á knøttin við tað sama henda, sum at fara inn á allar síðurnar og trýsta á \"Ger alment\". Endamálið við knøttunum er at hann skal brúkast, tá ið nógv innihald er blivið broytt, t.d. á einari nýggjari heimasíðu."
     REMOVEDPAGEFROMDRAFT: 'Strikaði ''%s'' frá kladdu heimasíðuni'
     RESTORE: Endurstovna
-    RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Far aftur til hesa útgávuna'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Goym
-    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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    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'
-    PUBLISHED: Published
-    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 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: Feilkota
-    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: 'Síðan var ikki funnin'
-    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 - Ikki funnin'
-    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 - Longd er kravd'
-    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'
+    CODE: 'Feilkota'
+    DEFAULTERRORPAGETITLE: 'Síðan var ikki funnin'
   Folder:
-    AddFolderButton: 'Add folder'
-    DELETEUNUSEDTHUMBNAILS: 'Delete unused thumbnails'
     UNUSEDFILESTITLE: 'Óbrúktar fílur'
-    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: 'Víðarisend til'
     REDIRECTTOEXTERNAL: 'Onnur heimasíðu'
     REDIRECTTOPAGE: 'Ein síða á tínari heimasíðu'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Síða á tínari heimasíðu'
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Víðari
     SEARCH: Leita
-    SearchResults: 'Search Results'
   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: 'Tómar síður'
     LAST2WEEKS: 'Síður broyttar seinastu 2 vikurnar'
-    OtherGroupTitle: Other
-    ParameterLiveCheckbox: 'Check live site'
-    REPEMPTY: 'The {title} report is empty.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   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: Øll
     ACCESSHEADER: 'Hvør skal kunna síggja hesa síðuna?'
     ACCESSLOGGEDIN: 'Innritaðir brúkarar'
     ACCESSONLYTHESE: 'Bert hesi fólkini (vel fra yvirliti)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'Loyv viðmerkingum á hesari síðuni?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Avlýs kladdu broytingarnar'
     BUTTONCANCELDRAFTDESC: 'Strika tína kladdu, og far aftur til tí nuverandi almennu síðuna'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Óalmenna kunngerð'
+    BUTTONUNPUBLISH: Óalmenna kunngerð
     BUTTONUNPUBLISHDESC: 'Strika hesa síðuna frá tí almennu heimasíðuni'
-    CREATED: 'Date Created'
     Comments: Viðmerkingar
     Content: Innihald
-    DEFAULTABOUTCONTENT: '<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>'
     DEFAULTABOUTTITLE: 'Um okkum'
-    DEFAULTCONTACTCONTENT: '<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>'
     DEFAULTCONTACTTITLE: 'Samband við okkum'
-    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: Heim
-    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: 'Øll kunna innrita á CMS skipanina'
     EDITHEADER: 'Hvør kann broyta hesa síðuna?'
     EDITONLYTHESE: 'Bert hesa fólkini (vel frá yvirliti)'
-    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'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Hendan síðan inniheldur brotnar leinkur.'
     HTMLEDITORTITLE: Innihald
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
-    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).'
+    METADESC: 'Frágreiðing'
     METAEXTRA: 'Serlig meta frámerki'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: 'Page location'
     PAGETITLE: 'Navn á síðuni'
     PAGETYPE: 'Slag av síðu'
-    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: 'Vís á vælmyndum?'
     SHOWINSEARCH: 'Vís í leiting?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: Virkisháttur
-    TABCONTENT: Innihald
-    TABDEPENDENT: 'Dependent pages'
+    TABCONTENT: 'Innihald'
     TOPLEVEL: 'Heimasíðu innihald (Fyrsta støði)'
-    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 ''Pages'' section" 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: Yvirsíða
-    many_many_BackLinkTracking: 'Backlink Tracking'
-    many_many_ImageTracking: 'Image Tracking'
-    many_many_LinkTracking: 'Link Tracking'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
+    has_one_Parent: 'Yvirsíða'
   StaticExporter:
-    BASEURL: 'Base URL'
     EXPORTTO: 'Útles til skjáttuna'
-    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
+  TableListField_PageControls_ss:
     VIEWFIRST: 'Vís fyrstu'
     VIEWLAST: 'Vís seinastu'
     VIEWNEXT: 'Vís næsta'
     VIEWPREVIOUS: 'Vís fyrra'
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Tú kann fáa atgongd til arkiv heimasíðuna her:'
     HAVEASKED: 'Tú mást fáa loyvi, fyri at kunna síggja innihaldið á okkara heimasíðu á'
-  VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
-    HEADER: 'This is a virtual page'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: 'Virtual Pags'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
-    SINGULARNAME: 'Virtual Page'
diff --git a/lang/fr.yml b/lang/fr.yml
index e4988bed..3422be74 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -2,14 +2,8 @@ fr:
   AssetAdmin:
     ADDFILES: 'Ajouter des fichiers'
     ActionAdd: 'Ajouter un dossier'
-    AppCategoryArchive: Archive
-    AppCategoryAudio: Audio
-    AppCategoryDocument: Document
-    AppCategoryFlash: Flash
-    AppCategoryImage: Image
     AppCategoryVideo: Vidéo
     BackToFolder: 'Revenir au dossier'
-    CREATED: Date
     CurrentFolderOnly: 'Limiter au dossier actuel ?'
     DetailsView: Détails
     FILES: Fichiers
@@ -18,26 +12,23 @@ fr:
     FROMTHEINTERNET: 'En ligne'
     FROMYOURCOMPUTER: 'Depuis votre ordinateur'
     Filetype: 'Type de fichier'
-    ListView: Liste
-    MENUTITLE: Fichiers
-    NEWFOLDER: 'Nouveau dossier'
+    ListView: 'Liste'
+    NEWFOLDER: Nouveau dossier
     SIZE: Taille
     THUMBSDELETED: '{count} miniatures inutilisées ont été supprimées'
-    TreeView: Arbre
+    TreeView: 'Arbre'
     Upload: Télécharger
+    MENUTITLE: Fichiers
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Supprimer dossiers'
   AssetAdmin_Tools:
     FILTER: Filtrer
-  AssetAdmin_left.ss:
-    GO: Go
   AssetTableField:
     BACKLINKCOUNT: 'Utilisé dans :'
-    PAGES: page(s)
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Retour
   BrokenLinksReport:
-    Any: 'N''importe quel'
+    Any: N'importe quel
     BROKENLINKS: 'Rapport des liens brisés'
     CheckSite: 'Consulter le site'
     CheckSiteDropdownDraft: 'Site Brouillon'
@@ -45,7 +36,6 @@ fr:
     ColumnDateLastModified: 'Date de la dernière modification'
     ColumnDateLastPublished: 'Date de la dernière publication'
     ColumnProblemType: 'Type de problème'
-    ColumnURL: URL
     HasBrokenFile: 'a cassé le fichier'
     HasBrokenLink: 'a cassé le lien'
     HasBrokenLinkAndFile: 'a cassé le lien et le fichier'
@@ -68,97 +58,76 @@ fr:
     PUBLISHED_PAGES: '%d pages publiées, %d échecs'
     PUBLISH_PAGES: Publier
     UNPUBLISHED_PAGES: '%d pages non publiées'
-    UNPUBLISH_PAGES: 'Non publiées'
-  CMSFileAddController:
-    MENUTITLE: Fichiers
+    UNPUBLISH_PAGES: Non publiées
   CMSMain:
     ACCESS: 'Droits d’accès à la section « {title} »'
     ACCESS_HELP: 'Permettre l''affichage de la section contenant l''arborescence et le contenu. La gestion des permissions de visualisation et d''édition peut se faire à travers des liste spécifiques à chaque page. Et aussi la "Permission de contenu" séparé.'
     AddNew: 'Ajouter page'
-    AddNewButton: Ajouter
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
+    AddNewButton: 'Ajouter'
     ChoosePageParentMode: 'Choisissez où créer cette page'
     ChoosePageType: 'Choisir le type de page'
     Create: Créer
     DELETE: 'Supprimer du site brouillon'
-    DELETEFP: 'Retirer du site publié'
+    DELETEFP: Retirer du site publié
     DESCREMOVED: 'et {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    EMAIL: Email
     EditTree: 'Ağacı düzenle'
     ListFiltered: 'Filtrelenmiş liste.'
-    MENUTITLE: 'Éditer la page'
     NEWPAGE: 'Nouveau {pagetype}'
     PAGENOTEXISTS: 'Cette page n''existe pas'
-    PAGES: Pages
     PAGETYPEANYOPT: Tous
     PAGETYPEOPT: 'Type de page'
     PUBALLCONFIRM: 'Publier chaque page du site en copiant le contenu à partir du site brouillon s''il vous plaît'
     PUBALLFUN: 'Fonctionnalité "Tout Publier"'
-    PUBALLFUN2: 'Presser ce boutton fera la même chose que d''aller sur chaque page et d''appuer sur "publier".'
+    PUBALLFUN2: "Presser ce boutton fera la même chose que d'aller sur chaque page et d'appuer sur \"publier\"."
     PUBPAGES: '{count} pages ont été correctement publiées'
     PageAdded: 'La page a été créée avec succès '
-    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: '« {title} » a été éliminée du site public '
     REMOVEDPAGEFROMDRAFT: 'Supprimé ''%s'' du site de test'
     RESTORE: Restaurer
     RESTORED: '« {title} » restaurée avec succès'
     ROLLBACK: 'Retourner à cette version'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Sauvegarder
-    SAVEDRAFT: 'Save draft'
     TabContent: Contenu
     TabHistory: Historique
     TabSettings: Paramètres
     TreeFiltered: 'Filtrelenmiş ağaç liste.'
     TreeFilteredClear: 'Filtreyi temizle'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Appliquer le filtre'
+    MENUTITLE: 'Éditer la page'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Appliquer le filtre'
     RESET: Réinitialiser
   CMSPageAddController:
-    MENUTITLE: 'Ajouter page'
     ParentMode_child: 'Sous une autre page'
     ParentMode_top: 'Premier niveau'
-  CMSPageEditController:
-    MENUTITLE: 'Éditer la page'
+    MENUTITLE: 'Ajouter page'
   CMSPageHistoryController:
     COMPAREMODE: 'Comparer (choisissez deux)'
     COMPAREVERSIONS: 'Comparer les versions'
     COMPARINGVERSION: 'Comparaison entre les versions {version1} et {version2}.'
-    MENUTITLE: Historique
     REVERTTOTHISVERSION: 'Revenir à cette version'
     SHOWUNPUBLISHED: 'Afficher les versions non publiées'
     SHOWVERSION: 'Afficher cette version'
     VIEW: Afficher
-    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Version affichée : {version}.'
-  CMSPageHistoryController_versions.ss:
+    MENUTITLE: Historique
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Auteur
     NOTPUBLISHED: 'Non publiée'
     PUBLISHER: Éditeur
     UNKNOWN: Inconnu
     WHEN: Date
-  CMSPageSettingsController:
-    MENUTITLE: 'Éditer la page'
   CMSPagesController:
-    GalleryView: Galerie
-    ListView: Liste
-    MENUTITLE: Pages
-    TreeView: Arbre
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: Glisser-déposer
-    MULTISELECT: 'Choix multiple'
-  CMSPagesController_Tools.ss:
+    GalleryView: 'Galerie'
+    ListView: 'Liste'
+    TreeView: 'Arbre'
+  CMSPagesController_ContentToolbar_ss:
+    ENABLEDRAGGING: 'Glisser-déposer'
+    MULTISELECT: Choix multiple
+  CMSPagesController_Tools_ss:
     FILTER: Filtrer
   CMSSearch:
     FILTERDATEFROM: De
-    FILTERDATEHEADING: Date
-    FILTERDATETO: 'à'
     FILTERLABELTEXT: Terme
-  CMSSettingsController:
-    MENUTITLE: Paramètres
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Pages modifiées'
   CMSSiteTreeFilter_DeletedPages:
@@ -170,11 +139,9 @@ fr:
   ContentController:
     ARCHIVEDSITE: 'Aperçu de cette version'
     ARCHIVEDSITEFROM: 'Site archivé depuis'
-    CMS: CMS
-    DRAFT: Draft
     DRAFTSITE: 'Site Brouillon'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Vous devez vous authentifier avec votre mot de passe CMS afin de pouvoir consulter le contenu brouillon ou archivé. <a href="%s">Cliquer ici pour revenir au site publié.</a>'
-    Email: 'Courrier électronique'
+    Email: Courrier électronique
     INSTALL_SUCCESS: 'Installation terminée!'
     InstallFilesDeleted: 'Les fichiers d’installation ont été supprimés. '
     InstallSecurityWarning: 'Pour des raisons de sécurité vous devriez supprimer maintenant les fichiers d’installation, à moins que vous n’ayez prévu de réinstaller le système ultérieurement (<em>ce qui nécessite de se connecter comme administrateur, voir plus haut</em>). Désormais, votre serveur n’aura besoin de droits de accès en écriture que pour le dossier « assets », vous pouvez donc les révoquer pour tous les autres dossiers. <a href="{link}" style="text-align: center;">Faites clic ici pour supprimer les fichiers d’installation.</a>'
@@ -182,24 +149,13 @@ fr:
     LOGGEDINAS: 'Connecté en tant que'
     LOGIN: Connectez-vous
     LOGOUT: 'Se déconnecter'
-    NOTLOGGEDIN: Non-connecté
-    PUBLISHED: Published
+    NOTLOGGEDIN: 'Non-connecté'
     PUBLISHEDSITE: 'Site Publié'
-    Password: 'Mot de passe'
+    Password: Mot de passe
     PostInstallTutorialIntro: 'Ce site est une version simplifiée d’un site SilverStripe 3. Pour le développer, consultez {link}.'
-    StartEditing: 'You can start editing your content by opening <a href="{link}">the 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:
-    CODE: 'Code d''erreur'
-    DEFAULTERRORPAGECONTENT: '<p>Désolé, il semble que vous tentez d''accéder à une page qui n''existe pas.</p><p>Merci de vérifier l''URL que vous avez saisie puis d''essayer à nouveau.</p>'
-    DEFAULTERRORPAGETITLE: 'Page non trouvée'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Nous sommes désolés, un problème nous a empêché de traiter votre requête.</p>'
-    DEFAULTSERVERERRORPAGETITLE: 'Erreur du serveur'
-    DESCRIPTION: 'Contenu personnalisé pour diverses erreurs (p. ex. « Page introuvable »)'
-    ERRORFILEPROBLEM: ' L’ouverture du fichier « {filename} » afin de le modifier a provoqué une erreur ; vérifiez les droits d’accès au fichier. '
-    PLURALNAME: 'Pages d’erreur'
-    SINGULARNAME: 'Page d’erreur'
     400: '400 - Requête incorrecte'
     401: '401 - Non autorisé'
     403: '403 - Interdit'
@@ -223,6 +179,15 @@ fr:
     503: '503 - Service indisponible'
     504: '504 - Temps d''attente d''une réponse d''un serveur à un serveur intermédiaire écoulé'
     505: '505 - Version HTTP non supportée'
+    CODE: 'Code d''erreur'
+    DEFAULTERRORPAGECONTENT: '<p>Désolé, il semble que vous tentez d''accéder à une page qui n''existe pas.</p><p>Merci de vérifier l''URL que vous avez saisie puis d''essayer à nouveau.</p>'
+    DEFAULTERRORPAGETITLE: 'Page non trouvée'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>Nous sommes désolés, un problème nous a empêché de traiter votre requête.</p>'
+    DEFAULTSERVERERRORPAGETITLE: 'Erreur du serveur'
+    DESCRIPTION: 'Contenu personnalisé pour diverses erreurs (p. ex. « Page introuvable »)'
+    ERRORFILEPROBLEM: ' L’ouverture du fichier « {filename} » afin de le modifier a provoqué une erreur ; vérifiez les droits d’accès au fichier. '
+    PLURALNAME: 'Pages d’erreur'
+    SINGULARNAME: 'Page d’erreur'
   Folder:
     AddFolderButton: 'Ajouter un dossier'
     DELETEUNUSEDTHUMBNAILS: 'Supprimer les miniatures inutilisées'
@@ -231,7 +196,6 @@ fr:
     UploadFilesButton: Télécharger
   LeftAndMain:
     DELETED: Supprimée.
-    PreviewButton: Aperçu
     SAVEDUP: Sauvegardée.
     STATUSPUBLISHEDSUCCESS: '« {title} » publiée avec succès'
     SearchResults: 'Résultats de la recherche'
@@ -253,14 +217,10 @@ fr:
     SINGULARNAME: 'Page de redirection'
     YOURPAGE: 'Page de votre site web'
   ReportAdmin:
-    MENUTITLE: Rapports
     ReportTitle: Titre
+    MENUTITLE: Rapports
   ReportAdminForm:
     FILTERBY: 'Filtrer par'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Démarrer
     SEARCH: Rechercher
@@ -277,8 +237,6 @@ fr:
     OtherGroupTitle: Autres
     ParameterLiveCheckbox: 'Visiter le site de production'
     REPEMPTY: 'Le rapport {title} est vide'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Pour partager un lien vers cette page, copiez et collez le lien ci-dessous.'
     ShareLink: 'Partager le lien'
@@ -301,7 +259,7 @@ fr:
     TOPLEVELCREATE: 'Qui peut créer des pages à la racine de ce site ?'
     VIEWHEADER: 'Qui peut consulter les pages sur ce site?'
   SiteTree:
-    ACCESSANYONE: 'Tout le monde'
+    ACCESSANYONE: Tout le monde
     ACCESSHEADER: 'Qui peut voir cette page?'
     ACCESSLOGGEDIN: 'Utilisateurs connectés'
     ACCESSONLYTHESE: 'Seulement ces personnes (choisir à partir de la liste)'
@@ -311,10 +269,7 @@ fr:
     APPEARSVIRTUALPAGES: 'Ce contenu apparaît aussi dans les sections {title} des pages virtuelles.'
     BUTTONCANCELDRAFT: 'Annuler les changements brouillons'
     BUTTONCANCELDRAFTDESC: 'Supprimer votre brouillon et revenir à la page actuellement publiée'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Retirer du site publié'
+    BUTTONUNPUBLISH: Retirer du site publié
     BUTTONUNPUBLISHDESC: 'Retirer cette page du site publié'
     CREATED: 'Date de création'
     Comments: Commentaires
@@ -322,15 +277,13 @@ fr:
     DEFAULTABOUTCONTENT: '<p>Vous pouvez éditer cette page avec votre propre contenu ou supprimer celle-ci et créer vos propres pages.<br></p>'
     DEFAULTABOUTTITLE: 'Qui sommes nous ?'
     DEFAULTCONTACTCONTENT: '<p>Vous pouvez éditer cette page avec votre propre contenu ou supprimer celle-ci et créer vos propres pages.<br></p>'
-    DEFAULTCONTACTTITLE: Contactez-nous
+    DEFAULTCONTACTTITLE: 'Contactez-nous'
     DEFAULTHOMECONTENT: '<p>Bienvenue sur SilverStripe&nbsp;! Ceci est la page d’accueil par défaut. Vous pouvez la modifier dans le <a href="admin/">panneau d’administration</a> du CMS.  Vous pouvez consulter la <a href="http://doc.silverstripe.com">documentation développeur</a> ou commencer <a href="http://doc.silverstripe.com/doku.php?id=tutorials">les tutoriaux.</a></p>'
     DEFAULTHOMETITLE: Accueil
     DELETEDPAGEHELP: 'La page n’est plus publique '
     DELETEDPAGESHORT: Supprimée
     DEPENDENT_NOTE: 'Les pages suivantes dépendent de cette page. Ceci inclut les pages virtuelles, les redirections et les pages avec des liens.'
-    DESCRIPTION: 'Page au contenu générique'
     DependtPageColumnLinkType: 'Type de lien'
-    DependtPageColumnURL: URL
     EDITANYONE: 'Toute personne pouvant se connecter au CMS'
     EDITHEADER: 'Qui peut modifier cette page?'
     EDITONLYTHESE: 'Seulement ces personnes (choisir à partir de la liste)'
@@ -338,25 +291,19 @@ fr:
     EDIT_ALL_DESCRIPTION: 'Editer toute la page'
     EDIT_ALL_HELP: 'Possibilité d''édition de toute les pages du site, peu importe les réglages de l''onglet Accès. Nécessite la permission "Access to Site Content". '
     Editors: 'Groupes d''éditeurs'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Cette page possède des liens rompus.'
     HTMLEDITORTITLE: Contenu
     INHERIT: 'hérite de la page parente'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Dernière mise à jour'
     LINKCHANGENOTE: 'Changer le lien de cette page affectera aussi les liens des pages enfants.'
     MENUTITLE: 'Nom de navigation'
-    METADESC: Description
+    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: 'Balises Méta personnalisées'
     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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
     PAGELOCATION: 'Emplacement de la page'
     PAGETITLE: 'Nom de la page'
     PAGETYPE: 'Type de page'
@@ -366,7 +313,6 @@ fr:
     PARENTTYPE_SUBPAGE: 'Sous-page d''une page parente (choisir en-dessous) '
     PERMISSION_GRANTACCESS_DESCRIPTION: 'Contrôler les groupes qui peuvent accéder ou éditer certaines pages'
     PERMISSION_GRANTACCESS_HELP: 'Autoriser la gestion des restrictions d''accès d''une page dans la section "Pages"'
-    PLURALNAME: Pages
     PageTypNotAllowedOnRoot: 'Le type de page « {type} » n’est pas autorisé au niveau racine'
     PageTypeNotAllowed: 'Le type de page « {type} » n''est pas autorisé comme enfant de cette page parent'
     REMOVEDFROMDRAFTHELP: 'La page est publiée, mais a été effacée des brouillons'
@@ -376,7 +322,6 @@ fr:
     REORGANISE_HELP: 'Réorganiser les pages dans l''arborescence du site par glisser & déposer.'
     SHOWINMENUS: 'Afficher dans les menus ?'
     SHOWINSEARCH: 'Afficher dans les recherches ?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: Comportement
     TABCONTENT: 'Contenu principal'
     TABDEPENDENT: 'Pages dépendantes'
@@ -385,7 +330,6 @@ fr:
     URLSegment: 'Segment d''URL'
     VIEWERGROUPS: 'Groupes de Visualisation'
     VIEW_ALL_DESCRIPTION: 'Voir toute la page'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'Voir les brouillons'
     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'
@@ -395,7 +339,6 @@ fr:
     many_many_ImageTracking: 'Suivi des images'
     many_many_LinkTracking: 'Suivi des Liens'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Les caractères spéciaux sont automatiquement convertis ou supprimés.'
   StaticExporter:
     BASEURL: 'URL de base'
@@ -403,11 +346,11 @@ fr:
     NAME: 'Exportation Statique'
   TableListField:
     SELECT: 'Sélectionner:'
-  TableListField.ss:
+  TableListField_ss:
     NOITEMSFOUND: 'Aucun élément trouvé'
     SORTASC: 'Classer en ordre ascendant'
     SORTDESC: 'Classer en ordre descendant'
-  TableListField_PageControls.ss:
+  TableListField_PageControls_ss:
     DISPLAYING: Gösterilen
     OF: de
     TO: kime
@@ -417,20 +360,20 @@ fr:
     VIEWPREVIOUS: 'Voir le(s) précédent(s)'
   TreeTools:
     DisplayLabel: 'Afficher :'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Vous pouvez accéder le site archivé par ce lien :'
     HAVEASKED: 'Vous avez demandé à voir le contenu de notre site le'
   VirtualPage:
-    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Affiche le contenu d’une autre page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Cette page est virtuelle'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Pages Virtuelles'
     PageTypNotAllowedOnRoot: 'Le type de page d’origine « {type} » n’est pas autorisé au niveau racine pour cette page virtuelle'
     SINGULARNAME: 'Page virtuelle'
+  CMSFileAddController:
+    MENUTITLE: Fichiers
+  CMSPageEditController:
+    MENUTITLE: 'Éditer la page'
+  CMSPageSettingsController:
+    MENUTITLE: 'Éditer la page'
+  CMSSettingsController:
+    MENUTITLE: Paramètres
diff --git a/lang/gl_ES.yml b/lang/gl_ES.yml
index ea11062a..11315b31 100644
--- a/lang/gl_ES.yml
+++ b/lang/gl_ES.yml
@@ -3,38 +3,26 @@ gl_ES:
     ADDFILES: 'Engadir Ficheiros'
     ActionAdd: 'Engadir cartafol'
     AppCategoryArchive: Arquivo
-    AppCategoryAudio: Audio
-    AppCategoryDocument: Document
-    AppCategoryFlash: Flash
     AppCategoryImage: Imaxe
-    AppCategoryVideo: Video
     BackToFolder: 'Retornar ao cartafol'
     CREATED: Data
     CurrentFolderOnly: 'Limitar ao cartafol actual?'
     DetailsView: Detalles
-    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: 'Dende a Internet'
     FROMYOURCOMPUTER: 'Dende o teu Computador'
     Filetype: 'Tipo ficheiro'
     ListView: 'Vista en Listado'
-    MENUTITLE: Ficheiros
-    NEWFOLDER: NewFolder
     SIZE: Tamaño
-    THUMBSDELETED: '{count} unused thumbnails have been deleted'
     TreeView: 'Vista en Árbore'
     Upload: Subir
+    MENUTITLE: Ficheiros
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Eliminar cartafoles'
   AssetAdmin_Tools:
     FILTER: Filtro
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Ir
-  AssetTableField:
-    BACKLINKCOUNT: 'Used on:'
-    PAGES: page(s)
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Atrás
   BrokenLinksReport:
     Any: Ningún
@@ -45,7 +33,6 @@ gl_ES:
     ColumnDateLastModified: 'Data de modificación'
     ColumnDateLastPublished: 'Data da última publicación'
     ColumnProblemType: 'Tipo de problema'
-    ColumnURL: URL
     HasBrokenFile: 'rompeu o ficheiro'
     HasBrokenLink: 'ten ligazón rota'
     HasBrokenLinkAndFile: 'rompeu a ligazón e o ficheiro'
@@ -61,104 +48,66 @@ gl_ES:
   CMSAddPageController:
     Title: 'Engadir páxina'
   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: 'Eliminar do sitio borrador'
     DELETE_PAGES: 'Eliminar do sitio publicado'
     PUBLISHED_PAGES: '%d páxinas publicadas, %d erros'
     PUBLISH_PAGES: Publicar
     UNPUBLISHED_PAGES: '%d páxinas sen publicar'
-    UNPUBLISH_PAGES: 'Sen publicar'
-  CMSFileAddController:
-    MENUTITLE: Ficheiros
+    UNPUBLISH_PAGES: Sen publicar
   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: 'Engadir nova páxina'
     AddNewButton: 'Engadir novo'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: 'Escoller donde crear esta páxina'
     ChoosePageType: 'Escoller tipo de páxina'
     Create: Crear
     DELETE: 'Eliminar borrador'
     DELETEFP: Eliminar
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: Correo-e
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Editar Páxina'
-    NEWPAGE: 'New {pagetype}'
     PAGENOTEXISTS: 'Esta páxina non existe'
     PAGES: Páxinas
     PAGETYPEANYOPT: Ningún
     PAGETYPEOPT: 'Tipo de Páxina'
     PUBALLCONFIRM: 'Por favor publica toda a páxina no sitio, copiando o contido a contorna de produción'
     PUBALLFUN: 'Funcionalidade "Publicar Todo"'
-    PUBALLFUN2: "Premendo este botón farás o equivalente de ir a todas as páxinas e premer en \"publicar\". \\nIsto está pensado para facer un uso masivo despois das edicións de contido, por exemplo \\ncando o sitio foi construído por primeira vez."
-    PUBPAGES: 'Done: Published {count} pages'
-    PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
+    PUBALLFUN2: "Premendo este botón farás o equivalente de ir a todas as páxinas e premer en \"publicar\". \nIsto está pensado para facer un uso masivo despois das edicións de contido, por exemplo \ncando o sitio foi construído por primeira vez."
     REMOVEDPAGEFROMDRAFT: 'Eliminado ''%s''  do borrador do sitio'
     RESTORE: Restaurar
-    RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Desfacer a esta versión'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Gardar
-    SAVEDRAFT: 'Save draft'
     TabContent: Contido
     TabHistory: Historial
     TabSettings: Configuracións
-    TreeFiltered: 'Filtered tree.'
-    TreeFilteredClear: 'Clear filter'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Aplicar Filtro'
+    MENUTITLE: 'Editar Páxina'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Aplicar Filtro'
     RESET: Reiniciar
   CMSPageAddController:
-    MENUTITLE: 'Engadir páxina'
     ParentMode_child: 'Baixo outra páxina'
     ParentMode_top: 'Nivel superior'
-  CMSPageEditController:
-    MENUTITLE: 'Editar Páxina'
+    MENUTITLE: 'Engadir páxina'
   CMSPageHistoryController:
     COMPAREMODE: 'Modo comparación (seleccionar dúas)'
     COMPAREVERSIONS: 'Comparar Versións'
-    COMPARINGVERSION: 'Comparing versions {version1} and {version2}.'
-    MENUTITLE: Historial
     REVERTTOTHISVERSION: 'Retornar a esta versión'
     SHOWUNPUBLISHED: 'Amosar versións sen publicar'
     SHOWVERSION: 'Amosar Versión'
     VIEW: ver
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    VIEWINGVERSION: 'Currently viewing version {version}.'
-  CMSPageHistoryController_versions.ss:
-    AUTHOR: Autor
+    MENUTITLE: Historial
+  CMSPageHistoryController_versions_ss:
     NOTPUBLISHED: 'Non publicado'
     PUBLISHER: Editor
     UNKNOWN: Descoñecido
     WHEN: Cando
-  CMSPageSettingsController:
-    MENUTITLE: 'Editar Páxina'
   CMSPagesController:
     GalleryView: 'Vista en Galería'
     ListView: 'Vista en Listado'
     MENUTITLE: Páxinas
     TreeView: 'Vista en Árbore'
-  CMSPagesController_ContentToolbar.ss:
+  CMSPagesController_ContentToolbar_ss:
     ENABLEDRAGGING: 'Arrastrar e soltar'
-    MULTISELECT: 'Selección múltiple'
-  CMSPagesController_Tools.ss:
+    MULTISELECT: Selección múltiple
+  CMSPagesController_Tools_ss:
     FILTER: Filtro
-  CMSSearch:
-    FILTERDATEFROM: Desde
-    FILTERDATEHEADING: Data
-    FILTERDATETO: Ata
-    FILTERLABELTEXT: Contido
-  CMSSettingsController:
-    MENUTITLE: Configuracións
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Páxinas cambiadas'
   CMSSiteTreeFilter_DeletedPages:
@@ -168,27 +117,13 @@ gl_ES:
   ContentControl:
     NOTEWONTBESHOWN: 'Nota: esta mensaxe non se amosará aos visitantes'
   ContentController:
-    ARCHIVEDSITE: 'Preview version'
     ARCHIVEDSITEFROM: 'Sitio arquivado dende'
-    CMS: CMS
-    DRAFT: Draft
     DRAFTSITE: 'Sitio Borrador'
-    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: 'Iniciada sesión como'
-    LOGIN: 'Iniciar sesión'
+    LOGIN: Iniciar sesión
     LOGOUT: 'Pechar sesión'
     NOTLOGGEDIN: 'Sen iniciar sesión'
-    PUBLISHED: Published
     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 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:
     CODE: 'Código de erro'
@@ -196,33 +131,6 @@ gl_ES:
     DEFAULTERRORPAGETITLE: 'Páxina non atopada'
     DEFAULTSERVERERRORPAGECONTENT: '<p>Sintoo, houbo un problema coa xestión da túa petición.</p>'
     DEFAULTSERVERERRORPAGETITLE: 'Erro Servidor'
-    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: 'Engadir cartafol'
     DELETEUNUSEDTHUMBNAILS: 'Eliminar as miniaturas sen usar'
@@ -230,12 +138,8 @@ gl_ES:
     UNUSEDTHUMBNAILSTITLE: 'Miniaturas sen usar'
     UploadFilesButton: Subir
   LeftAndMain:
-    DELETED: Deleted.
     PreviewButton: Previsualizar
-    SAVEDUP: Saved.
-    STATUSPUBLISHEDSUCCESS: 'Published ''{title}'' successfully'
     SearchResults: 'Resultados Busca'
-    VersionUnknown: Descoñecido
   Permission:
     CMS_ACCESS_CATEGORY: 'Acceso CMS'
   Permissions:
@@ -243,28 +147,16 @@ gl_ES:
     PERMISSIONS_CATEGORY: 'Roles e permisos de acceso'
   RedirectorPage:
     DESCRIPTION: 'Redireccións a unha páxina interna diferente'
-    HASBEENSETUP: 'A redirector page has been set up without anywhere to redirect to.'
     HEADER: 'Esta páxina redirixirá os usuarios a outra páxina'
     OTHERURL: 'Outra URL do sitio web'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Redirixir a'
     REDIRECTTOEXTERNAL: 'Outro sitio web'
     REDIRECTTOPAGE: 'Unha páxina no teu sitio web'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Páxina no teu sitio web'
   ReportAdmin:
     MENUTITLE: Informes
-    ReportTitle: Title
   ReportAdminForm:
     FILTERBY: 'Filtrar por'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  SearchForm:
-    GO: Ir
-    SEARCH: Buscar
-    SearchResults: 'Resultados Busca'
   SideReport:
     BROKENFILES: 'Páxinas con ficheiros rotos'
     BROKENLINKS: 'Páxinas con ligazóns rotas'
@@ -276,9 +168,6 @@ gl_ES:
     LAST2WEEKS: 'Páxinas editadas nas 2 últimas semanas'
     OtherGroupTitle: Outro
     ParameterLiveCheckbox: 'Probar o sitio en vivo'
-    REPEMPTY: 'The {title} report is empty.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'To share a this to this page, copy and paste the link below.'
     ShareLink: 'Ligazón compartir'
@@ -288,9 +177,6 @@ gl_ES:
     DEFAULTTHEME: '(Usar tema por defecto)'
     EDITHEADER: 'Quen pode editar neste sitio?'
     EDIT_PERMISSION: 'Xestionar a configuración do sitio'
-    EDIT_PERMISSION_HELP: 'Ability to edit global access settings/top-level page permissions.'
-    PLURALNAME: 'Site Configs'
-    SINGULARNAME: 'Site Config'
     SITENAMEDEFAULT: 'O nome do teu Sitio'
     SITETAGLINE: 'Eslogan do sitio'
     SITETITLE: 'Título do Sitio'
@@ -305,78 +191,48 @@ gl_ES:
     ACCESSHEADER: 'Quen pode ver esta páxina?'
     ACCESSLOGGEDIN: 'Usuarios con sesión iniciada'
     ACCESSONLYTHESE: 'Só esta xente (escoller da lista)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'Permitir comentario nesta páxina?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancelar cambios do borrador'
     BUTTONCANCELDRAFTDESC: 'Eliminar o borrador e revertir a páxina publicada actualmente'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Sen publicar'
+    BUTTONUNPUBLISH: Sen publicar
     BUTTONUNPUBLISHDESC: 'Eliminar esta páxina do sitio publicado'
     CREATED: 'Data de Creación'
     Comments: Comentarios
     Content: Contido
-    DEFAULTABOUTCONTENT: '<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>'
     DEFAULTABOUTTITLE: 'Sobre nós'
-    DEFAULTCONTACTCONTENT: '<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>'
-    DEFAULTCONTACTTITLE: Contactarnos
+    DEFAULTCONTACTTITLE: 'Contactarnos'
     DEFAULTHOMECONTENT: '<p>Benvido a SilverStripe! Esta é a páxina de inicio por defecto. Podes editar esta páxina abrindo <a href="admin/">o CMS</a>. Agora podes acceder a <a href="http://doc.silverstripe.org">documentación do desenvolvedor</a>, ou comezar <a href="http://doc.silverstripe.org/doku.php?id=tutorials">os titoriais.</a></p>'
     DEFAULTHOMETITLE: Inicio
-    DELETEDPAGEHELP: 'Page is no longer published'
     DELETEDPAGESHORT: Eliminado
-    DEPENDENT_NOTE: 'The following pages depend on this page. This includes virtual pages, redirector pages, and pages with content links.'
     DESCRIPTION: 'Páxina de contido xenérico'
     DependtPageColumnLinkType: 'Tipo de ligazón'
-    DependtPageColumnURL: URL
     EDITANYONE: 'Ningún pode iniciar sesión no CMS'
     EDITHEADER: 'Quen pode editar esta páxina?'
     EDITONLYTHESE: 'Só esta xente (escoller da lista)'
     EDITORGROUPS: 'Grupos Editor'
     EDIT_ALL_DESCRIPTION: 'Editar calquer páxina'
-    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: 'Grupos dos Editores'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Esta páxina ten ligazóns rotas.'
     HTMLEDITORTITLE: Contido
     INHERIT: 'Herdado da páxina pai'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Último Actualizado'
-    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'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
     PAGELOCATION: 'Localización da páxina'
     PAGETITLE: 'Nome da páxina'
     PAGETYPE: 'Tipo de Páxina'
     PARENTID: 'Páxina pai'
     PARENTTYPE: 'Localización da páxina'
     PARENTTYPE_ROOT: 'Páxina nivel alto'
-    PARENTTYPE_SUBPAGE: 'Sub-page underneath a parent page'
     PERMISSION_GRANTACCESS_DESCRIPTION: 'Xestionar dereitos de acceso para o contido'
-    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: 'Eliminado do borrador'
     REMOVE_INSTALL_WARNING: 'Coidado: Deberías eliminar install.php da instalación deste Silverstripe por razóns de seguridade.'
     REORGANISE_DESCRIPTION: 'Cambiar a estrutura do sitio'
     REORGANISE_HELP: 'Reorganizar as páxinas na árbore do sitio a través de arrastrar e soltar.'
     SHOWINMENUS: 'Amosar nos menús?'
     SHOWINSEARCH: 'Amosar na busca?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: Comportamento
     TABCONTENT: 'Contido Principal'
     TABDEPENDENT: 'Páxinas dependentes'
@@ -385,52 +241,39 @@ gl_ES:
     URLSegment: 'Segmento URL'
     VIEWERGROUPS: 'Visor Grupos'
     VIEW_ALL_DESCRIPTION: 'Ver calquera páxina'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'Ver contido do borrador'
-    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: Visibilidade
     has_one_Parent: 'Páxina pai'
-    many_many_BackLinkTracking: 'Backlink Tracking'
     many_many_ImageTracking: 'Imaxe de Seguemento'
     many_many_LinkTracking: 'Ligazón de Seguemento'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
   StaticExporter:
-    BASEURL: 'Base URL'
     EXPORTTO: 'Exportar ao cartafol'
     NAME: 'Exportar estáticos'
   TableListField:
     SELECT: 'Seleccionar:'
-  TableListField.ss:
-    NOITEMSFOUND: 'No items found'
+  TableListField_ss:
     SORTASC: 'Ordear ascendentemente'
     SORTDESC: 'Ordear descendentemente'
-  TableListField_PageControls.ss:
-    DISPLAYING: Displaying
-    OF: of
-    TO: to
+  TableListField_PageControls_ss:
     VIEWFIRST: 'Ver primeiro'
     VIEWLAST: 'Ver último'
     VIEWNEXT: 'Ver seguinte'
     VIEWPREVIOUS: 'Ver anterior'
   TreeTools:
     DisplayLabel: 'Visualizar:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Podes acceder ao sitio arquivado nesta ligazón:'
     HAVEASKED: 'Solicitaches ver o contido do sitio sobre'
   VirtualPage:
-    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Visualizar o contido doutra páxina'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Esta é unha páxina virtual'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Páxs Virtuais'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Páxina Virtual'
+  CMSFileAddController:
+    MENUTITLE: Ficheiros
+  CMSPageEditController:
+    MENUTITLE: 'Editar Páxina'
+  CMSPageSettingsController:
+    MENUTITLE: 'Editar Páxina'
+  CMSSettingsController:
+    MENUTITLE: Configuracións
diff --git a/lang/grk.yml b/lang/grk.yml
deleted file mode 100644
index 84ad3658..00000000
--- a/lang/grk.yml
+++ /dev/null
@@ -1,436 +0,0 @@
-grk:
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    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 ''{title}''{description} 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'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    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'
-    PUBLISHED: Published
-    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 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'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  SearchForm:
-    GO: Go
-    SEARCH: Search
-    SearchResults: 'Search Results'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
-  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'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    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'
-    GroupPlaceholder: 'Click to select group'
-    HASBROKENLINKS: 'This page has broken links.'
-    HTMLEDITORTITLE: Content
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its 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 ''Pages'' section" 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:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    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:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  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: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
-    HEADER: 'This is a virtual page'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: 'Virtual Pags'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
-    SINGULARNAME: 'Virtual Page'
diff --git a/lang/he_IL.yml b/lang/he_IL.yml
index dd6d6b16..22324771 100644
--- a/lang/he_IL.yml
+++ b/lang/he_IL.yml
@@ -6,7 +6,7 @@ he_IL:
     AppCategoryAudio: שמע
     AppCategoryDocument: מסמך
     AppCategoryFlash: פלאש
-    AppCategoryImage: 'תמונה'
+    AppCategoryImage: תמונה
     AppCategoryVideo: וידאו
     BackToFolder: 'חזרה לתיקייה'
     CREATED: תאריך
@@ -19,22 +19,22 @@ he_IL:
     FROMYOURCOMPUTER: 'מהמחשב שלך'
     Filetype: 'סוג הקובץ'
     ListView: 'תצוגת רשימה'
-    MENUTITLE: קבצים
-    NEWFOLDER: 'תיקייה חדשה'
+    NEWFOLDER: תיקייה חדשה
     SIZE: גודל
     THUMBSDELETED: '{count} תמונות ממוזערות שלא היו בשימוש נמחקו'
     TreeView: 'תצוגת עץ'
     Upload: העלאה
+    MENUTITLE: קבצים
   AssetAdmin_DeleteBatchAction:
     TITLE: 'למחוק תיקיות'
   AssetAdmin_Tools:
-    FILTER: 'מסנן'
-  AssetAdmin_left.ss:
+    FILTER: מסנן
+  AssetAdmin_left_ss:
     GO: לעבור
   AssetTableField:
     BACKLINKCOUNT: 'נעשה שימוש בתאריך:'
     PAGES: עמוד/ים
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: חזרה
   BrokenLinksReport:
     Any: כלשהם
@@ -68,27 +68,21 @@ he_IL:
     PUBLISHED_PAGES: 'פורסמו %d עמודים, %d שגיאות'
     PUBLISH_PAGES: פרסום
     UNPUBLISHED_PAGES: 'בוטל פרסומם של %d עמודים'
-    UNPUBLISH_PAGES: 'ביטול הפרסום'
-  CMSFileAddController:
-    MENUTITLE: קבצים
+    UNPUBLISH_PAGES: ביטול הפרסום
   CMSMain:
     ACCESS: 'גישה לאגף ''{title}'''
     ACCESS_HELP: 'מתן האפשרות לצפות באגף המכיל את עץ העמודים והתוכן. ניתן לצפות ולערוך הרשאות באמצעות תיבות בחירה ייעודיות לכל עמוד, כמו גם „הרשאות התוכן“ הנפרדות.'
     AddNew: 'הוספת עמוד חדש'
     AddNewButton: 'הוספת חדש'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: 'נא לבחור היכן ליצור עמוד זה'
     ChoosePageType: 'נא לבחור בסוג העמוד'
     Create: יצירה
     DELETE: 'מחיקה מאתר הטיוטה'
     DELETEFP: מחיקה
     DESCREMOVED: 'ו־{count} צאצאים'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: דוא״ל
     EditTree: 'עריכת העץ'
     ListFiltered: 'רשימה מסוננת.'
-    MENUTITLE: 'עריכת העמוד'
     NEWPAGE: '{pagetype} חדש'
     PAGENOTEXISTS: 'עמוד זה אינו קיים במערכת'
     PAGES: עמודים
@@ -96,69 +90,59 @@ he_IL:
     PAGETYPEOPT: 'סוג העמוד'
     PUBALLCONFIRM: 'פרסום העמודים באתר, תוך העתקת כל הטיוטות לגרסה הסופית'
     PUBALLFUN: 'פרסום הכול'
-    PUBALLFUN2: 'לחיצה על כפתור זה מקבילה לאישור פרסום על כל העמודים באתר. הכפתור נועד לאישורים גורפים שבאו בעקבות עריכה נרחבת באתר דוגמת ההגדרות הראשוניות בעת יצירת אתר זה'
+    PUBALLFUN2: "לחיצה על כפתור זה מקבילה לאישור פרסום על כל העמודים באתר. הכפתור נועד לאישורים גורפים שבאו בעקבות עריכה נרחבת באתר דוגמת ההגדרות הראשוניות בעת יצירת אתר זה"
     PUBPAGES: 'בוצע: פורסמו {count} עמודים'
     PageAdded: 'העמוד נוצר בהצלחה'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: '''{title}'' הוסר מהאתר שפורסם'
     REMOVEDPAGEFROMDRAFT: '''$s'' הוסר מאתר הטיוטה'
     RESTORE: שחזור
     RESTORED: '''{title}'' שוחזר בהצלחה'
     ROLLBACK: 'שחזור לגרסה זו'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: שמירה
-    SAVEDRAFT: 'Save draft'
     TabContent: תוכן
     TabHistory: היסטורייה
     TabSettings: הגדרות
     TreeFiltered: 'עץ מסונן.'
     TreeFilteredClear: 'ביטול הסינון'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'החלת המסנן'
+    MENUTITLE: 'עריכת העמוד'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'החלת המסנן'
     RESET: איפוס
   CMSPageAddController:
-    MENUTITLE: 'הוספת עמוד'
     ParentMode_child: 'תחת עמוד אחר'
     ParentMode_top: 'רמה עליונה'
-  CMSPageEditController:
-    MENUTITLE: 'עריכת עמוד'
+    MENUTITLE: 'הוספת עמוד'
   CMSPageHistoryController:
     COMPAREMODE: 'מצב השוואה (יש לבחור שניים)'
     COMPAREVERSIONS: 'השוואת גרסאות'
     COMPARINGVERSION: 'השוואה בין הגרסאות {version1} ו־{version2}.'
-    MENUTITLE: היסטוריה
     REVERTTOTHISVERSION: 'חזרה לגרסה זו'
     SHOWUNPUBLISHED: 'הצגת גרסאות שלא פוסרמו'
     SHOWVERSION: 'הצגת הגרסה'
     VIEW: צפייה
-    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'הגרסה הנוכחית המופיעה {version}.'
-  CMSPageHistoryController_versions.ss:
-    AUTHOR: 'נוצר על ידי'
+    MENUTITLE: היסטוריה
+  CMSPageHistoryController_versions_ss:
+    AUTHOR: נוצר על ידי
     NOTPUBLISHED: 'לא פורסם'
-    PUBLISHER: 'פורסם על ידי'
-    UNKNOWN: 'לא ידוע'
+    PUBLISHER: פורסם על ידי
+    UNKNOWN: לא ידוע
     WHEN: מתי
-  CMSPageSettingsController:
-    MENUTITLE: 'עריכת העמוד'
   CMSPagesController:
     GalleryView: 'תצוגת גלריה'
     ListView: 'תצוגת רשימה'
     MENUTITLE: עמודים
     TreeView: 'תצוגת עץ'
-  CMSPagesController_ContentToolbar.ss:
+  CMSPagesController_ContentToolbar_ss:
     ENABLEDRAGGING: 'גרירה והשלכה'
-    MULTISELECT: 'בחירה מרובה'
-  CMSPagesController_Tools.ss:
-    FILTER: 'מסנן'
+    MULTISELECT: בחירה מרובה
+  CMSPagesController_Tools_ss:
+    FILTER: מסנן
   CMSSearch:
     FILTERDATEFROM: מ־
     FILTERDATEHEADING: תאריך
     FILTERDATETO: עד
     FILTERLABELTEXT: תוכן
-  CMSSettingsController:
-    MENUTITLE: הגדרות
   CMSSiteTreeFilter_ChangedPages:
     Title: 'דפים ששונו'
   CMSSiteTreeFilter_DeletedPages:
@@ -170,8 +154,6 @@ he_IL:
   ContentController:
     ARCHIVEDSITE: 'הצגה מקדימה של הגרסה'
     ARCHIVEDSITEFROM: 'אתר ארכיון מהתאריך'
-    CMS: CMS
-    DRAFT: Draft
     DRAFTSITE: 'אתר טיוטה'
     DRAFT_SITE_ACCESS_RESTRICTION: 'עליך להיכנס עם ססמת המערכת כדי לצפות בדף טיוטה או בתוכן שמור. <a href="%s">לחזרה לאתר יש ללחוץ כאן</a>'
     Email: דוא״ל
@@ -180,26 +162,15 @@ he_IL:
     InstallSecurityWarning: 'מטעמי אבטחה עליך למחוק כעת את קובצי ההתקנה, אלמלא תכניותיך הן להתקין מחדש מאוחר יותר (<em>נדרשת כניסת מנהל, פרטים להלן</em>). שרת האינטרנט יזדקק רק לעת עתה לגישה לכתיבה לתיקייה „assets“, ניתן להסיר את גישת הכתיבה מכל שאר התיקיות. <a href="{link}" style="text-align: center;">יש ללחוץ כאן כדי למחוק את קובצי ההתקנה.</a>'
     InstallSuccessCongratulations: 'מערכת ה־SilverStripe הותקנה בהצלחה!'
     LOGGEDINAS: 'נכנסת בשם'
-    LOGIN: 'כניסה'
-    LOGOUT: יציאה
+    LOGIN: כניסה
+    LOGOUT: 'יציאה'
     NOTLOGGEDIN: 'לא נכנסת'
-    PUBLISHED: Published
     PUBLISHEDSITE: 'אתר שפורסם'
     Password: ססמה
     PostInstallTutorialIntro: 'אתר זה הנו גרסה מופשטת של אתר SilverStrip 3. כדי להרחיב את האתר, נא לגשת לכתובת {link}.'
-    StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'לא ניתן למחוק את קובצי ההתקנה. נא למחוק את הקבצים שלהלן ידנית'
     VIEWPAGEIN: 'צפייה בעמוד תחת:'
   ErrorPage:
-    CODE: 'הודעת שגיאה'
-    DEFAULTERRORPAGECONTENT: '<p>מצטערים, נראה שהדף שניסית להגיע אליו אינו קיים</p><p>נא לבדוק את הכתובת המבוקשת ולנסות שנית</p>'
-    DEFAULTERRORPAGETITLE: 'הדף המבוקש לא נמצא'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>אירעה תקלה בעת הטיפול בבקשתך, עמך הסליחה.</p>'
-    DEFAULTSERVERERRORPAGETITLE: 'שגיאת שרת'
-    DESCRIPTION: 'תוכן מותאם אישית למקרי שגיאות שונים (לדוגמה: „העמוד לא נמצא“)'
-    ERRORFILEPROBLEM: 'שגיאה בפתיחת הקובץ „{filename}“ לכתיבה. נא לבדוק את הרשאות הקובץ.'
-    PLURALNAME: 'עמודי שגיאה'
-    SINGULARNAME: 'עמוד שגיאה'
     400: '400 - בקשה שגויה'
     401: '401 - אין הרשאה'
     403: '403 - אין כניסה'
@@ -223,6 +194,15 @@ he_IL:
     503: '503 - השירות אינו זמין'
     504: '504 - תם הזמן שהוקצב לשער הגישה'
     505: '505 - גרסת ה־HTTP לא נתמכת'
+    CODE: 'הודעת שגיאה'
+    DEFAULTERRORPAGECONTENT: '<p>מצטערים, נראה שהדף שניסית להגיע אליו אינו קיים</p><p>נא לבדוק את הכתובת המבוקשת ולנסות שנית</p>'
+    DEFAULTERRORPAGETITLE: 'הדף המבוקש לא נמצא'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>אירעה תקלה בעת הטיפול בבקשתך, עמך הסליחה.</p>'
+    DEFAULTSERVERERRORPAGETITLE: 'שגיאת שרת'
+    DESCRIPTION: 'תוכן מותאם אישית למקרי שגיאות שונים (לדוגמה: „העמוד לא נמצא“)'
+    ERRORFILEPROBLEM: 'שגיאה בפתיחת הקובץ „{filename}“ לכתיבה. נא לבדוק את הרשאות הקובץ.'
+    PLURALNAME: 'עמודי שגיאה'
+    SINGULARNAME: 'עמוד שגיאה'
   Folder:
     AddFolderButton: 'הוספת תיקייות'
     DELETEUNUSEDTHUMBNAILS: 'מחיקת תמונות ממוזערות שאינן בשימוש'
@@ -230,12 +210,12 @@ he_IL:
     UNUSEDTHUMBNAILSTITLE: 'תמונות ממוזערות שאינן בשימוש'
     UploadFilesButton: העלאה
   LeftAndMain:
-    DELETED: 'נמחק.'
-    PreviewButton: 'תצוגה מקדימה'
-    SAVEDUP: 'נשמר.'
+    DELETED: נמחק.
+    PreviewButton: תצוגה מקדימה
+    SAVEDUP: נשמר.
     STATUSPUBLISHEDSUCCESS: '''{title}'' פורסם בהצלחה'
     SearchResults: 'תוצאות החיפוש'
-    VersionUnknown: 'לא ידועה'
+    VersionUnknown: לא ידועה
   Permission:
     CMS_ACCESS_CATEGORY: 'גישה ל־CMS'
   Permissions:
@@ -253,14 +233,10 @@ he_IL:
     SINGULARNAME: 'עמוד הפנייה'
     YOURPAGE: 'עמוד באתר שלך'
   ReportAdmin:
-    MENUTITLE: דוחות
     ReportTitle: כותרת
+    MENUTITLE: דוחות
   ReportAdminForm:
     FILTERBY: 'סינון לפי'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: לעבור
     SEARCH: חיפוש
@@ -277,8 +253,6 @@ he_IL:
     OtherGroupTitle: אחר
     ParameterLiveCheckbox: 'בדיקת האתר החי'
     REPEMPTY: 'הדוח {title} ריק.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'כדי לשתף קישור עמוד זה יש להעתיק ולהדביק את הקישור שלהלן.'
     ShareLink: 'שיתוף הקישור'
@@ -297,11 +271,11 @@ he_IL:
     TABACCESS: גישה
     TABMAIN: ראשי
     TAGLINEDEFAULT: 'שורת התיוג שלך כאן'
-    THEME: 'ערכת עיצוב'
+    THEME: ערכת עיצוב
     TOPLEVELCREATE: 'מי יכול ליצור עמודים בראש האתר?'
     VIEWHEADER: 'מי יכול לצפות בעמודים באתר זה?'
   SiteTree:
-    ACCESSANYONE: 'כל אחד'
+    ACCESSANYONE: כל אחד
     ACCESSHEADER: 'מי יכול לצפות בעמוד זה?'
     ACCESSLOGGEDIN: 'משתמשים שנכנסו'
     ACCESSONLYTHESE: 'רק האנשים האלה (יש לבחור מהרשימה)'
@@ -311,10 +285,7 @@ he_IL:
     APPEARSVIRTUALPAGES: 'תוכן זה מופיע גם בעמודים הווירטואליים באגפים של {title}.'
     BUTTONCANCELDRAFT: 'ביטול שינויי הטיוטה'
     BUTTONCANCELDRAFTDESC: 'למחוק את הטיוטה שלך ולהחזיר לעמוד הנוכחי שפורסם'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'ביטול הפרסום'
+    BUTTONUNPUBLISH: ביטול הפרסום
     BUTTONUNPUBLISHDESC: 'הסרת עמוד זה מהאתר שפורסם'
     CREATED: 'תאריך היצירה'
     Comments: תגובות
@@ -324,9 +295,9 @@ he_IL:
     DEFAULTCONTACTCONTENT: '<p>ניתן למלא עמוד זה בתוכן משלך, או למחוק אותו וליצור עמודים משלך.<br /></p>'
     DEFAULTCONTACTTITLE: 'יצירת קשר'
     DEFAULTHOMECONTENT: '<p>ברוך בואך ל־SilverStripe! זהו עמוד הבית כבררת המחדל. ניתן לערוך עמוד זה על ידי פתיחת <a href="admin/">ה־CMS</a>. כעת ניתן לגשת <a href="http://doc.silverstripe.org">לתיעוד עבור המפתחים</a>, או לגשת ללמוד <a href="http://doc.silverstripe.org/doku.php?id=tutorials">מהמדריכים.</a></p>'
-    DEFAULTHOMETITLE: 'דף הבית'
+    DEFAULTHOMETITLE: דף הבית
     DELETEDPAGEHELP: 'העמוד אינו מפורסם עוד'
-    DELETEDPAGESHORT: 'נמחק'
+    DELETEDPAGESHORT: נמחק
     DEPENDENT_NOTE: 'העמודים הבאים תלויים בעמוד זה. בין אלו נכללים, עמודים וירטואליים, עמודי הפנייה ועמודים עם קישורי תוכן.'
     DESCRIPTION: 'דף תוכן גנרי'
     DependtPageColumnLinkType: 'סוג הקישור'
@@ -338,25 +309,19 @@ he_IL:
     EDIT_ALL_DESCRIPTION: 'עריכת עמוד כלשהו'
     EDIT_ALL_HELP: 'היכולת לערוך כל עמוד באתר זה, ללא תלות בהגדרות בלשונית הגישה.  דורש את ההרשאה „גישה לאגף „עמודים““.'
     Editors: 'קבוצות עורכים'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'דף זה מכיל קישורים שבורים'
     HTMLEDITORTITLE: תוכן
     INHERIT: 'הורשה מדף ההורה'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'עודכן לאחרונה'
     LINKCHANGENOTE: 'החלפת הקישורים בעמוד זה ישפיע גם על הקישורים של כל העמודים הצאצאים.'
     MENUTITLE: 'תווית ניווט'
-    METADESC: תיאור
+    METADESC: 'תיאור'
     METADESCHELP: 'מנועי החיפוש משתמשים בתוכן זה כדי להציג תוצאות חיפוש (למרות שלא תהיה לכך השפעה על הדירוג שלהם).'
     METAEXTRA: 'תגי על נוספים'
     METAEXTRAHELP: 'תגיות HTML לנתוני על נוספים. לדוגמה &lt;meta name="שם_מותאם_אישית" content="התוכן שלך כאן" /&gt;'
     MODIFIEDONDRAFTHELP: 'בעמוד יש שינויים שלא פורסמו'
-    MODIFIEDONDRAFTSHORT: 'השתנה'
-    MetadataToggle: 'נתוני על'
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
+    MODIFIEDONDRAFTSHORT: השתנה
+    MetadataToggle: נתוני על
     PAGELOCATION: 'מיקום העמוד'
     PAGETITLE: 'שם הדף'
     PAGETYPE: 'סוג דף'
@@ -377,7 +342,7 @@ he_IL:
     SHOWINMENUS: 'להציג בתפריטים?'
     SHOWINSEARCH: 'לכלול בחיפוש?'
     SINGULARNAME: עמוד
-    TABBEHAVIOUR: 'התנהגות'
+    TABBEHAVIOUR: התנהגות
     TABCONTENT: 'תוכן ראשי'
     TABDEPENDENT: 'עמודים תלויים'
     TOPLEVEL: 'תוכן האתר (רמה עליונה)'
@@ -385,17 +350,15 @@ he_IL:
     URLSegment: 'מקטע כתובת'
     VIEWERGROUPS: 'קבוצות צופים'
     VIEW_ALL_DESCRIPTION: 'צפייה בכל עמוד שהוא'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'צפייה בתוכן טיוטה'
     VIEW_DRAFT_CONTENT_HELP: 'חל על צפייה בעמודים מחוץ ל־CMD במצב טיוטה. חיוני לצורך שיתוף פעולה עם גורמים חיצוניים שאין להם גישה ל־CMS.'
     Viewers: 'קבוצות צופים'
-    Visibility: 'אופן הצגה'
+    Visibility: אופן הצגה
     has_one_Parent: 'דף הורה'
     many_many_BackLinkTracking: 'מעקב אחרי קישור חוזר'
     many_many_ImageTracking: 'מעקב אחר תמונה'
     many_many_LinkTracking: 'מעקב אחר קישורים'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: ' תווים מיוחדים מומרים אוטומטית או שהם מוסרים.'
   StaticExporter:
     BASEURL: 'כתובת בסיס'
@@ -403,11 +366,11 @@ he_IL:
     NAME: 'מתבצע יצוא'
   TableListField:
     SELECT: 'בחירה:'
-  TableListField.ss:
+  TableListField_ss:
     NOITEMSFOUND: 'לא נמצאו פריטים'
     SORTASC: 'סידור בסדר עולה'
     SORTDESC: 'סידור בסדר יורד'
-  TableListField_PageControls.ss:
+  TableListField_PageControls_ss:
     DISPLAYING: מוצגים
     OF: מתוך
     TO: עד
@@ -417,20 +380,20 @@ he_IL:
     VIEWPREVIOUS: 'הצגת הקודם'
   TreeTools:
     DisplayLabel: 'תצוגה:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'ניתן להיכנס לארכיון האתר בקישור הזה:'
     HAVEASKED: 'ביקשת לצפות בתוכן האתר שלנו תחת'
   VirtualPage:
-    CHOOSE: 'Linked Page'
     DESCRIPTION: 'הצגת תוכן של עמוד אחר'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'זהו עמוד וירטואלי'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'דפים וירטואליים'
     PageTypNotAllowedOnRoot: 'סוג העמוד המקורי „{type}“ אינו מורשה ברמת העל של עמוד וירטואלי זה'
     SINGULARNAME: 'דף וירטואלי'
+  CMSFileAddController:
+    MENUTITLE: קבצים
+  CMSPageEditController:
+    MENUTITLE: 'עריכת עמוד'
+  CMSPageSettingsController:
+    MENUTITLE: 'עריכת העמוד'
+  CMSSettingsController:
+    MENUTITLE: הגדרות
diff --git a/lang/hr.yml b/lang/hr.yml
index 277a05a9..6ab99f63 100644
--- a/lang/hr.yml
+++ b/lang/hr.yml
@@ -1,436 +1,70 @@
 hr:
   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: 'Novi direktorij'
-    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:
+    NEWFOLDER: Novi direktorij
+  AssetAdmin_left_ss:
     GO: Idi
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    EMAIL: Email
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Edit Page'
-    NEWPAGE: 'New {pagetype}'
     PAGENOTEXISTS: 'Stranica ne postoji'
-    PAGES: Pages
-    PAGETYPEANYOPT: Any
-    PAGETYPEOPT: 'Page Type'
     PUBALLCONFIRM: 'Molim objavi svaku stranicu, kopirajući sadržaj'
     PUBALLFUN: '"Objavi sve"'
-    PUBALLFUN2: 'Ovaj gumb radi isto što i klikanje na "objavi" gumbe za svaku stranicu posebno. Koristi se nakon velikih promjena u sadržaju, kao npr. kod prve objave stranice.'
-    PUBPAGES: 'Done: Published {count} pages'
-    PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
-    REMOVEDPAGEFROMDRAFT: 'Removed ''%s'' from the draft site'
-    RESTORE: Restore
-    RESTORED: 'Restored ''{title}'' successfully'
+    PUBALLFUN2: "Ovaj gumb radi isto što i klikanje na \"objavi\" gumbe za svaku stranicu posebno. Koristi se nakon velikih promjena u sadržaju, kao npr. kod prve objave stranice."
     ROLLBACK: 'Vrati na ovu verziju'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Snimi
-    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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    DRAFTSITE: 'Draft Site'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Morate biti prijavljeni sa vašom CMS zaporkom kako bi ste mogli vidjeti privremeni ili arhivirani sadržaj. <a href="%s">Kliknite kako bi ste se vratili na objavljen dio stranice</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'
-    PUBLISHED: Published
-    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 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: 'Stranica za preusjeravanje nema postavljenog preusmjeravanja'
     HEADER: 'Ova stranica preusmjeriti će korisnike na drugu stranicu'
     OTHERURL: 'URL drugog weba'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Preusmjeri na'
     REDIRECTTOEXTERNAL: 'Drugi web'
     REDIRECTTOPAGE: 'Stranicu na Vašom webu'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Stranica na Vašem webu'
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  SearchForm:
-    GO: Go
-    SEARCH: Search
-    SearchResults: 'Search Results'
   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: 'Prazne stranice'
     LAST2WEEKS: 'Stranice mijenjane u zadnja 2 tjedna'
-    OtherGroupTitle: Other
-    ParameterLiveCheckbox: 'Check live site'
-    REPEMPTY: 'The {title} report is empty.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   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: Svi
     ACCESSHEADER: 'Tko može pregledavati ovu stranicu?'
     ACCESSLOGGEDIN: 'Samo prijavljeni korisnici'
     ACCESSONLYTHESE: 'Samo slijedeći korisnici (odaberite s popisa)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'Dozvoli komentare na stranici'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Otkaži promjene na privremenoj stranici (draft)'
     BUTTONCANCELDRAFTDESC: 'Obiriši privremenu stranicu i vrati na trenutno objavljenu'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: Unpublish
     BUTTONUNPUBLISHDESC: 'Izbrišite ovu stranicu sa objavljene'
-    CREATED: 'Date Created'
-    Comments: Comments
     Content: Sadržaj
-    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: 'Svi koji se mogu prijaviti  u CMS'
     EDITHEADER: 'Tko može uređivati unutar CMSa?'
     EDITONLYTHESE: 'Samo slijedeći korisnici (odaberite s popisa)'
-    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'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Ova stranica ima pogrešne linkove'
     HTMLEDITORTITLE: Sadržaj
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
-    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).'
+    METADESC: 'Opis'
     METAEXTRA: 'Podešeni Meta Tagovi'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: 'Page location'
     PAGETITLE: 'Ime stranice'
     PAGETYPE: 'Vrsta stranice'
-    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: 'Pokaži u izbornicima?'
     SHOWINSEARCH: 'Pokaži u tražilici?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: Karakteristike
-    TABCONTENT: Sadržaj
-    TABDEPENDENT: 'Dependent pages'
+    TABCONTENT: 'Sadržaj'
     TOPLEVEL: 'Sadržaj stranice (Top Level)'
-    TOPLEVELCREATORGROUPS: 'Top level creators'
     URLSegment: 'Dio URLa'
-    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 ''Pages'' section" 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: 'Roditeljska stranica'
-    many_many_BackLinkTracking: 'Backlink Tracking'
-    many_many_ImageTracking: 'Image Tracking'
-    many_many_LinkTracking: 'Link Tracking'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
   StaticExporter:
     BASEURL: 'Osnovni URL'
     EXPORTTO: 'Izvezi u taj direktorij'
     NAME: 'Statični 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
+  TableListField_PageControls_ss:
     VIEWFIRST: 'Pogledaj prvi'
     VIEWLAST: 'Pogledaj zadnji'
     VIEWNEXT: 'Pogledaj slijedeći'
     VIEWPREVIOUS: 'Pogledaj prethodni'
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Na slijedećem linku možete pristupiti arhiviranoj stranici:'
     HAVEASKED: 'Zatražili ste sadržaj naše stranice '
   VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Ovo je virtualna stranica'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Virtualne stranice'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Virtualna stranica'
diff --git a/lang/hu.yml b/lang/hu.yml
index 89523d10..d306221d 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -5,90 +5,59 @@ hu:
     AppCategoryArchive: Archív
     AppCategoryAudio: Audió
     AppCategoryDocument: Dokumentum
-    AppCategoryFlash: Flash
     AppCategoryImage: Kép
     AppCategoryVideo: Videó
     BackToFolder: 'Vissza a mappába'
     CREATED: Dátum
-    CurrentFolderOnly: 'Limit to current folder?'
     DetailsView: Részletek
     FILES: Állományok
-    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: Internetről
-    FROMYOURCOMPUTER: Számítógépéről
+    FROMTHEINTERNET: 'Internetről'
+    FROMYOURCOMPUTER: 'Számítógépéről'
     Filetype: 'Állomány típusa'
     ListView: 'Lista nézet'
-    MENUTITLE: Állományok
-    NEWFOLDER: 'Új mappa'
+    NEWFOLDER: Új mappa
     SIZE: Méret
-    THUMBSDELETED: '{count} unused thumbnails have been deleted'
-    TreeView: 'Tree View'
     Upload: Feltöltés
+    MENUTITLE: Állományok
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Mappák törlése'
   AssetAdmin_Tools:
     FILTER: Szűrő
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Mehet
   AssetTableField:
     BACKLINKCOUNT: 'Felhasználva:'
     PAGES: oldal(ak)
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Vissza
   BrokenLinksReport:
     Any: Bármely
-    BROKENLINKS: 'Broken links report'
     CheckSite: 'Oldal ellenőrzése'
     CheckSiteDropdownDraft: 'Oldal vázlata'
     CheckSiteDropdownPublished: 'Publikált oldal'
-    ColumnDateLastModified: 'Date last modified'
-    ColumnDateLastPublished: 'Date last published'
     ColumnProblemType: 'Probléma típusa'
-    ColumnURL: URL
-    HasBrokenFile: 'has broken file'
-    HasBrokenLink: 'has broken link'
-    HasBrokenLinkAndFile: 'has broken link and file'
     HoverTitleEditPage: 'Oldal szerkesztése'
     PageName: 'Oldal neve'
-    ReasonDropdown: 'Problem to check'
     ReasonDropdownBROKENFILE: 'Hibás állomány'
     ReasonDropdownBROKENLINK: 'Hibás hivatkozás'
-    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: 'a virtuális oldal egy nem létező oldalra hivatkozik'
   CMSAddPageController:
     Title: 'Oldal hozzáadása'
   CMSBatchActions:
-    DELETED_DRAFT_PAGES: 'Deleted %d pages from draft site, %d failures'
     DELETED_PAGES: '%d oldal törölve a publikáltak közül, %d hibás'
     DELETE_DRAFT_PAGES: 'Törlés a vázlatokból'
     DELETE_PAGES: 'Törlés a publikált oldalakból'
     PUBLISHED_PAGES: '%d oldal publikálva, %d hibás'
     PUBLISH_PAGES: Publikálni
     UNPUBLISHED_PAGES: '%d publikálatlan oldal'
-    UNPUBLISH_PAGES: 'Publikálás visszavonása'
-  CMSFileAddController:
-    MENUTITLE: Állományok
+    UNPUBLISH_PAGES: Publikálás visszavonása
   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: 'Új oldal hozzáadása'
     AddNewButton: 'Új hozzáadása'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
     ChoosePageType: 'Válassza ki az oldal típusát'
     Create: Létrehozni
     DELETE: 'Vázlat törlése'
     DELETEFP: Törlés
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    EMAIL: Email
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Oldal szerkesztése'
     NEWPAGE: 'Új {pagetype}'
     PAGENOTEXISTS: 'Ez az oldal nem létezik.'
     PAGES: Oldalak
@@ -96,153 +65,83 @@ hu:
     PAGETYPEOPT: 'Oldal típusa'
     PUBALLCONFIRM: 'Minden oldal publikálása, fázistartalmak kitevése'
     PUBALLFUN: '"Összes publikálása" funkció'
-    PUBALLFUN2: 'Ennek a gombnak a megnyomásával ugyanazt érheted el, mintha az összes oldalon megnyomnád a publikálás gombot. Akkor célszerű használni, ha a tartalom nagy változáson ment keresztül, mint például az oldal kezdeti felépítésénél.'
-    PUBPAGES: 'Done: Published {count} pages'
+    PUBALLFUN2: "Ennek a gombnak a megnyomásával ugyanazt érheted el, mintha az összes oldalon megnyomnád a publikálás gombot. Akkor célszerű használni, ha a tartalom nagy változáson ment keresztül, mint például az oldal kezdeti felépítésénél."
     PageAdded: 'Oldal sikeresen létrehozva'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
     REMOVEDPAGEFROMDRAFT: '''%s'' törlése a piszkozatoldalról'
     RESTORE: Visszaállítás
-    RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Visszaállítás ehhez a verzióhoz'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Mentés
-    SAVEDRAFT: 'Save draft'
     TabContent: Tartalom
-    TabHistory: History
     TabSettings: Beállítások
-    TreeFiltered: 'Filtered tree.'
     TreeFilteredClear: 'Szűrő törlése'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Szűrő alkalmazása'
-    RESET: Reset
+    MENUTITLE: 'Oldal szerkesztése'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Szűrő alkalmazása'
   CMSPageAddController:
-    MENUTITLE: 'Oldal hozzáadása'
     ParentMode_child: 'Másik oldal alatt'
     ParentMode_top: 'Felső szint'
-  CMSPageEditController:
-    MENUTITLE: 'Oldal szerkesztése'
+    MENUTITLE: 'Oldal hozzáadása'
   CMSPageHistoryController:
-    COMPAREMODE: 'Compare mode (select two)'
     COMPAREVERSIONS: 'Verziók összehasonlítása'
-    COMPARINGVERSION: 'Comparing versions {version1} and {version2}.'
-    MENUTITLE: Előzmények
     REVERTTOTHISVERSION: 'Visszatérés erre a verzióra'
-    SHOWUNPUBLISHED: 'Show unpublished versions'
-    SHOWVERSION: 'Show Version'
     VIEW: megtekintés
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    VIEWINGVERSION: 'Currently viewing version {version}.'
-  CMSPageHistoryController_versions.ss:
-    AUTHOR: Szerző
+  CMSPageHistoryController_versions_ss:
     NOTPUBLISHED: 'Nincs publikálva'
     PUBLISHER: Szerző
-    UNKNOWN: Ismeretlen
     WHEN: Mikor
-  CMSPageSettingsController:
-    MENUTITLE: 'Oldal szerkesztése'
   CMSPagesController:
     GalleryView: 'Galéria nézet'
     ListView: 'Lista nézet'
-    MENUTITLE: Oldalak
     TreeView: 'Fa nézet'
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: 'Drag''n''drop'
-    MULTISELECT: Multi-selection
-  CMSPagesController_Tools.ss:
+  CMSPagesController_Tools_ss:
     FILTER: Szűrő
   CMSSearch:
     FILTERDATEFROM: -tól
     FILTERDATEHEADING: Dátum
     FILTERDATETO: -ig
     FILTERLABELTEXT: Tartalom
-  CMSSettingsController:
-    MENUTITLE: Beállítások
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Változtatott oldalak'
   CMSSiteTreeFilter_DeletedPages:
     Title: 'Összes oldal, a töröltekkel együtt'
-  CMSSiteTreeFilter_Search:
-    Title: 'Összes oldal'
   ContentControl:
     NOTEWONTBESHOWN: 'Megjegyzés: ez az üzenet a látogatók számára nem jelenik meg'
   ContentController:
     ARCHIVEDSITE: 'Előnézeti verzió'
-    ARCHIVEDSITEFROM: Archiválva
-    CMS: CMS
-    DRAFT: Draft
+    ARCHIVEDSITEFROM: 'Archiválva'
     DRAFTSITE: 'Vázlat oldal'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Be kell jelentkezned a CMS jelszavaddal, hogy megtekinthesd a piszkozatot vagy az archivált tartalmat. <a href="%s">A publikált oldalra való visszatéréshez kattints ide.</a>'
-    Email: Email
     INSTALL_SUCCESS: 'Sikeres telepítés!'
     InstallFilesDeleted: 'A telepítő állományok sikeresen tőrőlve lettek.'
-    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: 'A SilverStripe sikeresen telepítve lett!'
     LOGGEDINAS: 'Bejelentkezve, mint'
     LOGIN: Bejelentkezés
-    LOGOUT: Kijelentkezés
-    NOTLOGGEDIN: 'Not logged in'
-    PUBLISHED: Published
+    LOGOUT: 'Kijelentkezés'
     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 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:
-    CODE: Hibakód
-    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>'
+    400: '400 - Hibás kérés'
+    404: '404 - Az oldal nem létezik'
+    409: '409 - Konfliktus'
+    CODE: 'Hibakód'
     DEFAULTERRORPAGETITLE: 'Az oldal nem található'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Sorry, there was a problem with handling your request.</p>'
     DEFAULTSERVERERRORPAGETITLE: 'Szerver hiba'
-    DESCRIPTION: 'Custom content for different error cases (e.g. "Page not found")'
-    ERRORFILEPROBLEM: 'Error opening file "{filename}" for writing. Please check file permissions.'
     PLURALNAME: 'Hiba oldalak'
     SINGULARNAME: 'Hiba oldal'
-    400: '400 - Hibás kérés'
-    401: '401 - Unauthorized'
-    403: '403 - Forbidden'
-    404: '404 - Az oldal nem létezik'
-    405: '405 - Method Not Allowed'
-    406: '406 - Not Acceptable'
-    407: '407 - Proxy Authentication Required'
-    408: '408 - Request Timeout'
-    409: '409 - Konfliktus'
-    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: 'Mappa hozzáadása'
     DELETEUNUSEDTHUMBNAILS: 'Nem használt bélyegképek törlése'
     UNUSEDFILESTITLE: 'Nem használt állományok'
     UNUSEDTHUMBNAILSTITLE: 'Nem használt bélyegképek'
-    UploadFilesButton: Feltöltés
   LeftAndMain:
     DELETED: Törölve.
-    PreviewButton: Előnézet
     SAVEDUP: Elmentve.
     STATUSPUBLISHEDSUCCESS: '''{title}'' sikeresen publikálva'
-    SearchResults: Találatok
-    VersionUnknown: Ismeretlen
+    SearchResults: 'Találatok'
   Permission:
     CMS_ACCESS_CATEGORY: 'CMS hozzáférés'
-  Permissions:
-    CONTENT_CATEGORY: 'Content permissions'
-    PERMISSIONS_CATEGORY: 'Roles and access permissions'
   RedirectorPage:
-    DESCRIPTION: 'Átirányítja egy másik belső oldalra'
     HASBEENSETUP: 'Egy átirányító oldal került létrehozásra, anélkül hogy lenne hova átirányítania.'
     HEADER: 'Ez az oldal egy másik oldalra fogja írányítani a felhasználókat'
     OTHERURL: 'Egy másik weboldal URL-je '
@@ -254,52 +153,28 @@ hu:
     YOURPAGE: 'Oldal a weblapodon'
   ReportAdmin:
     MENUTITLE: Jelentések
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Mehet
     SEARCH: Keresés
-    SearchResults: Találatok
+    SearchResults: 'Találatok'
   SideReport:
-    BROKENFILES: 'Pages with broken files'
     BROKENLINKS: 'Oldalak hibás hivatkozásokkal'
     BROKENREDIRECTORPAGES: 'RedirectorPage-ek törölt oldalakra hivatkoznak'
     BROKENVIRTUALPAGES: 'VirtualPages törölt oldalakra mutatnak'
-    BrokenLinksGroupTitle: 'Broken links reports'
-    ContentGroupTitle: 'Content reports'
     EMPTYPAGES: 'Üres oldalak'
     LAST2WEEKS: 'Elmúlt 2 héten belül szerkesztett oldalak'
     OtherGroupTitle: Más
-    ParameterLiveCheckbox: 'Check live site'
-    REPEMPTY: 'The {title} report is empty.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'To share a this to this page, copy and paste the link below.'
     ShareLink: 'Hivatkozás megosztása'
-  SilverStripeNavigatorLinkl:
-    CloseLink: Bezárni
   SiteConfig:
     DEFAULTTHEME: '(Alap téma használata)'
-    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: 'Oldal konfigurációk'
     SINGULARNAME: 'Oldal konfiguráció'
     SITENAMEDEFAULT: 'Az oldal neve'
-    SITETAGLINE: 'Site Tagline/Slogan'
     SITETITLE: 'Oldal címe'
     TABACCESS: Hozzáférés
-    TABMAIN: Main
-    TAGLINEDEFAULT: 'your tagline here'
     THEME: Témák
-    TOPLEVELCREATE: 'Who can create pages in the root of the site?'
-    VIEWHEADER: 'Who can view pages on this site?'
   SiteTree:
     ACCESSANYONE: Mindenki
     ACCESSHEADER: 'Ki láthatja ezt az oldalt a weblapon?'
@@ -308,129 +183,70 @@ hu:
     ADDEDTODRAFTHELP: 'Az oldal jelenleg még nincs publikálva.'
     ADDEDTODRAFTSHORT: Vázlat
     ALLOWCOMMENTS: 'Megjegyzések engedélyezése ezen az oldalon?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Piszkozaton végzett változtatások visszavonása'
     BUTTONCANCELDRAFTDESC: 'Piszkozat törlése, és vissztérés a jelenleg publikált oldalra'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Publikálás visszavonása'
+    BUTTONUNPUBLISH: Publikálás visszavonása
     BUTTONUNPUBLISHDESC: 'Oldal eltávolítása a publikált oldalról'
     CREATED: 'Létrehozás dátuma'
     Comments: Kommentárok
     Content: Tartalom
-    DEFAULTABOUTCONTENT: '<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>'
-    DEFAULTABOUTTITLE: Rólunk
-    DEFAULTCONTACTCONTENT: '<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>'
-    DEFAULTCONTACTTITLE: Kapcsolat
-    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: Kezdőoldal
-    DELETEDPAGEHELP: 'Page is no longer published'
+    DEFAULTCONTACTTITLE: 'Kapcsolat'
     DELETEDPAGESHORT: Törölve
-    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: 'Hivatkozás típusa'
-    DependtPageColumnURL: URL
     EDITANYONE: 'Bárki, aki be tud jelentkezni a CMS-be'
     EDITHEADER: 'Ki szerkesztheti ezt a CMS-ben?'
     EDITONLYTHESE: 'Csak ezek az emberek (válassz a listából)'
-    EDITORGROUPS: 'Csoportok szerkesztése'
     EDIT_ALL_DESCRIPTION: 'Bármely oldal szerkesztése'
-    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'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Ez az oldal hibás linkeket tartalmaz.'
     HTMLEDITORTITLE: Tartalom
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Utoljára frissítve'
-    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).'
+    METADESC: 'Leírás'
     METAEXTRA: 'Saját meta címké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: Változtatva
     MetadataToggle: Metaadatok
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: 'Page location'
     PAGETITLE: 'Oldal neve'
     PAGETYPE: 'Oldal típusa'
-    PARENTID: 'Szülő oldal'
-    PARENTTYPE: 'Page location'
     PARENTTYPE_ROOT: 'Felső szintű oldal'
-    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: Oldalak
-    PageTypNotAllowedOnRoot: 'Page type "{type}" is not allowed on the root level'
-    PageTypeNotAllowed: 'Page type "{type}" not allowed as child of this parent page'
     REMOVEDFROMDRAFTHELP: 'Az oldal publikálva lett, de törölve lett a vázlatok közül'
     REMOVEDFROMDRAFTSHORT: 'Törölve a vázlatokból'
     REMOVE_INSTALL_WARNING: 'Figyelmeztetés: Törölje az install.php állományt a Silverstripe telepítéséből. '
     REORGANISE_DESCRIPTION: 'Oldal szerkezetének megváltoztatása'
-    REORGANISE_HELP: 'Rearrange pages in the site tree through drag&drop.'
     SHOWINMENUS: 'Látható legyen a menükben?'
     SHOWINSEARCH: 'Látható legyen a keresésben?'
     SINGULARNAME: Oldal
     TABBEHAVIOUR: Viselkedés
-    TABCONTENT: Tartalom
-    TABDEPENDENT: 'Dependent pages'
+    TABCONTENT: 'Tartalom'
     TOPLEVEL: 'Oldaltartalom (legfelső szint)'
-    TOPLEVELCREATORGROUPS: 'Top level creators'
     URLSegment: 'URL szegmens'
-    VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'Bármely oldal megtekintése'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" 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: Láthatóság
     has_one_Parent: 'Szülő oldal'
-    many_many_BackLinkTracking: 'Backlink Tracking'
     many_many_ImageTracking: 'Kép követése'
-    many_many_LinkTracking: 'Link Tracking'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'A speciális karakterek automatikusan konvertálódnak vagy törlődnek.'
   StaticExporter:
     BASEURL: 'Alap URL'
     EXPORTTO: 'Exportálás abba a mappába'
     NAME: 'Statikus exportáló'
-  TableListField:
-    SELECT: 'Select:'
-  TableListField.ss:
-    NOITEMSFOUND: 'No items found'
+  TableListField_ss:
     SORTASC: 'Rendezés növekvő sorrendben'
     SORTDESC: 'Rendezés csökkenő sorrendben'
-  TableListField_PageControls.ss:
-    DISPLAYING: Displaying
-    OF: of
-    TO: to
+  TableListField_PageControls_ss:
     VIEWFIRST: 'Első mutatása'
     VIEWLAST: 'Utolsó mutatása'
     VIEWNEXT: 'Következő mutatása'
     VIEWPREVIOUS: 'Előző mutatása'
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Az archivált oldalt elérheted ezen a linken:'
     HAVEASKED: 'Azt kérted, hogy megnézhesd a honlapunk tartalmát ekkor:'
   VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Ez egy virtuális oldal'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: 'Virtual Pags'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Virtuális oldal'
+  CMSFileAddController:
+    MENUTITLE: Állományok
+  CMSPageEditController:
+    MENUTITLE: 'Oldal szerkesztése'
+  CMSPageSettingsController:
+    MENUTITLE: 'Oldal szerkesztése'
diff --git a/lang/hy_AM.yml b/lang/hy_AM.yml
index 690af2f9..8fa8f392 100644
--- a/lang/hy_AM.yml
+++ b/lang/hy_AM.yml
@@ -1,436 +1,3 @@
 hy_AM:
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    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 ''{title}''{description} 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'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    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'
-    PUBLISHED: Published
-    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 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'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  SearchForm:
-    GO: Go
-    SEARCH: Search
-    SearchResults: 'Search Results'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   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'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    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'
-    GroupPlaceholder: 'Click to select group'
-    HASBROKENLINKS: 'This page has broken links.'
-    HTMLEDITORTITLE: Content
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its 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 ''Pages'' section" 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:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    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:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  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: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
-    HEADER: 'This is a virtual page'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: 'Virtual Pags'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
-    SINGULARNAME: 'Virtual Page'
diff --git a/lang/id.yml b/lang/id.yml
index 8ecb89cc..e657fb4b 100644
--- a/lang/id.yml
+++ b/lang/id.yml
@@ -1,205 +1,12 @@
 id:
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
     DELETE: 'Hapus dari situs draft'
-    DELETEFP: 'Hapus dari situs yang telah diterbitkan'
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    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 ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
-    REMOVEDPAGEFROMDRAFT: 'Removed ''%s'' from the draft site'
+    DELETEFP: Hapus dari situs yang telah diterbitkan
     RESTORE: Pulihkan
-    RESTORED: 'Restored ''{title}'' successfully'
-    ROLLBACK: 'Roll back to this version'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Simpan
-    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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    DRAFTSITE: 'Draft Site'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Anda harus masuk dengan password CMS Anda untuk melihat konten draft atau terarsip. <a href="%s">Klik di sini untuk kembali ke situs yang dipublikasi</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'
-    PUBLISHED: Published
-    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 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: 'Kode yang salah'
-    DEFAULTERRORPAGECONTENT: '<p>Maaf, sepertinya anda berusha mengakses halaman yang tidak ada.</p><p>Mohon periksa ejaan URL yang ingin anda akses dan coba lagi.</p>'
-    DEFAULTERRORPAGETITLE: 'Halaman tidak ditemukan'
-    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 - Permintaan buruk'
     401: '401 - Tidak ada otorisasi'
     403: '493 - Tidak ada ijin'
@@ -221,102 +28,47 @@ id:
     501: '501 - Tidak Diimplementasi'
     502: '502 - Gateway Buruk'
     503: '503 - Servis Tidak Tersedia'
-    504: '504 - Gateway Timeout'
     505: '505 - Versi HTTP Tidak Disupport'
+    CODE: 'Kode yang salah'
+    DEFAULTERRORPAGECONTENT: '<p>Maaf, sepertinya anda berusha mengakses halaman yang tidak ada.</p><p>Mohon periksa ejaan URL yang ingin anda akses dan coba lagi.</p>'
+    DEFAULTERRORPAGETITLE: 'Halaman tidak ditemukan'
   Folder:
-    AddFolderButton: 'Add folder'
     DELETEUNUSEDTHUMBNAILS: 'Hapus thumbnail-thumbnail yang tidal dipakai'
     UNUSEDFILESTITLE: 'File-file yang tidak dipakai'
     UNUSEDTHUMBNAILSTITLE: 'Thumbnail-thumbnail yang tidak dipakai'
-    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: 'halaman yang mengirim user ke alamat lain dibuat tanpa tujuan dari pengiriman itu sendiri'
     HEADER: 'Halaman ini akan mengarahkan user ke halaman lain'
     OTHERURL: 'URL situs web lain'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Arahkan lagi ke'
     REDIRECTTOEXTERNAL: 'Situs web yang lain'
     REDIRECTTOPAGE: 'Sebuah halaman pada situs web Anda'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Halaman pada situs web Anda'
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Pergi
     SEARCH: Cari
     SearchResults: 'Hasil Pencarian'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'To share a this to this page, copy and paste the link below.'
-    ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Tutup
   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: 'Nama Situs'
     SITETAGLINE: 'Slogan Situs'
     SITETITLE: 'Judul Situs'
-    TABACCESS: Access
-    TABMAIN: 'Tab Utama'
+    TABMAIN: Tab Utama
     TAGLINEDEFAULT: 'slogan situsmu disini'
     THEME: Tema
-    TOPLEVELCREATE: 'Who can create pages in the root of the site?'
-    VIEWHEADER: 'Who can view pages on this site?'
   SiteTree:
-    ACCESSANYONE: 'Siapa saja'
+    ACCESSANYONE: Siapa saja
     ACCESSHEADER: 'Siapa yang dapat melihat halaman ini pada situs saya?'
     ACCESSLOGGEDIN: 'User yang masuk'
     ACCESSONLYTHESE: 'Hanya orang ini saja (pilih dari daftar)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'Bolehkan komentar pada halaman ini?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Batalkan perubahan draft'
     BUTTONCANCELDRAFTDESC: 'Hapus draft dan kembalikan ke halaman yang sedang dipublikasikan'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Tidak Dipublikasi'
+    BUTTONUNPUBLISH: Tidak Dipublikasi
     BUTTONUNPUBLISHDESC: 'Pindahkan halaman ini dari situs yang dipublikasikan'
-    CREATED: 'Date Created'
     Comments: Komen-komen
     Content: Isi
     DEFAULTABOUTCONTENT: '<p>Anda dapat mengisi halaman ini dengan isi anda sendiri, atau hapus dan buat halaman-halaman anda sendiri.<br /></p>'
@@ -324,113 +76,32 @@ id:
     DEFAULTCONTACTCONTENT: '<p>Anda dapat mengisi halaman ini dengan isi anda sendiri, atau hapus dan buat halaman-halaman anda sendiri.<br /></p>'
     DEFAULTCONTACTTITLE: 'Hubungi Kami'
     DEFAULTHOMECONTENT: '<p>Selamat datang di SilverStripe! Ini adalah homepage default anda. Anda dapat mengedit halaman ini dengan membuka <a href="admin/">CMS ini</a>. Sekarang anda dapat mengakses <a href="http://doc.silverstripe.com">dokumentasi developer</a>, atau memulai <a href="http://doc.silverstripe.com/doku.php?id=tutorials">tutorial-tutorial yang tersedia.</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: 'Siapa saja yang dapat masuk ke dalam CMS'
     EDITHEADER: 'Siapa yang dapat mengedit ini dari dalam CMS?'
     EDITONLYTHESE: 'Hanya orang ini saja (pilih dari daftar)'
-    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'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Halaman ini mempunyai link yang rusak'
     HTMLEDITORTITLE: Konten
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
-    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'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
+    METADESC: 'Deskripsi'
     PAGELOCATION: 'Lokasi halaman'
     PAGETITLE: 'Nama Halaman'
     PAGETYPE: 'Tipe halaman'
-    PARENTID: 'Parent page'
     PARENTTYPE: 'Lokasi halaman'
-    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: 'Perlihatkan dalam menu?'
     SHOWINSEARCH: 'Perlihatkan dalam pencarian'
-    SINGULARNAME: Page
     TABBEHAVIOUR: Perilaku
-    TABCONTENT: Kontain
-    TABDEPENDENT: 'Dependent pages'
+    TABCONTENT: 'Kontain'
     TOPLEVEL: 'Konten Situs (Level Atas)'
-    TOPLEVELCREATORGROUPS: 'Top level creators'
     URLSegment: 'Segmen URL'
-    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 ''Pages'' section" 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: 'Halaman Induk'
-    many_many_BackLinkTracking: 'Backlink Tracking'
-    many_many_ImageTracking: 'Image Tracking'
-    many_many_LinkTracking: 'Link Tracking'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
-  StaticExporter:
-    BASEURL: 'Base URL'
-    EXPORTTO: 'Export to that folder'
-    NAME: 'Static exporter'
   TableListField:
     SELECT: 'Pilih:'
-  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
+  TableListField_PageControls_ss:
     VIEWFIRST: 'Tampil pertama'
     VIEWLAST: 'Tampil terakhir'
     VIEWNEXT: 'Tampil berikutnya'
     VIEWPREVIOUS: 'Tampil sebelumnya'
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  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: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Ini adalah halaman virtual'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Halaman-halaman Virtual'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Halaman Virtual'
diff --git a/lang/is.yml b/lang/is.yml
index 0feddead..9ca0a9e0 100644
--- a/lang/is.yml
+++ b/lang/is.yml
@@ -1,322 +1,54 @@
 is:
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
     DELETE: 'Eyða úr drögum'
-    DELETEFP: 'Eyða úr birtum síðum'
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    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 ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
-    REMOVEDPAGEFROMDRAFT: 'Removed ''%s'' from the draft site'
+    DELETEFP: Eyða úr birtum síðum
     RESTORE: Endurheimta
-    RESTORED: 'Restored ''{title}'' successfully'
-    ROLLBACK: 'Roll back to this version'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Vista
-    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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    DRAFTSITE: 'Draft Site'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Þú verður að innskrá þig með lykilorðinu þínu til að geta séð drög eða innihald skjalasafns. <a href="%s">Smelltu hér til að fara til baka á útgefnu síðuna.</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: 'Innskráður sem'
     LOGIN: Innskrá
-    LOGOUT: Útskrá
+    LOGOUT: 'Útskrá'
     NOTLOGGEDIN: 'Ekki innskráður'
-    PUBLISHED: Published
     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 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:
     CODE: 'Villu númer'
     DEFAULTERRORPAGECONTENT: '<p>Afsakið, það virðist vera að þú ert að reyna opna síðu sem er ekki til.</p><p>Vinsamlegast athugaðu hvort að slóðin sé rétt skrifuð og prófaðu aftur</p>'
     DEFAULTERRORPAGETITLE: 'Síða fannst ekki'
-    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: 'Eyða ónotuðum smámyndum'
     UNUSEDFILESTITLE: 'Ónotaðar skrár'
     UNUSEDTHUMBNAILSTITLE: 'Ónotaðar smámyndir'
-    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: 'Þessi síða mun áframsenda notendur á aðra síðu'
     OTHERURL: 'Slóð á aðra heimasíðu'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Áframsenda á'
     REDIRECTTOEXTERNAL: 'Önnur heimasíða'
     REDIRECTTOPAGE: 'Síða á heimasíðunni þinni'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Síða á heimasíðunni þinni'
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Framkvæma
     SEARCH: Leita
     SearchResults: 'Leitar niðurstaða'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'To share a this to this page, copy and paste the link below.'
-    ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Loka
   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: 'Nafn síðunnar'
-    SITETAGLINE: 'Site Tagline/Slogan'
     SITETITLE: 'Titill síðunnar'
-    TABACCESS: Access
-    TABMAIN: Main
-    TAGLINEDEFAULT: 'your tagline here'
     THEME: Þema
-    TOPLEVELCREATE: 'Who can create pages in the root of the site?'
-    VIEWHEADER: 'Who can view pages on this site?'
   SiteTree:
     ACCESSANYONE: Allir
     ACCESSHEADER: 'Hver má skoða þessa síðu á heimasíðunni minni?'
     ACCESSLOGGEDIN: 'Innskráðir notendur'
     ACCESSONLYTHESE: 'Aðeins þetta fólk (veldu úr listanum)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'Leyfa lesendum að skrifa athugasemdir á þessa síðu?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Hætta við breytingar á drögum'
     BUTTONCANCELDRAFTDESC: 'Eyða drögunum þínum og fara aftur ál núverandi bitar síðu'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Taka úr birtingu'
+    BUTTONUNPUBLISH: Taka úr birtingu
     BUTTONUNPUBLISHDESC: 'Fjarlægja þessa síðu úr birtum síðum'
-    CREATED: 'Date Created'
     Comments: Athugasemdir
     Content: Efni
     DEFAULTABOUTCONTENT: '<p>Þú getur fyllt út þessa síðu með þínu efni eða eytt henni og búið til þína eigin síðu.<br/></p>'
@@ -325,112 +57,32 @@ is:
     DEFAULTCONTACTTITLE: 'Hafa samband'
     DEFAULTHOMECONTENT: '<p>Velkomin(n) á SilverStripe! Þetta er sjálfvalda heimasíðan. Þú getur breytt þessari síðu með því að opna <a href="admin/">kerfið</a>. Þú getur skoðað <a href="http://doc.silverstripe.com">hönnunar leiðbeiningarnar</a>, eða skoðað<a href="http://doc.silverstripe.com/doku.php?id=tutorials">kennsluna</a></p>'
     DEFAULTHOMETITLE: Heim
-    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: 'Allir þeir sem geta innskráð sig í kerfið'
     EDITHEADER: 'Hver getur breytt þessu í kerfinu?'
     EDITONLYTHESE: 'Aðeins þetta fólk (veldu úr listanum)'
-    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'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Þessi síða inniheldur óvirkann hlekk.'
     HTMLEDITORTITLE: Efni
     INHERIT: 'Erfa frá foreldra síðu'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
-    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).'
+    METADESC: 'Lýsing'
     METAEXTRA: 'Sérnsniðin 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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
     PAGELOCATION: 'Staðsetning síðu'
     PAGETITLE: 'Nafn síðu'
     PAGETYPE: 'Tegund síðu'
-    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: 'Sýna í valmynd?'
     SHOWINSEARCH: 'Sýna í leit?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: Hegðun
-    TABCONTENT: Efni
-    TABDEPENDENT: 'Dependent pages'
-    TOPLEVEL: 'Site Content (Top Level)'
-    TOPLEVELCREATORGROUPS: 'Top level creators'
+    TABCONTENT: 'Efni'
     URLSegment: 'Slóðar hlutar'
-    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 ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'Skoða uppkast'
-    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: 'Yfir síða'
-    many_many_BackLinkTracking: 'Backlink Tracking'
-    many_many_ImageTracking: 'Image Tracking'
-    many_many_LinkTracking: 'Link Tracking'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
-  StaticExporter:
-    BASEURL: 'Base URL'
-    EXPORTTO: 'Export to that folder'
-    NAME: 'Static exporter'
   TableListField:
     SELECT: 'Veldu:'
-  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
+  TableListField_PageControls_ss:
     VIEWFIRST: 'Sýna first'
     VIEWLAST: 'Sýna síðast'
     VIEWNEXT: 'Sýna næsta'
     VIEWPREVIOUS: 'Sýna fyrri'
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  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: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Þetta er sýndarsíða'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Sýndar síða'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Sýndar síða'
diff --git a/lang/it.yml b/lang/it.yml
index 28be4084..e2d0f93c 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -3,23 +3,18 @@ it:
     ADDFILES: 'Aggiungi File'
     ActionAdd: 'Aggiungi cartella'
     AppCategoryArchive: Archivia
-    AppCategoryAudio: Audio
     AppCategoryDocument: Documento
-    AppCategoryFlash: Flash
     AppCategoryImage: Immagine
-    AppCategoryVideo: Video
     BackToFolder: 'Torna alla cartella'
-    CREATED: 'Data creazione'
+    CREATED: Data creazione
     CurrentFolderOnly: 'Limita alla cartella corrente?'
     DetailsView: Dettagli
-    FILES: Files
     FILESYSTEMSYNC: 'Sincronizza file'
     FILESYSTEMSYNCTITLE: 'Aggiorna il database dei file. Utile quando nuovi file sono stati caricati fuori dal CMS, es. via FTP.'
     FROMTHEINTERNET: 'Da Internet'
     FROMYOURCOMPUTER: 'Dal tuo computer'
     Filetype: 'Tipo di file'
     ListView: 'Visualizzazione a lista'
-    MENUTITLE: Files
     NEWFOLDER: NuovaCartella
     SIZE: Dimensione
     THUMBSDELETED: '{count} miniature inutilizzate sono state eliminate'
@@ -29,12 +24,12 @@ it:
     TITLE: 'Elimina cartelle'
   AssetAdmin_Tools:
     FILTER: Filtra
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Vai
   AssetTableField:
     BACKLINKCOUNT: 'Usato in:'
     PAGES: pagina/e
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Indietro
   BrokenLinksReport:
     Any: Qualsiasi
@@ -45,7 +40,6 @@ it:
     ColumnDateLastModified: 'Data ultima modifica'
     ColumnDateLastPublished: 'Data ultima pubblicazione'
     ColumnProblemType: 'Tipo problema'
-    ColumnURL: URL
     HasBrokenFile: 'ha un file non funzionante'
     HasBrokenLink: 'ha un link non funzionante'
     HasBrokenLinkAndFile: 'ha link e file non funzionanti'
@@ -68,27 +62,21 @@ it:
     PUBLISHED_PAGES: 'Pubblicate %d pagine, %d non a buon fine'
     PUBLISH_PAGES: Pubblica
     UNPUBLISHED_PAGES: '%d pagine non pubblicate'
-    UNPUBLISH_PAGES: 'Non pubblicare'
-  CMSFileAddController:
-    MENUTITLE: Files
+    UNPUBLISH_PAGES: Non pubblicare
   CMSMain:
     ACCESS: 'Accesso alla sezione ''{title}'''
     ACCESS_HELP: 'Consente la visualizzazione della sezione con l''albero delle pagine e i contenuti. I permessi di visualizzazione e modifica possono essere gestiti attraverso menù a tendina specifici della pagina, come dai separati "Permessi sui contenuti".'
     AddNew: 'Aggiungi nuova pagina'
     AddNewButton: 'Aggiungi nuova'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: 'Scegli dove creare questa pagina'
     ChoosePageType: 'Scegli tipo di pagina'
     Create: Crea
     DELETE: 'Elimina bozza'
-    DELETEFP: 'Elimina dal sito pubblicato'
+    DELETEFP: Elimina dal sito pubblicato
     DESCREMOVED: 'e {count} discendenti'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    EMAIL: Email
+    DUPLICATED: '''{title}'' duplicato correttamente'
     EditTree: 'Modifica albero'
     ListFiltered: 'Lista filtrata.'
-    MENUTITLE: 'Modifica pagina'
     NEWPAGE: 'Nuova {pagetype}'
     PAGENOTEXISTS: 'Questa pagina non esiste'
     PAGES: Pagine
@@ -96,69 +84,62 @@ it:
     PAGETYPEOPT: 'Tipo di pagina'
     PUBALLCONFIRM: 'Per favore pubblica ogni singola pagina nel sito, copiando i contenuti da ''bozza'' a ''pubblicato''.'
     PUBALLFUN: 'Funzione "Pubblica tutto"'
-    PUBALLFUN2: 'Cliccare questo bottone equivale ad accedere a tutte le pagine e cliccare ''pubblica''. Tale bottone è inteso per essere utilizzato dopo aver apportato modifiche di massa ai contenuti, come nella prima pubblicazione del sito.'
+    PUBALLFUN2: "Cliccare questo bottone equivale ad accedere a tutte le pagine e cliccare 'pubblica'. Tale bottone è inteso per essere utilizzato dopo aver apportato modifiche di massa ai contenuti, come nella prima pubblicazione del sito."
     PUBPAGES: 'Fatto: Pubblicate {count} pagine'
     PageAdded: 'Pagina creata con successo'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
+    REMOVED: '''{title}'' {description} rimosso dal sito pubblico'
     REMOVEDPAGE: 'Eliminata ''{title}'' dal sito pubblicato'
     REMOVEDPAGEFROMDRAFT: 'Eliminata ''%s'' dal sito bozza'
     RESTORE: Ripristina
     RESTORED: 'Ripristinata ''{title}'' con successo'
     ROLLBACK: 'Ripristina a questa versione'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
+    ROLLEDBACKVERSIONv2: 'Ripristinata la versione #%d.'
     SAVE: Salva
-    SAVEDRAFT: 'Save draft'
+    SAVEDRAFT: 'Bozza salvata'
     TabContent: Contenuto
     TabHistory: Archivio
     TabSettings: Impostazioni
     TreeFiltered: 'Albero filtrato.'
     TreeFilteredClear: 'Azzera filtro'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Applica filtro'
+    MENUTITLE: 'Modifica pagina'
+    AddPageRestriction: 'Nota: alcuni tipi di pagina non sono permessi in questa sezione'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Applica filtro'
     RESET: Azzera
   CMSPageAddController:
-    MENUTITLE: 'Aggiungi pagina'
     ParentMode_child: 'Sotto un''altra pagina'
     ParentMode_top: 'Primo livello'
-  CMSPageEditController:
-    MENUTITLE: 'Modifica pagina'
+    MENUTITLE: 'Aggiungi pagina'
   CMSPageHistoryController:
     COMPAREMODE: 'Modalità confronto (selezionane due)'
     COMPAREVERSIONS: 'Confronta versioni'
     COMPARINGVERSION: 'Confronto versioni {version1} e {version2}.'
-    MENUTITLE: Archivio
     REVERTTOTHISVERSION: 'Ripristina a questa versione'
     SHOWUNPUBLISHED: 'Mostra versioni non pubblicate'
     SHOWVERSION: 'Mostra versione'
     VIEW: vista
-    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Versione attualmente visualizzata {version}.'
-  CMSPageHistoryController_versions.ss:
+    MENUTITLE: Archivio
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Autore
     NOTPUBLISHED: 'Non pubblicato'
     PUBLISHER: Editore
     UNKNOWN: Sconosciuto
     WHEN: Quando
-  CMSPageSettingsController:
-    MENUTITLE: 'Modifica pagina'
   CMSPagesController:
     GalleryView: 'Visualizzazione a galleria'
     ListView: 'Visualizzazione a lista'
     MENUTITLE: Pagine
     TreeView: 'Visualizzazione a albero'
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: 'Drag''n''drop'
-    MULTISELECT: 'Selezione multipla'
-  CMSPagesController_Tools.ss:
+  CMSPagesController_ContentToolbar_ss:
+    MULTISELECT: Selezione multipla
+  CMSPagesController_Tools_ss:
     FILTER: Filtra
   CMSSearch:
     FILTERDATEFROM: Da
     FILTERDATEHEADING: Data
     FILTERDATETO: A
     FILTERLABELTEXT: Contenuto
-  CMSSettingsController:
-    MENUTITLE: Impostazioni
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Pagine cambiate'
   CMSSiteTreeFilter_DeletedPages:
@@ -170,36 +151,24 @@ it:
   ContentController:
     ARCHIVEDSITE: 'Anteprima versione'
     ARCHIVEDSITEFROM: 'Sito archiviato da'
-    CMS: CMS
-    DRAFT: Draft
     DRAFTSITE: 'Sito Bozza'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Devi autenticarti utilizzando la tua password per poter visualizzare bozze o contenuti archiviati. <a href="%s">Clicca qui per tornare al sito pubblicato</a>'
-    Email: Email
     INSTALL_SUCCESS: 'Installazione conclusa con successo!'
     InstallFilesDeleted: 'I file di installazione sono stati eliminati con successo.'
     InstallSecurityWarning: 'Per motivi di sicurezza ora devi eliminare i file di installazione, a meno che non stai pianificando in installare nuovamente più tardi (<em>richiede accesso da amministratore, vedi sopra</em>). Inoltre il server web ora richiede permessi di scrittura solo alla cartella "assets", Quindi puoi rimuovere i permessi di scrittura da tutte le altre cartelle. <a href="{link}" style="text-align: center;">Clicca qui per cancellare i file di installazione.</a>'
     InstallSuccessCongratulations: 'SilverStripe è stato installato con successo!'
     LOGGEDINAS: 'Sei collegato come'
     LOGIN: Accedi
-    LOGOUT: Disconnetti
+    LOGOUT: 'Disconnetti'
     NOTLOGGEDIN: 'Non connesso'
-    PUBLISHED: Published
     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: 'You can start editing your content by opening <a href="{link}">the 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:'
+    DRAFT: Bozza
+    PUBLISHED: Pubblicato
   ErrorPage:
-    CODE: 'Codice di errore'
-    DEFAULTERRORPAGECONTENT: '<p>Spiacente, sembra che tu cercassi di accedere ad una pagina che non esiste.</p><p>Controlla che l''URL a cui stavi cercando di accedere sia corretto e prova di nuovo.</p>'
-    DEFAULTERRORPAGETITLE: 'Pagina non trovata'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Spiacenti, c''è stato un problema con la gestione della tua richiesta.</p>'
-    DEFAULTSERVERERRORPAGETITLE: 'Errore server'
-    DESCRIPTION: 'Contenuto personalizzato per differenti casi di errore (es. "Pagina non trovata")'
-    ERRORFILEPROBLEM: 'Errore nell''apertura del file "{filename}" per la scrittura. Controlla i permessi del file.'
-    PLURALNAME: 'Pagine errore'
-    SINGULARNAME: 'Pagine errore'
     400: '400 - Richiesta errata'
     401: '401 - Non Autorizzato'
     403: '403 - Accesso Negato'
@@ -223,6 +192,15 @@ it:
     503: '503 - Servizio non Disponibile'
     504: '504 - Timeout del gateway'
     505: '505 - Versione HTTP non supportata'
+    CODE: 'Codice di errore'
+    DEFAULTERRORPAGECONTENT: '<p>Spiacente, sembra che tu cercassi di accedere ad una pagina che non esiste.</p><p>Controlla che l''URL a cui stavi cercando di accedere sia corretto e prova di nuovo.</p>'
+    DEFAULTERRORPAGETITLE: 'Pagina non trovata'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>Spiacenti, c''è stato un problema con la gestione della tua richiesta.</p>'
+    DEFAULTSERVERERRORPAGETITLE: 'Errore server'
+    DESCRIPTION: 'Contenuto personalizzato per differenti casi di errore (es. "Pagina non trovata")'
+    ERRORFILEPROBLEM: 'Errore nell''apertura del file "{filename}" per la scrittura. Controlla i permessi del file.'
+    PLURALNAME: 'Pagine errore'
+    SINGULARNAME: 'Pagine errore'
   Folder:
     AddFolderButton: 'Aggiungi cartella'
     DELETEUNUSEDTHUMBNAILS: 'Elimina anteprime inutilizzate'
@@ -253,14 +231,10 @@ it:
     SINGULARNAME: 'Pagina di redirezione'
     YOURPAGE: 'Pagina sul tuo sito web'
   ReportAdmin:
-    MENUTITLE: Rapporti
     ReportTitle: Titolo
+    MENUTITLE: Rapporti
   ReportAdminForm:
     FILTERBY: 'Filtra per'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Vai
     SEARCH: Cerca
@@ -277,8 +251,6 @@ it:
     OtherGroupTitle: Altro
     ParameterLiveCheckbox: 'Verifica sito pubblicato'
     REPEMPTY: 'Il rapporto {title} è vuoto.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Per condividere questa pagina, copia e incolla il link qui sotto.'
     ShareLink: 'Link di condivisione'
@@ -311,10 +283,8 @@ it:
     APPEARSVIRTUALPAGES: 'Questo contenuto appare nelle pagine virtuali nelle sezioni {title}.'
     BUTTONCANCELDRAFT: 'Cancella le modifiche salvate in bozza'
     BUTTONCANCELDRAFTDESC: 'Cancella la tua bozza e ritorna alla versione corrente della pagina pubblicata'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Non pubblicare'
+    BUTTONSAVEPUBLISH: 'Salva & pubblica'
+    BUTTONUNPUBLISH: Non pubblicare
     BUTTONUNPUBLISHDESC: 'Rimuovi questa pagina dal sito pubblicato'
     CREATED: 'Data creazione'
     Comments: Commenti
@@ -322,15 +292,13 @@ it:
     DEFAULTABOUTCONTENT: '<p>Puoi riempire questa pagina con i tuoi contenuti, oppure cancellarla e creare le tue pagine.<br /></p>'
     DEFAULTABOUTTITLE: 'Chi siamo'
     DEFAULTCONTACTCONTENT: '<p>Puoi riempire questa pagina con i tuoi contenuti, oppure cancellarla e creare le tue pagine.<br /></p>'
-    DEFAULTCONTACTTITLE: Contattaci
+    DEFAULTCONTACTTITLE: 'Contattaci'
     DEFAULTHOMECONTENT: '<p>Benvenuto in SilverStripe! Questa è l''homepage di default. Puoi modificare questa pagina aprendo <a href="admin/">il CMS</a>. Puoi visualizzare adesso la <a href="http://doc.silverstripe.com">documentazione di sviluppo</a>, o iniziaren <a href="http://doc.silverstripe.com/doku.php?id=tutorials">i tutorial.</a></p>'
-    DEFAULTHOMETITLE: Home
     DELETEDPAGEHELP: 'La pagina non è più pubblicata'
     DELETEDPAGESHORT: Eliminata
     DEPENDENT_NOTE: 'Le seguenti pagine dipendono da questa pagina. Queste includono pagine virtuali, pagine di redirezione e pagine con link nel contenuto.'
     DESCRIPTION: 'Pagina con contenuto generico'
     DependtPageColumnLinkType: 'Tipo di link'
-    DependtPageColumnURL: URL
     EDITANYONE: 'Chiunque può autenticarsi al CMS'
     EDITHEADER: 'Chi può modificare questa pagina?'
     EDITONLYTHESE: 'Solamente queste persone (scegli dalla lista)'
@@ -338,25 +306,19 @@ it:
     EDIT_ALL_DESCRIPTION: 'Modifica qualunque pagina'
     EDIT_ALL_HELP: 'Possibilità di modificare qualsiasi pagina nel sito, senza tenere conto delle impostazioni nella tab Access. Richiede i permessi di "Accesso ai contenuti del sito"'
     Editors: 'Gruppi di Editori'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Questa pagina ha link non funzionanti.'
     HTMLEDITORTITLE: Contenuto
     INHERIT: 'Eredita dalla pagina madre'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Ultimo aggiornamento'
     LINKCHANGENOTE: 'Cambiare il link di questa pagina farà cambiare anche i link delle pagine figlio. '
     MENUTITLE: 'Etichetta di navigazione'
-    METADESC: Descrizione
+    METADESC: 'Descrizione'
     METADESCHELP: 'I motori di ricerca utilizzano questo contenuto per visualizzare i risultati (ma non ne influenza la posizione)'
     METAEXTRA: 'Meta tag personalizzati'
     METAEXTRAHELP: 'Tag HTML per meta addizionali. Per esempio &lt;meta name="nomePersonalizzato" content="Il tuo contenuto personalizzato" /&gt;'
     MODIFIEDONDRAFTHELP: 'La pagina ha modifiche non pubblicate'
     MODIFIEDONDRAFTSHORT: Modificata
-    MetadataToggle: Metadata
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
+    OBSOLETECLASS: 'Quasta pagina è del tipo obsoleto {type}. Salvarla ripristinerà il suo tipo e potrai perdere dati'
     PAGELOCATION: 'Collocazione pagina'
     PAGETITLE: 'Nome della pagina'
     PAGETYPE: 'Tipo di pagina'
@@ -385,29 +347,36 @@ it:
     URLSegment: 'Segmento URL'
     VIEWERGROUPS: 'Gruppi di visualizzatori'
     VIEW_ALL_DESCRIPTION: 'Visualizza qualsiasi pagina'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
+    VIEW_ALL_HELP: 'Possibilità di vedere qualsiasi pagina del sito, senza tenere conto delle impostazioni nel tab Accesso. Richiede i permessi per "Accesso alla sezione ''Pagine''"'
     VIEW_DRAFT_CONTENT: 'Visualizza contenuto bozza'
     VIEW_DRAFT_CONTENT_HELP: 'Si applica per visualizzare le pagine in bozza al di fuori del CMS. Utile per collaboratori esterni che non hanno accesso al CMS.'
     Viewers: 'Gruppi di visualizzatori'
-    Visibility: 'Visibilità'
+    Visibility: Visibilità
     has_one_Parent: 'Pagina madre'
     many_many_BackLinkTracking: 'Monitoriaggio link di ritorno'
     many_many_ImageTracking: 'Monitoraggio immagine'
     many_many_LinkTracking: 'Monitoraggio link'
+    BUTTONPUBLISHED: Pubblicato
+    BUTTONSAVED: Salvato
+    GroupPlaceholder: 'Clicca per selezionare il gruppo'
+    LASTPUBLISHED: 'Ultima pubblicata'
+    LASTSAVED: 'Ultima salvata'
+    MoreOptions: 'Altre opzioni'
+    NOTPUBLISHED: 'Non pubblicato'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'I caratteri speciali sono automaticamente convertiti o eliminati.'
+    EMPTY: 'Perfavore inserisci un segmento URL o clicca cancella'
   StaticExporter:
     BASEURL: 'URL di base'
     EXPORTTO: 'Esporta in questa cartella'
     NAME: 'Sistema di esportazione statico'
   TableListField:
     SELECT: 'Seleziona:'
-  TableListField.ss:
+  TableListField_ss:
     NOITEMSFOUND: 'Nessun elemento trovato'
     SORTASC: 'Ordina in modo ascendente'
     SORTDESC: 'Ordina in modo discendente'
-  TableListField_PageControls.ss:
+  TableListField_PageControls_ss:
     DISPLAYING: Visualizzo
     OF: di
     TO: a
@@ -417,20 +386,24 @@ it:
     VIEWPREVIOUS: 'Visualizza precedente'
   TreeTools:
     DisplayLabel: 'Visualizza:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Puoi accedere al sito archiviato da questo indirizzo:'
     HAVEASKED: 'Hai chiesto di visualizzare il contenuto del nostro sito il'
   VirtualPage:
-    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Visualizza il contenuto di un''altra pagina'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Questa è una pagina virtuale'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Pagine virtuali'
     PageTypNotAllowedOnRoot: 'Il tipo di pagina originale "{type}" non è consentito al primo livello per questa pagina virtuale'
     SINGULARNAME: 'Pagina virtuale'
+  CMSPageEditController:
+    MENUTITLE: 'Modifica pagina'
+  CMSPageSettingsController:
+    MENUTITLE: 'Modifica pagina'
+  CMSSettingsController:
+    MENUTITLE: Impostazioni
+  SITETREE:
+    VIRTUALPAGEDRAFTWARNING: 'Perfavore pubblica la pagina linkata per poter pubblicare la pagina virtuale.'
+    VIRTUALPAGEWARNING: 'Perfavore scegli una pagina da linkare e salvala per poter pubblicare questa pagina.'
+    VIRTUALPAGEWARNINGSETTINGS: 'Perfavore scegli una pagina da linkare nel campo "Contenuto" per poter pubblicare.'
+  SilverStripeNavigator:
+    ARCHIVED: Archiviato
diff --git a/lang/ja_JP.yml b/lang/ja_JP.yml
index 520c5069..ae277031 100644
--- a/lang/ja_JP.yml
+++ b/lang/ja_JP.yml
@@ -4,202 +4,144 @@ ja_JP:
     ActionAdd: 'フォルダを追加'
     AppCategoryArchive: アーカイブ
     AppCategoryAudio: 音楽
-    AppCategoryDocument: Document
-    AppCategoryFlash: Flash
     AppCategoryImage: 画像
     AppCategoryVideo: 動画
-    BackToFolder: フォルダへ戻る
+    BackToFolder: 'フォルダへ戻る'
     CREATED: 日付
     CurrentFolderOnly: 'このフォルダに限定しますか?'
     DetailsView: 詳細
     FILES: ファイル
-    FILESYSTEMSYNC: 'Sync files'
     FILESYSTEMSYNCTITLE: 'ファイルに関するCMSデータベースエントリーを更新する。例えば、FTPなどCMS以外を経由してファイルをアップロードした場合に便利です。'
-    FROMTHEINTERNET: インターネットから
-    FROMYOURCOMPUTER: コンピュータから
-    Filetype: ファイルの種類
-    ListView: リスト表示
-    MENUTITLE: ファイル
+    FROMTHEINTERNET: 'インターネットから'
+    FROMYOURCOMPUTER: 'コンピュータから'
+    Filetype: 'ファイルの種類'
+    ListView: 'リスト表示'
     NEWFOLDER: 新しいフォルダ
     SIZE: サイズ
     THUMBSDELETED: '{count}個の未使用のサムネイルを削除しました'
-    TreeView: ツリー表示
+    TreeView: 'ツリー表示'
     Upload: アップロード
+    MENUTITLE: ファイル
   AssetAdmin_DeleteBatchAction:
-    TITLE: フォルダを削除
+    TITLE: 'フォルダを削除'
   AssetAdmin_Tools:
     FILTER: フィルタ
-  AssetAdmin_left.ss:
-    GO: Go
   AssetTableField:
-    BACKLINKCOUNT: 'Used on:'
     PAGES: ページ
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: 戻る
   BrokenLinksReport:
     Any: 何でも
-    BROKENLINKS: 壊れたリンクのレポート
-    CheckSite: 'Check site'
-    CheckSiteDropdownDraft: 下書きサイト
+    BROKENLINKS: '壊れたリンクのレポート'
+    CheckSiteDropdownDraft: '下書きサイト'
     CheckSiteDropdownPublished: '公開済みサイト'
-    ColumnDateLastModified: 最終更新日
+    ColumnDateLastModified: '最終更新日'
     ColumnDateLastPublished: '最終公開日'
-    ColumnProblemType: 問題の種類
-    ColumnURL: URL
-    HasBrokenFile: 'has broken file'
-    HasBrokenLink: 'has broken link'
-    HasBrokenLinkAndFile: 'has broken link and file'
-    HoverTitleEditPage: ページの編集
-    PageName: ページ名
-    ReasonDropdown: 'Problem to check'
-    ReasonDropdownBROKENFILE: 壊れたファイル
-    ReasonDropdownBROKENLINK: 壊れているリンク
-    ReasonDropdownRPBROKENLINK: 存在しないページを指しているリダイレクトページ
-    ReasonDropdownVPBROKENLINK: 存在しないページを指している仮想ページ
-    RedirectorNonExistent: 存在しないページを指しているリダイレクトページ
-    VirtualPageNonExistent: 存在しないページを指している仮想ページ
+    ColumnProblemType: '問題の種類'
+    HoverTitleEditPage: 'ページの編集'
+    PageName: 'ページ名'
+    ReasonDropdownBROKENFILE: '壊れたファイル'
+    ReasonDropdownBROKENLINK: '壊れているリンク'
+    ReasonDropdownRPBROKENLINK: '存在しないページを指しているリダイレクトページ'
+    ReasonDropdownVPBROKENLINK: '存在しないページを指している仮想ページ'
+    RedirectorNonExistent: '存在しないページを指しているリダイレクトページ'
+    VirtualPageNonExistent: '存在しないページを指している仮想ページ'
   CMSAddPageController:
     Title: 'ページを追加'
   CMSBatchActions:
     DELETED_DRAFT_PAGES: '%dページを下書きサイトから削除しましたが、%dページの削除に失敗しました。'
     DELETED_PAGES: '%dページを公開サイトから削除しましたが、%dページの削除に失敗しました。'
-    DELETE_DRAFT_PAGES: 下書きサイトから削除
+    DELETE_DRAFT_PAGES: '下書きサイトから削除'
     DELETE_PAGES: '公開サイトから削除'
     PUBLISHED_PAGES: '%dページを公開しましたが、%dページの公開に失敗しました。'
-    PUBLISH_PAGES: '公開'
+    PUBLISH_PAGES: 公開
     UNPUBLISHED_PAGES: '%dページを非公開にしました'
-    UNPUBLISH_PAGES: '非公開'
-  CMSFileAddController:
-    MENUTITLE: ファイル
+    UNPUBLISH_PAGES: 非公開
   CMSMain:
-    ACCESS: 'Access to ''{title}'' section'
-    ACCESS_HELP: 'Allow viewing of the section containing page tree and content. View and edit permissions can be handled through page specific dropdowns, as well as the separate "Content permissions".'
     AddNew: '新しいページを追加'
     AddNewButton: '新しく追加'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: 'このページを作成する場所を選択'
-    ChoosePageType: ページの種類を選択
+    ChoosePageType: 'ページの種類を選択'
     Create: 作成
-    DELETE: ドラフトサイトから削除
-    DELETEFP: '公開サイトから削除'
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
+    DELETE: 'ドラフトサイトから削除'
+    DELETEFP: 公開サイトから削除
     EMAIL: Eメール
-    EditTree: ツリーを編集
-    ListFiltered: フィルタリングされたリスト
-    MENUTITLE: ページを編集
-    NEWPAGE: 'New {pagetype}'
-    PAGENOTEXISTS: このページは存在しません
+    EditTree: 'ツリーを編集'
+    ListFiltered: 'フィルタリングされたリスト'
+    PAGENOTEXISTS: 'このページは存在しません'
     PAGES: ページ
     PAGETYPEANYOPT: 何でも
-    PAGETYPEOPT: ページの種類
-    PUBALLCONFIRM: 'Please publish every page in the site, copying content stage to live'
-    PUBALLFUN: '"Publish All" functionality'
-    PUBALLFUN2: 'このボタンを押すことはすべてのページへ移動して"公開"を押すことと同じです。この機能は、サイトをはじめて作成した時など多くのコンテンツの編集がある場合に利用されることを想定されています。'
+    PAGETYPEOPT: 'ページの種類'
+    PUBALLFUN2: "このボタンを押すことはすべてのページへ移動して\"公開\"を押すことと同じです。この機能は、サイトをはじめて作成した時など多くのコンテンツの編集がある場合に利用されることを想定されています。"
     PUBPAGES: '完了: {count}ページを公開しました'
-    PageAdded: ページの作成に成功
-    REMOVED: 'Deleted ''{title}''{description} from live site'
+    PageAdded: 'ページの作成に成功'
     REMOVEDPAGE: '''{title}''を公開されているサイトから削除しました'
     REMOVEDPAGEFROMDRAFT: '%sを下書きサイトから削除しました'
-    RESTORE: '復元'
+    RESTORE: 復元
     RESTORED: '{title}を復旧しました'
-    ROLLBACK: このバージョンへ戻す
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
+    ROLLBACK: 'このバージョンへ戻す'
     SAVE: 保存
-    SAVEDRAFT: 'Save draft'
     TabContent: コンテンツ
     TabHistory: 履歴
     TabSettings: 設定
-    TreeFiltered: フィルタリングされたツリー
-    TreeFilteredClear: フィルタを解除
-  CMSMain_left.ss:
-    'APPLY FILTER': フィルタを適用
+    TreeFiltered: 'フィルタリングされたツリー'
+    TreeFilteredClear: 'フィルタを解除'
+    MENUTITLE: 'ページを編集'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'フィルタを適用'
     RESET: リセット
   CMSPageAddController:
+    ParentMode_child: '他のページの下に作成'
+    ParentMode_top: '最上位層'
     MENUTITLE: 'ページを追加'
-    ParentMode_child: 他のページの下に作成
-    ParentMode_top: 最上位層
-  CMSPageEditController:
-    MENUTITLE: ページの編集
   CMSPageHistoryController:
-    COMPAREMODE: 比較モード（２つを選択）
-    COMPAREVERSIONS: バージョンの比較
+    COMPAREMODE: '比較モード（２つを選択）'
+    COMPAREVERSIONS: 'バージョンの比較'
     COMPARINGVERSION: '{version1}と{version2}を比較しています。'
-    MENUTITLE: 履歴
-    REVERTTOTHISVERSION: このバージョンに戻す
+    REVERTTOTHISVERSION: 'このバージョンに戻す'
     SHOWUNPUBLISHED: '公開されていないバージョンを表示'
-    SHOWVERSION: バージョンを表示
+    SHOWVERSION: 'バージョンを表示'
     VIEW: 表示
-    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: '現在表示しているバージョンは{version}です。'
-  CMSPageHistoryController_versions.ss:
-    AUTHOR: '作成者'
+    MENUTITLE: 履歴
+  CMSPageHistoryController_versions_ss:
+    AUTHOR: 作成者
     NOTPUBLISHED: '未公開'
     PUBLISHER: パブリッシャー
     UNKNOWN: 不明
     WHEN: いつ
-  CMSPageSettingsController:
-    MENUTITLE: ページの編集
   CMSPagesController:
-    GalleryView: ギャラリー表示
-    ListView: 一覧表示
+    GalleryView: 'ギャラリー表示'
+    ListView: '一覧表示'
     MENUTITLE: ページ
-    TreeView: ツリー表示
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: ドラッグ・アンド・ドロップ
+    TreeView: 'ツリー表示'
+  CMSPagesController_ContentToolbar_ss:
+    ENABLEDRAGGING: 'ドラッグ・アンド・ドロップ'
     MULTISELECT: 複数選択
-  CMSPagesController_Tools.ss:
+  CMSPagesController_Tools_ss:
     FILTER: フィルタ
   CMSSearch:
     FILTERDATEFROM: 開始日
-    FILTERDATEHEADING: 日付
     FILTERDATETO: 終了日
-    FILTERLABELTEXT: コンテンツ
-  CMSSettingsController:
-    MENUTITLE: 設定
   CMSSiteTreeFilter_ChangedPages:
-    Title: 変更されたページ
+    Title: '変更されたページ'
   CMSSiteTreeFilter_DeletedPages:
     Title: '全ページ（削除されたページも含む）'
   CMSSiteTreeFilter_Search:
     Title: '全ページ'
-  ContentControl:
-    NOTEWONTBESHOWN: 'お知らせ: このメッセージは訪問者には表示されません'
   ContentController:
-    ARCHIVEDSITE: 'Preview version'
-    ARCHIVEDSITEFROM: 'Archived site from'
-    CMS: CMS
-    DRAFT: Draft
-    DRAFTSITE: 下書きサイト
+    DRAFTSITE: '下書きサイト'
     DRAFT_SITE_ACCESS_RESTRICTION: '草案かアーカイブされた内容を見るためにはログインしてください。<a href="%s">公開サイトにもどるにはコチラをクリックしてください。</a>'
     Email: Eメール
-    INSTALL_SUCCESS: 'Installation Successful!'
-    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>'
-    InstallSuccessCongratulations: 'SilverStripe has been successfully installed!'
-    LOGGEDINAS: ログイン中：
+    InstallFilesDeleted: 'インストール関連ファイルは正しく削除されました'
+    LOGGEDINAS: 'ログイン中：'
     LOGIN: ログイン
-    LOGOUT: ログアウト
-    NOTLOGGEDIN: ログインされていません
-    PUBLISHED: Published
+    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 content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'インストールファイルを削除することができませんでした。次のファイルを手動で削除してください。'
-    VIEWPAGEIN: 'View Page in:'
   ErrorPage:
-    CODE: エラーコード
-    DEFAULTERRORPAGECONTENT: '<p>申し訳ありませんが、貴方の見ようとしているページは存在しません。</p><p>貴方が見ようとしているサイトのURLの綴りがあっているのか、再度確認してください。</p>'
-    DEFAULTERRORPAGETITLE: ページが見つかりません
-    DEFAULTSERVERERRORPAGECONTENT: '<p>申し訳ございません。あなたのリクエストを処理中に問題が起きました。</p>'
-    DEFAULTSERVERERRORPAGETITLE: サーバーエラー
-    DESCRIPTION: 'それぞれのエラーケースに対してカスタムコンテンツを表示する(例:"ページがありません")'
-    ERRORFILEPROBLEM: 'Error opening file "{filename}" for writing. Please check file permissions.'
-    PLURALNAME: 'Error Pags'
-    SINGULARNAME: 'Error Page'
     400: '400 - 不適格な要求です'
     401: '401 - 許可されていません'
     403: '403 - 禁止されています'
@@ -223,10 +165,16 @@ ja_JP:
     503: '503 - サービスが利用できません'
     504: '504 - Gatewayが時間切れです'
     505: '505 - サポートされていないHTTPのバージョンです'
+    CODE: 'エラーコード'
+    DEFAULTERRORPAGECONTENT: '<p>申し訳ありませんが、貴方の見ようとしているページは存在しません。</p><p>貴方が見ようとしているサイトのURLの綴りがあっているのか、再度確認してください。</p>'
+    DEFAULTERRORPAGETITLE: 'ページが見つかりません'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>申し訳ございません。あなたのリクエストを処理中に問題が起きました。</p>'
+    DEFAULTSERVERERRORPAGETITLE: 'サーバーエラー'
+    DESCRIPTION: 'それぞれのエラーケースに対してカスタムコンテンツを表示する(例:"ページがありません")'
   Folder:
     AddFolderButton: 'フォルダの追加'
     DELETEUNUSEDTHUMBNAILS: '未使用のサムネイルを削除'
-    UNUSEDFILESTITLE: 未使用のファイル
+    UNUSEDFILESTITLE: '未使用のファイル'
     UNUSEDTHUMBNAILSTITLE: '未使用のサムネイル'
     UploadFilesButton: アップロード
   LeftAndMain:
@@ -234,203 +182,150 @@ ja_JP:
     PreviewButton: プレビュー
     SAVEDUP: 保存済
     STATUSPUBLISHEDSUCCESS: '''{title}''を正しく公開することができました'
-    SearchResults: 検索結果
+    SearchResults: '検索結果'
     VersionUnknown: 不明
   Permission:
-    CMS_ACCESS_CATEGORY: CMSへのアクセス
+    CMS_ACCESS_CATEGORY: 'CMSへのアクセス'
   Permissions:
-    CONTENT_CATEGORY: コンテンツに関する権限
-    PERMISSIONS_CATEGORY: 役割とアクセス権限
+    CONTENT_CATEGORY: 'コンテンツに関する権限'
+    PERMISSIONS_CATEGORY: '役割とアクセス権限'
   RedirectorPage:
     DESCRIPTION: '別の内部ページにリダイレクト'
     HASBEENSETUP: '転送URLを含むページには、転送先がない状態で設定されています。'
-    HEADER: このページをユーザーを変更して他のページにしますか？
-    OTHERURL: 他のウェブサイトのURL
-    PLURALNAME: リダイレクトページ
-    REDIRECTTO: 変更は
-    REDIRECTTOEXTERNAL: 他のウェブサイト
-    REDIRECTTOPAGE: 貴方のウェブサイトを表示します
-    SINGULARNAME: リダイレクトページ
-    YOURPAGE: 貴方のウェブサイトを表示します
+    HEADER: 'このページをユーザーを変更して他のページにしますか？'
+    OTHERURL: '他のウェブサイトのURL'
+    PLURALNAME: 'リダイレクトページ'
+    REDIRECTTO: '変更は'
+    REDIRECTTOEXTERNAL: '他のウェブサイト'
+    REDIRECTTOPAGE: '貴方のウェブサイトを表示します'
+    SINGULARNAME: 'リダイレクトページ'
+    YOURPAGE: '貴方のウェブサイトを表示します'
   ReportAdmin:
     MENUTITLE: レポート
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: 開始
     SEARCH: 検索
-    SearchResults: 検索結果
+    SearchResults: '検索結果'
   SideReport:
-    BROKENFILES: 壊れているファイルがあるページ
-    BROKENLINKS: 'Pages with broken links'
-    BROKENREDIRECTORPAGES: 'RedirectorPages pointing to deleted pages'
+    BROKENFILES: '壊れているファイルがあるページ'
     BROKENVIRTUALPAGES: '削除されたページを参照している仮想ページ'
-    BrokenLinksGroupTitle: 壊れているリンクのレポート
-    ContentGroupTitle: 'Content reports'
-    EMPTYPAGES: 空のページ
-    LAST2WEEKS: 'Pages edited in the last 2 weeks'
+    BrokenLinksGroupTitle: '壊れているリンクのレポート'
+    EMPTYPAGES: '空のページ'
     OtherGroupTitle: その他
-    ParameterLiveCheckbox: 'Check live site'
     REPEMPTY: '{title}のレポートは空です'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'このページを共有するには、以下のリンクをコピー＆ペーストとします。'
     ShareLink: '共有リンク'
   SilverStripeNavigatorLinkl:
     CloseLink: 閉じる
   SiteConfig:
-    DEFAULTTHEME: (デフォルトのテーマを利用)
-    EDITHEADER: このサイト上でページを編集できる人
-    EDIT_PERMISSION: サイト設定の管理
-    EDIT_PERMISSION_HELP: 'Ability to edit global access settings/top-level page permissions.'
-    PLURALNAME: 'Site Configs'
-    SINGULARNAME: 'Site Config'
-    SITENAMEDEFAULT: サイト名
-    SITETAGLINE: サイトのキャッチコピー
-    SITETITLE: サイトタイトル
+    DEFAULTTHEME: '(デフォルトのテーマを利用)'
+    EDITHEADER: 'このサイト上でページを編集できる人'
+    EDIT_PERMISSION: 'サイト設定の管理'
+    SITENAMEDEFAULT: 'サイト名'
+    SITETAGLINE: 'サイトのキャッチコピー'
+    SITETITLE: 'サイトタイトル'
     TABACCESS: アクセス権限
     TABMAIN: メイン
     TAGLINEDEFAULT: 'サイトのキャッチフレーズをここに入力'
     THEME: テーマ
-    TOPLEVELCREATE: サイトのルートにおいてページを作成できる人
-    VIEWHEADER: このサイト上でページを閲覧できる人
+    TOPLEVELCREATE: 'サイトのルートにおいてページを作成できる人'
+    VIEWHEADER: 'このサイト上でページを閲覧できる人'
   SiteTree:
     ACCESSANYONE: 誰でも
-    ACCESSHEADER: このページを閲覧できる人
-    ACCESSLOGGEDIN: ログインしたユーザ
+    ACCESSHEADER: 'このページを閲覧できる人'
+    ACCESSLOGGEDIN: 'ログインしたユーザ'
     ACCESSONLYTHESE: 'この人達だけ (リストから選択してください)'
     ADDEDTODRAFTHELP: 'ページはまだ公開されていません'
     ADDEDTODRAFTSHORT: 下書き
-    ALLOWCOMMENTS: コメントを許可しますか？
+    ALLOWCOMMENTS: 'コメントを許可しますか？'
     APPEARSVIRTUALPAGES: 'このコンテンツは{title}として仮想ページにおいても表示されます。'
     BUTTONCANCELDRAFT: '草稿の編集内容を取り消します'
     BUTTONCANCELDRAFTDESC: '草稿と前回公開されたページを削除します'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: '非公開'
+    BUTTONUNPUBLISH: 非公開
     BUTTONUNPUBLISHDESC: '公開サイトから取り除きました'
-    CREATED: 作成日
     Comments: コメント
     Content: コンテンツ
     DEFAULTABOUTCONTENT: '<p>あなた自身、自由にページに書き込むことが出来、もちろん添削も自由に行えます。<br /></p>'
-    DEFAULTABOUTTITLE: 私たちについて
+    DEFAULTABOUTTITLE: '私たちについて'
     DEFAULTCONTACTCONTENT: '<p>あなた自身、自由にページに書き込むことが出来、もちろん添削も自由に行えます。<br /></p>'
-    DEFAULTCONTACTTITLE: 連絡はこちらまで
+    DEFAULTCONTACTTITLE: '連絡はこちらまで'
     DEFAULTHOMECONTENT: '<p>SilverStripeへようこそ！これはデフォルトのホームページです。このページを編集するには、<a href="admin/">CMS</a>にアクセスしてください。<a href="http://doc.silverstripe.org">開発者向けドキュメント</a>や、<a href="http://doc.silverstripe.org/doku.php?id=tutorials">チュートリアル</a>もご覧いただけます。</p>'
-    DEFAULTHOMETITLE: 'ホーム'
+    DEFAULTHOMETITLE: ホーム
     DELETEDPAGEHELP: 'このページは今は公開されていません。'
     DELETEDPAGESHORT: 削除済
-    DEPENDENT_NOTE: 'The following pages depend on this page. This includes virtual pages, redirector pages, and pages with content links.'
-    DESCRIPTION: 通常のコンテンツページ
-    DependtPageColumnLinkType: リンクの種類
-    DependtPageColumnURL: URL
-    EDITANYONE: 誰でもCMSにログインが可能
-    EDITHEADER: このページを編集できる人
+    DESCRIPTION: '通常のコンテンツページ'
+    EDITANYONE: '誰でもCMSにログインが可能'
+    EDITHEADER: 'このページを編集できる人'
     EDITONLYTHESE: 'この人達だけ (リストから選択してください)'
     EDITORGROUPS: '編集者グループ'
-    EDIT_ALL_DESCRIPTION: すべてのページを編集
-    EDIT_ALL_HELP: 'Ability to edit any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
-    Editors: 編集グループ
-    GroupPlaceholder: 'Click to select group'
-    HASBROKENLINKS: このページはリンク切れがあります
-    HTMLEDITORTITLE: '内容'
-    INHERIT: 親ページを受け継ぐ
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 最終更新日時
-    LINKCHANGENOTE: このページのリンクを変更するとすべての子ページのリンクに影響を与える可能性があります。
-    MENUTITLE: メニュー表示
-    METADESC: 説明
-    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
+    EDIT_ALL_DESCRIPTION: 'すべてのページを編集'
+    Editors: '編集グループ'
+    HASBROKENLINKS: 'このページはリンク切れがあります'
+    HTMLEDITORTITLE: 内容
+    INHERIT: '親ページを受け継ぐ'
+    MENUTITLE: 'メニュー表示'
+    METADESC: '説明'
     METAEXTRA: 'メタタグをカスタム'
-    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: '公開されていない変更がページにあります'
-    MODIFIEDONDRAFTSHORT: 更新日時
     MetadataToggle: メタデータ
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: 'ページの場所'
-    PAGETITLE: ページ名
-    PAGETYPE: ページタイプ
-    PARENTID: 親ページ
+    PAGETITLE: 'ページ名'
+    PAGETYPE: 'ページタイプ'
+    PARENTID: '親ページ'
     PARENTTYPE: 'ページの場所'
-    PARENTTYPE_ROOT: 最上位層のページ
-    PARENTTYPE_SUBPAGE: 親ページの下にあるサブページ
-    PERMISSION_GRANTACCESS_DESCRIPTION: コンテンツへのアクセス権限を編集
-    PERMISSION_GRANTACCESS_HELP: 'Allow setting of page-specific access restrictions in the "Pages" section.'
-    PLURALNAME: Pages
+    PARENTTYPE_ROOT: '最上位層のページ'
+    PARENTTYPE_SUBPAGE: '親ページの下にあるサブページ'
+    PERMISSION_GRANTACCESS_DESCRIPTION: 'コンテンツへのアクセス権限を編集'
     PageTypNotAllowedOnRoot: 'ページタイプ"{type}"は最上位層のページになることができません'
     PageTypeNotAllowed: 'ページタイプ"{type}"はこの親ページの子になることができません'
-    REMOVEDFROMDRAFTHELP: 'Page is published, but has been deleted from draft'
-    REMOVEDFROMDRAFTSHORT: 下書きから削除
     REMOVE_INSTALL_WARNING: '警告: セキュリティ上の理由から、SilverStripeのインストール先にあるinstall.phpを削除してください。'
     REORGANISE_DESCRIPTION: 'サイト構造を変更'
     REORGANISE_HELP: 'サイトツリー内のページをドラッグ・アンド・ドロップで再編集'
-    SHOWINMENUS: メニューに表示しますか？
-    SHOWINSEARCH: 検索に表示しますか？
-    SINGULARNAME: Page
+    SHOWINMENUS: 'メニューに表示しますか？'
+    SHOWINSEARCH: '検索に表示しますか？'
     TABBEHAVIOUR: 動作
-    TABCONTENT: コンテンツ
-    TABDEPENDENT: 依存ページ
+    TABCONTENT: 'コンテンツ'
+    TABDEPENDENT: '依存ページ'
     TOPLEVEL: 'サイトの内容 (最上位層)'
     TOPLEVELCREATORGROUPS: '最上位層のページ作成者'
-    URLSegment: URLセグメント
-    VIEWERGROUPS: '閲覧者グループ'
-    VIEW_ALL_DESCRIPTION: すべてのページを閲覧
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
-    VIEW_DRAFT_CONTENT: ドラフトを見る
-    VIEW_DRAFT_CONTENT_HELP: 'Applies to viewing pages outside of the CMS in draft mode. Useful for external collaborators without CMS access.'
+    URLSegment: 'URLセグメント'
+    VIEW_ALL_DESCRIPTION: 'すべてのページを閲覧'
+    VIEW_DRAFT_CONTENT: 'ドラフトを見る'
     Viewers: '閲覧者のグループ'
     Visibility: 表示・非表示
-    has_one_Parent: 親ページ
+    has_one_Parent: '親ページ'
     many_many_BackLinkTracking: 'リンク元を追跡'
-    many_many_ImageTracking: 画像へのリンクを追跡
-    many_many_LinkTracking: リンクを追跡
+    many_many_ImageTracking: '画像へのリンクを追跡'
+    many_many_LinkTracking: 'リンクを追跡'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: 特殊文字は自動的に変換されたか取り除かれました
+    HelpChars: '特殊文字は自動的に変換されたか取り除かれました'
   StaticExporter:
-    BASEURL: ベースURL
-    EXPORTTO: このフォルダにエクスポート
-    NAME: スタティック・エクスポーター
+    NAME: 'スタティック・エクスポーター'
   TableListField:
-    SELECT: 選択：
-  TableListField.ss:
+    SELECT: '選択：'
+  TableListField_ss:
     NOITEMSFOUND: '見つかった項目はありませんでした'
     SORTASC: '昇順に並び替える'
     SORTDESC: '降順に並び替える'
-  TableListField_PageControls.ss:
+  TableListField_PageControls_ss:
     DISPLAYING: 表示中
-    OF: of
-    TO: to
-    VIEWFIRST: 一番目を表示
-    VIEWLAST: 最新を表示
-    VIEWNEXT: 次を表示
-    VIEWPREVIOUS: 前回を表示
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
-    CANACCESS: アーカイブされたサイトには次のリンクでアクセス可能です：
-    HAVEASKED: 'You have asked to view the content of our site on'
+    VIEWFIRST: '一番目を表示'
+    VIEWLAST: '最新を表示'
+    VIEWNEXT: '次を表示'
+    VIEWPREVIOUS: '前回を表示'
+  ViewArchivedEmail_ss:
+    CANACCESS: 'アーカイブされたサイトには次のリンクでアクセス可能です：'
   VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 別のページのコンテンツを表示
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
-    HEADER: これがバーチャルページです
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: 仮想ページ
+    DESCRIPTION: '別のページのコンテンツを表示'
+    HEADER: 'これがバーチャルページです'
+    PLURALNAME: '仮想ページ'
     PageTypNotAllowedOnRoot: 'この仮想ページに対して元のページの種類{type}はルートレベルに配置されることが許可されていません。'
-    SINGULARNAME: 仮想ページ
+    SINGULARNAME: '仮想ページ'
+  CMSFileAddController:
+    MENUTITLE: ファイル
+  CMSPageEditController:
+    MENUTITLE: 'ページの編集'
+  CMSPageSettingsController:
+    MENUTITLE: 'ページの編集'
+  CMSSettingsController:
+    MENUTITLE: 設定
diff --git a/lang/km.yml b/lang/km.yml
index 3b4e721d..638b5c71 100644
--- a/lang/km.yml
+++ b/lang/km.yml
@@ -1,436 +1,14 @@
 km:
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    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 ''{title}''{description} 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'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    DRAFTSITE: 'Draft Site'
     DRAFT_SITE_ACCESS_RESTRICTION: 'ដើម្បីមើលទំព័រប្រៀងសូម ចូលកាន់ប្រព័ន្ធគ្រប់គ្រងដោយប្រើយឈ្មោះ និងពាក្យសំងាត់របស់អ្នក សូមចុចត្រនេះ <a href="%s"> ដើម្បីត្រលប់ទៅ កាន់ទំព័ររួចរាល់។</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'
-    PUBLISHED: Published
-    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 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'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  SearchForm:
-    GO: Go
-    SEARCH: Search
-    SearchResults: 'Search Results'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   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'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: Unpublish
-    BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
-    CREATED: 'Date Created'
-    Comments: Comments
     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'
-    GroupPlaceholder: 'Click to select group'
-    HASBROKENLINKS: 'This page has broken links.'
     HTMLEDITORTITLE: អត្ថបទ
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: 'Page location'
-    PAGETITLE: 'Page name'
-    PAGETYPE: ប្រភេទទំព័រ
-    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'
+    PAGETYPE: 'ប្រភេទទំព័រ'
     URLSegment: 'កំណាត់ URL'
-    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 ''Pages'' section" 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: ទំព័រមេ
-    many_many_BackLinkTracking: 'Backlink Tracking'
-    many_many_ImageTracking: 'Image Tracking'
-    many_many_LinkTracking: 'Link Tracking'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    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:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
-    CANACCESS: 'You can access the archived site at this link:'
-    HAVEASKED: 'You have asked to view the content of our site on'
+    has_one_Parent: 'ទំព័រមេ'
   VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
-    HEADER: 'This is a virtual page'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'ទំព័រដូច'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'ទំព័រដូច'
diff --git a/lang/ko.yml b/lang/ko.yml
index d0450eaa..87f68f41 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -1,436 +1,3 @@
 ko:
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    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 ''{title}''{description} 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'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    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'
-    PUBLISHED: Published
-    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 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'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  SearchForm:
-    GO: Go
-    SEARCH: Search
-    SearchResults: 'Search Results'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   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'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    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'
-    GroupPlaceholder: 'Click to select group'
-    HASBROKENLINKS: 'This page has broken links.'
-    HTMLEDITORTITLE: Content
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its 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 ''Pages'' section" 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:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    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:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  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: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
-    HEADER: 'This is a virtual page'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: 'Virtual Pags'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
-    SINGULARNAME: 'Virtual Page'
diff --git a/lang/lc_XX.yml b/lang/lc_XX.yml
deleted file mode 100644
index 0758a584..00000000
--- a/lang/lc_XX.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-lc_XX:
-  ContentController:
-    DRAFT_SITE_ACCESS_RESTRICTION: "U MUST LOG IN WIF UR CMS PASWORD IN ORDR 2 VIEW TEH DRAFT OR ARCHIVD CONTENT. <a href=\"%s\">CLICK HEAR 2 GO BAK 2 TEH PUBLISHD SIET.</a>"
-  ErrorPage:
-    CODE: "TEH ERRUR CODE"
-  Folder:
-    UNUSEDFILESTITLE: "UNUSD FILEZ"
-  RedirectorPage:
-    HASBEENSETUP: "A REDIRECTOR PAEG HAS BEEN SET UP WITHOUT ANYWHERE 2 REDIRECT 2."
-    HEADER: "DIS PAEG WILL REDIRECT USERS 2 ANOTHR PAEG"
-    OTHERURL: "UDDR WEBSITEZ URL"
-    REDIRECTTO: "REDIRECT 2"
-    REDIRECTTOEXTERNAL: "ANOTHR WEBSIET"
-    REDIRECTTOPAGE: "A PAEG ON UR WEBSEIT"
-    YOURPAGE: "PAEG ON UR WEBSEIT"
-  SiteTree:
-    ACCESSANYONE: "ANY1"
-    ACCESSHEADER: "WAT PEEPS CAN C DAT PAEG ON MY SITE?"
-    ACCESSLOGGEDIN: "LOGGD-IN USERS"
-    ACCESSONLYTHESE: "ONLY THEES PEEPS (CHOOSE FRUM LIST)"
-    ALLOWCOMMENTS: "ALLOW COMMENTZ ON DIS PAEG?"
-    APPEARSVIRTUALPAGES: "DIS CONTENT ALSO APPEARz ON TEH VIRTUAL PAGEZ IN DA %s SECSHUNS."
-    BUTTONCANCELDRAFT: "CANCEL DRAFT CHANGEZ"
-    BUTTONCANCELDRAFTDESC: "DELETE UR DRAFT AN REVERT 2 TEH CURRENTLY PUBLISHD PAEG"
-    BUTTONSAVEPUBLISH: "SAV N PUBLISH"
-    BUTTONUNPUBLISH: "UNPUBLISH"
-    BUTTONUNPUBLISHDESC: "REMOOV DIS PAEG FRUM TEH PUBLISHD SIET"
-    EDITANYONE: "ANYONE HOO CAN LOG-IN 2 TEH CMS"
-    EDITHEADER: "WAT PEEPS CAN EDIT DIS INSIDE TEH CMS?"
-    EDITONLYTHESE: "ONLY THEEZ PEEPS (CHOOSE FRUM LIST)"
-    HASBROKENLINKS: |
-                     DIS PAEG HAS BROKD LINKZ.
-                     
-    HTMLEDITORTITLE: "TEH CONTENT"
-    MENUTITLE: "NAVIGASHUN LABEL"
-    METADESC: "DESCRIPSHUN"
-    METAEXTRA: "CUSTOM META TAGZ"
-    METAKEYWORDS: "KEYWURDZ"
-    METATITLE: "TITLE"
-    PAGETITLE: "NAYM OV TEH PAEG"
-    PAGETYPE: "TYPE OV TEH PAEG"
-    SHOWINMENUS: "SHOU IN MENUZ?"
-    SHOWINSEARCH: "SHOU IN SEARCH?"
-    TABACCESS: "ACCESZ"
-    TABBEHAVIOUR: "BEHAVIOUR"
-    TABCONTENT: "CONTENT"
-    TABMETA: "META-DATA"
-    TOPLEVEL: |
-               SIET CONTENT (TOP LEVEL)
-               
-  VirtualPage:
-    CHOOSE: "CHOOSE PAEG 2 LINK 2"
-    EDITCONTENT: "kLICK HEER 2 EDIT TEH CONTENT"
-    HEADER: "DIS R A VIRTUAL PAEG"
diff --git a/lang/lt.yml b/lang/lt.yml
index 328deda9..57e47172 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -4,14 +4,11 @@ lt:
     ActionAdd: 'Pridėti aplanką'
     AppCategoryArchive: Archyvas
     AppCategoryAudio: Garsas
-    AppCategoryDocument: Dokumentas
-    AppCategoryFlash: Flash
     AppCategoryImage: Paveikslėlis
-    AppCategoryVideo: Video
     BackToFolder: 'Atgal į aplanką'
     CREATED: Data
     CurrentFolderOnly: 'Apriboti iki šio aplanko?'
-    DetailsView: 'Detalesnė informacija'
+    DetailsView: Detalesnė informacija
     FILES: Bylos
     FILESYSTEMSYNC: 'Sinchronizuoti bylas'
     FILESYSTEMSYNCTITLE: 'Atnaujinti TVS bylų sarašo duomenų bazę. Naudotina, kai naujos bylos buvo įkeltos naudojant trečios šalies programinę įrangą, Pavyzdžiui FTP.'
@@ -19,25 +16,25 @@ lt:
     FROMYOURCOMPUTER: 'Iš jūsų kompiuterio'
     Filetype: 'Bylos tipas'
     ListView: 'Sąrašo rodinys'
-    MENUTITLE: Bylos
-    NEWFOLDER: 'Naujas aplankas'
+    NEWFOLDER: Naujas aplankas
     SIZE: Dydis
     THUMBSDELETED: 'Buvo ištrinta {count} nepanaudotų paveikslėlių peržiūrų.'
     TreeView: 'Medžio rodinys'
     Upload: Įkelti
+    MENUTITLE: Bylos
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Ištrinti aplankus'
   AssetAdmin_Tools:
     FILTER: Filtras
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Vykdyti
   AssetTableField:
     BACKLINKCOUNT: 'Naudojama:'
     PAGES: puslapis(-iai)
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Atgal
   BrokenLinksReport:
-    Any: 'Bet kurias'
+    Any: Bet kurias
     BROKENLINKS: 'Sugadintų nuorodų ataskaita'
     CheckSite: 'Patikrinti svetainę'
     CheckSiteDropdownDraft: 'Juodraštinė svetainė'
@@ -45,7 +42,7 @@ lt:
     ColumnDateLastModified: 'Paskutinį kartą pakeista'
     ColumnDateLastPublished: 'Paskutini kartą publikuota'
     ColumnProblemType: 'Problemos tipas'
-    ColumnURL: 'URL adresas'
+    ColumnURL: URL adresas
     HasBrokenFile: 'turi sugadintą bylą'
     HasBrokenLink: 'turi sugadintą nuorodą'
     HasBrokenLinkAndFile: 'turi sugadintą nuorodą bei bylą'
@@ -69,96 +66,81 @@ lt:
     PUBLISH_PAGES: Publikuoti
     UNPUBLISHED_PAGES: 'Nebepublikuojami %d puslapiai.'
     UNPUBLISH_PAGES: Nebepublikuoti
-  CMSFileAddController:
-    MENUTITLE: Bylos
   CMSMain:
     ACCESS: 'Priėjimas prie ''{title}'' dalies'
     ACCESS_HELP: 'Leisti peržiūrėti svetainės medžio ir turinio skiltį. Peržiūros, bei redagavimo leidimai gali būti pakeisti per iškrentančius pasirinkimus ir per atskirus "Turinio leidimai".'
     AddNew: 'Pridėti naują puslapį'
     AddNewButton: 'Pridėti naują'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: 'Pasirinkite kur sukurti šį puslapį'
     ChoosePageType: 'Pasirinkite puslapio tipą'
     Create: Sukurti
     DELETE: 'Ištrinti juodraštį'
     DELETEFP: Ištrinti
     DESCREMOVED: 'ir {count} jam priklausantys'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    EMAIL: 'E. paštas'
+    DUPLICATED: 'Puslapis ''{title}'' dubliuotas sėkmingai'
+    DUPLICATEDWITHCHILDREN: 'Puslapis ''{title}'' , bei jo vaikai dubliuoti sėkmingai'
+    EMAIL: E. paštas
     EditTree: 'Redaguoti Medį'
     ListFiltered: 'Filtruotas sąrašas.'
-    MENUTITLE: 'Redaguoti puslapį'
     NEWPAGE: 'Naujas {pagetype}'
     PAGENOTEXISTS: 'Šis puslapis neegzistuoja'
     PAGES: Puslapiai
-    PAGETYPEANYOPT: 'Bet koks'
+    PAGETYPEANYOPT: Bet koks
     PAGETYPEOPT: 'Puslapio tipas'
     PUBALLCONFIRM: 'Prašome publikuoti kiekvieną svetainės puslapį, kopijuojant turinį į svetainę'
     PUBALLFUN: '"Publikuoti viską" funkcionalumas'
-    PUBALLFUN2: "Paspaudus šį mygtuką, bus publikuotas kiekvienas puslapis svetainėje. \\nŠitai numatyta naudoti kai padaromi dideli pakeitimai svetainės turinyje, \\npavyzdžiui ką tik sukūrus svetainę."
+    PUBALLFUN2: "Paspaudus šį mygtuką, bus publikuotas kiekvienas puslapis svetainėje. \nŠitai numatyta naudoti kai padaromi dideli pakeitimai svetainės turinyje, \npavyzdžiui ką tik sukūrus svetainę."
     PUBPAGES: 'Įvykdyta: Publikuoti {count} puslapiai'
     PageAdded: 'Puslapis sėkmingai sukurtas'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Iš publikuojamos svetainės pašalintas ''{title}'''
     REMOVEDPAGEFROMDRAFT: '''%s'' pašalintas iš juodraštinės svetainės'
     RESTORE: Atstatyti
     RESTORED: '''{title}'' atstatytas sėkmingai'
     ROLLBACK: 'Gryžti prie šios versijos'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
+    ROLLEDBACKPUBv2: 'Buvo sugrįžta prie publikuotos versijos.'
+    ROLLEDBACKVERSIONv2: 'Buvo sugrįžta prie  #%d versijos.'
     SAVE: Išsaugoti
-    SAVEDRAFT: 'Save draft'
+    SAVEDRAFT: 'Išsaugoti juodraštį'
     TabContent: Turinys
     TabHistory: Istorija
     TabSettings: Nustatymai
     TreeFiltered: 'Filtruotas medis.'
     TreeFilteredClear: 'Panaikinti filtrą'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Pritaikyti filtrą'
+    MENUTITLE: 'Redaguoti puslapį'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Pritaikyti filtrą'
     RESET: Atstatyti
   CMSPageAddController:
-    MENUTITLE: 'Pridėti puslapį'
     ParentMode_child: 'Po kitu puslapiu'
     ParentMode_top: 'Aukščiausias lygmuo'
-  CMSPageEditController:
-    MENUTITLE: 'Redaguoti puslapį'
+    MENUTITLE: 'Pridėti puslapį'
   CMSPageHistoryController:
     COMPAREMODE: 'Palyginimo režimas (pasirinkite du)'
     COMPAREVERSIONS: 'Palyginti versijas'
     COMPARINGVERSION: 'Lyginame versijas {version1} ir {version2}.'
-    MENUTITLE: Istorija
     REVERTTOTHISVERSION: 'Palikti šią versiją'
     SHOWUNPUBLISHED: 'Rodyti nepublikuojamas versijas'
     SHOWVERSION: 'Rodyti versiją'
     VIEW: peržiūrėti
-    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Dabar peržiūrima versija {version}.'
-  CMSPageHistoryController_versions.ss:
+    MENUTITLE: Istorija
+    VIEWINGLATEST: 'Dabar peržiūrima naujausia versija.'
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Autorius
-    NOTPUBLISHED: Nepublikuotas
+    NOTPUBLISHED: 'Nepublikuotas'
     PUBLISHER: Leidėjas
     UNKNOWN: Nežinoma
     WHEN: Kada
-  CMSPageSettingsController:
-    MENUTITLE: 'Redaguoti puslapį'
   CMSPagesController:
     GalleryView: 'Galerijos rodinys'
     ListView: 'Sąrašo rodinys'
     MENUTITLE: Puslapiai
     TreeView: 'Medžio rodinys'
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: Tempti/Mesti
-    MULTISELECT: 'Daugybinis pasirinkimas'
-  CMSPagesController_Tools.ss:
+  CMSPagesController_ContentToolbar_ss:
+    ENABLEDRAGGING: 'Tempti/Mesti'
+    MULTISELECT: Daugybinis pasirinkimas
+  CMSPagesController_Tools_ss:
     FILTER: Filtras
-  CMSSearch:
-    FILTERDATEFROM: Nuo
-    FILTERDATEHEADING: Data
-    FILTERDATETO: iki
-    FILTERLABELTEXT: Turinys
-  CMSSettingsController:
-    MENUTITLE: Nustatymai
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Pakeisti puslapiai'
   CMSSiteTreeFilter_DeletedPages:
@@ -168,38 +150,25 @@ lt:
   ContentControl:
     NOTEWONTBESHOWN: 'Pastaba: ši žinutė nebus matoma jūsų lankytojams'
   ContentController:
-    ARCHIVEDSITE: 'Preview version'
+    ARCHIVEDSITE: 'Peržiūrėti versiją'
     ARCHIVEDSITEFROM: 'Archyvuota svetainė iš'
     CMS: TVS
-    DRAFT: Draft
     DRAFTSITE: 'Juodraštinė svetainė'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Jūs turite prisijungti su savo TVS slaptažodžiu, kad galėtumėte peržiūrėti juodraščio arba archyvo turinį.<a href="%s">Spauskite čia, norėdami grįžti į svetainę</a>.'
-    Email: 'E. paštas'
-    INSTALL_SUCCESS: 'Įdiegimas sėkmingas!'
+    Email: E. paštas
     InstallFilesDeleted: 'Įdiegimo bylos sėkmingai pašalintos'
     InstallSecurityWarning: 'Saugumo sumetimais Jūs turėtumėte ištrinti įdiegimo bylas, nebent vėliau Jūs planuojate iš naujo diegti (<em>bus reikalinga administravimo prieiga, žiūrėkite viršuje</em>). Web paslaugos programa turi gauti rašymo teises "assets" aplankui, kitiems aplankams tokių teisių nereikia. <a href="{link}" style="text-align: center;">Spauskite čia jei norite ištrinti įdiegimo bylas</a>'
-    InstallSuccessCongratulations: 'SilverStripe buvo sėkmingai įdiegta!'
     LOGGEDINAS: 'Prisijungėte kaip '
     LOGIN: Prisijungti
-    LOGOUT: Atsijungti
-    NOTLOGGEDIN: Neprisijungęs
-    PUBLISHED: Published
+    LOGOUT: 'Atsijungti'
+    NOTLOGGEDIN: 'Neprisijungęs'
     PUBLISHEDSITE: 'Publikuojama svetainė'
     Password: Slaptažodis
-    PostInstallTutorialIntro: 'Šis puslapis yra supaprastinta SilverStripe 3 tinklapio versija. Norėdami išplėsti jo funkcionalumą, apsilankykite {link}.'
-    StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Nepajėgiame ištrinti įdiegimo bylų. Prašome pašalinti bylas rankiniu būdu.'
     VIEWPAGEIN: 'Peržiūrėti puslapį:'
+    DRAFT: Juodraštis
+    PUBLISHED: Publikuota
   ErrorPage:
-    CODE: 'Klaidos kodas'
-    DEFAULTERRORPAGECONTENT: '	<p>Atsiprašome, atrodo, kad Jūs bandėte patekti į puslapį, kuris neegzistuoja.</p><p>Prašome patikrinti URL adresą ir pabandyti dar kartą.</p>'
-    DEFAULTERRORPAGETITLE: 'Puslapis nerastas'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Apgailestaujame, tačiau apdorojant užklausą įvyko klaida.</p>'
-    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'
     400: '400 - Bloga užklausa'
     401: '401 - Leidimas neduotas'
     403: '403 - Uždrausta'
@@ -223,6 +192,15 @@ lt:
     503: '503 - Servisas nepasiekiamas'
     504: '504 - viršytas laiko limitas'
     505: '505 - nepalaikoma HTTP versija'
+    CODE: 'Klaidos kodas'
+    DEFAULTERRORPAGECONTENT: "\t\n<p>Atsiprašome, atrodo, kad Jūs bandėte patekti į puslapį, kuris neegzistuoja.</p><p>Prašome patikrinti URL adresą ir pabandyti dar kartą.</p>\n"
+    DEFAULTERRORPAGETITLE: 'Puslapis nerastas'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>Apgailestaujame, tačiau apdorojant užklausą įvyko klaida.</p>'
+    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'
   Folder:
     AddFolderButton: 'Pridėti aplanką'
     DELETEUNUSEDTHUMBNAILS: 'Ištrinti nenaudojamus peržiūros paveikslėlius'
@@ -234,8 +212,6 @@ lt:
     PreviewButton: Peržiūra
     SAVEDUP: Išsaugota.
     STATUSPUBLISHEDSUCCESS: '''{title}'' publikuota sėkmingai'
-    SearchResults: 'Paieškos rezultatai'
-    VersionUnknown: Nežinoma
   Permission:
     CMS_ACCESS_CATEGORY: 'TVS Prieiga'
   Permissions:
@@ -253,18 +229,13 @@ lt:
     SINGULARNAME: 'Nukreipimo puslapis'
     YOURPAGE: 'Puslapį Jūsų svetainėje'
   ReportAdmin:
-    MENUTITLE: Ataskaitos
     ReportTitle: Antraštė
+    MENUTITLE: Ataskaitos
   ReportAdminForm:
     FILTERBY: 'Filtruoti pagal'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Vykdyti
     SEARCH: Ieškoti
-    SearchResults: 'Paieškos rezultatai'
   SideReport:
     BROKENFILES: 'Puslapiai su sugadintomis bylomis'
     BROKENLINKS: 'Puslapiai su neveikiančiomis nuorodomis'
@@ -277,8 +248,6 @@ lt:
     OtherGroupTitle: Kita
     ParameterLiveCheckbox: 'Patikrinti publikuojamą svetainę'
     REPEMPTY: '{title} ataskaita yra tuščia.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Norėdami dalintis nuoroda į šį puslapį, kopijuokite, bei įklijuokite nuorodą apačioje.'
     ShareLink: 'Dalintis nuoroda'
@@ -301,19 +270,15 @@ lt:
     TOPLEVELCREATE: 'Kas gali kurti puslapius pagrindiniame svetainės lygmenyje?'
     VIEWHEADER: 'Kas gali matyti puslapius šioje svetainėje?'
   SiteTree:
-    ACCESSANYONE: 'Bet kas'
+    ACCESSANYONE: Bet kas
     ACCESSHEADER: 'Kas gali matyti šį puslapį?'
     ACCESSLOGGEDIN: 'Prisijungę naudotojai'
     ACCESSONLYTHESE: 'Tik šie žmonės (pasirinkite iš sąrašo)'
     ADDEDTODRAFTHELP: 'Puslapis dar nebuvo publikuotas'
     ADDEDTODRAFTSHORT: Juodraštis
     ALLOWCOMMENTS: 'Ar leisti komentuoti šį puslapį?'
-    APPEARSVIRTUALPAGES: 'Šis turinys taip pat matomas virtualiuose puslapiuose, {title} skyriuose.'
     BUTTONCANCELDRAFT: 'Atšaukti juodraščio pakeitimus'
     BUTTONCANCELDRAFTDESC: 'Ištrinti juodraštį ir grįžti prie šiuo metu publikuojamo puslapio'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Nebepublikuoti
     BUTTONUNPUBLISHDESC: 'Pašalinti šį puslapį iš publikuojamos svetainės'
     CREATED: 'Sukūrimo data'
@@ -322,7 +287,7 @@ lt:
     DEFAULTABOUTCONTENT: '<p>Jūs galite į šį puslapį patalpinti savo norimą turinį. Taip pat galite šį puslapį ištrinti ir sukurti visiškai naujus.<br /></p>'
     DEFAULTABOUTTITLE: 'Apie mus'
     DEFAULTCONTACTCONTENT: '<p>Jūs galite į šį puslapį patalpinti savo norimą turinį. Taip pat galite šį puslapį ištrinti ir sukurti visiškai naujus.<br /></p>'
-    DEFAULTCONTACTTITLE: Kontaktai
+    DEFAULTCONTACTTITLE: 'Kontaktai'
     DEFAULTHOMECONTENT: '<p>Sveiki atvykę į SilverStripe! Tai pagrindinis puslapis. Jūs galite redaguoti šį puslapį atidarydami <a href="admin/">TVS</a>. Dabar galite naudotis <a href="http://doc.silverstripe.com">Tobulinimo dokumentacija</a>, arba <a href = "http://doc.silverstripe.com/doku.php?id=tutorials">pradėti nuo pamokų.</a></p>'
     DEFAULTHOMETITLE: Pradžia
     DELETEDPAGEHELP: 'Puslapis nebepublikuojamas'
@@ -330,7 +295,7 @@ lt:
     DEPENDENT_NOTE: 'Šiam puslapiui priklauso šie puslapiai. Tai gali būti virtualūs, nukreipiantys puslapiai, bei puslapiai rodantys kitų puslapių turinį.'
     DESCRIPTION: 'Standartinio turinio puslapis'
     DependtPageColumnLinkType: 'Nuorodos tipas'
-    DependtPageColumnURL: 'URL adresas'
+    DependtPageColumnURL: URL adresas
     EDITANYONE: 'Bet kuris prisijungęs prie TVS'
     EDITHEADER: 'Kas gali redaguoti šį puslapį?'
     EDITONLYTHESE: 'Tik šie žmonės (pasirinkite iš sąrašo)'
@@ -338,25 +303,17 @@ lt:
     EDIT_ALL_DESCRIPTION: 'Gali redaguoti puslapį, apeinant puslapio redagavimo teises'
     EDIT_ALL_HELP: 'Galimybė redaguoti bet kurį puslapį, nepriklausomai nuo "Priėjimo/Leidimų" skyriaus nustatymų. Būtinas leidimas "Prieiti prie ''Puslapių''"'
     Editors: 'Redaguotojų grupė'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Šiame puslapyje yra nebegaliojančių nuorodų.'
     HTMLEDITORTITLE: Turinys
     INHERIT: 'Paveldėti iš pradinio puslapio'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Vėliausiai atnaujinta'
     LINKCHANGENOTE: 'Keičiant šio puslapio nuorodą, keisis ir jam priklausančių puslapių nuorodos.'
     MENUTITLE: 'Navigacijos pavadinimas'
     METADESC: 'Meta aprašymas'
-    METADESCHELP: 'Paieškos varikliai naudoja šį turinį paieškos rezultatų atvaizdavimui (tačiau jis neturės įtakos rezultatų reitingui).'
     METAEXTRA: 'Naudotojo meta žymės'
-    METAEXTRAHELP: 'HTML žymos papildomai meta informacijai. Pavyzdžiui: &lt;meta name="tavoPavadinimas" content="tavo turinys čia" /&gt;'
     MODIFIEDONDRAFTHELP: 'Puslapyje yra nepublikuoto turinio'
     MODIFIEDONDRAFTSHORT: Pakeistas
     MetadataToggle: Metaduomenys
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
     PAGELOCATION: 'Puslapio vieta'
     PAGETITLE: 'Puslapio pavadinimas'
     PAGETYPE: 'Puslapio tipas'
@@ -385,7 +342,6 @@ lt:
     URLSegment: 'URL dalis'
     VIEWERGROUPS: 'Lankytojų grupės'
     VIEW_ALL_DESCRIPTION: 'Gali peržiūrėti bet kurį puslapį svetainėje, apeinant puslapio peržiūros teises'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'Peržiūrėti juodraščio turinį'
     VIEW_DRAFT_CONTENT_HELP: 'Pritaikoma puslapių peržiūrai be TVS pagalbos juodraščio režime. Naudinga bendradarbiaujant su redaktoriais be TVS prieigos.'
     Viewers: 'Matymo grupės'
@@ -394,20 +350,19 @@ lt:
     many_many_BackLinkTracking: 'Atgalinis stebėjimas'
     many_many_ImageTracking: 'Paveikslėlių sekimas'
     many_many_LinkTracking: 'Nuorodos sekimas'
+    BUTTONPUBLISHED: Publikuota
+    BUTTONSAVED: Išsaugota
+    MoreOptions: 'Daugiau pasirinkimų'
+    NOTPUBLISHED: 'Nepublikuotas'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Specialūs simboliai automatiškai pakeičiami arba pašalinami.'
-  StaticExporter:
-    BASEURL: 'Bazinis URL'
-    EXPORTTO: 'Eksportuoti į šį aplanką'
-    NAME: 'Statinis eksportavimas'
   TableListField:
     SELECT: 'Pasirinkite:'
-  TableListField.ss:
+  TableListField_ss:
     NOITEMSFOUND: '404 - Nerasta'
     SORTASC: 'Rūšiuoti didėjimo tvarka'
     SORTDESC: 'Rūšiuoti mažėjimo tvarka'
-  TableListField_PageControls.ss:
+  TableListField_PageControls_ss:
     DISPLAYING: Rodoma
     OF: iš
     TO: į
@@ -417,20 +372,30 @@ lt:
     VIEWPREVIOUS: 'Žiūrėti ankstesnį'
   TreeTools:
     DisplayLabel: 'Rodyti:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Jūs galite atverti suarchyvuotą svetainę paspaudę šią nuorodą:'
     HAVEASKED: 'Jūs norėjote peržiūrėti turinį mūsų svetainėje '
   VirtualPage:
-    CHOOSE: 'Linked Page'
+    CHOOSE: 'Prijungtas puslapis'
     DESCRIPTION: 'Rodo kito puslapio turinį'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
+    EDITCONTENT: 'Redaguoti turinį prijungtame puslapyje'
     HEADER: 'Tai virtualus puslapis'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Virtualūs puslapiai'
     PageTypNotAllowedOnRoot: 'Norimas puslapio tipas "{type}" neleidžiamas šiame virtualiame puslapyje, šakniniame lygmenyje.'
     SINGULARNAME: 'Virtualus puslapis'
+    EditLink: Redaguoti
+    HEADERWITHLINK: 'Tai virtualus puslapis su turiniu iš puslapio "{title}" ({link})'
+  CMSFileAddController:
+    MENUTITLE: Bylos
+  CMSPageEditController:
+    MENUTITLE: 'Redaguoti puslapį'
+  CMSPageSettingsController:
+    MENUTITLE: 'Redaguoti puslapį'
+  CMSSettingsController:
+    MENUTITLE: Nustatymai
+  SilverStripeNavigator:
+    ARCHIVED: Archyvuota
+  URLSegmentField:
+    Cancel: Atšaukti
+    Edit: Redaguoti
+    OK: Gerai
diff --git a/lang/lv.yml b/lang/lv.yml
index 644dac30..688b5499 100644
--- a/lang/lv.yml
+++ b/lang/lv.yml
@@ -1,205 +1,22 @@
 lv:
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
     DELETE: 'Dzēst no melnrakstu vietnes'
-    DELETEFP: 'Dzēst no publicētās vietnes'
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    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 ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
-    REMOVEDPAGEFROMDRAFT: 'Removed ''%s'' from the draft site'
+    DELETEFP: Dzēst no publicētās vietnes
     RESTORE: Restaurēt
-    RESTORED: 'Restored ''{title}'' successfully'
-    ROLLBACK: 'Roll back to this version'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Saglabāt
-    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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  CMSSettingsController:
-    MENUTITLE: Settings
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Changed pages'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'All pages, including deleted'
-  CMSSiteTreeFilter_Search:
-    Title: 'All pages'
   ContentControl:
     NOTEWONTBESHOWN: 'Piezīme: šī ziņa nebūs redzama Jūsu apmeklētājiem'
   ContentController:
-    ARCHIVEDSITE: 'Preview version'
     ARCHIVEDSITEFROM: 'Arhivēta vietne no'
-    CMS: CMS
-    DRAFT: Draft
     DRAFTSITE: 'Melnrakstu vietne'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Lai aplūkotu melnrakstu vai arhivētu saturu, Jums ir jāpieslēdzas ar Jūsu CMS paroli. <a href="%s">Lai dotos atpakaļu uz publisko lapu, klikšķiniet šeit.</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: 'Pieslēdzies kā'
     LOGIN: Pieslēgties
-    LOGOUT: Atslēgties
+    LOGOUT: 'Atslēgties'
     NOTLOGGEDIN: 'Nav pieslēdzies'
-    PUBLISHED: Published
     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 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:
-    CODE: 'Kļūdas kods'
-    DEFAULTERRORPAGECONTENT: '<p>Atvainojiet, šķiet, ka lapa kurai mēģinat piekļūt neeksistē.</p><p>Lūdzu pārliecinieties par pareizrakstību URL, kuram vēlaties piekļūt400.</p>'
-    DEFAULTERRORPAGETITLE: 'Lapa nav atrasta'
-    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 - Nekorekts pieprasījums'
     401: '401 - Neautorizēts'
     403: '403 - Aizliegts'
@@ -223,62 +40,28 @@ lv:
     503: '503 - Serviss uz laiku nav pieejams'
     504: '504 - Beidzies vārtejas pieprasījuma laiks'
     505: '505 - Šī HTTP protokola versija netiek atbalstīta.'
+    CODE: 'Kļūdas kods'
+    DEFAULTERRORPAGECONTENT: '<p>Atvainojiet, šķiet, ka lapa kurai mēģinat piekļūt neeksistē.</p><p>Lūdzu pārliecinieties par pareizrakstību URL, kuram vēlaties piekļūt400.</p>'
+    DEFAULTERRORPAGETITLE: 'Lapa nav atrasta'
   Folder:
-    AddFolderButton: 'Add folder'
     DELETEUNUSEDTHUMBNAILS: 'Dzēst neizmantotos sīktēlus'
     UNUSEDFILESTITLE: 'Neizmanotie faili'
     UNUSEDTHUMBNAILSTITLE: 'Neizmantotie sīktēli'
-    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: 'Satura atļaujas'
     PERMISSIONS_CATEGORY: 'Lomu un piekļuves atļaujas'
   RedirectorPage:
-    DESCRIPTION: 'Redirects to a different internal page'
     HASBEENSETUP: 'Novirzītājlapa ir uzstādīta bez norādes uz kurieni novirzīt.'
     HEADER: 'Šī lapa novirzīs lietotājus uz citu lapu '
     OTHERURL: 'Citas tīmekļa vietnes URL'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Novirzīt uz '
     REDIRECTTOEXTERNAL: 'Cita tīmekļa vietni'
     REDIRECTTOPAGE: 'Tīmekļa vietnes lapu'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Tīmekļa vietnes lapa'
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Aiziet
     SEARCH: Meklēt
     SearchResults: 'Meklēšanas rezultāti'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Lai to koplietotu ar šo lapu, nokopējiet un ievietojoiet zemāk redzamo saiti.'
     ShareLink: 'Koplietot saiti'
@@ -289,14 +72,12 @@ lv:
     EDITHEADER: 'Kurš var labot šīs vietnes lapas?'
     EDIT_PERMISSION: 'Pārvaldīt vietnes konfigurāciju'
     EDIT_PERMISSION_HELP: 'Iespēja labot globālus piekļuves uzstādījumus/augstākā līmeņa lapu atļaujas.'
-    PLURALNAME: 'Site Configs'
-    SINGULARNAME: 'Site Config'
     SITENAMEDEFAULT: 'Jūsu vietnes nosaukums'
     SITETAGLINE: 'Vietnes apakšvirsraksts/sauklis'
     SITETITLE: 'Vietnes nosaukums'
-    TABACCESS: 'Piekļuves tiesības'
+    TABACCESS: Piekļuves tiesības
     TABMAIN: Sākums
-    TAGLINEDEFAULT: Apakšvirsraksts/sauklis
+    TAGLINEDEFAULT: 'Apakšvirsraksts/sauklis'
     THEME: Tēma
     TOPLEVELCREATE: 'Kurš drīkst izveidot lapas vietnes saknes direktorijā?'
     VIEWHEADER: 'Kurš drīkst aplūkot lapas šajā vietnē?'
@@ -305,18 +86,11 @@ lv:
     ACCESSHEADER: 'Kas drīkst aplūkot šo lapu?'
     ACCESSLOGGEDIN: 'Pieslēgušies lietotāji'
     ACCESSONLYTHESE: 'Tikai šie lietotāji (izvēlieties no saraksta)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'Atļaut pievienot komentārus šai lapai ?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Atcelt melnraksta izmaiņas'
     BUTTONCANCELDRAFTDESC: 'Dzēst melnrakstu un atstatīt uz šobrīd publicēto lapu'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Nebpublicēt
     BUTTONUNPUBLISHDESC: 'Izņemt šo lapu no publicētās vietnes'
-    CREATED: 'Date Created'
     Comments: Komentāri
     Content: Saturs
     DEFAULTABOUTCONTENT: '<p>Jūs variet aizpildīt šo lapu ar savu saturu, vai dzēst šo lapu un izveidot savas lapas.<br /></p>'
@@ -325,12 +99,8 @@ lv:
     DEFAULTCONTACTTITLE: 'Sazinieties ar mums'
     DEFAULTHOMECONTENT: '<p>Laipni lūgti Silverstripe! Šī ir noklusētā mājaslapa. Jūs varat labot šo lapu atverot <a href="admin/">CMS</a>. Jūs varat piekļūt <a href="http://doc.silverstripe.org">izstrādātāju dokumentācijai</a>, vai sākt ar <a href="http://doc.silverstripe.org/doku.php?id=tutorials">apmācību.</a></p>'
     DEFAULTHOMETITLE: Sākums
-    DELETEDPAGEHELP: 'Page is no longer published'
-    DELETEDPAGESHORT: Deleted
     DEPENDENT_NOTE: 'Sekojošās lapas ir atkarīgas no šīs lapas. Tās var būt virtuālās lapas, novirzītājlapas, un lapas, kas satur saites.'
-    DESCRIPTION: 'Generic content page'
     DependtPageColumnLinkType: 'Saites tips'
-    DependtPageColumnURL: URL
     EDITANYONE: 'Ikviens, kurš ir pieslēdzies CMS'
     EDITHEADER: 'Kurš drīkst labot šo lapu?'
     EDITONLYTHESE: 'Tikai šie lietotāji (izvēlieties no saraksta)'
@@ -338,25 +108,13 @@ lv:
     EDIT_ALL_DESCRIPTION: 'Labot jebkuru lapu'
     EDIT_ALL_HELP: 'Iespēja labot jebkuru vietnes lapu, neskatoties uz uzstādijumiem Piekļuve cilnē'
     Editors: 'Redaktoru grupas'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Šī lapa satur bojātas saites.'
     HTMLEDITORTITLE: Saturs
     INHERIT: 'Mantot no vecāka lapas'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
     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).'
+    METADESC: 'Apraksts'
     METAEXTRA: 'Lietotāja Meta-tagi'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
     PAGELOCATION: 'Lapas adrese'
     PAGETITLE: 'Lapas nosaukums'
     PAGETYPE: 'Lapas tips'
@@ -366,71 +124,36 @@ lv:
     PARENTTYPE_SUBPAGE: 'Apakšlapa zem vecāka lapas (izvēlieties zemāk)'
     PERMISSION_GRANTACCESS_DESCRIPTION: 'Pārvaldīt piekļuves tiesības saturam'
     PERMISSION_GRANTACCESS_HELP: 'Atļaut atsevišķu lapu piekļuves ierobežojumu iestatījumu sadaļā "Lapas".'
-    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: 'Mainīt vietnes struktūru'
     REORGANISE_HELP: 'Pārkārtot lapas koka struktūra ar "vilkt un nomest" paņēmienu.'
     SHOWINMENUS: 'Rādīt izvēlnēs?'
     SHOWINSEARCH: 'Rādīt meklēšanas rezultātos?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: Uzvedība
-    TABCONTENT: Saturs
+    TABCONTENT: 'Saturs'
     TABDEPENDENT: 'Atkarīgās lapas'
     TOPLEVEL: 'Vietnes Saturs (Augšējais līmenis)'
     TOPLEVELCREATORGROUPS: 'Augstākā līmeņa veidotāji'
     URLSegment: 'URL Segments'
     VIEWERGROUPS: 'Skatītāju grupas'
     VIEW_ALL_DESCRIPTION: 'Skatī jebkuru lapu'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'Aplūkot melnraksa saturu'
     VIEW_DRAFT_CONTENT_HELP: 'Attiecās uz lapu aplūkošanu ārpus CMS melnraksta režīmā. Var būt noderīgi ārējiem darbiniekiem, kuriem nav piekļuve CMS.'
     Viewers: 'Skatītāju grupas'
-    Visibility: Visibility
     has_one_Parent: 'Lapas vecāks'
     many_many_BackLinkTracking: 'Atpakaļsaišu izsekošana'
     many_many_ImageTracking: 'Attēlu izsekošana'
     many_many_LinkTracking: 'Saišu izsekošana'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
-  StaticExporter:
-    BASEURL: 'Base URL'
-    EXPORTTO: 'Export to that folder'
-    NAME: 'Static exporter'
   TableListField:
     SELECT: 'Izvēlēties:'
-  TableListField.ss:
-    NOITEMSFOUND: 'No items found'
+  TableListField_ss:
     SORTASC: 'Kārtot augošā secībā'
     SORTDESC: 'Kārtot dilstošā secībā'
-  TableListField_PageControls.ss:
-    DISPLAYING: Displaying
-    OF: of
-    TO: to
+  TableListField_PageControls_ss:
     VIEWFIRST: 'Skatīt pirmo'
     VIEWLAST: 'Skatīt pēdējo'
     VIEWNEXT: 'Skatīt nākamo'
     VIEWPREVIOUS: 'Skatīt iepriekšējo'
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  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: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Šī ir virtuāla lapa'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Virtuālās lapas'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Virtuālās lapa'
diff --git a/lang/mi_NZ.yml b/lang/mi.yml
similarity index 82%
rename from lang/mi_NZ.yml
rename to lang/mi.yml
index 3b9dbb51..576b4d3c 100644
--- a/lang/mi_NZ.yml
+++ b/lang/mi.yml
@@ -1,43 +1,42 @@
-mi_NZ:
+mi:
   AssetAdmin:
     ADDFILES: 'Tāpiri Kōnae'
     ActionAdd: 'Tāpiri kōpaki'
     AppCategoryArchive: Puranga
     AppCategoryAudio: Ororongo
     AppCategoryDocument: Tuhinga
-    AppCategoryFlash: Flash
     AppCategoryImage: Atahanga
     AppCategoryVideo: Ataata
     BackToFolder: 'Hoki ki te kōpaki'
     CREATED: Rā
     CurrentFolderOnly: 'Ka whakatiki ki te kōpaki o nāianei?'
-    DetailsView: 'Ngā Taipitopito'
-    FILES: 'Ngā Kōnae'
+    DetailsView: Ngā Taipitopito
+    FILES: Ngā Kōnae
     FILESYSTEMSYNC: 'Tukutahi kōnae'
     FILESYSTEMSYNCTITLE: 'Whakahōutia ngā tāurunga pātengi raraunga CMS o ngā kōnae kei te pūnaha kōnae. He whaitake ina tukuna atu he kōnae hou mai i waho i te CMS, hei tauira, mā te FTP.'
     FROMTHEINTERNET: 'Mai i te Ipurangi'
     FROMYOURCOMPUTER: 'Mai i tō rorohiko'
     Filetype: 'Momo kōnae'
     ListView: 'Tirohanga Rārangi'
-    MENUTITLE: 'Ngā Kōnae'
     NEWFOLDER: KōpakiHōu
     SIZE: Rahi
     THUMBSDELETED: ' Kua mukua e {count} ngā karakōnui kāore i whakamahia'
     TreeView: 'Tirohanga Rākau'
     Upload: Tukuatu
+    MENUTITLE: Ngā Kōnae
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Muku kōpaki'
   AssetAdmin_Tools:
     FILTER: Tātari
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Haere
   AssetTableField:
     BACKLINKCOUNT: 'I whakamahia i:'
-    PAGES: 'te/ngā whārangi'
-  BackLink_Button.ss:
+    PAGES: te/ngā whārangi
+  BackLink_Button_ss:
     Back: Hoki
   BrokenLinksReport:
-    Any: 'Ko tētahi'
+    Any: Ko tētahi
     BROKENLINKS: 'Pūrongo hono whati'
     CheckSite: 'Taki pae'
     CheckSiteDropdownDraft: 'Pae hukihuki'
@@ -69,96 +68,80 @@ mi_NZ:
     PUBLISH_PAGES: Whakaputa
     UNPUBLISHED_PAGES: ' %d ngā whārangi kua wetewhakaputaina'
     UNPUBLISH_PAGES: Wete-whakaputa
-  CMSFileAddController:
-    MENUTITLE: 'Ngā Kōnae'
   CMSMain:
     ACCESS: 'Uru ki te wāhanga ''{title}'' '
     ACCESS_HELP: 'Tukua kia kitea te wāhanga kei roto te whārangi rākau me ngā ihirangi. Ka taea te whakahaere i te tiro me te whakatika whakaaetanga mā ngā takaiho tauwhāiti-whārangi, mā "Ngā whakaaetanga ihirangi" motuhake hoki.'
     AddNew: 'Tāpiri whārangi hōu'
     AddNewButton: 'Tāpiri mea hōu'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: 'Kōwhiri ki hea hangaia ai tēnei whārangi'
     ChoosePageType: 'Kōwhiria te momo whārangi'
     Create: Hanga
     DELETE: 'Mukua te hukihuki'
     DELETEFP: Muku
     DESCREMOVED: 'me ngā uri {count}'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: Īmēra
     EditTree: 'Whakatika Rākau'
     ListFiltered: 'Rārangi kua tātaritia'
-    MENUTITLE: 'Whakatika Whārangi'
     NEWPAGE: '{pagetype} hou'
     PAGENOTEXISTS: 'KIāore tēnei whārangi e tīari'
-    PAGES: 'Ngā Whārangi'
-    PAGETYPEANYOPT: 'Ko tētahi'
+    PAGES: Ngā Whārangi
+    PAGETYPEANYOPT: Ko tētahi
     PAGETYPEOPT: 'Momo wharangi '
     PUBALLCONFIRM: 'Whakaputaina koa i ia whārangi i te pae me te tārua i te content stage kia ora ai.'
     PUBALLFUN: 'Te taumahinga "Whakaputaina Katoatia"'
-    PUBALLFUN2: 'Ko te pēhi i tēnei pātene he taurite ki te haere ki ia whārangi me te pēhi i te "whakaputaina". Ko te tikanga, ka whakamahia tēnei pātene i muri ake i te mahi whakatikatika kua maha ngā tinihanga, pērā i te wā i hangaia tuatahi mai te pae. '
+    PUBALLFUN2: "Ko te pēhi i tēnei pātene he taurite ki te haere ki ia whārangi me te pēhi i te \"whakaputaina\". Ko te tikanga, ka whakamahia tēnei pātene i muri ake i te mahi whakatikatika kua maha ngā tinihanga, pērā i te wā i hangaia tuatahi mai te pae. "
     PUBPAGES: 'Kua oti: I whakaputaina ngā whārangi {count}'
     PageAdded: 'I momoho te hanga whārangi'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'I tango te ''{title}'' i te pae kua whakaputaina'
     REMOVEDPAGEFROMDRAFT: 'I tangohia a ''%s'' i te pae hukihuki'
     RESTORE: Whakaora
     RESTORED: 'I momoho te whakaora i te ''{title}'''
     ROLLBACK: 'Hoki whakamuri ki tēnei putanga.'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: tiakina
-    SAVEDRAFT: 'Save draft'
-    TabContent: 'Ngā Ihirangi'
+    TabContent: Ngā Ihirangi
     TabHistory: Hītori
-    TabSettings: 'Ngā Tautuhinga'
+    TabSettings: Ngā Tautuhinga
     TreeFiltered: 'Rākau kua tātaritia'
     TreeFilteredClear: 'Ūkui tātari'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Hoatu Tātari'
-    RESET: 'Tautuhi Anō'
+    MENUTITLE: 'Whakatika Whārangi'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Hoatu Tātari'
+    RESET: Tautuhi Anō
   CMSPageAddController:
-    MENUTITLE: 'Tāpiri whārangi'
     ParentMode_child: 'Kei raro i tētahi atu whārangi'
     ParentMode_top: 'Taumata matua'
-  CMSPageEditController:
-    MENUTITLE: 'Whakatika Whārangi'
+    MENUTITLE: 'Tāpiri whārangi'
   CMSPageHistoryController:
     COMPAREMODE: 'Whakataurite Aratau (tīpakohia kia rua)'
     COMPAREVERSIONS: 'Whakatauritea Ngā Putanga'
     COMPARINGVERSION: 'Whakataurite ana i te putanga {version1} me te putanga {version2}.'
-    MENUTITLE: Hītori
     REVERTTOTHISVERSION: 'Hoki ki tēnei putanga'
     SHOWUNPUBLISHED: 'Whakaaturia ngā putanga kāore i whakaputaina'
     SHOWVERSION: 'Whakaatu Putanga'
     VIEW: Tiro
-    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Tiro ana i te putanga {version} ināianei.'
-  CMSPageHistoryController_versions.ss:
+    MENUTITLE: Hītori
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Kaituhi
     NOTPUBLISHED: 'Kāore i whakaputaina'
     PUBLISHER: Pūwhakaputa
-    UNKNOWN: 'Tē Mōhiotia'
+    UNKNOWN: Tē Mōhiotia
     WHEN: Inahea
-  CMSPageSettingsController:
-    MENUTITLE: 'Whakatika Whārangi'
   CMSPagesController:
     GalleryView: 'Tirohanga Taiwhanga'
     ListView: 'Tirohanga Rārangi'
-    MENUTITLE: 'Ngā Whārangi'
+    MENUTITLE: Ngā Whārangi
     TreeView: 'Tirohanga Rākau'
-  CMSPagesController_ContentToolbar.ss:
+  CMSPagesController_ContentToolbar_ss:
     ENABLEDRAGGING: 'Tō me te taka'
     MULTISELECT: Tīpakonga-maha
-  CMSPagesController_Tools.ss:
+  CMSPagesController_Tools_ss:
     FILTER: Tātari
   CMSSearch:
-    FILTERDATEFROM: 'Mai i'
+    FILTERDATEFROM: Mai i
     FILTERDATEHEADING: Rā
     FILTERDATETO: Ki
-    FILTERLABELTEXT: 'Ngā Ihirangi'
-  CMSSettingsController:
-    MENUTITLE: 'Ngā Tautuhinga'
+    FILTERLABELTEXT: Ngā Ihirangi
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Ngā whārangi kua hurihia'
   CMSSiteTreeFilter_DeletedPages:
@@ -170,8 +153,6 @@ mi_NZ:
   ContentController:
     ARCHIVEDSITE: 'Putanga Arokite'
     ARCHIVEDSITEFROM: 'Pae putumōhio mai i'
-    CMS: CMS
-    DRAFT: Draft
     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
@@ -181,25 +162,14 @@ mi_NZ:
     InstallSuccessCongratulations: 'Kua tāuta momohotia te Silverstripe!'
     LOGGEDINAS: 'Kua takiuru hei'
     LOGIN: Takiuru
-    LOGOUT: Takiputa
+    LOGOUT: 'Takiputa'
     NOTLOGGEDIN: 'Kāore anō kia taukiru'
-    PUBLISHED: Published
     PUBLISHEDSITE: 'Pae Kua Whakaputaina'
     Password: Kupuhipa
     PostInstallTutorialIntro: 'He tauira rūnā tēnei paetukutuku o tētahi paetukutuku SilverStripe 3. Hei toro i tēnei, tirohia te {link}'
-    StartEditing: 'You can start editing your content by opening <a href="{link}">the 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:
-    CODE: 'Waehere hapa'
-    DEFAULTERRORPAGECONTENT: '<p>Aroha noa, te āhua nei e ngana ana koe ki te uru ki tētahi whārangi kāore i reira.</p><p>Tirohia te takikupu o te PRO e ngana ana ki te uru, ka whakamātau anō.</p>'
-    DEFAULTERRORPAGETITLE: 'Kāore i kitea te whārangi'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Aroha noa,kua rarua te tuku i tō tono.</p>'
-    DEFAULTSERVERERRORPAGETITLE: 'Hapa tūmau'
-    DESCRIPTION: 'Ngā ihirangi ritenga mō ngā take hapa rerekē (hei tauira. "Kāore i kitea te whārangi")'
-    ERRORFILEPROBLEM: 'Kua hapa te whakatuwhera i te kōnae "{filename}" mō te tuhituhi. Tirohia ngā whakaaetanga kōnae.'
-    PLURALNAME: 'Ngā Whārangi Hapa'
-    SINGULARNAME: 'Whārangi Hapa'
     400: '400 - Tono Kino'
     401: '401 - Tē Whakamanatia'
     403: '403 - Kua Rāhuitia'
@@ -223,6 +193,15 @@ mi_NZ:
     503: '503 - Rātonga Tē Wātea'
     504: '504 - Wāhiki Tomokanga'
     505: '505 - Putanga HTTP Tē Tautokona'
+    CODE: 'Waehere hapa'
+    DEFAULTERRORPAGECONTENT: '<p>Aroha noa, te āhua nei e ngana ana koe ki te uru ki tētahi whārangi kāore i reira.</p><p>Tirohia te takikupu o te PRO e ngana ana ki te uru, ka whakamātau anō.</p>'
+    DEFAULTERRORPAGETITLE: 'Kāore i kitea te whārangi'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>Aroha noa,kua rarua te tuku i tō tono.</p>'
+    DEFAULTSERVERERRORPAGETITLE: 'Hapa tūmau'
+    DESCRIPTION: 'Ngā ihirangi ritenga mō ngā take hapa rerekē (hei tauira. "Kāore i kitea te whārangi")'
+    ERRORFILEPROBLEM: 'Kua hapa te whakatuwhera i te kōnae "{filename}" mō te tuhituhi. Tirohia ngā whakaaetanga kōnae.'
+    PLURALNAME: 'Ngā Whārangi Hapa'
+    SINGULARNAME: 'Whārangi Hapa'
   Folder:
     AddFolderButton: 'Tāpiri kōpaki'
     DELETEUNUSEDTHUMBNAILS: 'Mukua ngā karakōnui kāore i whakamahia'
@@ -230,12 +209,12 @@ mi_NZ:
     UNUSEDTHUMBNAILSTITLE: 'Ngā karakōnui kāore i whakamahia'
     UploadFilesButton: Tukuatu
   LeftAndMain:
-    DELETED: 'Kua Mukua'
+    DELETED: Kua Mukua
     PreviewButton: Arokite
-    SAVEDUP: 'Kua Tiakina'
+    SAVEDUP: Kua Tiakina
     STATUSPUBLISHEDSUCCESS: 'I momoho te whakaputa i te ''{title}'' '
     SearchResults: 'Ngā Hua Rapu'
-    VersionUnknown: 'Tē Mōhiotia'
+    VersionUnknown: Tē Mōhiotia
   Permission:
     CMS_ACCESS_CATEGORY: 'Uru CMS'
   Permissions:
@@ -253,14 +232,10 @@ mi_NZ:
     SINGULARNAME: 'Whārangi Tuku Anō'
     YOURPAGE: 'Whārangi kei tō paetukutuku'
   ReportAdmin:
-    MENUTITLE: 'Ngā Pūrongo'
     ReportTitle: Taitara
+    MENUTITLE: Ngā Pūrongo
   ReportAdminForm:
     FILTERBY: 'Tātari mā te'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Haere
     SEARCH: Rapu
@@ -274,11 +249,9 @@ mi_NZ:
     ContentGroupTitle: 'Ngā pūrongo ihirangi'
     EMPTYPAGES: 'Ngā whārangi me te kore ihirangi'
     LAST2WEEKS: 'Ngā whārangi i whakatikatia i ngā wiki e 2 kua hipa'
-    OtherGroupTitle: 'Ētahi atu'
+    OtherGroupTitle: Ētahi atu
     ParameterLiveCheckbox: 'Tirohia te pae ora'
     REPEMPTY: 'Kua piako te pūrongo {title}.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Hei tiritiri i te hono ki tēnei whārangi, tāruatia me te whakapiri i te hono i raro.'
     ShareLink: 'Tiritiri hono'
@@ -301,7 +274,7 @@ mi_NZ:
     TOPLEVELCREATE: 'Mā wai he whārangi i te pūtake o te pae e hanga?'
     VIEWHEADER: 'Mā wai ngā whārangi i tēnei pae e tiro?'
   SiteTree:
-    ACCESSANYONE: 'Tētahi tangata'
+    ACCESSANYONE: Tētahi tangata
     ACCESSHEADER: 'Mā wai tēnei whārangi e tiro?'
     ACCESSLOGGEDIN: 'Ngā kaiwhakamahi kua takiuru'
     ACCESSONLYTHESE: 'Ko ēnei tāngata anake (kōwhiria i te rārangi)'
@@ -311,14 +284,11 @@ mi_NZ:
     APPEARSVIRTUALPAGES: 'Ka kitea hoki ēnei ihirangi i ngā whārangi mariko kei ngā wāhanga  {title}.'
     BUTTONCANCELDRAFT: 'Whakakorea ngā huringa hukihuki'
     BUTTONCANCELDRAFTDESC: 'Mukua tō hukihuki, ka hoki ki te whārangi kua whakaputaina ināianei'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Wetewhakaputa
     BUTTONUNPUBLISHDESC: 'Tangohia tēnei whārangi i te pae kua whakaputaina'
     CREATED: 'Rā Hanga'
-    Comments: 'Ngā Tākupu'
-    Content: 'Ngā Ihirangi'
+    Comments: Ngā Tākupu
+    Content: Ngā Ihirangi
     DEFAULTABOUTCONTENT: '<p>Ka taea te whakakī i tēnei whārangi ki āu ake ihirangi, te muku rānei me te hanga i āu ake whārangi.<br /></p>'
     DEFAULTABOUTTITLE: 'Mō Mātou'
     DEFAULTCONTACTCONTENT: '<p>Ka taea te whakakī i tēnei whārangi ki āu ake ihirangi, te muku rānei me te hanga i āu ake whārangi.<br /></p>'
@@ -326,7 +296,7 @@ mi_NZ:
     DEFAULTHOMECONTENT: '<p>Nau mai ki SilverStripe! Ko tēnei te whārangi kāinga taunoa. Ka taea tēnei whārangi te whakatika mā te <a href="admin/">the CMS</a>. Ka taea ngā tuhinga kaiwhakawhanake <a href="http://doc.silverstripe.org">te uru</a>, te tīmata rānei i ngā akoranga <a href="http://doc.silverstripe.org/doku.php?id=tutorials">.</a></p>'
     DEFAULTHOMETITLE: Kāinga
     DELETEDPAGEHELP: 'Kua kore e whakaputaina te whārangi'
-    DELETEDPAGESHORT: 'Kua Mukua'
+    DELETEDPAGESHORT: Kua Mukua
     DEPENDENT_NOTE: 'Ka whakawhirinaki ngā whārangi e whai ana ki tēnei whārangi. Kei roto nei ngā whārangi matua, ngā whārangi tuku anō me ngā whārangi whai hono ihirangi.'
     DESCRIPTION: 'Whārangi ihirangi ahuwhānui'
     DependtPageColumnLinkType: 'Momo hono'
@@ -338,26 +308,18 @@ mi_NZ:
     EDIT_ALL_DESCRIPTION: 'Whakatikatia tētahi whārangi'
     EDIT_ALL_HELP: 'Te āhei ki te whakatika i tētahi whārangi i te pae, ahakoa ngā tautuhinga kei te ripa Uru. Ka hiahiatia te whakaaetanga o te "wāhanga Urui ki ''Ngā Whārangi''"'
     Editors: 'Ngā Rōpū Kaiwhakatika'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'He hononga whati kei tēnei whārangi.'
     HTMLEDITORTITLE: Kai
     INHERIT: 'I tukuna iho i te whārangi matua'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Whakahōunga Tōmuri'
     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'
-    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'
+    MODIFIEDONDRAFTSHORT: Kua Whakakētia
     MetadataToggle: Raraungameta
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: Tauwāhi
+    PAGELOCATION: 'Tauwāhi'
     PAGETITLE: 'Ingoa whārangi'
     PAGETYPE: 'Tūmomo wharangi '
     PARENTID: 'Whārangi matua'
@@ -366,7 +328,7 @@ mi_NZ:
     PARENTTYPE_SUBPAGE: 'Whārangi-iti kei raro i te whārangi matua'
     PERMISSION_GRANTACCESS_DESCRIPTION: 'Whakahaeretia ngā motika uru mō ngā ihirangi'
     PERMISSION_GRANTACCESS_HELP: 'Tukuna te tautuhi rāhuitanga uru ki ētahi whārangi tauwhāiti i te wāhanga "Ngā Whārangi"'
-    PLURALNAME: 'Ngā Whārangi'
+    PLURALNAME: Ngā Whārangi
     PageTypNotAllowedOnRoot: 'Kāore e whakaaetia te momo whārangi "{type}" i te taumata pūtake'
     PageTypeNotAllowed: 'Kāore e whakaaetia te momo whārangi "{type}" hei tamaiti a tēnei whārangi matua'
     REMOVEDFROMDRAFTHELP: 'Kua whakaputaina te whārangi, engari kua mukua i te hukihuki'
@@ -385,7 +347,6 @@ mi_NZ:
     URLSegment: 'Wāhanga PRO'
     VIEWERGROUPS: 'Ngā Ropū Kaitirotiro'
     VIEW_ALL_DESCRIPTION: 'Tirohia tētahi whārangi'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'Tirohia ngā ihirangi hukihuki'
     VIEW_DRAFT_CONTENT_HELP: 'Ka hāngai ki te tiro whārangi i waho i te CMS i te aratau hukihuki. He whaihua mā ngā kaimahitahi kāore i a rātou te āhei CMS.'
     Viewers: 'Ngā Rōpū Kaitirotiro'
@@ -395,20 +356,19 @@ mi_NZ:
     many_many_ImageTracking: 'Taki Atahanga'
     many_many_LinkTracking: 'Taki Hono'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Ka tahuri aunoatia, ka tangohia rānei ngā pūāhua motuhake'
   StaticExporter:
     BASEURL: 'PRO Matua'
     EXPORTTO: 'Kaweake ki tēnā kōpaki'
     NAME: 'Pūkaweatu rerekore'
   TableListField:
-    SELECT: Tīpako
-  TableListField.ss:
+    SELECT: 'Tīpako'
+  TableListField_ss:
     NOITEMSFOUND: 'Kāore he tūemi i kitea'
     SORTASC: 'Kōmakatia ki te raupapa aupiki'
     SORTDESC: 'Kōmakatia ki te raupapa auheke'
-  TableListField_PageControls.ss:
-    DISPLAYING: 'Whakaatu ana'
+  TableListField_PageControls_ss:
+    DISPLAYING: Whakaatu ana
     OF: o
     TO: ki
     VIEWFIRST: 'Tirohia te tuatahi'
@@ -417,20 +377,20 @@ mi_NZ:
     VIEWPREVIOUS: 'Tirohia tōmua'
   TreeTools:
     DisplayLabel: 'Whakaatu:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Ka taea te uru ki te pae putumōhio mā tēnei hononga'
     HAVEASKED: 'Kua tono mai kia tirohia e koe ngā ihirangi o tā mātou pae i'
   VirtualPage:
-    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Ka whakaatu i ngā ihirangi o tētahi atu whārangi'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'He whārangi mariko tēnei'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Ngā Whārangi Mariko'
     PageTypNotAllowedOnRoot: 'Kāore e whakaaetia te momo whārangi taketake "{type}" i te taumata pūtake o tēnei whārangi mariko'
     SINGULARNAME: 'Whārangi Mariko'
+  CMSFileAddController:
+    MENUTITLE: Ngā Kōnae
+  CMSPageEditController:
+    MENUTITLE: 'Whakatika Whārangi'
+  CMSPageSettingsController:
+    MENUTITLE: 'Whakatika Whārangi'
+  CMSSettingsController:
+    MENUTITLE: Ngā Tautuhinga
diff --git a/lang/ms.yml b/lang/ms.yml
index 999b1c32..e75eee55 100644
--- a/lang/ms.yml
+++ b/lang/ms.yml
@@ -1,323 +1,35 @@
 ms:
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    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 ''{title}''{description} 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'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    DRAFTSITE: 'Draft Site'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Anda pertu mendaftar masuk dengan kata aluan CMS anda untuk melihat draf atau kandungan diarkib. <a href="%s">Klik sini untuk kembali ke tapak tertebit.</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'
-    PUBLISHED: Published
-    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 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:
+    417: '417 - kegagalan expectation'
     CODE: 'Kod kesilapan'
     DEFAULTERRORPAGECONTENT: '<p>Minta maaf, rupa-rupanya anda ingin mencapai halaman yang tidak wujud</p><p>Sila semak ejaan URL yang anda ingin mencapai dan cuba semula</p>'
     DEFAULTERRORPAGETITLE: 'Halaman tidak wujud'
-    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 - kegagalan expectation'
-    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: 'Hapuskan thumbnail yang tidak digunakan'
     UNUSEDFILESTITLE: 'Fail-fail yang tidak digunakan'
     UNUSEDTHUMBNAILSTITLE: 'Thumbnail yang tidak digunakan'
-    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: 'Mukasurat pengalih destinasi dihasilkan tanpa menyatakan destinasi alihan.'
     HEADER: 'Mukasurat ini akan mengalih pengguna ke mukasurat lain'
     OTHERURL: 'URL laman web lain'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Alihkan ke'
     REDIRECTTOEXTERNAL: 'Laman web lain'
     REDIRECTTOPAGE: 'Tambah halaman ke laman anda'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Halaman di laman anda'
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  SearchForm:
-    GO: Go
-    SEARCH: Search
-    SearchResults: 'Search Results'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   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: 'Sesiapa sahaja'
+    ACCESSANYONE: Sesiapa sahaja
     ACCESSHEADER: 'Siapa yang boleh melihat mukasurat ini?'
     ACCESSLOGGEDIN: 'Pengguna berdaftar masuk'
     ACCESSONLYTHESE: 'Hanya pengguna berikut (pilih dari senarai)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'Terima komen untuk mukasurat ini?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Batalkan perubahan ke atas draf'
     BUTTONCANCELDRAFTDESC: 'Hapus draf dan kembalikan ke mukasurat asal yang telah diterbitkan'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Tidak diterbitkan'
+    BUTTONUNPUBLISH: Tidak diterbitkan
     BUTTONUNPUBLISHDESC: 'Hapus mukasurat ini dari laman sebenar'
-    CREATED: 'Date Created'
-    Comments: Comments
     Content: Kandungan
     DEFAULTABOUTCONTENT: '<p>Anda bole isikan kandungan anda sendiri ke dalam mukasurat ini. atau padamkannya dan hasilkan mukasurat yang baru untuk menggantikannya.<br /></p>'
     DEFAULTABOUTTITLE: 'Tentang Kami'
@@ -325,112 +37,29 @@ ms:
     DEFAULTCONTACTTITLE: 'Hubungi Kami'
     DEFAULTHOMECONTENT: '<p>Selamat datang ke laman SilverStripe! Ini adalah laman utama yang asal. Anda boleh menyunting mukasurat ini dengan menggunakan <a href="admin/">CMS yang disediakan</a>. Untuk bantuan, sila lawati <a href="http://doc.silverstripe.com">dukumentasi pembangun perisian</a>, atau mula menggunakan <a href="http://doc.silverstripe.com/doku.php?id=tutorials">dokumen tutorial.</a></p>'
     DEFAULTHOMETITLE: Utama
-    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: 'Sesiapa sahaja yang boleh mendaftar masuk ke CMS'
     EDITHEADER: 'Siapa yang boleh melakukan penyuntingan menggunakan CMS?'
     EDITONLYTHESE: 'Hanya pengguna berikut (pilih dari senarai)'
-    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'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Mukasurat ini mengandungi pautan bermasalah.'
     HTMLEDITORTITLE: Kandungan
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
-    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).'
+    METADESC: 'Keterangan'
     METAEXTRA: 'Label-meta khas'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: 'Page location'
     PAGETITLE: 'Nama halaman'
     PAGETYPE: 'Jenis halaman'
-    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: 'Paparkan di menu?'
     SHOWINSEARCH: 'Paparkan di carian?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: Perilaku
-    TABCONTENT: Kandungan
-    TABDEPENDENT: 'Dependent pages'
+    TABCONTENT: 'Kandungan'
     TOPLEVEL: 'Kandungan Laman (Peringkat Atas)'
-    TOPLEVELCREATORGROUPS: 'Top level creators'
     URLSegment: 'Segmen URL'
-    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 ''Pages'' section" 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: 'Halaman Induk'
-    many_many_BackLinkTracking: 'Backlink Tracking'
-    many_many_ImageTracking: 'Image Tracking'
-    many_many_LinkTracking: 'Link Tracking'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    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
+  TableListField_PageControls_ss:
     VIEWFIRST: 'Lihat pertama'
     VIEWLAST: 'Lihat terakhir'
     VIEWNEXT: 'Lihat berikut'
     VIEWPREVIOUS: 'Lihat dahulu'
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  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: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Ini adalah mukasurat maya'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Halaman-halaman Maya'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Halaman Maya'
diff --git a/lang/my.yml b/lang/my.yml
index 40b1eee0..863082a1 100644
--- a/lang/my.yml
+++ b/lang/my.yml
@@ -1,436 +1,3 @@
 my:
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    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 ''{title}''{description} 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'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: 'ေန ့စြဲ'
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    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'
-    PUBLISHED: Published
-    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 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'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  SearchForm:
-    GO: Go
-    SEARCH: Search
-    SearchResults: 'Search Results'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   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'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    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'
-    GroupPlaceholder: 'Click to select group'
-    HASBROKENLINKS: 'This page has broken links.'
-    HTMLEDITORTITLE: Content
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its 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 ''Pages'' section" 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:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    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:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  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: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
-    HEADER: 'This is a virtual page'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: 'Virtual Pags'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
-    SINGULARNAME: 'Virtual Page'
diff --git a/lang/nb.yml b/lang/nb.yml
index c339536b..17450724 100644
--- a/lang/nb.yml
+++ b/lang/nb.yml
@@ -1,166 +1,141 @@
 nb:
   AssetAdmin:
     ADDFILES: 'Legg til filer'
-    ActionAdd: 'Legg til folder'
+    ActionAdd: 'Legg til mappe'
     AppCategoryArchive: Arkiv
-    AppCategoryAudio: Audio
-    AppCategoryDocument: Document
-    AppCategoryFlash: Flash
+    AppCategoryDocument: Dokument
     AppCategoryImage: Bilde
-    AppCategoryVideo: Video
-    BackToFolder: 'Tilbake til folder'
+    BackToFolder: 'Tilbake til mappe'
     CREATED: Dato
-    CurrentFolderOnly: 'Begrens til nåværende folder'
+    CurrentFolderOnly: 'Begrens til nåværende mappe'
     DetailsView: Detaljer
-    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.'
+    FILES: Filer
+    FILESYSTEMSYNC: 'Synkroniser filer'
+    FILESYSTEMSYNCTITLE: 'Oppdaterer publiseringssystemets database av filene på nettstedet. Nyttig når nye filer har blitt lastet opp utenfor publiseringssystemet, for eksempel gjennom FTP.'
     FROMTHEINTERNET: 'Fra internett'
-    FROMYOURCOMPUTER: 'Fra din pc'
-    Filetype: Filtype
-    ListView: Listevisning
-    MENUTITLE: Filer
-    NEWFOLDER: 'Ny folder'
+    FROMYOURCOMPUTER: 'Fra din PC'
+    Filetype: 'Filtype'
+    ListView: 'Listevisning'
+    NEWFOLDER: Ny mappe
     SIZE: Størrelse
-    THUMBSDELETED: '{count} unused thumbnails have been deleted'
-    TreeView: Trevisning
-    Upload: 'Last opp'
+    THUMBSDELETED: '{count} ubrukte miniatyrbilder har blitt slettet.'
+    TreeView: 'Trevisning'
+    Upload: Last opp
+    MENUTITLE: Filer
   AssetAdmin_DeleteBatchAction:
-    TITLE: 'Slett foldere'
-  AssetAdmin_Tools:
-    FILTER: Filter
-  AssetAdmin_left.ss:
-    GO: Go
+    TITLE: 'Slett mapper'
+  AssetAdmin_left_ss:
+    GO: Utfør
   AssetTableField:
-    BACKLINKCOUNT: 'Used on:'
-    PAGES: page(s)
-  BackLink_Button.ss:
+    BACKLINKCOUNT: 'Brukt på:'
+    PAGES: side(r)
+  BackLink_Button_ss:
     Back: Tilbake
   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'
+    Any: Hvilken som helst
+    BROKENLINKS: 'Rapport over ødelagte lenker'
+    CheckSite: 'Sjekk nettstedet'
+    CheckSiteDropdownDraft: 'Utkastnettsted'
+    CheckSiteDropdownPublished: 'Publisert nettsted'
+    ColumnDateLastModified: 'Dato sist endret'
+    ColumnDateLastPublished: 'Dato sist publisert'
+    ColumnProblemType: 'Problemtype'
+    HasBrokenFile: 'har ødelagt fil'
+    HasBrokenLink: 'har ødelagt lenke'
+    HasBrokenLinkAndFile: 'har ødelagt lenke og fil'
     HoverTitleEditPage: 'Rediger side'
-    PageName: Sidenavn
-    ReasonDropdown: 'Problem to check'
-    ReasonDropdownBROKENFILE: 'Broken file'
-    ReasonDropdownBROKENLINK: 'Broken link'
+    PageName: 'Sidenavn'
+    ReasonDropdown: 'Problem som skal sjekkes'
+    ReasonDropdownBROKENFILE: 'Ødelagt fil'
+    ReasonDropdownBROKENLINK: 'Ødelagt lenke'
     ReasonDropdownRPBROKENLINK: 'Omdirigeringsside peker til ikke-eksisterende side'
-    ReasonDropdownVPBROKENLINK: 'Virtual page pointing to non-existent page'
-    RedirectorNonExistent: 'redirector page pointing to non-existent page'
+    ReasonDropdownVPBROKENLINK: 'Virtuell side peker til ikke-eksisterende side'
+    RedirectorNonExistent: 'omdirigeringsside peker til ikke-eksisterende side'
     VirtualPageNonExistent: 'Virtuell side peker til ikke-eksisterende side'
   CMSAddPageController:
     Title: 'Legg til side'
   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'
+    DELETED_DRAFT_PAGES: 'Slettet %d sider fra utkastnettstedet, %d feilet.'
+    DELETED_PAGES: 'Slettet %d sider fra det publiserte nettstedet, %d feilet.'
+    DELETE_DRAFT_PAGES: 'Slett fra utkastnettsted.'
     DELETE_PAGES: 'Slett fra publisert side'
-    PUBLISHED_PAGES: 'Published %d pages, %d failures'
+    PUBLISHED_PAGES: 'Publiserte %d sider, %d feilet.'
     PUBLISH_PAGES: Publiser
-    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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Slett fra utkast side'
-    DELETEFP: 'Slett fra publisert side'
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    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 ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
-    REMOVEDPAGEFROMDRAFT: 'Removed ''%s'' from the draft site'
+    ACCESS: 'Adgang til seksjon for ''{title}'''
+    ACCESS_HELP: 'Lar deg se seksjonen som inneholder sidetreet og annet innhold. Tillatelser for å vise og redigere kan behandles gjennom sidespesifikke nedtrekkslister, så vel som  separate "Innholdstillatelser".'
+    AddNew: 'Opprett ny side'
+    AddNewButton: 'Opprett ny'
+    ChoosePageParentMode: 'Velg hvor du vil opprette siden'
+    ChoosePageType: 'Velg sidetype'
+    Create: Opprett
+    DELETE: 'Slett utkast'
+    DELETEFP: Slett
+    DESCREMOVED: 'og {count} undersider.'
+    DUPLICATED: 'Vellykket duplisering av "{title}".'
+    DUPLICATEDWITHCHILDREN: 'Vellykket duplisering av "{title}" og undersider.'
+    EMAIL: Epost
+    EditTree: 'Rediger treet'
+    ListFiltered: 'Filtrerte liste.'
+    NEWPAGE: 'Ny {pagetype}'
+    PAGENOTEXISTS: 'Siden eksisterer ikke'
+    PAGES: Sider
+    PAGETYPEANYOPT: Hvilken som helst
+    PAGETYPEOPT: 'Sidetype'
+    PUBALLCONFIRM: 'Vennligst publiser hver eneste side på nettstedet, og kopier innhold til aktivt nettsted'
+    PUBALLFUN: 'Funksjonalitet for "Publiser alle"'
+    PUBALLFUN2: "Å trykke på denne knappen er det samme som å gå på hver side og trykke \"publiser\". Den er ment for å bli brukt etter at det har blitt gjort massive endringer av innholdet, som for eksempel når siden først ble laget."
+    PUBPAGES: 'Ferdig: Publiserte {count} sider.'
+    PageAdded: 'Siden ble opprettet.'
+    REMOVED: 'Slettet "{title}" {description} fra publisert nettsted.'
+    REMOVEDPAGE: 'Fjernet "{title}" fra det publiserte nettstedet'
+    REMOVEDPAGEFROMDRAFT: 'Fjernet ''%s''  fra utkastnettstedet'
     RESTORE: Gjenopprett
-    RESTORED: 'Restored ''{title}'' successfully'
-    ROLLBACK: 'Roll back to this version'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
+    RESTORED: 'Vellykket gjenoppretting av "{title}".'
+    ROLLBACK: 'Tilbakestill til denne versjonen'
+    ROLLEDBACKPUBv2: 'Tilbakestilte til den publiserte versjonen.'
+    ROLLEDBACKVERSIONv2: 'Tilbakestile til versjon #%d.'
     SAVE: Lagre
-    SAVEDRAFT: 'Save draft'
-    TabContent: Content
-    TabHistory: History
-    TabSettings: Settings
-    TreeFiltered: 'Filtered tree.'
-    TreeFilteredClear: 'Clear filter'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Apply Filter'
-    RESET: Reset
+    SAVEDRAFT: 'Lagre utkast'
+    TabContent: Innhold
+    TabHistory: Historikk
+    TabSettings: Innstillinger
+    TreeFiltered: 'Filtrerte treet.'
+    TreeFilteredClear: 'Fjern filtrering'
+    MENUTITLE: 'Rediger side'
+    AddPageRestriction: 'Merk: Noen sidetyper er ikke tillatt for dette valget.'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Aktiver filter'
+    RESET: Tilbakestill
   CMSPageAddController:
+    ParentMode_child: 'Under en annen side'
+    ParentMode_top: 'Toppnivå'
     MENUTITLE: 'Legg til side'
-    ParentMode_child: 'Under another page'
-    ParentMode_top: 'Top level'
-  CMSPageEditController:
-    MENUTITLE: 'Edit Page'
   CMSPageHistoryController:
     COMPAREMODE: 'Sammenlign modus (velg to)'
     COMPAREVERSIONS: 'Sammenlign versjoner'
-    COMPARINGVERSION: 'Comparing versions {version1} and {version2}.'
-    MENUTITLE: Historie
-    REVERTTOTHISVERSION: 'Tilbake til denne versjonen'
+    COMPARINGVERSION: 'Sammenligner versjon {version1} og {version2}.'
+    REVERTTOTHISVERSION: 'Tilbakestill til denne versjonen'
     SHOWUNPUBLISHED: 'Vis upubliserte versjoner'
     SHOWVERSION: 'Vis versjon'
     VIEW: Visning
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    VIEWINGVERSION: 'Currently viewing version {version}.'
-  CMSPageHistoryController_versions.ss:
-    AUTHOR: Forfatter
-    NOTPUBLISHED: 'Ikke utgitt'
-    PUBLISHER: Utgiver
+    VIEWINGVERSION: 'Viser versjon {version}.'
+    MENUTITLE: Historie
+    VIEWINGLATEST: 'Viser den nyeste versjonen.'
+  CMSPageHistoryController_versions_ss:
+    NOTPUBLISHED: 'Ikke publisert'
     UNKNOWN: Ukjent
     WHEN: Når
-  CMSPageSettingsController:
-    MENUTITLE: 'Rediger siden'
   CMSPagesController:
-    GalleryView: Bildevisning
-    ListView: Listevisning
-    MENUTITLE: Sider
-    TreeView: Trevisning
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: 'Drag''n''drop'
-    MULTISELECT: Multi-selection
-  CMSPagesController_Tools.ss:
-    FILTER: Filter
+    TreeView: 'Trevisning'
+  CMSPagesController_ContentToolbar_ss:
+    ENABLEDRAGGING: 'Dra-og-slipp'
+    MULTISELECT: Flervalg
   CMSSearch:
     FILTERDATEFROM: Fra
     FILTERDATEHEADING: Dato
-    FILTERDATETO: Til
-    FILTERLABELTEXT: Innhold
-  CMSSettingsController:
-    MENUTITLE: Innstillinger
   CMSSiteTreeFilter_ChangedPages:
-    Title: 'Changed pages'
+    Title: 'Endrede sider'
   CMSSiteTreeFilter_DeletedPages:
     Title: 'Alle sider, inkludert slettede'
   CMSSiteTreeFilter_Search:
@@ -168,39 +143,30 @@ nb:
   ContentControl:
     NOTEWONTBESHOWN: 'Merk: denne beskjeden vil ikke være synlig for besøkende'
   ContentController:
-    ARCHIVEDSITE: 'Preview version'
-    ARCHIVEDSITEFROM: 'Archived site from'
-    CMS: CMS
-    DRAFT: Draft
-    DRAFTSITE: 'Draft Site'
+    ARCHIVEDSITE: 'Forhåndsvis versjon'
+    ARCHIVEDSITEFROM: 'Arkivert nettsted fra '
+    CMS: Publiseringssystem
+    DRAFTSITE: 'Utkastnettsted'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Du må være logget inn i kontrollpanelet for å se utkast eller det arkiverte innholdet. <a href="%s">Klikk her for å gå tilbake til den publiserte versjonen.</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'
+    Email: Epost
+    INSTALL_SUCCESS: 'Installasjonen var vellykket!'
+    InstallFilesDeleted: 'Vellykket sletting av installasjonsfilene.'
+    InstallSecurityWarning: 'Av sikkerhetsgrunner bør du nå slette installsjonsfilene, med mindre du planlegger å reinstallere senere (<em>krever administrasjonsinnlogging, se over</em>). Webserveren trenger nå bare skrivetilgang til "assets"-mappen, så du kan fjerne skrivetilgang til alle andre mapper. <a href="{link}" style="text-align: center;">Trykk her for å slette installasjonsfilene.</a>'
+    InstallSuccessCongratulations: 'SilverStriper har blitt installert!'
+    LOGGEDINAS: 'Logget inn som'
+    LOGIN: Innlogging
+    LOGOUT: 'Logg ut'
     NOTLOGGEDIN: 'Ikke logget inn'
-    PUBLISHED: Published
-    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 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:'
+    PUBLISHEDSITE: 'Publisert nettsted'
+    Password: Passord
+    PostInstallTutorialIntro: 'Dette nettstedet er en simplistisk versjon av et nettsted for SilverStripe 3. For å utvide nettstedet kan du ta en titt på {link}.'
+    StartEditing: 'Du kan redigere innholdet ved å åpne <a href="{link}">publiseringssystemet</a>.'
+    UnableDeleteInstall: 'Klarte ikke å slette installasjonsfilene. Vennligst slett filene under manuelt'
+    VIEWPAGEIN: 'Vis side i:'
+    DRAFT: Utkast
+    PUBLISHED: Publisert
   ErrorPage:
-    CODE: Feilkode
-    DEFAULTERRORPAGECONTENT: '<p>Beklager, det ser ut til at du prøver å nå en side som ikke finnes.</p><p>Sjekk at du har skrevet riktig adresse og prøv på nytt.</p>'
-    DEFAULTERRORPAGETITLE: 'Finner ikke siden'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Sorry, there was a problem with handling your request.</p>'
-    DEFAULTSERVERERRORPAGETITLE: Serverfeil
-    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 - Dårlig Sidespørring'
+    400: '400 - Ugyldig sidespørring'
     401: '401 - Uautorisert'
     403: '403 - Forbudt'
     404: '404 - Ikke funnet'
@@ -223,214 +189,223 @@ nb:
     503: '503 - Service ikke tilgjengelig'
     504: '504 - Gateway timeout'
     505: '505 - HTTP versjon ikke støttet'
+    CODE: 'Feilkode'
+    DEFAULTERRORPAGECONTENT: '<p>Beklager, det ser ut til at du prøver å nå en side som ikke finnes.</p><p>Sjekk at du har skrevet riktig adresse og prøv på nytt.</p>'
+    DEFAULTERRORPAGETITLE: 'Siden ble ikke funnet'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>Beklager, det oppstod et problem under utføringen.</p>'
+    DEFAULTSERVERERRORPAGETITLE: 'Serverfeil'
+    DESCRIPTION: 'Egendefinert innhold for forskjellige feilsituasjoner (f.eks "Siden ble ikke funnet")'
+    ERRORFILEPROBLEM: 'Feil ved åpning av filen "{filename}". Vennligst sjekk filtillatelser.'
+    PLURALNAME: 'Feilsider'
+    SINGULARNAME: 'Feilside'
   Folder:
-    AddFolderButton: 'Legg til folder'
+    AddFolderButton: 'Legg til mappe'
     DELETEUNUSEDTHUMBNAILS: 'Slett miniatyrbilder som ikke er i bruk'
     UNUSEDFILESTITLE: 'Filer ikke i bruk'
     UNUSEDTHUMBNAILSTITLE: 'Miniatyrbilder ikke i bruk'
-    UploadFilesButton: 'Last opp'
+    UploadFilesButton: Last opp
   LeftAndMain:
-    DELETED: Deleted.
+    DELETED: Slettet.
     PreviewButton: Forhåndsvisning
-    SAVEDUP: Saved.
-    STATUSPUBLISHEDSUCCESS: 'Published ''{title}'' successfully'
-    SearchResults: Søkeresultater
-    VersionUnknown: Ukjent
+    SAVEDUP: Lagret.
+    STATUSPUBLISHEDSUCCESS: 'Vellykket publisering av "{title}".'
+    SearchResults: 'Søkeresultater'
   Permission:
-    CMS_ACCESS_CATEGORY: 'CMS Access'
+    CMS_ACCESS_CATEGORY: 'Tilgang til publiseringssystemet'
   Permissions:
-    CONTENT_CATEGORY: 'Content permissions'
-    PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    CONTENT_CATEGORY: 'Innholdstillatelser'
+    PERMISSIONS_CATEGORY: 'Rolle- og tilgangstillatelser'
   RedirectorPage:
     DESCRIPTION: 'Omdirigerer til en annen intern side'
     HASBEENSETUP: 'En omdirigeringssside har blitt satt opp uten et mål å omdirigere til.'
     HEADER: 'Denne siden vil omdirigere brukere til en annen side'
-    OTHERURL: 'Andre nettsteds URL'
-    PLURALNAME: 'Redirector Pags'
-    REDIRECTTO: 'Omdirigere til'
+    OTHERURL: 'Nettadresse til et annet nettsted'
+    PLURALNAME: 'Omdirigeringssider'
+    REDIRECTTO: 'Omdiriger til'
     REDIRECTTOEXTERNAL: 'Et annet nettsted'
     REDIRECTTOPAGE: 'En side på nettstedet'
-    SINGULARNAME: 'Redirector Page'
+    SINGULARNAME: 'Omdirigeringsside'
     YOURPAGE: 'Side på ditt nettsted'
   ReportAdmin:
+    ReportTitle: Tittel
     MENUTITLE: Rapporter
-    ReportTitle: Title
   ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
+    FILTERBY: 'Filtrer på '
   SearchForm:
     GO: Utfør
     SEARCH: Søk
-    SearchResults: Søkeresultater
+    SearchResults: 'Søkeresultater'
   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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
+    BROKENFILES: 'Sider med ødelagte lenker'
+    BROKENLINKS: 'Sider med ødelagte lenker'
+    BROKENREDIRECTORPAGES: 'Omdirigeringssider som peker til slettede sider'
+    BROKENVIRTUALPAGES: 'Virtuelle sider som peker til slettede sider'
+    BrokenLinksGroupTitle: 'Rapport over ødelagte lenker'
+    ContentGroupTitle: 'Innholdsrapporter'
+    EMPTYPAGES: 'Sider uten innhold'
+    LAST2WEEKS: 'Sider endret i de siste 2 ukene'
+    OtherGroupTitle: Andre
+    ParameterLiveCheckbox: 'Sjekk aktivt nettsted'
+    REPEMPTY: 'Rapporten for {title} er tom.'
   SilverStripeNavigatorLink:
-    ShareInstructions: 'To share a this to this page, copy and paste the link below.'
-    ShareLink: 'Del link'
+    ShareInstructions: 'For å dele en lenke til denne siden, kopier og lim inn lenken nedenfor.'
+    ShareLink: 'Del lenke'
   SilverStripeNavigatorLinkl:
     CloseLink: Lukk
   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?'
+    DEFAULTTHEME: '(Bruk standard utseende)'
+    EDITHEADER: 'Hvem kan redigere sider på dette nettstedet?'
+    EDIT_PERMISSION: 'Behandle nettstedskonfigurasjon'
+    EDIT_PERMISSION_HELP: 'Lar deg endre globale adgangsinnstillinger og tillatelser for toppnivåsider.'
+    PLURALNAME: 'Nettstedskonfigurasjoner'
+    SINGULARNAME: 'Nettstedskonfigurasjon'
+    SITENAMEDEFAULT: 'Nettstedsnavn'
+    SITETAGLINE: 'Slagord for nettstedet'
+    SITETITLE: 'Tittel for nettstedet'
+    TABACCESS: Tilgang
+    TABMAIN: Hovedinnstillinger
+    TAGLINEDEFAULT: 'slagordet ditt her'
+    THEME: Utseende
+    TOPLEVELCREATE: 'Hvem kan opprette toppnivåsider på dette nettstedet?'
+    VIEWHEADER: 'Hvem kan se sider på dette nettstedet?'
   SiteTree:
     ACCESSANYONE: Alle
     ACCESSHEADER: 'Hvem kan se denne siden?'
     ACCESSLOGGEDIN: 'Brukere som er logget inn'
     ACCESSONLYTHESE: 'Bare disse personene (velg fra listen)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
+    ADDEDTODRAFTHELP: 'Siden har ikke blitt publisert ennå'
+    ADDEDTODRAFTSHORT: Utkast
     ALLOWCOMMENTS: 'Tillat kommentarer på denne siden?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
+    APPEARSVIRTUALPAGES: 'Dette innholdet opptrer også i {title}-seksjonene til de virtuelle sidene.'
     BUTTONCANCELDRAFT: 'Avbryt endringer i utkast'
     BUTTONCANCELDRAFTDESC: 'Slett utkast og gå tilbake til publisert versjon av denne siden'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: Av-publiser
+    BUTTONSAVEPUBLISH: 'Lagre og publiser'
+    BUTTONUNPUBLISH: Avpubliser
     BUTTONUNPUBLISHDESC: 'Fjern denne siden fra det publiserte nettstedet'
-    CREATED: 'Kreasjons dato'
+    CREATED: 'Opprettelsesdato'
     Comments: Kommentarer
     Content: Innhold
-    DEFAULTABOUTCONTENT: '<p>Du kan fylle denne siden med ditt innhold, eller du kan slette siden og lage dine egne sider.<br /></p>'
+    DEFAULTABOUTCONTENT: '<p>Du kan fylle denne siden med ditt eget innhold, eller du kan slette siden og lage dine egne sider.<br /></p>'
     DEFAULTABOUTTITLE: 'Om oss'
     DEFAULTCONTACTCONTENT: '<p>Du kan fylle denne siden med ditt innhold, eller du kan slette siden og lage dine egne sider.<br /></p>'
     DEFAULTCONTACTTITLE: 'Kontakt oss'
-    DEFAULTHOMECONTENT: '<p>Velkommen til SilverStripe! Dette er standard hjemmeside. Du kan redigere siden ved å åpne <a href="admin/">CMS''n</a>. Du kan nå aksessere <a href="http://doc.silverstripe.com">dokumentasjon for utviklere</a>, eller begynne å <a href="http://doc.silverstripe.com/doku.php?id=tutorials">lære SilverStripe.</a></p>'
+    DEFAULTHOMECONTENT: '<p>Velkommen til SilverStripe! Dette er en standard side som vi har opprettet for deg. Du kan redigere denne siden ved å åpne <a href="admin/">publiseringssystemet</a>. Du kan nå se på <a href="http://doc.silverstripe.com">dokumentasjonen for utviklere</a>, eller begynne å <a href="http://doc.silverstripe.com/doku.php?id=tutorials">lære SilverStripe.</a></p>'
     DEFAULTHOMETITLE: Hjem
-    DELETEDPAGEHELP: 'Page is no longer published'
+    DELETEDPAGEHELP: 'Siden er ikke lenger publisert.'
     DELETEDPAGESHORT: Slettet
     DEPENDENT_NOTE: 'De følgende sidene avhenger av denne siden. Dette inkluderer virtuelle sider, omdirigeringssider og sider med innholdslenker.'
     DESCRIPTION: 'Generisk innholdsside'
-    DependtPageColumnLinkType: 'Link type'
-    DependtPageColumnURL: URL
     EDITANYONE: 'Alle som kan logge inn til kontrollpanelet'
     EDITHEADER: 'Hvem kan redigere dette i kontrollpanelet?'
     EDITONLYTHESE: 'Bare disse personene'
-    EDITORGROUPS: 'Redaktør grupper'
-    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: Redaktørgrupper
-    GroupPlaceholder: 'Click to select group'
+    EDITORGROUPS: 'Redaktørgrupper'
+    EDIT_ALL_HELP: 'Lar deg redigere hvilken som helst side på nettstedet, uavhengig av innstillingene på adgangsfanen. Krever at du har tilgang til sideseksjonen.'
+    Editors: 'Redaktørgrupper'
     HASBROKENLINKS: 'Denne siden har ødelagte lenker.'
     HTMLEDITORTITLE: Innhold
-    INHERIT: 'Arvet fra foreldre side'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
+    INHERIT: 'Arvet fra overordnet side'
     LASTUPDATED: 'Sist oppdatert'
     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'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: Sideplassering
-    PAGETITLE: Sidenavn
-    PAGETYPE: Sidetype
+    MENUTITLE: 'Navigasjonsetikett'
+    METADESC: 'Beskrivelse'
+    METADESCHELP: 'Søkemotorer bruker dette innholdet for å vise søkeresultater (selv om de ikke påvirker rekkefølgen).'
+    METAEXTRA: 'Egendefinerte meta-elementer'
+    METAEXTRAHELP: 'HTML-elementer for ekstra metainformasjon. For eksempel &lt;meta name="egetNavn" content="Ditt egendefinerte innhold her" /&gt;'
+    MODIFIEDONDRAFTHELP: 'Siden har upubliserte forandringer'
+    MODIFIEDONDRAFTSHORT: Endret
+    OBSOLETECLASS: 'Denne siden er av den utdaterte typen {type}. Lagring vil tilbakestille typen og kan medføre tap av informasjon.'
+    PAGELOCATION: 'Sideplassering'
+    PAGETITLE: 'Sidenavn'
+    PAGETYPE: 'Sidetype'
     PARENTID: 'Overordnet side'
-    PARENTTYPE: 'Page location'
-    PARENTTYPE_ROOT: 'Top-level page'
-    PARENTTYPE_SUBPAGE: 'Sub-page underneath a parent page'
+    PARENTTYPE: 'Sideplassering'
+    PARENTTYPE_SUBPAGE: 'Underside'
     PERMISSION_GRANTACCESS_DESCRIPTION: 'Kontroller hvilke grupper som har tilgang til eller kan endre sidene'
-    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'
+    PERMISSION_GRANTACCESS_HELP: 'Tillat tilordning av restriksjoner på sidenivå i sideseksjonen.'
+    PLURALNAME: Sider
+    PageTypNotAllowedOnRoot: 'Sidetypen "{type}" er ikke tillatt på toppnivå'
+    PageTypeNotAllowed: 'Sidetypen "{type}" er ikke tillatt som underside til denne siden.'
+    REMOVEDFROMDRAFTHELP: 'Siden er publisert, men har blitt slettet fra utkastet.'
     REMOVEDFROMDRAFTSHORT: 'Fjernet fra utkast'
-    REMOVE_INSTALL_WARNING: 'Advarsel: du burde fjerne installerte.php fra silverstripe for sikkerhetskyld'
+    REMOVE_INSTALL_WARNING: 'Advarsel: Du bør fjerne installer.php fra SilverStripe-installasjonen av sikkerhetsgrunner.'
     REORGANISE_DESCRIPTION: 'Endre nettstedets struktur'
-    REORGANISE_HELP: 'Rearrange pages in the site tree through drag&drop.'
+    REORGANISE_HELP: 'Omorganiser sidene i sidetreet ved hjelp av dra-og-slipp.'
     SHOWINMENUS: 'Vis i menyer?'
     SHOWINSEARCH: 'Vis i søk?'
-    SINGULARNAME: Page
+    SINGULARNAME: Side
     TABBEHAVIOUR: Adferd
-    TABCONTENT: Innhold
-    TABDEPENDENT: 'Dependent pages'
-    TOPLEVEL: 'Nettstedets Innhold (øverste nivå)'
-    TOPLEVELCREATORGROUPS: 'Top level creators'
-    URLSegment: 'URL Segment'
-    VIEWERGROUPS: 'Publikums grupper'
-    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 ''Pages'' section" permission'
+    TABCONTENT: 'Innhold'
+    TABDEPENDENT: 'Undersider'
+    TOPLEVEL: 'Nettstedets innhold (toppnivå)'
+    TOPLEVELCREATORGROUPS: 'Toppnivåopprettere'
+    URLSegment: 'Adressesegment'
+    VIEWERGROUPS: 'Publikumsgrupper'
+    VIEW_ALL_HELP: 'Viser alle sider på nettstedet, uavhengig av innstillingene på adgangsfanen. Krever at du har adgang til sideseksjonen.'
     VIEW_DRAFT_CONTENT: 'Se innhold i utkast'
-    VIEW_DRAFT_CONTENT_HELP: 'Gjelder visning av sider utenfor CMS i utkastmodus. Nyttig for eksterne bidragsytere uten CMS-tilgang.'
-    Viewers: Lesergrupper
+    VIEW_DRAFT_CONTENT_HELP: 'Gjelder visning av sider utenfor publiseringssystemet i utkastmodus. Nyttig for eksterne bidragsytere uten tilgang til publiseringssystemet.'
+    Viewers: 'Lesergrupper'
     Visibility: Synlighet
-    has_one_Parent: Foreldreside
-    many_many_BackLinkTracking: Referansesporing
-    many_many_ImageTracking: Bildesporing
-    many_many_LinkTracking: Lenkesporing
+    has_one_Parent: 'Overordnet side'
+    many_many_BackLinkTracking: 'Referansesporing'
+    many_many_ImageTracking: 'Bildesporing'
+    many_many_LinkTracking: 'Lenkesporing'
+    BUTTONPUBLISHED: Publisert
+    BUTTONSAVED: Lagret
+    GroupPlaceholder: 'Trykk for å velge gruppe'
+    LASTPUBLISHED: 'Sist publisert'
+    LASTSAVED: 'Sist lagret'
+    MoreOptions: 'Flere alternativer'
+    NOTPUBLISHED: 'Ikke publisert'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
+    HelpChars: 'Spesialtegn blir automatisk konvertert eller fjernet.'
+    EMPTY: 'Vennligst skriv inn adressesegment eller trykk avbryt.'
   StaticExporter:
-    BASEURL: 'Base URL'
-    EXPORTTO: 'Eksporter til folderen'
+    BASEURL: 'Basisadresse'
+    EXPORTTO: 'Eksporter til mappen'
     NAME: 'Eksport av statiske sider'
   TableListField:
     SELECT: 'Velg:'
-  TableListField.ss:
-    NOITEMSFOUND: 'No items found'
+  TableListField_ss:
+    NOITEMSFOUND: 'Ingen elementer ble funnet'
     SORTASC: 'Sorter i stigende rekkefølge'
     SORTDESC: 'Sorter i synkende rekkefølge'
-  TableListField_PageControls.ss:
-    DISPLAYING: Displaying
-    OF: of
-    TO: to
+  TableListField_PageControls_ss:
+    DISPLAYING: Viser
+    OF: av
+    TO: til
     VIEWFIRST: 'Se første'
     VIEWLAST: 'Se siste'
     VIEWNEXT: 'Se neste'
     VIEWPREVIOUS: 'Se forrige'
   TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
-    CANACCESS: 'You can access the archived site at this link:'
-    HAVEASKED: 'You have asked to view the content of our site on'
+    DisplayLabel: 'Vis:'
+  ViewArchivedEmail_ss:
+    CANACCESS: 'Du kan besøke det arkiverte nettstedet med denne lenken:'
+    HAVEASKED: 'Du har bedt om å vise innholdet på nettstedet vårt på '
   VirtualPage:
-    CHOOSE: 'Linked Page'
+    CHOOSE: 'Lenket side'
     DESCRIPTION: 'Viser innholdet av en annen side'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
+    EDITCONTENT: 'Rediger innhold på lenket side'
     HEADER: 'Dette er en virituell side'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: 'Virtuelle Sider'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
-    SINGULARNAME: 'Virtuell Side'
+    PLURALNAME: 'Virtuelle sider'
+    PageTypNotAllowedOnRoot: 'Originaltypen "{type}" er ikke tillatt på toppnivået for denne virtuelle siden.'
+    SINGULARNAME: 'Virtuell side'
+    EditLink: rediger
+    HEADERWITHLINK: 'Dette er en virtuell side som kopierer innhold fra "{title}" ({link})'
+  CMSFileAddController:
+    MENUTITLE: Filer
+  CMSPageEditController:
+    MENUTITLE: 'Rediger side'
+  CMSPageSettingsController:
+    MENUTITLE: 'Rediger siden'
+  CMSSettingsController:
+    MENUTITLE: Innstillinger
+  SITETREE:
+    VIRTUALPAGEDRAFTWARNING: 'Vennligst publiser den lenkede siden for å publisere den virtuelle siden'
+    VIRTUALPAGEWARNING: 'Vennligst velg en lenket side og lagre først for å publisere denne siden'
+    VIRTUALPAGEWARNINGSETTINGS: 'Vennligst velg en lenket side i hovedinnholdsfeltene for å publisere siden'
+  SilverStripeNavigator:
+    ARCHIVED: Arkivert
+  URLSegmentField:
+    Cancel: Avbryt
+    Edit: Rediger
diff --git a/lang/ne.yml b/lang/ne.yml
index 330a599e..3312e896 100644
--- a/lang/ne.yml
+++ b/lang/ne.yml
@@ -1,436 +1,41 @@
 ne:
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    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 ''{title}''{description} 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'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    VIEWINGVERSION: 'Currently viewing version {version}.'
-  CMSPageHistoryController_versions.ss:
-    AUTHOR: लेखक
-    NOTPUBLISHED: 'Not published'
-    PUBLISHER: Publisher
-    UNKNOWN: Unknown
-    WHEN: कहिले
-  CMSPageSettingsController:
-    MENUTITLE: 'Edit Page'
-  CMSPagesController:
-    GalleryView: 'Gallery View'
-    ListView: 'List View'
-    MENUTITLE: पानाहरू
-    TreeView: 'Tree View'
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: 'Drag''n''drop'
-    MULTISELECT: Multi-selection
-  CMSPagesController_Tools.ss:
-    FILTER: Filter
-  CMSSearch:
-    FILTERDATEFROM: बाट
-    FILTERDATEHEADING: मिति
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  CMSSettingsController:
-    MENUTITLE: Settings
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Changed pages'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'All pages, including deleted'
-  CMSSiteTreeFilter_Search:
-    Title: 'सबै पानाहरू'
-  ContentControl:
-    NOTEWONTBESHOWN: 'Note: this message will not be shown to your visitors'
   ContentController:
-    ARCHIVEDSITE: 'Preview version'
-    ARCHIVEDSITEFROM: 'Archived site from'
-    CMS: CMS
-    DRAFT: Draft
-    DRAFTSITE: 'Draft Site'
     DRAFT_SITE_ACCESS_RESTRICTION: 'यदि तपाईं draft अथवा archived सामाग्री हेर्न चाहानुहुन्छ भन्ने आफ्नो CMSको पासओडले भित्र जानुपर्छ । <a href="%s">प्रकाशित साईटमा जान यहाँ थिचु्नुहोस् ।  </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'
-    PUBLISHED: Published
-    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 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: 'त्रुटी सङ्केत '
-    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: 'कुनै पनि पुनर्निर्देशनबिना नै एउटा पुनर्निदेशन पृष्ठ सेटअप गरियो । '
     HEADER: 'यो पेजले प्रयोगकतालाई अर्को पेजमा लैजान्छ'
     OTHERURL: 'अर्को वेबसाईटको यू.र्.ल्'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'अर्को पेजमा लैजाउ'
     REDIRECTTOEXTERNAL: 'अर्को वेबसाईट'
     REDIRECTTOPAGE: 'तपाईंको वेबसाईटमा एउटा पेज'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'तपाईंको वेबसाईटमा एउटा पेज'
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  SearchForm:
-    GO: Go
-    SEARCH: Search
-    SearchResults: 'Search Results'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'To share a this to this page, copy and paste the link below.'
-    ShareLink: 'Share link'
-  SilverStripeNavigatorLinkl:
-    CloseLink: बन्द
-  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: जोकोहिले
     ACCESSHEADER: 'मेरो सईटमा कसले यो पजे हेर्न सक्छ ? '
     ACCESSLOGGEDIN: 'भित्र छिरेक प्रयोगकर्तहरु'
     ACCESSONLYTHESE: 'यि मान्छे मात्र (लिस्टबाट छान्)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'यो पजेमा प्रतिक्रिया लेखन् दिनुहोस् ?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'द्राफ्ट्रमा भएका परिवर्तनहरु क्यान्सिल गर्नुहोस् '
     BUTTONCANCELDRAFTDESC: 'द्राफ्ट्र हटाउनुहोस् र प्रकाशित पेजमा जानुहोस्'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'प्रकाशित नगरनुहोस्'
+    BUTTONUNPUBLISH: प्रकाशित नगरनुहोस्
     BUTTONUNPUBLISHDESC: 'प्रकाशित साईटबाट यो पेजलाई हटाउनुहोस्'
-    CREATED: 'Date Created'
-    Comments: Comments
-    Content: Content
-    DEFAULTABOUTCONTENT: '<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>'
-    DEFAULTABOUTTITLE: 'हाम्रो बारे'
-    DEFAULTCONTACTCONTENT: '<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>'
-    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: 'जोकोहिले जो सि.म्.एस् भित्र छिरेका छन्'
     EDITHEADER: 'कसले यो CMS भित्र मिलाउन सक्छ ?'
     EDITONLYTHESE: 'यि मान्छे मात्र (लिस्टबाट छान्)'
-    EDITORGROUPS: 'Editor Groups'
-    EDIT_ALL_DESCRIPTION: 'Edit any page'
-    EDIT_ALL_HELP: 'Ability to edit any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
-    Editors: 'Editors Groups'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'यो पजेमा टुटेका लिन्कहरु छन् ।'
     HTMLEDITORTITLE: सामाग्री
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
-    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'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: 'Page location'
+    METADESC: 'विवरण'
     PAGETITLE: 'पेजको नाम'
     PAGETYPE: 'पेज किसिम'
-    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: 'मेनुमा देखाउनुहोस् ? '
     SHOWINSEARCH: 'खोजिमा देखाउनुहोस् ?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: बनी
-    TABCONTENT: सामाग्री
-    TABDEPENDENT: 'Dependent pages'
+    TABCONTENT: 'सामाग्री'
     TOPLEVEL: 'साईट सामाग्री (उच्च स्तान)'
-    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 ''Pages'' section" 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:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    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:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  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: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'यो भरचुअल पेज हो'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: 'Virtual Pags'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
-    SINGULARNAME: 'Virtual Page'
diff --git a/lang/nl.yml b/lang/nl.yml
index 7c67e229..1d6e07c8 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -1,56 +1,48 @@
 nl:
   AssetAdmin:
-    ADDFILES: Bestanden
+    ADDFILES: 'Bestanden'
     ActionAdd: 'Map toevoegen'
     AppCategoryArchive: Archiveer
-    AppCategoryAudio: Audio
-    AppCategoryDocument: Document
-    AppCategoryFlash: Flash
     AppCategoryImage: Afbeelding
-    AppCategoryVideo: Video
     BackToFolder: 'Terug naar map'
     CREATED: Datum
     CurrentFolderOnly: 'Tot de huidige map beperken?'
-    DetailsView: Details
     FILES: Bestanden
     FILESYSTEMSYNC: 'Bestanden synchroniseren'
     FILESYSTEMSYNCTITLE: 'Zoek naar nieuwe of verwijderde bestanden op de schijf, om de database van het CMS bij te werken. Dit is nodig als er bestanden via FTP (of andere wijze) zijn toegevoegd.'
     FROMTHEINTERNET: 'Van het internet'
     FROMYOURCOMPUTER: 'Vanaf computer'
-    Filetype: Bestandstype
-    ListView: Lijstweergave
-    MENUTITLE: Bestanden
-    NEWFOLDER: 'Nieuwe Map'
+    Filetype: 'Bestandstype'
+    ListView: 'Lijstweergave'
+    NEWFOLDER: Nieuwe Map
     SIZE: Omvang
     THUMBSDELETED: '{count} ongebruikte miniatuur afbeeldingen zijn verwijderd'
-    TreeView: Boomstructuur
+    TreeView: 'Boomstructuur'
     Upload: Uploaden
+    MENUTITLE: Bestanden
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Verwijder mappen'
-  AssetAdmin_Tools:
-    FILTER: Filter
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Doen
   AssetTableField:
     BACKLINKCOUNT: 'Gebruikt op:'
     PAGES: pagina(s)
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Terug
   BrokenLinksReport:
     Any: Alles
     BROKENLINKS: 'Verbroken verwijzingen rapportage'
     CheckSite: 'Controleer site'
-    CheckSiteDropdownDraft: Concept-site
+    CheckSiteDropdownDraft: 'Concept-site'
     CheckSiteDropdownPublished: 'Gepubliceerde Site'
     ColumnDateLastModified: 'Laatste wijzigingsdatum'
     ColumnDateLastPublished: 'Laatste publicatiedatum'
     ColumnProblemType: 'Probleem type'
-    ColumnURL: URL
     HasBrokenFile: 'heeft verbroken bestand'
     HasBrokenLink: 'heeft verbroken link'
     HasBrokenLinkAndFile: 'heeft verbroken link en bestand'
     HoverTitleEditPage: 'Wijzig pagina'
-    PageName: Paginanaam
+    PageName: 'Paginanaam'
     ReasonDropdown: 'Te controleren probleem'
     ReasonDropdownBROKENFILE: 'Verbroken bestand'
     ReasonDropdownBROKENLINK: 'Verbroken link'
@@ -68,35 +60,29 @@ nl:
     PUBLISHED_PAGES: '%d pagina''s gepubliceerd'
     PUBLISH_PAGES: Publiceer
     UNPUBLISHED_PAGES: 'Publicatie van %d pagina''s ingetrokken'
-    UNPUBLISH_PAGES: 'Publicatie intrekken'
-  CMSFileAddController:
-    MENUTITLE: Bestanden
+    UNPUBLISH_PAGES: Publicatie intrekken
   CMSMain:
     ACCESS: 'Toegang tot het ''{title}'' gedeelte'
     ACCESS_HELP: 'Bevoegdheid voor bekijken van pagina tak en inhoudssecties. Bekijk- en bewerkingstoestemmingen kunnen worden toegekend door pagina specifieke menu''s en het aparte "Inhoudsmachtigingen".'
     AddNew: 'Voeg nieuwe pagina toe'
-    AddNewButton: Nieuw
-    AddPageRestriction: 'Opmerking: Sommige pagina types zijn niet toegestaan ​​voor deze selectie'
+    AddNewButton: 'Nieuw'
     ChoosePageParentMode: 'Kies waar u deze pagina wilt creëren'
     ChoosePageType: 'Kies een pagina type'
     Create: Creëer
     DELETE: 'Verwijder van de ontwerp webpagina'
-    DELETEFP: 'Verwijder van de gepubliceerde webpagina'
+    DELETEFP: Verwijder van de gepubliceerde webpagina
     DESCREMOVED: 'en {count} onderliggende'
     DUPLICATED: '''{title}'' succesvol gedupliceerd'
     DUPLICATEDWITHCHILDREN: '''{title}'' en kinderen succesvol gedupliceerd'
-    EMAIL: Email
     EditTree: 'Menu indelen'
-    ListFiltered: 'Gefilterde lijst.'
-    MENUTITLE: 'Wijzig pagina'
     NEWPAGE: 'Nieuwe {pagetype}'
     PAGENOTEXISTS: 'Deze pagina bestaat niet'
-    PAGES: 'Pagina ''s'
+    PAGES: Pagina 's
     PAGETYPEANYOPT: Elke
     PAGETYPEOPT: 'Pagina type'
     PUBALLCONFIRM: 'Publiceer elke pagina van de site waarbij de inhoud van de concept site gekopieerd wordt naar de live site.'
     PUBALLFUN: '"Publiceer Alles" functionaliteit'
-    PUBALLFUN2: 'Op deze knop klikken heeft hetzelfde resultaat als alle pagina''s apart publiceren. Hij is bedoeld om een groot aantal wijzigingen in een keer te publiceren.'
+    PUBALLFUN2: "Op deze knop klikken heeft hetzelfde resultaat als alle pagina's apart publiceren. Hij is bedoeld om een groot aantal wijzigingen in een keer te publiceren."
     PUBPAGES: 'Gereed: {count} pagina''s gepubliceerd'
     PageAdded: 'Pagina succesvol gecreëerd'
     REMOVED: '''{title}''{description} verwijderd van de live site'
@@ -113,52 +99,45 @@ nl:
     TabHistory: Geschiedenis
     TabSettings: Instellingen
     TreeFiltered: 'Gefilterde boomstructuur.'
-    TreeFilteredClear: 'Filter resetten'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Filter toepassen'
-    RESET: Reset
+    MENUTITLE: 'Wijzig pagina'
+    AddPageRestriction: 'Opmerking: Sommige pagina types zijn niet toegestaan ​​voor deze selectie'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Filter toepassen'
   CMSPageAddController:
-    MENUTITLE: 'Pagina toevoegen'
     ParentMode_child: 'Onder een andere pagina'
     ParentMode_top: 'Hoogste niveau'
-  CMSPageEditController:
-    MENUTITLE: 'Wijzig Pagina'
+    MENUTITLE: 'Pagina toevoegen'
   CMSPageHistoryController:
     COMPAREMODE: 'Vergelijken (selecteer 2)'
     COMPAREVERSIONS: 'Vergelijk Versies'
     COMPARINGVERSION: 'U vergelijkt versie {version1} en {version2}.'
-    MENUTITLE: Geschiedenis
     REVERTTOTHISVERSION: 'Deze versie terugzetten'
     SHOWUNPUBLISHED: 'Toon nog niet gepubliceerde versies'
     SHOWVERSION: 'Toon Versie'
     VIEW: toon
-    VIEWINGLATEST: 'U bekijkt nu de laatste versie.'
     VIEWINGVERSION: 'U bekijkt nu versie {version}.'
-  CMSPageHistoryController_versions.ss:
+    MENUTITLE: Geschiedenis
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Auteur
     NOTPUBLISHED: 'Niet gepubliceerd'
     PUBLISHER: Uitgever
     UNKNOWN: Onbekend
     WHEN: Wanneer
-  CMSPageSettingsController:
-    MENUTITLE: 'Wijzig pagina'
   CMSPagesController:
     GalleryView: 'Album weergave'
-    ListView: Lijstweergave
-    MENUTITLE: 'Pagina''s'
+    ListView: 'Lijstweergave'
+    MENUTITLE: Pagina's
     TreeView: 'Hierarchische weergave'
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: Slepen
-    MULTISELECT: 'Meervoudige selectie'
-  CMSPagesController_Tools.ss:
+  CMSPagesController_ContentToolbar_ss:
+    ENABLEDRAGGING: 'Slepen'
+    MULTISELECT: Meervoudige selectie
+  CMSPagesController_Tools_ss:
     FILTER: Filteren
   CMSSearch:
     FILTERDATEFROM: Van
     FILTERDATEHEADING: Datum
     FILTERDATETO: Aan
     FILTERLABELTEXT: Inhoud
-  CMSSettingsController:
-    MENUTITLE: Instellingen
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Gewijzigde pagina''s'
   CMSSiteTreeFilter_DeletedPages:
@@ -168,11 +147,8 @@ nl:
   ContentControl:
     NOTEWONTBESHOWN: 'Aantekening: dit bericht is niet zichtbaar voor bezoekers'
   ContentController:
-    ARCHIVEDSITE: 'Voorbeeld versie'
     ARCHIVEDSITEFROM: 'Gearchiveerde site van'
-    CMS: CMS
-    DRAFT: Concept
-    DRAFTSITE: Concept-site
+    DRAFTSITE: 'Concept-site'
     DRAFT_SITE_ACCESS_RESTRICTION: 'U moet inloggen met Uw CMS wachtwoord om die inhoud te kunnen zien. <a href="%s">Klik hier</a> om terug te keren naar de gepubliceerde site.'
     Email: E-mail
     INSTALL_SUCCESS: 'Installatie voltooid!'
@@ -181,25 +157,17 @@ nl:
     InstallSuccessCongratulations: 'SilverStripe is ge&Iuml;nstalleerd!'
     LOGGEDINAS: 'Ingelogd als'
     LOGIN: Inloggen
-    LOGOUT: Uitloggen
+    LOGOUT: 'Uitloggen'
     NOTLOGGEDIN: 'Niet ingelogd'
-    PUBLISHED: Gepubliceerd
     PUBLISHEDSITE: 'Gepubliceerde site'
     Password: Wachtwoord
     PostInstallTutorialIntro: 'Deze website is een eenvoudige versie van een SilverStripe 3 website. Voor uitbreidingen kunt je hier een kijkje nemen: {link}.'
     StartEditing: 'Je kunt de inhoud aanpassen via <a href="{link}">het CMS</a>.'
     UnableDeleteInstall: 'De installatiebestanden konden niet verwijderd worden. Verwijder onderstaande bestanden alstublieft handmatig.'
     VIEWPAGEIN: 'Bekijk pagina in:'
+    DRAFT: Concept
+    PUBLISHED: Gepubliceerd
   ErrorPage:
-    CODE: Foutcode
-    DEFAULTERRORPAGECONTENT: '<p>Sorry, maar de pagina die je zocht lijkt niet te bestaan.</p><p>Gelieve de spelling van de url te controleren en het opnieuw te proberen.</p>'
-    DEFAULTERRORPAGETITLE: 'Pagina niet gevonden'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Helaas, er was een probleem bij het verwerken van je verzoek.</p>'
-    DEFAULTSERVERERRORPAGETITLE: 'Probleem met de server'
-    DESCRIPTION: 'Aangepaste tekst voor verschillende foutmeldingen (bijv: "Pagina niet gevonden")'
-    ERRORFILEPROBLEM: 'Fout: "{filename}" kan niet geopend worden om te schrijven. Controleer alstublieft de bestandspermissies.'
-    PLURALNAME: 'Fout Pagina''s'
-    SINGULARNAME: 'Fout Pagina'
     400: '400 - Foute Vraag'
     401: '401 - Geen toestemming'
     403: '403 - Geen toegang'
@@ -208,7 +176,6 @@ nl:
     406: '406 - Niet toegankelijk'
     407: '407 - Proxy Auhenticatie Vereist'
     408: '408 - Vraag verlopen'
-    409: '409 - Conflict'
     410: '410 - Verdwenen'
     411: '411 - Lengte vereist'
     412: '412 - Voorwaarde gefaald'
@@ -221,8 +188,15 @@ nl:
     501: '501 -  Niet geïmplementeerd'
     502: '502 - Slechte Gateway'
     503: '503 - Service niet beschikbaar'
-    504: '504 - Gateway Timeout'
     505: '505 - HTTP Versie Niet Ondersteund'
+    CODE: 'Foutcode'
+    DEFAULTERRORPAGECONTENT: '<p>Sorry, maar de pagina die je zocht lijkt niet te bestaan.</p><p>Gelieve de spelling van de url te controleren en het opnieuw te proberen.</p>'
+    DEFAULTERRORPAGETITLE: 'Pagina niet gevonden'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>Helaas, er was een probleem bij het verwerken van je verzoek.</p>'
+    DEFAULTSERVERERRORPAGETITLE: 'Probleem met de server'
+    DESCRIPTION: 'Aangepaste tekst voor verschillende foutmeldingen (bijv: "Pagina niet gevonden")'
+    ERRORFILEPROBLEM: 'Fout: "{filename}" kan niet geopend worden om te schrijven. Controleer alstublieft de bestandspermissies.'
+    PLURALNAME: 'Fout Pagina''s'
   Folder:
     AddFolderButton: 'Map toevoegen'
     DELETEUNUSEDTHUMBNAILS: 'Verwijder ongebruikte thumbnails'
@@ -232,14 +206,14 @@ nl:
   LeftAndMain:
     DELETED: Verwijderd.
     PreviewButton: Voorbeeld
-    SAVEDUP: Bewaard.
+    SAVEDUP: Opgeslagen.
     STATUSPUBLISHEDSUCCESS: '''{title}'' is succesvol gepubliceerd'
-    SearchResults: Zoekresultaten
+    SearchResults: 'Zoekresultaten'
     VersionUnknown: Onbekend
   Permission:
     CMS_ACCESS_CATEGORY: 'CMS Toegang'
   Permissions:
-    CONTENT_CATEGORY: Inhoudsrechten
+    CONTENT_CATEGORY: 'Inhoudsrechten'
     PERMISSIONS_CATEGORY: 'Rollen en toegangsrechten'
   RedirectorPage:
     DESCRIPTION: 'Verwijst naar een andere pagina op deze site'
@@ -250,35 +224,27 @@ nl:
     REDIRECTTO: 'Doorverwijzen naar'
     REDIRECTTOEXTERNAL: 'Een andere website'
     REDIRECTTOPAGE: 'Een pagina op deze website'
-    SINGULARNAME: Verwijzingspagina
     YOURPAGE: 'Pagina op deze website'
   ReportAdmin:
     MENUTITLE: Rapporten
-    ReportTitle: Titel
   ReportAdminForm:
     FILTERBY: 'Filter op'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'U dient eerst de gekoppelde pagina te publiceren voordat u de virtuele pagina publiceert.'
-    VIRTUALPAGEWARNING: 'U dient eerst een gekoppelde pagina te selecteren en op te slaan voordat u deze pagina kunt publiceren.'
-    VIRTUALPAGEWARNINGSETTINGS: 'U dient een gekoppelde pagina te selecteren in de inhoud velden voor dat u kunt publiceren.'
   SearchForm:
     GO: Zoeken
     SEARCH: Zoeken
-    SearchResults: Zoekresultaten
+    SearchResults: 'Zoekresultaten'
   SideReport:
     BROKENFILES: 'Pagina''s met verbroken bestanden'
     BROKENLINKS: 'Pagina''s met verbroken verwijzingen'
     BROKENREDIRECTORPAGES: 'RedirectorPages die naar verwijderde pagina''s verwijzen'
     BROKENVIRTUALPAGES: 'VirtuelePagina''s die naar verwijderde pagina''s verwijzen'
     BrokenLinksGroupTitle: 'Verbroken verwijzingen raportage'
-    ContentGroupTitle: Inhoudsrapportages
+    ContentGroupTitle: 'Inhoudsrapportages'
     EMPTYPAGES: 'Lege pagina''s'
     LAST2WEEKS: 'Pagina''s gewijzigd in de laatste twee weken'
     OtherGroupTitle: Anders
     ParameterLiveCheckbox: 'Controleer gepubliceerde site'
     REPEMPTY: 'Het {title} rapport is leeg.'
-  SilverStripeNavigator:
-    ARCHIVED: Gearchiveerd
   SilverStripeNavigatorLink:
     ShareInstructions: 'Kopieer en plak de link hieronder, om een link te delen op deze pagina.'
     ShareLink: 'Deel een link'
@@ -311,10 +277,8 @@ nl:
     APPEARSVIRTUALPAGES: 'Deze inhoud verschijnt ook op de virtuele pagina''s in de {title} gedeeltes.'
     BUTTONCANCELDRAFT: 'Annuleer veranderingen op dit concept'
     BUTTONCANCELDRAFTDESC: 'Verwijder het concept en zet de gepubliceerde pagina''s naar deze concept pagina'
-    BUTTONPUBLISHED: Gepubliceerd
-    BUTTONSAVED: Bewaard.
     BUTTONSAVEPUBLISH: 'Opslaan & publiceren'
-    BUTTONUNPUBLISH: 'Publicatie intrekken'
+    BUTTONUNPUBLISH: Publicatie intrekken
     BUTTONUNPUBLISHDESC: 'Deze pagina verwijderen uit de gepubliceerde site'
     CREATED: 'Datum gemaakt'
     Comments: Commentaar
@@ -322,40 +286,29 @@ nl:
     DEFAULTABOUTCONTENT: '<p>Je kan deze pagina van je eigen inhoud voorzien of de pagina verwijderen en een nieuwe aanmaken.</p>'
     DEFAULTABOUTTITLE: 'Over Ons'
     DEFAULTCONTACTCONTENT: '<p>Je kan deze pagina vullen met je eigen inhoud, of ze verwijderen en je eigen pagina''s aanmaken.</p>'
-    DEFAULTCONTACTTITLE: Contact
+    DEFAULTCONTACTTITLE: 'Contact'
     DEFAULTHOMECONTENT: '<p>Welkom bij Silverstripe! Dit is de standaard homepagina. Je kan deze pagina wijzigen door <a href="admin/">het CMS</a> te openen. Je kan nu de <a href="http://doc.silverstripe.com">documentatie voor ontwikkelaars</a> bekijken, of aan <a href="http://doc.silverstripe.com/doku.php?id=tutorials">de tutorials</a> beginnen.'
-    DEFAULTHOMETITLE: Home
     DELETEDPAGEHELP: 'Deze pagina is niet langer gepubliceerd'
     DELETEDPAGESHORT: Verwijderd
     DEPENDENT_NOTE: 'De volgende pagina''s zijn afhankelijk van deze pagina. Hieronder vallen virtuelepagina''s, verwijsingspagina''s en pagina''s met links in de inhoud.'
     DESCRIPTION: 'Algemene tekst pagina'
-    DependtPageColumnLinkType: 'Link type'
-    DependtPageColumnURL: URL
     EDITANYONE: 'Iedereen die kan inloggen in het CMS'
     EDITHEADER: 'Wie kan deze pagina wijzigen?'
     EDITONLYTHESE: 'Alleen deze gebruikers (kies uit de lijst)'
-    EDITORGROUPS: Wijziginggroepen
+    EDITORGROUPS: 'Wijziginggroepen'
     EDIT_ALL_DESCRIPTION: 'Kan iedere pagina wijzigen, ongeacht de specifieke pagina beveiliging'
     EDIT_ALL_HELP: 'Bevoegdheid om alle pagina''s op de site te wijzigen, onafhankelijk van de instellingen in het ''Toegang'' tabblad. Vereist "Toegang tot site inhoud" rechten'
-    Editors: Redacteursgroepen
-    GroupPlaceholder: 'Klik om de groep te selecteren'
+    Editors: 'Redacteursgroepen'
     HASBROKENLINKS: 'Deze pagina heeft gebroken links.'
     HTMLEDITORTITLE: Inhoud
     INHERIT: 'Overnemen van de bovenliggende pagina'
-    LASTPUBLISHED: 'Laatste publicatiedatum'
-    LASTSAVED: 'Laatste keer opgeslagen'
     LASTUPDATED: 'Laatst bijgewerkt'
     LINKCHANGENOTE: 'Het veranderen van de link van deze pagina beïnvloed de links van alle onderliggende pagina''s. '
     MENUTITLE: 'Navigatie label'
-    METADESC: Omschrijving
-    METADESCHELP: 'Zoekmachines gebruiken deze omschrijving voor het weergeven van zoekresultaten. Het heeft geen invloed op de positie binnen de resultaten.'
+    METADESC: 'Omschrijving'
     METAEXTRA: 'Aangepaste Meta Labels'
-    METAEXTRAHELP: 'HTML tags voor aanvullende meta-informatie. Bijvoorbeeld: &lt;meta name="aanvullendeTag" content="de aanvullende informatie plaats je hier" /&gt;'
     MODIFIEDONDRAFTHELP: 'Pagina heeft wijzigingen die nog niet gepubliceerd zijn'
     MODIFIEDONDRAFTSHORT: Aangepast
-    MetadataToggle: Metadata
-    MoreOptions: 'Meer opties'
-    NOTPUBLISHED: 'Niet gepubliceerd'
     OBSOLETECLASS: 'Deze pagina is van het type {type}. Dit type is niet meer in gebruik. Het opslaan van deze pagina zal het type wijzigen. Hierbij kan data verloren gaan.'
     PAGELOCATION: 'Pagina locatie'
     PAGETITLE: 'Pagina titel'
@@ -366,7 +319,7 @@ nl:
     PARENTTYPE_SUBPAGE: 'Subpagina onder bovenliggende pagina (kies hieronder)'
     PERMISSION_GRANTACCESS_DESCRIPTION: 'Instellen welke groepen toegang hebben tot bepaalde pagina''s of deze kunnen bewerken'
     PERMISSION_GRANTACCESS_HELP: 'Bevoegdheid om pagina specifieke toegangsrechten in de "Pagina''s" sectie te wijzigen.'
-    PLURALNAME: 'Pagina&rsquo;s'
+    PLURALNAME: Pagina&rsquo;s
     PageTypNotAllowedOnRoot: 'Paginatype "{type}" is niet toegestaan op het hoogste niveau'
     PageTypeNotAllowed: 'Pagina type "{type}" mag niet ondergeschikt zijn aan deze bovenliggende pagina'
     REMOVEDFROMDRAFTHELP: 'Deze pagina is gepubliceerd, maar verwijderd uit de conceptsite'
@@ -378,59 +331,68 @@ nl:
     SHOWINSEARCH: 'Weergeven in zoeken?'
     SINGULARNAME: Pagina
     TABBEHAVIOUR: Gedrag
-    TABCONTENT: Inhoud
+    TABCONTENT: 'Inhoud'
     TABDEPENDENT: 'Afhankelijke pagina''s'
     TOPLEVEL: 'Site Inhoud (Top Niveau)'
     TOPLEVELCREATORGROUPS: 'Hoogste niveau auteurs'
-    URLSegment: 'URL Segment'
-    VIEWERGROUPS: Toegangsgroepen
+    VIEWERGROUPS: 'Toegangsgroepen'
     VIEW_ALL_DESCRIPTION: 'Kan iedere pagina op de website bekijken, ongeacht de specifieke pagina instelling'
     VIEW_ALL_HELP: 'Bevoegdheid om alle pagina''s op de site te wijzigen, onafhankelijk van de instellingen in het ''Toegang'' tabblad. Vereist "Toegang tot site inhoud" rechten'
     VIEW_DRAFT_CONTENT: 'Bekijk concept inhoud'
     VIEW_DRAFT_CONTENT_HELP: 'Bevoegdheid om pagina''s buiten het CMS in concept mode te bekijken. Nuttig voor externe medewerkers zonder CMS toegang.'
-    Viewers: Gebruikersgroepen
+    Viewers: 'Gebruikersgroepen'
     Visibility: Zichtbaarheid
     has_one_Parent: 'Bovenliggende pagina'
     many_many_BackLinkTracking: 'Wederlink Volgen'
     many_many_ImageTracking: 'Afbeelding Volgen'
     many_many_LinkTracking: 'Link Volgen'
+    BUTTONPUBLISHED: Gepubliceerd
+    BUTTONSAVED: Opgeslagen
+    GroupPlaceholder: 'Klik om de groep te selecteren'
+    LASTPUBLISHED: 'Laatste publicatiedatum'
+    LASTSAVED: 'Laatste keer opgeslagen'
+    MoreOptions: 'Meer opties'
+    NOTPUBLISHED: 'Niet gepubliceerd'
   SiteTreeURLSegmentField:
-    EMPTY: 'Vul een URL Segment in of selecteer annuleren'
     HelpChars: 'Speciale tekens worden automatische omgezet of verwijderd.'
+    EMPTY: 'Vul een URL Segment in of selecteer annuleren'
   StaticExporter:
     BASEURL: 'Basis URL'
     EXPORTTO: 'Exporteren naar die map'
     NAME: 'Statische export'
   TableListField:
     SELECT: 'Selecteer:'
-  TableListField.ss:
+  TableListField_ss:
     NOITEMSFOUND: 'Geen items gevonden'
     SORTASC: 'Sorteer op oplopende volgorde'
     SORTDESC: 'Sorteer op aflopende volgorde'
-  TableListField_PageControls.ss:
-    DISPLAYING: Tonen
-    OF: van
-    TO: naar
+  TableListField_PageControls_ss:
     VIEWFIRST: 'Bekijk eerste'
     VIEWLAST: 'Bekijk laatste'
     VIEWNEXT: 'Toon volgende'
     VIEWPREVIOUS: 'Bekijk vorige'
   TreeTools:
     DisplayLabel: 'Weergeven:'
-  URLSegmentField:
-    Cancel: Annuleer
-    Edit: Bewerken
-    OK: Ok
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'U kunt de gearchiveerde site bekijken via deze link:'
     HAVEASKED: 'U heeft de inhoud van onze site opgevraagd op'
   VirtualPage:
-    CHOOSE: 'Gekoppelde pagina'
     DESCRIPTION: 'Geeft de inhoud van een andere pagina weer'
-    EDITCONTENT: 'Bewerk inhoud van de gekoppelde pagina'
-    EditLink: Bewerken
     HEADER: 'Dit is een virtuele pagina'
-    HEADERWITHLINK: 'Deze virtuele pagina kopieert de inhoud van "{title}" ({link})'
     PLURALNAME: 'Virtuele pagina''s'
     PageTypNotAllowedOnRoot: 'Voor deze virtuele pagina is het originele paginatype "{type}" niet toegestaan op het hoogste niveau.'
     SINGULARNAME: 'Virtuele Pagina'
+  CMSFileAddController:
+    MENUTITLE: Bestanden
+  CMSPageEditController:
+    MENUTITLE: 'Wijzig Pagina'
+  CMSPageSettingsController:
+    MENUTITLE: 'Wijzig pagina'
+  CMSSettingsController:
+    MENUTITLE: Instellingen
+  SITETREE:
+    VIRTUALPAGEDRAFTWARNING: 'U dient eerst de gekoppelde pagina te publiceren voordat u de virtuele pagina publiceert.'
+    VIRTUALPAGEWARNING: 'U dient eerst een gekoppelde pagina te selecteren en op te slaan voordat u deze pagina kunt publiceren.'
+    VIRTUALPAGEWARNINGSETTINGS: 'U dient een gekoppelde pagina te selecteren in de inhoud velden voor dat u kunt publiceren.'
+  SilverStripeNavigator:
+    ARCHIVED: Gearchiveerd
diff --git a/lang/pa.yml b/lang/pa.yml
index 98bf212c..a8571046 100644
--- a/lang/pa.yml
+++ b/lang/pa.yml
@@ -1,436 +1,32 @@
 pa:
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    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 ''{title}''{description} 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'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    DRAFTSITE: 'Draft Site'
-    DRAFT_SITE_ACCESS_RESTRICTION: 'ਕੱਚੀ ਜਾਂ ਪੁਰਾਣੀ ਸਾਈਟ ਦੇਖਣ ਲਈ ਤੁਹਾਨੰੂ ਜ਼ਰੂਰ ਆਪਣੇ CMS ਪਾਸਵਰਡ ਨਾਲ ਲੋਿਗਨ ਕਰਨੀ ਪਵੇਗੀ।<a href="%s">ਛਾਪੀ ਹੋਈ ਸਾਈਟ ਤੇ ਜਾਨ ਲਈ ਇੱਥੇ ਕਿਲੱਕ ਕਰੋ।</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'
-    PUBLISHED: Published
-    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 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'
+    DRAFT_SITE_ACCESS_RESTRICTION: 'ਕੱਚੀ ਜਾਂ ਪੁਰਾਣੀ ਸਾਈਟ ਦੇਖਣ ਲਈ ਤੁਹਾਨੰੂ ਜ਼ਰੂਰ ਆਪਣੇ CMS ਪਾਸਵਰਡ ਨਾਲ ਲੋਿਗਨ ਕਰਨੀ ਪਵੇਗੀ।
+
+      <a href="%s">ਛਾਪੀ ਹੋਈ ਸਾਈਟ ਤੇ ਜਾਨ ਲਈ ਇੱਥੇ ਕਿਲੱਕ ਕਰੋ।</a>
+
+      '
   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: 'ਹੋਰ ਵੈੱਬ-ਸਾਈਟ URL'
-    PLURALNAME: 'Redirector Pags'
-    REDIRECTTO: 'Redirect to'
     REDIRECTTOEXTERNAL: 'ਦੂਸਰੀ ਵੈੱਬ-ਸਾਈਟ '
     REDIRECTTOPAGE: 'ਇੱਕ ਪੰਨਾ ਤੁਹਾਡੀ ਵੈੱਬ-ਸਾਈਟ ਤੇ '
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'ਇੱਕ ਪੰਨਾ ਤੁਹਾਡੀ ਵੈੱਬ-ਸਾਈਟ ਤੇ '
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  SearchForm:
-    GO: Go
-    SEARCH: Search
-    SearchResults: 'Search Results'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   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: 'ਕੋਈ ਵੀ	'
+    ACCESSANYONE: "ਕੋਈ ਵੀ\t"
     ACCESSHEADER: 'Who can view this page on my site?'
-    ACCESSLOGGEDIN: 'Logged-in users'
-    ACCESSONLYTHESE: 'Only these people (choose from list)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'ਇਸ ਪੰਨੇ ਤੇ ਿਟੱਪਣੀਆਂ ਦੀ ਇਜਾਜ਼ਤ ਹੈ।'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'ਕੱਚੀਆ ਤਬਦੀਲੀਆਂ ਨੰੂ ਰੱਦ ਕਰੋ'
-    BUTTONCANCELDRAFTDESC: 'Delete your draft and revert to the currently published page'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'ਅਣਛਾਪੋ       '
-    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 inside the CMS?'
-    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'
-    GroupPlaceholder: 'Click to select group'
-    HASBROKENLINKS: 'This page has broken links.'
     HTMLEDITORTITLE: ਸਮਾਨ
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
-    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'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: 'Page location'
-    PAGETITLE: 'ਪੰਨੇ ਦਾ ਨਾਂ	'
+    METADESC: 'ਵਰਣਨ'
+    PAGETITLE: "ਪੰਨੇ ਦਾ ਨਾਂ\t"
     PAGETYPE: 'ਸਫ਼ੇ ਦੀ ਿਕਸਮ  '
-    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: 'menus ਿਵੱਚ ਿਦਖਾਉ?'
     SHOWINSEARCH: 'search ਿਵੱਚ ਿਦਖਾਉ?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: ਵਰਤਾਉ
     TABCONTENT: 'ਸਮਾਨ '
-    TABDEPENDENT: 'Dependent pages'
     TOPLEVEL: 'ਸਾਈਟ ਦਾ ਸਮਾਨ (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 ''Pages'' section" 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:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    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:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  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: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'ਇਹ ਇੱਕ virtual ਪੰਨਾ ਹੈ।'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: 'Virtual Pags'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
-    SINGULARNAME: 'Virtual Page'
diff --git a/lang/pes_IR.yml b/lang/pes_IR.yml
deleted file mode 100644
index db526b9c..00000000
--- a/lang/pes_IR.yml
+++ /dev/null
@@ -1,436 +0,0 @@
-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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    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 ''{title}''{description} 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'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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
-    DRAFT: Draft
-    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'
-    PUBLISHED: Published
-    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 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'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
-  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'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    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'
-    GroupPlaceholder: 'Click to select group'
-    HASBROKENLINKS: 'This page has broken links.'
-    HTMLEDITORTITLE: Content
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its 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 ''Pages'' section" 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:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    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:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  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: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
-    HEADER: 'This is a virtual page'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: 'Virtual Pags'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
-    SINGULARNAME: 'Virtual Page'
diff --git a/lang/pl.yml b/lang/pl.yml
index 6919089a..efb38d92 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -5,7 +5,6 @@ pl:
     AppCategoryArchive: Archiwum
     AppCategoryAudio: Dźwięk
     AppCategoryDocument: Dokument
-    AppCategoryFlash: Flash
     AppCategoryImage: Obraz
     AppCategoryVideo: Wideo
     BackToFolder: 'Wróć do katalogu'
@@ -19,22 +18,22 @@ pl:
     FROMYOURCOMPUTER: 'Z komputera'
     Filetype: 'Typ pliku'
     ListView: 'Widok listy'
-    MENUTITLE: Pliki
     NEWFOLDER: NowyKatalog
     SIZE: Rozmiar
     THUMBSDELETED: '{count} nieuzywane miniatury zostały usunięte'
     TreeView: 'Widok drzewa'
     Upload: Prześlij
+    MENUTITLE: Pliki
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Usuń foldery'
   AssetAdmin_Tools:
     FILTER: Filtr
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Przejdź
   AssetTableField:
     BACKLINKCOUNT: 'Używany na:'
     PAGES: stron(y)
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Wstecz
   BrokenLinksReport:
     Any: Jakikolwiek
@@ -45,7 +44,6 @@ pl:
     ColumnDateLastModified: 'Data ostatniej modyfikacji'
     ColumnDateLastPublished: 'Data ostatniej publikacji'
     ColumnProblemType: 'Rodzaj problemu'
-    ColumnURL: URL
     HasBrokenFile: 'ma uszkodzony plik'
     HasBrokenLink: 'ma uszkodzony link'
     HasBrokenLinkAndFile: 'ma uszkodzony link oraz plik'
@@ -68,97 +66,75 @@ pl:
     PUBLISHED_PAGES: 'Opublikowano %d stron, %d się nie powiodło'
     PUBLISH_PAGES: Opublikuj
     UNPUBLISHED_PAGES: 'Usunięto z opublikowanych %d stron'
-    UNPUBLISH_PAGES: 'Cofnij publikację'
-  CMSFileAddController:
-    MENUTITLE: Pliki
+    UNPUBLISH_PAGES: Cofnij publikację
   CMSMain:
-    ACCESS: 'Dostęp do ''{title}'''
     ACCESS_HELP: 'Zezwala na oglądanie sekcji zawierających drzewo stron oraz treść. Prawo Przeglądaj i edytuj może być obsługiwane przez pola wyboru dostępne na stronach oraz poprzez zakładkę uprawnień.'
     AddNew: 'Dodaj nową stronę'
     AddNewButton: 'Dodaj nowy'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: 'Wybierz gdzie chcesz utworzyć tę stronę'
     ChoosePageType: 'Wybierz rodzaj strony'
     Create: Utwórz
     DELETE: 'Usuń szkic'
-    DELETEFP: 'Usuń z opublikowanej witryny'
+    DELETEFP: Usuń z opublikowanej witryny
     DESCREMOVED: 'i {count} potomków'
     DUPLICATED: 'Duplikowanie ''{title}'' zakończone powodzeniem'
     DUPLICATEDWITHCHILDREN: 'Duplikowanie ''{title}'' oraz podstron zakończone powodzeniem'
-    EMAIL: Email
     EditTree: 'Edytuj drzewko'
     ListFiltered: 'Filtrowana lista.'
-    MENUTITLE: 'Edytuj stronę'
     NEWPAGE: 'Nowa {pagetype}'
     PAGENOTEXISTS: 'Ta strona nie istnieje'
-    PAGES: Strony
     PAGETYPEANYOPT: Jakikolwiek
-    PAGETYPEOPT: 'Rodzaj strony'
     PUBALLCONFIRM: 'Opublikuj każdą stronę w witrynie'
     PUBALLFUN: '"Opublikuj wszystko"'
-    PUBALLFUN2: 'Naciśnięcie tego przycisku spowoduje przejście po wszystkich stronach i opublikowanie ich. Zazwyczaj używa się tego, gdy w witrynie było bardzo dużo zmian, na przykład gdy witryna została utworzona.'
+    PUBALLFUN2: "Naciśnięcie tego przycisku spowoduje przejście po wszystkich stronach i opublikowanie ich. Zazwyczaj używa się tego, gdy w witrynie było bardzo dużo zmian, na przykład gdy witryna została utworzona."
     PUBPAGES: 'Zrobiono:  Opublikowano {count} stron'
-    PageAdded: 'Pomyślnie utworzono stronę'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Usunięto ''{title}'' z opublikowanych stron'
     REMOVEDPAGEFROMDRAFT: '''%s'' usunięto ze szkiców'
     RESTORE: Przywróć
     RESTORED: 'Pomyślnie przywrócono ''{title}'''
     ROLLBACK: 'Wróć do tej wersji'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Zapisz
     SAVEDRAFT: 'Zapisz szkic'
-    TabContent: Zawartość
     TabHistory: Historia
-    TabSettings: Ustawienia
     TreeFiltered: 'Filtruj drzewko'
     TreeFilteredClear: 'Wyczyść filtr'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Zastosuj filtr'
+    MENUTITLE: 'Edytuj stronę'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Zastosuj filtr'
     RESET: Resetuj
   CMSPageAddController:
-    MENUTITLE: 'Dodaj stronę'
     ParentMode_child: 'Pod inną stroną'
     ParentMode_top: 'Główny poziom'
-  CMSPageEditController:
-    MENUTITLE: 'Edytuj stronę'
+    MENUTITLE: 'Dodaj stronę'
   CMSPageHistoryController:
     COMPAREMODE: 'Tryb porównywania (wybierz dwie)'
     COMPAREVERSIONS: 'Porównaj wersje'
     COMPARINGVERSION: 'Porównanie wersji {version1} i {version2}.'
-    MENUTITLE: Historia
     REVERTTOTHISVERSION: 'Wróć do tej wersji'
     SHOWUNPUBLISHED: 'Pokaż nieopublikowane wersje'
     SHOWVERSION: 'Pokaż wersję'
     VIEW: zobacz
-    VIEWINGLATEST: 'Obecnie oglądasz najnowszą wersję'
     VIEWINGVERSION: 'Obecnie oglądasz wersję {version}.'
-  CMSPageHistoryController_versions.ss:
+    MENUTITLE: Historia
+    VIEWINGLATEST: 'Obecnie oglądasz najnowszą wersję'
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Autor
-    NOTPUBLISHED: Nieopublikowana
+    NOTPUBLISHED: 'Nieopublikowana'
     PUBLISHER: Edytor
     UNKNOWN: Nieznany
     WHEN: Kiedy
-  CMSPageSettingsController:
-    MENUTITLE: 'Edytuj stronę'
   CMSPagesController:
-    GalleryView: 'Widok galerii'
     ListView: 'Widok listy'
-    MENUTITLE: Strony
     TreeView: 'Widok drzewa'
-  CMSPagesController_ContentToolbar.ss:
+  CMSPagesController_ContentToolbar_ss:
     ENABLEDRAGGING: 'Przeciągnij i upuść'
-    MULTISELECT: 'Multi wybór'
-  CMSPagesController_Tools.ss:
+    MULTISELECT: Multi wybór
+  CMSPagesController_Tools_ss:
     FILTER: Filtr
   CMSSearch:
     FILTERDATEFROM: Od
     FILTERDATEHEADING: Data
     FILTERDATETO: Do
     FILTERLABELTEXT: Zawartość
-  CMSSettingsController:
-    MENUTITLE: Ustawienia
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Zmienione strony'
   CMSSiteTreeFilter_DeletedPages:
@@ -170,36 +146,27 @@ pl:
   ContentController:
     ARCHIVEDSITE: 'Podgląd wersji'
     ARCHIVEDSITEFROM: 'Zarchiwizowana witryna od'
-    CMS: 'System Zarządzania Treścią'
-    DRAFT: Szkic
+    CMS: System Zarządzania Treścią
     DRAFTSITE: 'Szkic witryny'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Musisz zalogować się za pomocą swojego hasła do CMSa, aby obejrzeć nieopublikowaną i zarchiwizowaną treść. <a href="%s">Kliknij tutaj aby powrócić do opublikowanej strony.</a>'
-    Email: 'Adres e-mail'
+    Email: Adres e-mail
     INSTALL_SUCCESS: 'Instalacja przebiegła pomyślnie'
     InstallFilesDeleted: 'Pliki instalacyjne zostały pomyślnie usunięte'
     InstallSecurityWarning: 'Dla bezpieczeństwa powinieneś skasować pliki instalacyjne, chyba że planujesz reinstalację w późniejszym czasie (<em>wymaga zalogowania się jako admin, patrz wyżej</em>). Serwer potrzebuje teraz tylko dostępu do folderu "assets", możesz usunąć dostęp do innych folderów. <a href="{link}" style="text-align: center;">Kliknij tutaj aby usunąć pliki instalacyjne.</a>'
     InstallSuccessCongratulations: 'SilverStripe został zainstalowany!'
     LOGGEDINAS: 'Zalogowany jako'
     LOGIN: Zaloguj
-    LOGOUT: Wyloguj
+    LOGOUT: 'Wyloguj'
     NOTLOGGEDIN: 'Nie zalogowany'
-    PUBLISHED: Opublikowano
     PUBLISHEDSITE: 'Opublikowana witryna'
     Password: Hasło
     PostInstallTutorialIntro: 'Ta strona jest uproszczoną wersją witryny SilverStripe 3. Aby ją rozszerzyć, zajrzyj proszę na stronę: {link}'
     StartEditing: 'Możesz zacząć edytować Twoją stronę otwierając <a href=\\"{link}\\">CMS</a>.'
     UnableDeleteInstall: 'Nie można usunąć plików instalacyjnych. Proszę usunąć je ręcznie'
     VIEWPAGEIN: 'Zobacz stronę w:'
+    DRAFT: Szkic
+    PUBLISHED: Opublikowano
   ErrorPage:
-    CODE: 'Kod błędu'
-    DEFAULTERRORPAGECONTENT: '<p>Niestety, próbujesz wejść na stronę, która nie istnieje.</p><p>Sprawdź pisownię adresu URL i spróbuj ponownie.</p>'
-    DEFAULTERRORPAGETITLE: 'Nie znaleziono strony'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Wystąpił problem z obsługą Twojego żądania.</p>'
-    DEFAULTSERVERERRORPAGETITLE: 'Błąd serwera'
-    DESCRIPTION: 'Własna zawartość dla różnych błędów (np. "Strona nie została znaleziona")'
-    ERRORFILEPROBLEM: 'Błąd podczas otwierania pliku "{filename}". Proszę sprawdzić uprawnienia do plików.'
-    PLURALNAME: 'Strony błędów'
-    SINGULARNAME: 'Strona błędów'
     400: '400 - Nieprawidłowe zapytanie'
     401: '401 - Nieautoryzowany dostęp'
     403: '403 - Zabroniony'
@@ -223,6 +190,15 @@ pl:
     503: '503 - Usługa niedostępna'
     504: '504 - Przekroczony czas bramy'
     505: '505 - Wersja HTTP nie obsługiwana'
+    CODE: 'Kod błędu'
+    DEFAULTERRORPAGECONTENT: '<p>Niestety, próbujesz wejść na stronę, która nie istnieje.</p><p>Sprawdź pisownię adresu URL i spróbuj ponownie.</p>'
+    DEFAULTERRORPAGETITLE: 'Nie znaleziono strony'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>Wystąpił problem z obsługą Twojego żądania.</p>'
+    DEFAULTSERVERERRORPAGETITLE: 'Błąd serwera'
+    DESCRIPTION: 'Własna zawartość dla różnych błędów (np. "Strona nie została znaleziona")'
+    ERRORFILEPROBLEM: 'Błąd podczas otwierania pliku "{filename}". Proszę sprawdzić uprawnienia do plików.'
+    PLURALNAME: 'Strony błędów'
+    SINGULARNAME: 'Strona błędów'
   Folder:
     AddFolderButton: 'Dodaj katalog'
     DELETEUNUSEDTHUMBNAILS: 'Usuń nieużywane miniatury'
@@ -231,7 +207,7 @@ pl:
     UploadFilesButton: Prześlij
   LeftAndMain:
     DELETED: Usunięty
-    PreviewButton: 'Podgląd'
+    PreviewButton: Podgląd
     SAVEDUP: Zapisane
     STATUSPUBLISHEDSUCCESS: 'Opublikowano ''{title}'' '
     SearchResults: 'Wyniki wyszukiwania'
@@ -253,14 +229,10 @@ pl:
     SINGULARNAME: 'Strona przekierowująca'
     YOURPAGE: 'Strona na Twojej witrynie'
   ReportAdmin:
-    MENUTITLE: Raporty
     ReportTitle: Tytuł
+    MENUTITLE: Raporty
   ReportAdminForm:
     FILTERBY: 'Filtruj po'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Przejdź
     SEARCH: Szukaj
@@ -271,14 +243,9 @@ pl:
     BROKENREDIRECTORPAGES: 'Strony przekierowania wskazujące na usunięte strony'
     BROKENVIRTUALPAGES: 'Wirtualne strony wskazujące na usunięte strony'
     BrokenLinksGroupTitle: 'Raporty o uszkodzonych linkach'
-    ContentGroupTitle: 'Raporty o treści'
-    EMPTYPAGES: 'Strony bez treści'
     LAST2WEEKS: 'Strony edytowane w ciągu 2 ostatnich tygodni'
-    OtherGroupTitle: Inne
     ParameterLiveCheckbox: 'Sprawdź witrynę'
     REPEMPTY: '{title} raport jest pusty.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Aby podzielić się tym na tej stronie, skopiuj i wklej poniższy link.'
     ShareLink: 'Podziel się linkiem'
@@ -311,8 +278,6 @@ pl:
     APPEARSVIRTUALPAGES: 'Ta treść pojawia się również na wirtualnej stronie w sekcji {title}.'
     BUTTONCANCELDRAFT: 'Anuluj wprowadzone zmiany'
     BUTTONCANCELDRAFTDESC: 'Usuń zmiany i wróć do istniejącej wersji opublikowanej strony'
-    BUTTONPUBLISHED: Opublikowano
-    BUTTONSAVED: Zapisano
     BUTTONSAVEPUBLISH: 'Zapisz i opublikuj'
     BUTTONUNPUBLISH: Nieopublikowane
     BUTTONUNPUBLISHDESC: 'Usuń tę stronę z opublikowanej witryny'
@@ -322,15 +287,15 @@ pl:
     DEFAULTABOUTCONTENT: '<p>Możesz wypełnić tę stronę własną treścią, usunąć ją i tworzyć własne strony.<br /></p>'
     DEFAULTABOUTTITLE: 'O nas'
     DEFAULTCONTACTCONTENT: '<p>Możesz wypełnić tę stronę własną treścią, usunąć ją i tworzyć własne strony.<br /></p>'
-    DEFAULTCONTACTTITLE: Kontakt
+    DEFAULTCONTACTTITLE: 'Kontakt'
     DEFAULTHOMECONTENT: '<p>Witaj w SilverStripe! To jest domyślna strona główna. Możesz ją edytować, otwierając <a href="admin/">CMS</a>. Możesz również otworzyć <a href="http://doc.silverstripe.com">dokumentację dla developerów</a>, lub rozpocząć <a href="http://doc.silverstripe.com/doku.php?id=tutorials">jeden z samouczków.</a></p>'
-    DEFAULTHOMETITLE: 'Strona główna'
+    DEFAULTHOMETITLE: Strona główna
     DELETEDPAGEHELP: 'Strona nie jest już opublikowana'
     DELETEDPAGESHORT: Usunięty
     DEPENDENT_NOTE: 'Poniższe strony są zależne od tej (łącznie z wirtualnymi stronami, stronami przekierowującymi oraz stronami z treścią).'
     DESCRIPTION: 'Zwykła strona'
     DependtPageColumnLinkType: 'Typ linku'
-    DependtPageColumnURL: 'Adres internetowy'
+    DependtPageColumnURL: Adres internetowy
     EDITANYONE: 'Każdy to jest zalogowany w systemie CMS'
     EDITHEADER: 'Kto może edytować wewnątrz systemu CMS?'
     EDITONLYTHESE: 'Tylko Ci ludzi (wybierz z listy)'
@@ -338,25 +303,17 @@ pl:
     EDIT_ALL_DESCRIPTION: 'Edytuj jakąkolwiek stronę'
     EDIT_ALL_HELP: 'Możliwość edycji jakiejkolwiek strony w witrynie, bez względu na ustawienia w zakładce Dostęp. Wymaga uprawnienia "Dostęp do edycji treści"'
     Editors: 'Grupy Edytorów'
-    GroupPlaceholder: 'Kliknij aby wybrać grupę'
     HASBROKENLINKS: 'Ta strona ma niedziałający link'
     HTMLEDITORTITLE: Zawartość
     INHERIT: 'Dziedzicz ze strony nadrzędnej'
-    LASTPUBLISHED: 'Ostatnio opublikowano'
-    LASTSAVED: 'Ostatnio zapisane'
     LASTUPDATED: 'Ostania zmiana'
     LINKCHANGENOTE: 'Zmiana linku na aktualnej stronie skutkuje zmianą w linkach stron potomnych.'
     MENUTITLE: 'Sekcja nawigacji'
-    METADESC: Opis
-    METADESCHELP: 'Wyszukiwarki używają tej zawartości do wyświetlania wyników wyszukiwania (aczkolwiek nie zmieni to ich miejsca w rankingu)'
+    METADESC: 'Opis'
     METAEXTRA: 'Własne meta tagi'
-    METAEXTRAHELP: 'Tagi HTML dla dodatkowych informacji. Na przykład &lt;meta name="niestandardowaNazwa" content="twoja zawartość" /&gt;'
     MODIFIEDONDRAFTHELP: 'Na stronie znajdują się nieopublikowane zmiany'
     MODIFIEDONDRAFTSHORT: Zmodyfikowana
     MetadataToggle: Metadane
-    MoreOptions: 'Więcej opcji'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
     PAGELOCATION: 'Lokalizacja strony'
     PAGETITLE: 'Nazwa strony'
     PAGETYPE: 'Rodzaj strony'
@@ -378,14 +335,13 @@ pl:
     SHOWINSEARCH: 'Pokazuj w wyszukiwarce?'
     SINGULARNAME: Strona
     TABBEHAVIOUR: Zachowanie
-    TABCONTENT: Zawartość
+    TABCONTENT: 'Zawartość'
     TABDEPENDENT: 'Strony zależne'
     TOPLEVEL: 'Zawartość witryny (główny poziom)'
     TOPLEVELCREATORGROUPS: 'Twórcy najwyższego szczebla'
     URLSegment: 'Segment adresu URL'
     VIEWERGROUPS: 'Grupy przeglądających'
     VIEW_ALL_DESCRIPTION: 'Przeglądanie stron'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'Obejrzyj szkic treści'
     VIEW_DRAFT_CONTENT_HELP: 'Stosowane do oglądania szkiców stron poza systemem CMS. Przydatne w przypadku zewnętrznych współpracowników nie mających dostępu do CMS.'
     Viewers: 'Grupy przeglądających'
@@ -394,20 +350,25 @@ pl:
     many_many_BackLinkTracking: 'Śledzenie backlinków'
     many_many_ImageTracking: 'Śledzenie obrazków'
     many_many_LinkTracking: 'Śledzenie linków'
+    BUTTONPUBLISHED: Opublikowano
+    BUTTONSAVED: Zapisano
+    GroupPlaceholder: 'Kliknij aby wybrać grupę'
+    LASTPUBLISHED: 'Ostatnio opublikowano'
+    LASTSAVED: 'Ostatnio zapisane'
+    MoreOptions: 'Więcej opcji'
   SiteTreeURLSegmentField:
     EMPTY: 'Proszę podać część adresu lub kliknąć anuluj'
-    HelpChars: 'Znaki specjalne są automatycznie zamienione lub usunięte.'
   StaticExporter:
     BASEURL: 'Bazowy URL'
     EXPORTTO: 'Eksportuj do tego katalogu'
     NAME: 'Statyczny eksporter'
   TableListField:
     SELECT: 'Wybierz:'
-  TableListField.ss:
+  TableListField_ss:
     NOITEMSFOUND: 'Nic nie znaleziono'
     SORTASC: 'Sortuj w porządku rosnącym'
     SORTDESC: 'Sortuj w porządku malejącym'
-  TableListField_PageControls.ss:
+  TableListField_PageControls_ss:
     DISPLAYING: Wyświetlane
     OF: z
     TO: do
@@ -417,20 +378,24 @@ pl:
     VIEWPREVIOUS: 'Zobacz poprzednie'
   TreeTools:
     DisplayLabel: 'Wyświetl:'
-  URLSegmentField:
-    Cancel: Anuluj
-    Edit: Edytuj
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Dostęp do zarchiwizowanej witryny:'
     HAVEASKED: 'Poprosiłeś o obejrzenie treści naszej strony na'
   VirtualPage:
     CHOOSE: 'Linkowana strona'
     DESCRIPTION: 'Wyświetla zawartość innej strony'
     EDITCONTENT: 'Edycja treści na linkowanej stronie'
-    EditLink: edytuj
     HEADER: 'To jest wirtualna strona'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Wirtualne Strony'
     PageTypNotAllowedOnRoot: '"{type}" nie jest dozwolona dla głównego poziomu wirtualnej strony'
     SINGULARNAME: 'Wirtualna Strona'
+    EditLink: edytuj
+  CMSPageEditController:
+    MENUTITLE: 'Edytuj stronę'
+  CMSPageSettingsController:
+    MENUTITLE: 'Edytuj stronę'
+  CMSSettingsController:
+    MENUTITLE: Ustawienia
+  URLSegmentField:
+    Cancel: Anuluj
+    Edit: Edytuj
diff --git a/lang/pt.yml b/lang/pt.yml
index 2405f1b8..2454836d 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -3,9 +3,8 @@ pt:
     ADDFILES: 'Adicionar ficheiros'
     ActionAdd: 'Adicionar pasta'
     AppCategoryArchive: Arquivar
-    AppCategoryAudio: Audio
     AppCategoryDocument: Documento
-    AppCategoryFlash: 'Inserir flash'
+    AppCategoryFlash: Inserir flash
     AppCategoryImage: Imagem
     AppCategoryVideo: Vídeo
     BackToFolder: 'Voltar para a pasta'
@@ -19,22 +18,22 @@ pt:
     FROMYOURCOMPUTER: 'Do computador'
     Filetype: 'Tipo de ficheiro'
     ListView: 'Vista em lista'
-    MENUTITLE: Ficheiros
-    NEWFOLDER: 'Nova Pasta'
+    NEWFOLDER: Nova Pasta
     SIZE: Tamanho
     THUMBSDELETED: '{count} miniaturas não utilizadas foram removidas'
     TreeView: 'Vista em árvore'
     Upload: Enviar
+    MENUTITLE: Ficheiros
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Apagar pastas'
   AssetAdmin_Tools:
     FILTER: Filtro
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Ir
   AssetTableField:
     BACKLINKCOUNT: 'Usado em:'
     PAGES: página(s)
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Voltar
   BrokenLinksReport:
     Any: Qualquer
@@ -45,7 +44,6 @@ pt:
     ColumnDateLastModified: 'Data da última modificação'
     ColumnDateLastPublished: 'Data da última publicação'
     ColumnProblemType: 'Tipo de problema'
-    ColumnURL: URL
     HasBrokenFile: 'Ficheiro corrompido'
     HasBrokenLink: 'tem link inválido'
     HasBrokenLinkAndFile: 'link e ficheiro inválido'
@@ -64,31 +62,24 @@ pt:
     DELETED_DRAFT_PAGES: 'Apagadas %d páginas publicadas, %d falharam'
     DELETED_PAGES: 'Apagadas %d páginas publicadas, %d falharam'
     DELETE_DRAFT_PAGES: 'Apagar do site de rascunho'
-    DELETE_PAGES: 'Apagar do site de rascunho'
     PUBLISHED_PAGES: 'Publicadas %d páginas, %d falhas'
     PUBLISH_PAGES: Publicar
     UNPUBLISHED_PAGES: '%d páginas não publicadas'
-    UNPUBLISH_PAGES: 'Remover do site Publicado'
-  CMSFileAddController:
-    MENUTITLE: Ficheiros
   CMSMain:
     ACCESS: 'Acesso à secção ''{title}'''
     ACCESS_HELP: 'Permitir a visualização da árvore de páginas e respectivos conteúdos. Ver e editar permissões que podem ser seleccionadas a partir de uma caixa de selecção, bem como os separadores de "permissões de conteúdo".'
     AddNew: 'Adicionar nova página'
-    AddNewButton: Novo
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
+    AddNewButton: 'Novo'
     ChoosePageParentMode: 'Escolha onde criar esta página'
     ChoosePageType: 'Escolher tipo de página'
     Create: Criar
     DELETE: 'Apagar do site de rascunho'
-    DELETEFP: 'Apagar do site publicado'
+    DELETEFP: Apagar do site publicado
     DESCREMOVED: 'e {count} descendentes'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    EMAIL: Email
+    DUPLICATED: 'Página ''{title}'' duplicada com sucesso'
+    DUPLICATEDWITHCHILDREN: 'Página ''{title}'' e filhos duplicados com sucesso'
     EditTree: 'Editar árvore'
     ListFiltered: 'Lista filtrada.'
-    MENUTITLE: 'Editar página'
     NEWPAGE: 'Nova {pagetype}'
     PAGENOTEXISTS: 'Esta página não existe'
     PAGES: Páginas
@@ -96,69 +87,64 @@ pt:
     PAGETYPEOPT: 'Tipo de Página'
     PUBALLCONFIRM: 'Por favor, publique cada uma das páginas do site, copiando o conteúdo para a versão publicada'
     PUBALLFUN: 'funcionalidade "Publicar tudo"'
-    PUBALLFUN2: 'Ao pressionar este botão fará o equivalente a ir a cada página e pressionar o botão "publicar". É aconselhado a sua utilização quando existem muitas edições de diferentes páginas ou então quando o site se encontra disponível para ser publicado para o público em geral.'
+    PUBALLFUN2: "Ao pressionar este botão fará o equivalente a ir a cada página e pressionar o botão \"publicar\". É aconselhado a sua utilização quando existem muitas edições de diferentes páginas ou então quando o site se encontra disponível para ser publicado para o público em geral."
     PUBPAGES: 'Concluído: Publicadas {count} páginas'
     PageAdded: 'Página criada com sucesso'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Remover ''{title}'' do site publicado'
     REMOVEDPAGEFROMDRAFT: 'Removido ''%s'' do site de rascunho'
     RESTORE: Restaurar
     RESTORED: '''{title}'' restaurado com sucesso'
     ROLLBACK: 'Voltar para esta versão'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
+    ROLLEDBACKPUBv2: 'Voltar para a versão publicada.'
+    ROLLEDBACKVERSIONv2: 'Voltar para a versão #%d.'
     SAVE: Guardar
-    SAVEDRAFT: 'Save draft'
+    SAVEDRAFT: 'Guardar rascunho'
     TabContent: Conteúdo
     TabHistory: Histórico
     TabSettings: Configurações
     TreeFiltered: 'Filtrar árvore'
     TreeFilteredClear: 'Remover filtro'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Aplicar filtro'
+    MENUTITLE: 'Editar página'
+    AddPageRestriction: 'Nota: Alguns tipos de página não estão disponíveis nesta seleção'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Aplicar filtro'
     RESET: Redefinir
   CMSPageAddController:
-    MENUTITLE: 'Adicionar página'
     ParentMode_child: 'Por cima de outra página'
     ParentMode_top: 'Nível de topo'
-  CMSPageEditController:
-    MENUTITLE: 'Editar página'
+    MENUTITLE: 'Adicionar página'
   CMSPageHistoryController:
     COMPAREMODE: 'Modo de comparação (selecione duas)'
     COMPAREVERSIONS: 'Comparar versões'
     COMPARINGVERSION: 'Comparando as versões {version1} e {version2}.'
-    MENUTITLE: Histórico
     REVERTTOTHISVERSION: 'Reverter para esta versão'
     SHOWUNPUBLISHED: 'Mostrar versões não publicadas'
     SHOWVERSION: 'Mostrar versão'
     VIEW: ver
-    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Actualmente está a ver a versão nº {version}.'
-  CMSPageHistoryController_versions.ss:
+    MENUTITLE: Histórico
+    VIEWINGLATEST: 'Atualmente está a ver a última versão'
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Autor
     NOTPUBLISHED: 'Não publicada'
     PUBLISHER: Publicador
     UNKNOWN: Desconhecido
     WHEN: Quando
-  CMSPageSettingsController:
-    MENUTITLE: 'Editar página'
   CMSPagesController:
     GalleryView: 'Vista de galeria'
     ListView: 'Vista em lista'
     MENUTITLE: Páginas
     TreeView: 'Vista em árvore'
-  CMSPagesController_ContentToolbar.ss:
+  CMSPagesController_ContentToolbar_ss:
     ENABLEDRAGGING: 'Arrastar e Largar'
     MULTISELECT: Multi-selecção
-  CMSPagesController_Tools.ss:
+  CMSPagesController_Tools_ss:
     FILTER: Filtrar
   CMSSearch:
     FILTERDATEFROM: De
     FILTERDATEHEADING: Data
     FILTERDATETO: Para
     FILTERLABELTEXT: Conteúdo
-  CMSSettingsController:
-    MENUTITLE: Configurações
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Páginas alteradas'
   CMSSiteTreeFilter_DeletedPages:
@@ -168,39 +154,25 @@ pt:
   ContentControl:
     NOTEWONTBESHOWN: 'Nota: Esta mensagem não vai ser apresentada aos visitantes'
   ContentController:
-    ARCHIVEDSITE: Pré-visualização
+    ARCHIVEDSITE: 'Pré-visualização'
     ARCHIVEDSITEFROM: 'Arquivar o site de'
-    CMS: 'Gestor de Conteúdos'
-    DRAFT: Draft
+    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: '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 foi instalado com sucesso'
     LOGGEDINAS: 'Autenticado como'
     LOGIN: Autenticar
-    LOGOUT: Sair
+    LOGOUT: 'Sair'
     NOTLOGGEDIN: 'Não autenticado'
-    PUBLISHED: Published
     PUBLISHEDSITE: 'Site Publicado'
     Password: Palavra-passe
     PostInstallTutorialIntro: 'Este site é uma versão simplificada do SilverStripe 3. Para adicionar novas funcionalidades visita {link}.'
-    StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Impossível remover os ficheiros de instalação. Por favor, remova-os manualmente.'
     VIEWPAGEIN: 'Ver página em:'
   ErrorPage:
-    CODE: 'Código de erro'
-    DEFAULTERRORPAGECONTENT: '<p>A página a que tentou aceder não existe.</p><p>Verifique se não existem erros no endereço a que tentou aceder e tente novamente.</p>'
-    DEFAULTERRORPAGETITLE: 'Página não encontrada'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Desculpe, ocorreu um problema no processamento do seu pedido</p>'
-    DEFAULTSERVERERRORPAGETITLE: '500 - Erro do servidor'
-    DESCRIPTION: 'Conteúdo personalizado para as diferentes possibilidades de erro (ex. página não encontrada)'
-    ERRORFILEPROBLEM: 'Erro ao escrever no ficheiro "{filename}". Por favor, verifique as permissões do ficheiro.'
-    PLURALNAME: 'Página de erro'
-    SINGULARNAME: 'Página de erro'
-    400: '400 - Bad Request'
     401: '401 - Não Autorizado'
     403: '403 - Proibido'
     404: '404 - Não Encontrado'
@@ -219,10 +191,17 @@ pt:
     417: '417 - Falha de expectativa'
     500: '500 - Erro de Servidor'
     501: '501 - Não implementado'
-    502: '502 - Bad Gateway'
     503: '503 - Serviço Indisponível'
-    504: '504 - Gateway Timeout'
     505: '505 - Versão HTTP não suportada'
+    CODE: 'Código de erro'
+    DEFAULTERRORPAGECONTENT: '<p>A página a que tentou aceder não existe.</p><p>Verifique se não existem erros no endereço a que tentou aceder e tente novamente.</p>'
+    DEFAULTERRORPAGETITLE: 'Página não encontrada'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>Desculpe, ocorreu um problema no processamento do seu pedido</p>'
+    DEFAULTSERVERERRORPAGETITLE: '500 - Erro do servidor'
+    DESCRIPTION: 'Conteúdo personalizado para as diferentes possibilidades de erro (ex. página não encontrada)'
+    ERRORFILEPROBLEM: 'Erro ao escrever no ficheiro "{filename}". Por favor, verifique as permissões do ficheiro.'
+    PLURALNAME: 'Página de erro'
+    SINGULARNAME: 'Página de erro'
   Folder:
     AddFolderButton: 'Adicionar pasta'
     DELETEUNUSEDTHUMBNAILS: 'Apagar miniaturas não utilizadas'
@@ -253,14 +232,10 @@ pt:
     SINGULARNAME: 'A página redirecciona para uma que não existe'
     YOURPAGE: 'Página no seu site'
   ReportAdmin:
-    MENUTITLE: Relatórios
     ReportTitle: Título
+    MENUTITLE: Relatórios
   ReportAdminForm:
     FILTERBY: 'Filtrar por'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Ir
     SEARCH: Procurar
@@ -277,8 +252,6 @@ pt:
     OtherGroupTitle: Outro
     ParameterLiveCheckbox: 'Verificar site publicado'
     REPEMPTY: 'O relatório {title} encontra-se vazio.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Para partilhar esta página, copie e cole o link abaixo '
     ShareLink: 'Partilhar ligação'
@@ -311,10 +284,7 @@ pt:
     APPEARSVIRTUALPAGES: 'Este conteúdo também aparece nas páginas virtuais das secções {title}'
     BUTTONCANCELDRAFT: 'Cancelar alterações do rascunho'
     BUTTONCANCELDRAFTDESC: 'Apagar o seu rascunho e reverter para a versão publicada atualmente'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Remover do site Publicado'
+    BUTTONUNPUBLISH: Remover do site Publicado
     BUTTONUNPUBLISHDESC: 'Remover esta página do site publicado'
     CREATED: 'Data de criação'
     Comments: Comentários
@@ -322,41 +292,33 @@ pt:
     DEFAULTABOUTCONTENT: '<p>Pode preencher esta página com o seu próprio conteúdo, ou apagá-la e criar as suas próprias páginas.</p>'
     DEFAULTABOUTTITLE: 'Quem Somos'
     DEFAULTCONTACTCONTENT: '<p>Pode preencher esta página com o seu próprio conteúdo, ou apagá-la e criar as suas próprias páginas.</p>'
-    DEFAULTCONTACTTITLE: Contacte-nos
+    DEFAULTCONTACTTITLE: 'Contacte-nos'
     DEFAULTHOMECONTENT: '<p>Bem-vido ao SilverStripe! Esta é a página principal. Pode editar esta página acedendo ao <a href="admin/">CMS</a>. Poderá também visitar a <a href="http//doc.silverstripe.com">documentação para desenvolvimento</a>, ou começar <a href="http://doc.silverstripe.com/doku.php?id=tutorials">pelos tutoriais.</a></p>'
-    DEFAULTHOMETITLE: 'Página Principal'
+    DEFAULTHOMETITLE: Página Principal
     DELETEDPAGEHELP: 'A página nunca mais será publicada'
     DELETEDPAGESHORT: Apagada
     DEPENDENT_NOTE: 'As páginas seguintes dependem desta página. Isto inclui páginas virtuais, páginas redireccionadas e páginas com links de conteúdo.'
     DESCRIPTION: 'Página de conteúdo genérico'
     DependtPageColumnLinkType: 'Tipo de ligação'
-    DependtPageColumnURL: URL
     EDITANYONE: 'Todos que possam efectuar a autenticação no CMS'
     EDITHEADER: 'Quem pode editar esta página no CMS?'
     EDITONLYTHESE: 'Apenas estes (selecione da lista abaixo)'
-    EDITORGROUPS: 'Editar grupos'
     EDIT_ALL_DESCRIPTION: 'Editar qualquer página'
     EDIT_ALL_HELP: 'Capacidade de visualizar qualquer página do site, independentemente das configurações. Requer as permissões "Acesso ao conteúdo do site"'
     Editors: 'Grupos de Editores'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Esta página contém links quebrados.'
     HTMLEDITORTITLE: Conteúdo
     INHERIT: 'Herdado da página superior'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Última atualização'
     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
+    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'
     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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
     PAGELOCATION: 'Localização da página'
     PAGETITLE: 'Nome da página'
     PAGETYPE: 'Tipo de Página'
@@ -365,7 +327,6 @@ pt:
     PARENTTYPE_ROOT: 'Página de topo'
     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: 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'
@@ -378,24 +339,19 @@ pt:
     SHOWINSEARCH: 'Mostrar nas pesquisas?'
     SINGULARNAME: Página
     TABBEHAVIOUR: Comportamento
-    TABCONTENT: Conteúdo
+    TABCONTENT: 'Conteúdo'
     TABDEPENDENT: 'Páginas Dependentes'
     TOPLEVEL: 'Conteúdo do Site (Nível Superior)'
     TOPLEVELCREATORGROUPS: 'Nível de topo'
     URLSegment: 'Segmento de URL'
     VIEWERGROUPS: 'Ver grupos '
-    VIEW_ALL_DESCRIPTION: 'Ver qualquer página'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'Ver o conteúdo de rascunho'
-    VIEW_DRAFT_CONTENT_HELP: 'Aplicar visualização em modo rascunho. Útil para colaboradores externos sem acesso ao CMS'
     Viewers: 'Grupo de Visualizadores'
     Visibility: Visibilidade
     has_one_Parent: 'Página Parente'
-    many_many_BackLinkTracking: 'Rastreio de backlinks'
     many_many_ImageTracking: 'Rastreamento de imagens'
     many_many_LinkTracking: 'Rastreamento de links'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Os caracteres especiais são automaticamente convertido ou removidos.'
   StaticExporter:
     BASEURL: 'URL base'
@@ -403,11 +359,11 @@ pt:
     NAME: 'Exportar estaticamente'
   TableListField:
     SELECT: 'Escolha:'
-  TableListField.ss:
+  TableListField_ss:
     NOITEMSFOUND: 'Não foram encontrados elementos'
     SORTASC: 'Ordenar por ordem crescente'
     SORTDESC: 'Ordenar por ordem decrescente'
-  TableListField_PageControls.ss:
+  TableListField_PageControls_ss:
     DISPLAYING: Apresentando
     OF: de
     TO: para
@@ -417,20 +373,27 @@ pt:
     VIEWPREVIOUS: 'Ver o anterior'
   TreeTools:
     DisplayLabel: 'Apresentar:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Pode aceder aos arquivos do site a partir deste link:'
     HAVEASKED: 'Pediu para ver o conteúdo do nosso site na'
   VirtualPage:
-    CHOOSE: 'Linked Page'
+    CHOOSE: 'Página associada'
     DESCRIPTION: 'Apresentar o conteúdo de outra página'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
+    EDITCONTENT: 'Editar o conteúdo na página associada'
     HEADER: 'Esta é uma página virtual'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Páginas Virtuais'
     PageTypNotAllowedOnRoot: 'Páginas do tipo "{type}" não tem permissões para serem criadas a este nível.'
     SINGULARNAME: 'Página Virtual'
+    EditLink: editar
+    HEADERWITHLINK: 'Esta é uma página virtual com o conteúdo copiado da página "{title}" ({link})'
+  CMSFileAddController:
+    MENUTITLE: Ficheiros
+  CMSPageEditController:
+    MENUTITLE: 'Editar página'
+  CMSPageSettingsController:
+    MENUTITLE: 'Editar página'
+  CMSSettingsController:
+    MENUTITLE: Configurações
+  URLSegmentField:
+    Cancel: 'Cancelar '
+    Edit: Editar
diff --git a/lang/pt_BR.yml b/lang/pt_BR.yml
index cb42582e..a0afe1bd 100644
--- a/lang/pt_BR.yml
+++ b/lang/pt_BR.yml
@@ -1,205 +1,23 @@
 pt_BR:
   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: 'Nova Pasta'
-    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:
+    NEWFOLDER: Nova Pasta
+  AssetAdmin_left_ss:
     GO: Ir
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
     DELETE: 'Excluir do site de rascunho'
-    DELETEFP: 'Excluir do site ativo'
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
+    DELETEFP: Excluir do site ativo
     EMAIL: E-mail
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Edit Page'
-    NEWPAGE: 'New {pagetype}'
     PAGENOTEXISTS: 'Esta página não existe'
-    PAGES: Pages
-    PAGETYPEANYOPT: Any
-    PAGETYPEOPT: 'Page Type'
     PUBALLCONFIRM: 'Por favor publique todas as páginas no site, copiando content stage to live'
     PUBALLFUN: 'Funcionalidade "Publicar Tudo"'
-    PUBALLFUN2: 'Apertar este botão equivale a ir em cada página individualmente e clicar em "Publicar". Serve para ser usado em situações em que foram editadas grandes quantidades de conteúdo, como por exemplo quando o site foi inicialmente construído.'
-    PUBPAGES: 'Done: Published {count} pages'
-    PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
+    PUBALLFUN2: "Apertar este botão equivale a ir em cada página individualmente e clicar em \"Publicar\". Serve para ser usado em situações em que foram editadas grandes quantidades de conteúdo, como por exemplo quando o site foi inicialmente construído."
     REMOVEDPAGEFROMDRAFT: 'Removido ''%s''  do site de rascunho'
     RESTORE: Restaurar
-    RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Reverter para esta versão'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Salvar
-    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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    DRAFTSITE: 'Draft Site'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Você precisa entrar com sua senha do CMS para ver os rascunhos ou o conteúdo arquivado. <a href="%s">Clique aqui para voltar para o site publicado.</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'
-    PUBLISHED: Published
-    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 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: 'Código do erro'
-    DEFAULTERRORPAGECONTENT: '<p>desculpe, mas parece que você esta tentando acessar uma página que não existe.</p><p>Por favor, verifique se você digitou a URL corretamente e tente novamente</p>'
-    DEFAULTERRORPAGETITLE: 'Página não encontrada'
-    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 - Requisição Invalida'
     401: '401 - Não autorizado'
     403: '403 - Proibido'
@@ -223,214 +41,86 @@ pt_BR:
     503: '503 - Serviço não esta habilitado'
     504: '504 - Tempo de conecção esgorado'
     505: '505 - Versão do HTTP não suporado'
+    CODE: 'Código do erro'
+    DEFAULTERRORPAGECONTENT: '<p>desculpe, mas parece que você esta tentando acessar uma página que não existe.</p><p>Por favor, verifique se você digitou a URL corretamente e tente novamente</p>'
+    DEFAULTERRORPAGETITLE: 'Página não encontrada'
   Folder:
-    AddFolderButton: 'Add folder'
     DELETEUNUSEDTHUMBNAILS: 'Excluir miniaturas não utilizadas'
     UNUSEDFILESTITLE: 'Arquivos não utilizados'
     UNUSEDTHUMBNAILSTITLE: 'Miniaturas não utilizadas'
-    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: 'Uma página de redireccionamento foi criada sem nenhum destino específicado'
     HEADER: 'Esta página redireccionará os utilizadores para outra página'
     OTHERURL: 'Outro website URL'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Redirecionar para'
     REDIRECTTOEXTERNAL: 'Outro website'
     REDIRECTTOPAGE: 'Uma página no seu website'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Página no seu website'
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Ir
     SEARCH: Buscar
-    SearchResults: 'Search Results'
   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: 'Páginas em branco'
     LAST2WEEKS: 'Páginas editadas nas últimas 2 semanas'
-    OtherGroupTitle: Other
-    ParameterLiveCheckbox: 'Check live site'
-    REPEMPTY: 'The {title} report is empty.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   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: 'Qualquer pessoa'
+    ACCESSANYONE: Qualquer pessoa
     ACCESSHEADER: 'Quem pode ver esta página?'
     ACCESSLOGGEDIN: 'Utilizadores que tenham feito log-in'
     ACCESSONLYTHESE: 'Somente estas pessoas (escolha da lista)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'Permitir comentários sobre esta página?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancelar alterações no rascunho'
     BUTTONCANCELDRAFTDESC: 'Apague o seu rascunho e reverta para o site currrentement publicado'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Anular publicação'
+    BUTTONUNPUBLISH: Anular publicação
     BUTTONUNPUBLISHDESC: 'Remova esta página do site publicado'
-    CREATED: 'Date Created'
     Comments: Comentários
     Content: Conteúdo
     DEFAULTABOUTCONTENT: '<p>Você pode alimentar esta página com seu próprio conteúdo, ou excluir esta página e criar as suas proprias.<br /></p>'
     DEFAULTABOUTTITLE: 'Sobre nós'
     DEFAULTCONTACTCONTENT: '<p>Você pode alimentar esta página com seu próprio conteúdo, ou excluir esta página e criar as suas proprias.<br /></p>'
-    DEFAULTCONTACTTITLE: Contato
+    DEFAULTCONTACTTITLE: 'Contato'
     DEFAULTHOMECONTENT: '<p>Bem vindo ao SilverStripe! Esta é a página padrão de entrada. Você pode editar esta página abrindo o <a href="admin/">a area de administração CMS</a>. Você pode acessar a <a href="http://doc.silverstripe.com"> documentação do desenvolvedor</a>, ou começar <a href="http://doc.silverstripe.com/doku.php?id=tutorials">com os tutoriais.</a></p>'
-    DEFAULTHOMETITLE: 'Página Inicial'
-    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
+    DEFAULTHOMETITLE: Página Inicial
     EDITANYONE: 'Qualquer pessoa que possa fazer log-in'
     EDITHEADER: 'Quem pode editar esta página?'
     EDITONLYTHESE: 'Somente estas pessoas (escolha da lista)'
-    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: 'Grupo de editores'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Esta página tem links quebrados.'
     HTMLEDITORTITLE: Conteúdo
     INHERIT: 'Herdar da página mãe'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
-    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).'
+    METADESC: 'Descrição'
     METAEXTRA: 'Meta tags personalizadas'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: 'Page location'
     PAGETITLE: 'Nome da Página'
     PAGETYPE: 'Tipo de página'
     PARENTID: 'Página pai'
     PARENTTYPE: 'Lugar da página'
-    PARENTTYPE_ROOT: 'Top-level page'
-    PARENTTYPE_SUBPAGE: 'Sub-page underneath a parent page'
     PERMISSION_GRANTACCESS_DESCRIPTION: 'Controla os grupos que podem acessar ou editar determinadas páginas'
-    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: 'Mostrar nos menus?'
     SHOWINSEARCH: 'Uncluir na procura?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: Comportamento
-    TABCONTENT: Conteúdo
-    TABDEPENDENT: 'Dependent pages'
+    TABCONTENT: 'Conteúdo'
     TOPLEVEL: 'Conteúdo do Site (Top Level)'
-    TOPLEVELCREATORGROUPS: 'Top level creators'
     URLSegment: 'URL da página'
-    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 ''Pages'' section" 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: 'Grupo de visualizadores'
-    Visibility: Visibility
     has_one_Parent: 'Página mãe'
     many_many_BackLinkTracking: 'Gerenciar Backlink '
     many_many_ImageTracking: 'Gerenciar Imagem'
     many_many_LinkTracking: 'Gerenciar Link'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
   StaticExporter:
     BASEURL: 'URL Base'
     EXPORTTO: 'Exportar para a pasta'
     NAME: 'Relatório estático'
-  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
+  TableListField_PageControls_ss:
     VIEWFIRST: 'Ver primeiro'
     VIEWLAST: 'Ver ultimo'
     VIEWNEXT: 'Ver próximo'
     VIEWPREVIOUS: 'Ver anterior'
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Pode aceder ao site arquivado através deste link:'
     HAVEASKED: 'Você pediu para ver o conteúdo do nosso site em'
   VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Esta é uma página virtual'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Páginas virtuais'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Página virtual'
diff --git a/lang/ro.yml b/lang/ro.yml
index e688592c..1868cfe0 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -1,436 +1,55 @@
 ro:
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    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 ''{title}''{description} 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'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%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: 'Режим сравнения (выбрать две)'
     COMPAREVERSIONS: 'Сравнение версий'
-    COMPARINGVERSION: 'Comparing versions {version1} and {version2}.'
-    MENUTITLE: История
     REVERTTOTHISVERSION: 'Вернуться на эту версию'
     SHOWUNPUBLISHED: 'Показать неизданную версию'
     SHOWVERSION: 'Показать версию'
     VIEW: просмотр
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    VIEWINGVERSION: 'Currently viewing version {version}.'
-  CMSPageHistoryController_versions.ss:
+    MENUTITLE: История
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Автор
     NOTPUBLISHED: 'Не издано'
     PUBLISHER: Издатель
     UNKNOWN: Неизвестно
     WHEN: Когда
-  CMSPageSettingsController:
-    MENUTITLE: 'Править страницу'
   CMSPagesController:
     GalleryView: 'Обзор галереи'
-    ListView: Список
+    ListView: 'Список'
     MENUTITLE: Страницы
-    TreeView: Дерево
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: 'Drag''n''drop'
-    MULTISELECT: Multi-selection
-  CMSPagesController_Tools.ss:
-    FILTER: Filter
-  CMSSearch:
-    FILTERDATEFROM: От
-    FILTERDATEHEADING: Дата
-    FILTERDATETO: Кому
-    FILTERLABELTEXT: Содержание
-  CMSSettingsController:
-    MENUTITLE: Настройки
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Changed pages'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'All pages, including deleted'
+    TreeView: 'Дерево'
   CMSSiteTreeFilter_Search:
     Title: 'Все страницы'
-  ContentControl:
-    NOTEWONTBESHOWN: 'Note: this message will not be shown to your visitors'
-  ContentController:
-    ARCHIVEDSITE: 'Preview version'
-    ARCHIVEDSITEFROM: 'Archived site from'
-    CMS: CMS
-    DRAFT: Draft
-    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'
-    PUBLISHED: Published
-    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 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: Просмотр
-    SAVEDUP: Saved.
-    STATUSPUBLISHEDSUCCESS: 'Published ''{title}'' successfully'
-    SearchResults: 'Результаты поиска'
     VersionUnknown: Неизвестно
-  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: 'Адрес другого сайта'
-    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'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   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: Oricine
     ACCESSHEADER: 'Cine poate vizualiza această pagină pe site-ul meu?'
     ACCESSLOGGEDIN: 'Utilizatorii autentificaţi'
     ACCESSONLYTHESE: 'Doar aceste persoane (selectează din listă)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'Acceptă comentarii în aceasta pagină? '
-    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'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: Unpublish
-    BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
-    CREATED: 'Date Created'
-    Comments: Comments
     Content: Continut
-    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: 'Doar aceste persoane (selectează din 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'
-    GroupPlaceholder: 'Click to select group'
-    HASBROKENLINKS: 'This page has broken links.'
     HTMLEDITORTITLE: Continut
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
-    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'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: 'Page location'
+    METADESC: 'Descriere'
     PAGETITLE: 'Nume pagină'
     PAGETYPE: 'Tipul paginii'
-    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: 'Afişează in meniu?'
-    SHOWINSEARCH: 'Show in search?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: Comportament
     TABCONTENT: 'Conţinut '
-    TABDEPENDENT: 'Dependent pages'
-    TOPLEVEL: 'Site Content (Top Level)'
-    TOPLEVELCREATORGROUPS: 'Top level creators'
     URLSegment: 'Segment URL'
-    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 ''Pages'' section" 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: 'Pagina Parinte'
-    many_many_BackLinkTracking: 'Backlink Tracking'
-    many_many_ImageTracking: 'Image Tracking'
-    many_many_LinkTracking: 'Link Tracking'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
-  StaticExporter:
-    BASEURL: 'Основной адрес'
-    EXPORTTO: 'Экспорт в эту папку'
-    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:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  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: 'Linked Page'
     DESCRIPTION: 'Показать содержание другой страницы'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Aceasta este o pagină virtuală '
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Вирт. страницы'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Pagina Virtuala'
+  CMSPageSettingsController:
+    MENUTITLE: 'Править страницу'
+  CMSSettingsController:
+    MENUTITLE: Настройки
diff --git a/lang/ru.yml b/lang/ru.yml
index daddae6b..84f23e64 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -2,10 +2,9 @@ ru:
   AssetAdmin:
     ADDFILES: 'Добавить файлы'
     ActionAdd: 'Добавить папку'
-    AppCategoryArchive: 'Архив'
+    AppCategoryArchive: Архив
     AppCategoryAudio: Аудио
     AppCategoryDocument: Документ
-    AppCategoryFlash: Flash
     AppCategoryImage: Изображение
     AppCategoryVideo: Видео
     BackToFolder: 'Вернуться к папке'
@@ -19,22 +18,22 @@ ru:
     FROMYOURCOMPUTER: 'С диска'
     Filetype: 'Тип файла'
     ListView: 'В виде списка'
-    MENUTITLE: Файлы
-    NEWFOLDER: 'Новая папка'
-    SIZE: 'Размер'
+    NEWFOLDER: Новая папка
+    SIZE: Размер
     THUMBSDELETED: '{count} неиспользуемых миниатюр удалено'
     TreeView: 'В виде дерева'
     Upload: Загрузить
+    MENUTITLE: Файлы
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Удалить папки'
   AssetAdmin_Tools:
     FILTER: Фильтр
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Выбрать
   AssetTableField:
     BACKLINKCOUNT: 'Используется на:'
     PAGES: страниц
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Назад
   BrokenLinksReport:
     Any: Все
@@ -45,13 +44,12 @@ ru:
     ColumnDateLastModified: 'Дата последнего изменения'
     ColumnDateLastPublished: 'Дата последней публикации'
     ColumnProblemType: 'Вид проблемы'
-    ColumnURL: URL
     HasBrokenFile: 'содержит поврежденный файл'
     HasBrokenLink: 'содержит нерабочую ссылку'
     HasBrokenLinkAndFile: 'содержит нерабочую ссылку и поврежденный файл'
     HoverTitleEditPage: 'Править страницу'
     PageName: 'Название страницы'
-    ReasonDropdown: Проблема
+    ReasonDropdown: 'Проблема'
     ReasonDropdownBROKENFILE: 'Поврежденный файл'
     ReasonDropdownBROKENLINK: 'Нерабочая ссылка'
     ReasonDropdownRPBROKENLINK: 'Страница перенаправления указывает на несуществующую страницу'
@@ -68,27 +66,22 @@ ru:
     PUBLISHED_PAGES: 'Опубликовано %d страниц, %d ошибок'
     PUBLISH_PAGES: Опубликовать
     UNPUBLISHED_PAGES: 'Публикация %d страниц отменена'
-    UNPUBLISH_PAGES: 'Отмена публикации'
-  CMSFileAddController:
-    MENUTITLE: Файлы
+    UNPUBLISH_PAGES: Отмена публикации
   CMSMain:
     ACCESS: 'Доступ к разделу ''{title}'''
     ACCESS_HELP: 'Возможность просматривать раздел, содержащий дерево страниц и контент. Настройка прав просмотра и редактирования производится через выпадающие меню на отдельных страницах, а также через "Права доступа к содержимому".'
     AddNew: 'Добавить новую страницу'
-    AddNewButton: Добавить
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
+    AddNewButton: 'Добавить'
     ChoosePageParentMode: 'Выберите, где создать страницу'
     ChoosePageType: 'Выберите тип страницы'
     Create: Создать
     DELETE: 'Удалить черновик'
     DELETEFP: Удалить
     DESCREMOVED: 'и {count} страниц нижнего уровня'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    EMAIL: Email
+    DUPLICATED: 'Копия ''{title}'' создана'
+    DUPLICATEDWITHCHILDREN: 'Копия ''{title}'' и дочерних элементов создана'
     EditTree: 'Редактировать дерево'
     ListFiltered: 'Отфильтрованный список.'
-    MENUTITLE: 'Править страницу'
     NEWPAGE: 'Новая {pagetype}'
     PAGENOTEXISTS: 'Страница не существует'
     PAGES: Страницы
@@ -96,10 +89,10 @@ ru:
     PAGETYPEOPT: 'Тип страницы'
     PUBALLCONFIRM: 'Пожалуйста, опубликуйте каждую страницу сайта, перенося содержимое из чернового режима в опубликованный'
     PUBALLFUN: 'Функция "Опубликовать все"'
-    PUBALLFUN2: 'Нажатие этой кнопки выполнит ту же функцию, что и нажатие кнопки "Опубликовать" для каждой отдельной страницы. Данная функция предназначена для использования после значительных изменений содержимого, например, в момент создания нового сайта.'
+    PUBALLFUN2: "Нажатие этой кнопки выполнит ту же функцию, что и нажатие кнопки \"Опубликовать\" для каждой отдельной страницы. Данная функция предназначена для использования после значительных изменений содержимого, например, в момент создания нового сайта."
     PUBPAGES: 'Готово: опубликовано {count} страниц'
     PageAdded: 'Страница успешно создана'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
+    REMOVED: 'Страница ''{title}''{description} удалена с опубликованного сайта'
     REMOVEDPAGE: 'Страница ''{title}'' удалена с опубликованного сайта'
     REMOVEDPAGEFROMDRAFT: 'Страница ''%s'' удалена с чернового сайта'
     RESTORE: Восстановить
@@ -107,99 +100,80 @@ ru:
     ROLLBACK: 'Откатить до этой версии'
     ROLLEDBACKPUBv2: 'Выполнен откат к опубликованной версии.'
     ROLLEDBACKVERSIONv2: 'Выполнен откат к версии #%d.'
-    SAVE: 'Сохранить'
+    SAVE: Сохранить
     SAVEDRAFT: 'Сохранить черновик'
     TabContent: Содержимое
     TabHistory: История
     TabSettings: Настройки
     TreeFiltered: 'Отфильтрованное дерево.'
     TreeFilteredClear: 'Сбросить фильтр'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Применить фильтр'
+    MENUTITLE: 'Править страницу'
+    AddPageRestriction: 'Внимание: некоторые типы страниц в этом случае недоступны для выбора'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Применить фильтр'
     RESET: Восстановить
   CMSPageAddController:
-    MENUTITLE: 'Добавить страницу'
     ParentMode_child: 'Под другой страницей'
-    ParentMode_top: 'Верхний уровень'
-  CMSPageEditController:
-    MENUTITLE: 'Редактировать страницу'
+    MENUTITLE: 'Добавить страницу'
   CMSPageHistoryController:
     COMPAREMODE: 'Режим сравнения (выбрать две)'
     COMPAREVERSIONS: 'Сравнить версии'
     COMPARINGVERSION: 'Сравнение версий {version1} и {version2}.'
-    MENUTITLE: История
     REVERTTOTHISVERSION: 'Вернуться на эту версию'
     SHOWUNPUBLISHED: 'Показать неопубликованные версии'
     SHOWVERSION: 'Показать версию'
     VIEW: обзор
-    VIEWINGLATEST: 'Вы просматриваете самую новую версию.'
     VIEWINGVERSION: 'Вы просматриваете версию {version}.'
-  CMSPageHistoryController_versions.ss:
+    MENUTITLE: История
+    VIEWINGLATEST: 'Вы просматриваете самую новую версию.'
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Автор
     NOTPUBLISHED: 'Не издавалось'
     PUBLISHER: Издатель
     UNKNOWN: Неизвестно
     WHEN: Когда
-  CMSPageSettingsController:
-    MENUTITLE: 'Править страницу'
   CMSPagesController:
     GalleryView: 'В виде галереи'
     ListView: 'Обзор списка'
     MENUTITLE: Страницы
     TreeView: 'Обзор дерева'
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: 'Drag''n''drop'
-    MULTISELECT: 'Множественный выбор'
-  CMSPagesController_Tools.ss:
+  CMSPagesController_ContentToolbar_ss:
+    MULTISELECT: Множественный выбор
+  CMSPagesController_Tools_ss:
     FILTER: Фильтр
   CMSSearch:
     FILTERDATEFROM: От
     FILTERDATEHEADING: Дата
     FILTERDATETO: До
     FILTERLABELTEXT: Содержимое
-  CMSSettingsController:
-    MENUTITLE: Настройки
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Измененные страницы'
   CMSSiteTreeFilter_DeletedPages:
     Title: 'Все страницы, включая удаленные'
   CMSSiteTreeFilter_Search:
     Title: 'Все страницы'
-  ContentControl:
-    NOTEWONTBESHOWN: 'Примечание: это сообщение не будет отображаться для посетителей'
   ContentController:
     ARCHIVEDSITE: 'Версия для просмотра'
     ARCHIVEDSITEFROM: 'Архив сайта от'
-    CMS: CMS
-    DRAFT: Черновик
     DRAFTSITE: 'Черновой сайт'
-    DRAFT_SITE_ACCESS_RESTRICTION: 'Вы должны войти с паролем для Системы Управления (CMS), чтобы увидеть черновое или архивное содержимое. <a href="%s">Нажмите сюда, чтобы вернуться на опубликованный сайт.</a>'
-    Email: Email
+    DRAFT_SITE_ACCESS_RESTRICTION: 'Для просмотра чернового или архивного содержимого вам необходимо войти в систему со своим именем пользователя и паролем. <a href="%s">Щелкните здесь, чтобы вернуться на опубликованный сайт.</a>'
     INSTALL_SUCCESS: 'Инсталляция прошла успешно!'
     InstallFilesDeleted: 'Инсталляционные файлы были успешно удалены.'
-    InstallSecurityWarning: 'Если вы не планируете в ближайшее время переустанавливать CMS, по соображениям безопасности рекомендуется удалить инсталляционные файлы (<em>для этого необходим администраторский доступ, см. выше</em>). Теперь веб-серверу требуется доступ для записи только к папке "assets"; вы можете защитить от записи все остальные папки. <a href="{link}" style="text-align: center;">Щелкните здесь, чтобы удалить инсталляционные файлы.</a>'
+    InstallSecurityWarning: 'Если вы не планируете в ближайшее время переустанавливать CMS, по соображениям безопасности рекомендуется удалить инсталляционные файлы (<em>для этого требуются права доступа администратора ‒ см. выше</em>). Теперь веб-серверу необходим доступ для записи только к папке "assets"; все остальные папки можно защитить от записи. <a href="{link}" style="text-align: center;">Щелкните здесь, чтобы удалить инсталляционные файлы.</a>'
     InstallSuccessCongratulations: 'SilverStripe успешно установлен!'
     LOGGEDINAS: 'Залогинен как'
-    LOGIN: 'Вход'
+    LOGIN: Вход
     LOGOUT: 'Выход'
     NOTLOGGEDIN: 'Не вошли в систему'
-    PUBLISHED: Published
     PUBLISHEDSITE: 'Опубликованный сайт'
     Password: Пароль
     PostInstallTutorialIntro: 'Это упрощенная версия сайта, созданного с помощью SilverStripe 3. О возможностях расширения сайта можно узнать, щелкнув эту ссылку: {link}.'
     StartEditing: 'Вы можете приступить к редактированию содержимого сайта, открыв <a href="{link}">CMS</a>.'
     UnableDeleteInstall: 'Не удалось удалить инсталляционные файлы. Пожалуйста, удалите следующие файлы вручную'
     VIEWPAGEIN: 'Просмотреть страницу в:'
+    DRAFT: Черновик
+    PUBLISHED: Опубликовано
   ErrorPage:
-    CODE: 'Код ошибки'
-    DEFAULTERRORPAGECONTENT: '<p>Извините, страница, к которой вы пытаетесь получить доступ, не существует.</p><p>Пожалуйста, проверьте правильность написания ссылки и попытайтесь снова.</p>'
-    DEFAULTERRORPAGETITLE: 'Страница не найдена'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Не удалось обработать запрос.</p>'
-    DEFAULTSERVERERRORPAGETITLE: 'Ошибка сервера'
-    DESCRIPTION: 'Пользовательские страницы ошибок (например, "Страница не найдена")'
-    ERRORFILEPROBLEM: 'Ошибка при открытии файла "{filename}" для записи. Пожалуйста, проверьте права доступа к файлам.'
-    PLURALNAME: 'Страницы ошибок'
-    SINGULARNAME: 'Страница ошибки'
     400: '400 - Плохой запрос'
     401: '401 - Неавторизован'
     403: '403 - Запрещено'
@@ -223,6 +197,15 @@ ru:
     503: '503 - Сервис недоступен'
     504: '504 - Шлюз не отвечает'
     505: '505 - Версия HTTP не поддерживается'
+    CODE: 'Код ошибки'
+    DEFAULTERRORPAGECONTENT: '<p>Извините, страница, к которой вы пытаетесь получить доступ, не существует.</p><p>Пожалуйста, проверьте правильность написания ссылки и попытайтесь снова.</p>'
+    DEFAULTERRORPAGETITLE: 'Страница не найдена'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>Не удалось обработать запрос.</p>'
+    DEFAULTSERVERERRORPAGETITLE: 'Ошибка сервера'
+    DESCRIPTION: 'Пользовательские страницы ошибок (например, "Страница не найдена")'
+    ERRORFILEPROBLEM: 'Ошибка при открытии файла "{filename}" для записи. Пожалуйста, проверьте права доступа к файлам.'
+    PLURALNAME: 'Страницы ошибок'
+    SINGULARNAME: 'Страница ошибки'
   Folder:
     AddFolderButton: 'Добавить папку'
     DELETEUNUSEDTHUMBNAILS: 'Удалить неиспользуемые миниатюры'
@@ -232,7 +215,7 @@ ru:
   LeftAndMain:
     DELETED: Удалено.
     PreviewButton: Просмотр
-    SAVEDUP: 'Сохранено.'
+    SAVEDUP: Сохранено.
     STATUSPUBLISHEDSUCCESS: '''{title}'' успешно опубликован'
     SearchResults: 'Результаты поиска'
     VersionUnknown: Неизвестно
@@ -242,25 +225,20 @@ ru:
     CONTENT_CATEGORY: 'Права доступа к содержимому'
     PERMISSIONS_CATEGORY: 'Роли и права доступа'
   RedirectorPage:
-    DESCRIPTION: 'Перенаправление на другую внутреннюю страницу'
     HASBEENSETUP: 'Страница перенаправления установлена без указания места перенаправления.'
     HEADER: 'Эта страница будет перенаправлять пользователей на другую страницу'
     OTHERURL: 'URL другого сайта'
     PLURALNAME: 'Страницы перенаправления'
     REDIRECTTO: 'Перенаправлять на'
     REDIRECTTOEXTERNAL: 'Другой сайт'
-    REDIRECTTOPAGE: 'Страницу Вашего сайта'
+    REDIRECTTOPAGE: 'Страницу вашего сайта'
     SINGULARNAME: 'Страница перенаправления'
-    YOURPAGE: 'Страница Вашего сайта'
+    YOURPAGE: 'Страница вашего сайта'
   ReportAdmin:
-    MENUTITLE: Отчеты
     ReportTitle: Название
+    MENUTITLE: Отчеты
   ReportAdminForm:
     FILTERBY: 'Фильтровать по'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Для опубликования виртуальной страницы опубликуйте связанную страницу'
-    VIRTUALPAGEWARNING: 'Для опубликования этой страницы выберите связанную страницу и сохраните изменения'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Выполн.
     SEARCH: Поиск
@@ -277,11 +255,8 @@ ru:
     OtherGroupTitle: Другие
     ParameterLiveCheckbox: 'Проверить опубликованный сайт'
     REPEMPTY: 'Отчет {title} пуст.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Чтобы поделиться ссылкой на эту страницу, скопируйте URL ниже.'
-    ShareLink: 'Поделиться ссылкой'
   SilverStripeNavigatorLinkl:
     CloseLink: Закрыть
   SiteConfig:
@@ -311,18 +286,16 @@ ru:
     APPEARSVIRTUALPAGES: 'Это содержимое также отображается на виртуальных страницах в разделе {title}.'
     BUTTONCANCELDRAFT: 'Отменить изменения черновика'
     BUTTONCANCELDRAFTDESC: 'Удалить черновик и вернуться к уже опубликованной странице'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
     BUTTONSAVEPUBLISH: 'Сохранить и опубликовать'
-    BUTTONUNPUBLISH: 'Отмена публикации'
+    BUTTONUNPUBLISH: Отмена публикации
     BUTTONUNPUBLISHDESC: 'Удалить эту страницу с опубликованного сайта'
     CREATED: 'Дата создания'
     Comments: Комментарии
-    Content: 'Наполнение сайта'
-    DEFAULTABOUTCONTENT: '<p>Вы можете заполнить эту страницу собственным содержимым или удалить ее и создать новые страницы.<br /></p>'
+    Content: Наполнение сайта
+    DEFAULTABOUTCONTENT: '<p>Вы можете добавить на эту страницу собственные материалы или удалить ее и создать новые страницы.<br /></p>'
     DEFAULTABOUTTITLE: 'О нас'
     DEFAULTCONTACTCONTENT: '<p>Вы можете заполнить эту страницу собственным содержимым или удалить ее и создать новые страницы.<br /></p>'
-    DEFAULTCONTACTTITLE: Контакты
+    DEFAULTCONTACTTITLE: 'Контакты'
     DEFAULTHOMECONTENT: '<p>Добро пожаловать в SilverStripe! Это главная страница по умолчанию. Вы можете редактировать ее в <a href="admin/">Системе Управления Содержимым</a>. Вы также можете обратиться к <a href="http://doc.silverstripe.com">документации для разработчиков</a> или начать с <a href="http://doc.silverstripe.com/doku.php?id=tutorials">учебных материалов.</a></p>'
     DEFAULTHOMETITLE: Главная
     DELETEDPAGEHELP: 'Страница больше не является опубликованной'
@@ -330,32 +303,26 @@ ru:
     DEPENDENT_NOTE: 'С этой страницей связаны следующие зависимые страницы (сюда относятся виртуальные страницы, страницы перенаправления и страницы со ссылками на контент).'
     DESCRIPTION: 'Обычная страница'
     DependtPageColumnLinkType: 'Тип ссылки'
-    DependtPageColumnURL: URL
-    EDITANYONE: 'Все у кого есть доступ к Системе (CMS)'
+    EDITANYONE: 'Все, у кого есть доступ к системе (CMS)'
     EDITHEADER: 'Кто может редактировать эту страницу?'
     EDITONLYTHESE: 'Только эти пользователи (выберите из списка)'
     EDITORGROUPS: 'Группы редактирования'
     EDIT_ALL_DESCRIPTION: 'Редактирование любой страницы'
     EDIT_ALL_HELP: 'Возможность редактировать любую страницу на сайте независимо от настроек во вкладке "Доступ". Необходимо право доступа к разделу "Страницы".'
     Editors: 'Группы редактирования'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Эта страница содержит неверные ссылки.'
     HTMLEDITORTITLE: Содержимое
     INHERIT: 'Перенять от родительской страницы'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Последнее обновление'
     LINKCHANGENOTE: 'Изменение ссылки на эту страницу повлияет и на ссылки всех дочерних страниц.'
     MENUTITLE: 'Метка в навигации'
-    METADESC: Описание
+    METADESC: 'Описание'
     METADESCHELP: 'Поисковые системы используют этот контент для отображения результатов поиска (однако на рейтинг страницы он не влияет).'
     METAEXTRA: 'Пользовательские мета-тэги'
     METAEXTRAHELP: 'HTML-теги для дополнительной мета-информации. Например, &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'На этой странице есть неопубликованные изменения'
     MODIFIEDONDRAFTSHORT: Изменено
     MetadataToggle: Метаданные
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
     OBSOLETECLASS: 'Тип страницы {type} больше не поддерживается. При сохранении тип страницы будет сброшен, что может привести к потере данных'
     PAGELOCATION: 'Расположение страницы'
     PAGETITLE: 'Название страницы'
@@ -378,36 +345,43 @@ ru:
     SHOWINSEARCH: 'Показывать в поиске?'
     SINGULARNAME: Страница
     TABBEHAVIOUR: Поведение
-    TABCONTENT: Содержимое
+    TABCONTENT: 'Содержимое'
     TABDEPENDENT: 'Зависимые страницы'
-    TOPLEVEL: 'Содержимое сайта (Верхний уровень)'
+    TOPLEVEL: 'Содержимое сайта (верхний уровень)'
     TOPLEVELCREATORGROUPS: 'Авторы верхнего уровня'
     URLSegment: 'Адрес страницы'
     VIEWERGROUPS: 'Группы чтения'
     VIEW_ALL_DESCRIPTION: 'Просмотр любой страницы'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
-    VIEW_DRAFT_CONTENT: 'Просмотр содержимого черновика'
-    VIEW_DRAFT_CONTENT_HELP: 'Просмотр страниц вне CMS в режиме черновика. Эта опция может понадобиться внештатным сотрудникам, не имеющим доступа к CMS.'
+    VIEW_ALL_HELP: 'Возможность просматривать любую страницу на сайте независимо от настроек во вкладке "Доступ". Необходимо право доступа к разделу "Страницы".'
+    VIEW_DRAFT_CONTENT: 'Просмотр чернового содержимого'
+    VIEW_DRAFT_CONTENT_HELP: 'Просмотр страниц вне CMS в режиме черновика. Установите этот флажок, если у некоторых участников проектной команды (например, внештатных сотрудников) нет доступа к CMS.'
     Viewers: 'Группы чтения'
     Visibility: Отображение
     has_one_Parent: 'Родительская страница'
     many_many_BackLinkTracking: 'Отслеживание обратных ссылок'
     many_many_ImageTracking: 'Отслеживание изображений'
     many_many_LinkTracking: 'Отслеживание ссылок'
+    BUTTONPUBLISHED: Опубликовано
+    BUTTONSAVED: Сохранено
+    GroupPlaceholder: 'Щелкните, чтобы выбрать группу'
+    LASTPUBLISHED: 'Последняя публикация'
+    LASTSAVED: 'Дата сохранения'
+    MoreOptions: 'Другие варианты'
+    NOTPUBLISHED: 'Не опубликовано'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Спецсимволы автоматически конвертируются или удаляются.'
+    EMPTY: 'Задайте адрес страницы или нажмите "Отмена"'
   StaticExporter:
     BASEURL: 'Базовый URL'
     EXPORTTO: 'Экспорт в эту папку'
     NAME: 'Статический экспорт'
   TableListField:
     SELECT: 'Выбрать:'
-  TableListField.ss:
+  TableListField_ss:
     NOITEMSFOUND: 'Элементов не найдено'
     SORTASC: 'По возрастанию'
     SORTDESC: 'По убыванию'
-  TableListField_PageControls.ss:
+  TableListField_PageControls_ss:
     DISPLAYING: Отображение
     OF: из
     TO: по
@@ -417,20 +391,33 @@ ru:
     VIEWPREVIOUS: 'См. предыдущ.'
   TreeTools:
     DisplayLabel: 'Отображать:'
-  URLSegmentField:
-    Cancel: Отмена
-    Edit: 'Редактировать'
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Вы можете посмотреть архивную версию сайта по этой ссылке:'
     HAVEASKED: 'Вы запросили просмотр содержимого нашего сайта за'
   VirtualPage:
     CHOOSE: 'Связанная страница'
-    DESCRIPTION: 'Показать содержимое других страниц'
+    DESCRIPTION: 'Отображение содержимого другой страницы'
     EDITCONTENT: 'Редактировать содержимое на связанной странице'
-    EditLink: редактировать
     HEADER: 'Это виртуальная страница'
-    HEADERWITHLINK: 'Это виртуальная страница, копирующая содержимое из "{title}" ({link})'
     PLURALNAME: 'Виртуальная страница'
     PageTypNotAllowedOnRoot: 'Страницы типа "{type}" недопустимы в качестве корневых для этой виртуальной страницы'
     SINGULARNAME: 'Виртуальная страница'
+    EditLink: редактировать
+    HEADERWITHLINK: 'Это виртуальная страница, копирующая содержимое из "{title}" ({link})'
+  CMSFileAddController:
+    MENUTITLE: Файлы
+  CMSPageEditController:
+    MENUTITLE: 'Редактировать страницу'
+  CMSPageSettingsController:
+    MENUTITLE: 'Править страницу'
+  CMSSettingsController:
+    MENUTITLE: Настройки
+  SITETREE:
+    VIRTUALPAGEDRAFTWARNING: 'Для опубликования виртуальной страницы опубликуйте связанную страницу'
+    VIRTUALPAGEWARNING: 'Для опубликования этой страницы выберите связанную страницу и сохраните изменения'
+    VIRTUALPAGEWARNINGSETTINGS: 'Для опубликования выберите связанную страницу из области основного содержимого'
+  SilverStripeNavigator:
+    ARCHIVED: Архивные
+  URLSegmentField:
+    Cancel: Отмена
+    Edit: Редактировать
diff --git a/lang/si.yml b/lang/si.yml
index 776d6b64..ee4962dc 100644
--- a/lang/si.yml
+++ b/lang/si.yml
@@ -1,205 +1,18 @@
 si:
   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: 'අලත් ගොනුවක්'
-    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:
+    NEWFOLDER: අලත් ගොනුවක්
+  AssetAdmin_left_ss:
     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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
     DELETE: 'කටු අඩවියෙන් මකන්න'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: ඊමේල්
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Edit Page'
-    NEWPAGE: 'New {pagetype}'
     PAGENOTEXISTS: 'මෙම  පිටුව තවදුරටත් නොපවතී'
-    PAGES: Pages
-    PAGETYPEANYOPT: Any
-    PAGETYPEOPT: 'Page Type'
     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.'
-    PUBPAGES: 'Done: Published {count} pages'
-    PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
     REMOVEDPAGEFROMDRAFT: 'කටු අඩවියෙන් ''%s'' මකන ලදී'
-    RESTORE: Restore
-    RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'මෙම සංස්රනය ඉවත් කරනන්න'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
-    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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    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'
-    PUBLISHED: Published
-    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 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:'
+    SAVE: සේවි කරන්න
   ErrorPage:
-    CODE: 'වැරදි කේතය'
-    DEFAULTERRORPAGECONTENT: '<p>කණගාටුයි,ඔබ නොමැති පිටුවකට යාමට උත්සාහ කරයි. </p><p>ඔබට යාමට අවශ්ය URL එකෙහි අක්ෂර පරීක්ෂා කර නැවත උත්සාහ කරන්න.</p>'
-    DEFAULTERRORPAGETITLE: 'පිටුව නොලැබුනි'
-    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 - දුර්වල ඉල්ළීමක්'
     401: '401 - බල රහිත'
     403: '403 - තහනම්'
@@ -210,227 +23,67 @@ si:
     408: '408 - ඉල්ලීමේ කාලය අවසන්'
     409: '409 - ගැටුමකි'
     410: '410 - නැති විය'
-    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'
+    CODE: 'වැරදි කේතය'
+    DEFAULTERRORPAGECONTENT: '<p>කණගාටුයි,ඔබ නොමැති පිටුවකට යාමට උත්සාහ කරයි. </p><p>ඔබට යාමට අවශ්ය URL එකෙහි අක්ෂර පරීක්ෂා කර නැවත උත්සාහ කරන්න.</p>'
+    DEFAULTERRORPAGETITLE: 'පිටුව නොලැබුනි'
   Folder:
-    AddFolderButton: 'Add folder'
-    DELETEUNUSEDTHUMBNAILS: 'Delete unused thumbnails'
     UNUSEDFILESTITLE: 'භාවිතා නොකළ ගොනු'
-    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: 'යොමු කිරීමේ පිටුව කිසිවකට යොමු නොකරයි'
     HEADER: 'මෙම පිටුව පරිබෝඡකයන් වෙනත් යොමු කරයි'
     OTHERURL: 'වෙනත් වෙබ් අඩවි URL'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'යොමු කරන්න'
     REDIRECTTOEXTERNAL: 'වෙනත් වෙබ් අඩවි'
     REDIRECTTOPAGE: 'ඔබේ අඩවියේ පිටුවක්'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'ඔබේ අඩවියේ පිටුවක්'
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  SearchForm:
-    GO: Go
-    SEARCH: Search
-    SearchResults: 'Search Results'
   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: 'හිස් පිටු'
     LAST2WEEKS: 'අවසාන සති 2 තුල වෙනස්  කරන ලද පිටු'
-    OtherGroupTitle: Other
-    ParameterLiveCheckbox: 'Check live site'
-    REPEMPTY: 'The {title} report is empty.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   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: 'සියලු දෙනා'
+    ACCESSANYONE: සියලු දෙනා
     ACCESSHEADER: 'මෙම පිටුව බැලිය හැකි අය'
     ACCESSLOGGEDIN: 'ප්රවිෂ්ටව සිටින පරිශීලකයින්'
     ACCESSONLYTHESE: 'මේ අය පමනක් (ලයිස්තුවෙන් තෝරන්න)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'විචාර කිරීමට හැක'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'කටු වෙනස් කිරීම් අවලංගු කරන්න'
     BUTTONCANCELDRAFTDESC: 'කටු සටහන මකා, දැනට ප්රසිද්ධ පිටුවට ඵකතු කරන්න'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'අප්රසිද්ධ කරන්න'
+    BUTTONUNPUBLISH: අප්රසිද්ධ කරන්න
     BUTTONUNPUBLISHDESC: 'මෙම පිටුව ප්රසිද්ධ කල අඩවියෙන් ගලවන්න'
-    CREATED: 'Date Created'
-    Comments: Comments
-    Content: 'අන්තර්ගතය'
-    DEFAULTABOUTCONTENT: '<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>'
+    Content: අන්තර්ගතය
     DEFAULTABOUTTITLE: 'අපි ගැන'
-    DEFAULTCONTACTCONTENT: '<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>'
     DEFAULTCONTACTTITLE: 'අප අමතන්න'
-    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: 'CMS ඵකට ඇතුල් විය හැකි සියල්ලන්ටම'
     EDITHEADER: 'CMS ඵක සංස්කරනය කල හැක්කේ කාහටද?'
     EDITONLYTHESE: 'මෙම අයට පමනක් (ලැයිස්තුවෙන් තෝරන්න)'
-    EDITORGROUPS: 'Editor Groups'
-    EDIT_ALL_DESCRIPTION: 'Edit any page'
-    EDIT_ALL_HELP: 'Ability to edit any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
-    Editors: 'Editors Groups'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'මෙම පිටුවට කැඩුනු බැදීම් ඇත'
-    HTMLEDITORTITLE: 'අන්තර්ගතය'
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
-    LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
+    HTMLEDITORTITLE: අන්තර්ගතය
     MENUTITLE: 'සංක්රමන ලේබලය'
     METADESC: 'අර්තකතනය'
-    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: 'සැකසූ මෙටා ටැග්'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: 'Page location'
     PAGETITLE: 'පිටු නම'
     PAGETYPE: 'පිටු වර්ගය'
-    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: 'මෙනුවේ පෙන්වන්නද?'
     SHOWINSEARCH: 'සර්ච් ඵකේ පෙන්වන්නද?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: හැසිරීම
     TABCONTENT: 'අන්තර්ගතය'
-    TABDEPENDENT: 'Dependent pages'
     TOPLEVEL: 'අන්ර්ගතය'
-    TOPLEVELCREATORGROUPS: 'Top level creators'
     URLSegment: 'URL කොටස'
-    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 ''Pages'' section" 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: 'මවු පිටුව'
-    many_many_BackLinkTracking: 'Backlink Tracking'
-    many_many_ImageTracking: 'Image Tracking'
-    many_many_LinkTracking: 'Link Tracking'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
   StaticExporter:
     BASEURL: 'පාදම් URL'
     EXPORTTO: 'ඵම ගොනුවට අපනයනය කරන්නන'
     NAME: 'ස්තිතික අපනයනය කරන්නා'
-  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
+  TableListField_PageControls_ss:
     VIEWFIRST: 'පළමු එක පෙන්වන්න'
     VIEWLAST: 'අවසානය පෙන්වන්න'
     VIEWNEXT: 'ඊළඟ එක පෙන්වන්න'
     VIEWPREVIOUS: 'පෙර පෙන්වන්න'
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'මෙම බැදීමෙන් පැරනි අඩවියට ප්රවිෂ්ට විය හැක'
     HAVEASKED: 'ඹබට අපගේ වෙබ් අඩවිය නිරීක්ශනය කරන ලෙස ඉල්ලා ඇත'
   VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'මෙය මනඃකල්පිත පිටුවකි'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'මනඃකල්පිත පිටු'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'මනඃකල්පිත පිටුව'
diff --git a/lang/sk.yml b/lang/sk.yml
index 19a47679..addebb9f 100644
--- a/lang/sk.yml
+++ b/lang/sk.yml
@@ -5,9 +5,7 @@ sk:
     AppCategoryArchive: Archív
     AppCategoryAudio: Zvuk
     AppCategoryDocument: Dokument
-    AppCategoryFlash: Flash
     AppCategoryImage: Obrázok
-    AppCategoryVideo: Video
     BackToFolder: 'Späť na priečinok'
     CREATED: Dátum
     CurrentFolderOnly: 'Obmedziť na aktuálny priečinok?'
@@ -19,22 +17,22 @@ sk:
     FROMYOURCOMPUTER: 'Z vášho počitača'
     Filetype: 'Typ súboru'
     ListView: 'Zobraziť zoznam'
-    MENUTITLE: Súbory
-    NEWFOLDER: 'Nový priečinok'
+    NEWFOLDER: Nový priečinok
     SIZE: Veľkosť
     THUMBSDELETED: '{count} nepoužitých miniatúr bolo smazaných'
     TreeView: 'Zobraziť strom'
     Upload: Nahrať
+    MENUTITLE: Súbory
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Vymazať priečinky'
   AssetAdmin_Tools:
     FILTER: Filtrovať
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Choď
   AssetTableField:
     BACKLINKCOUNT: 'Použité na:'
     PAGES: stránka(y)
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Späť
   BrokenLinksReport:
     Any: Akákoľvek
@@ -45,7 +43,6 @@ sk:
     ColumnDateLastModified: 'Dátum poslednej úpravy'
     ColumnDateLastPublished: 'Dátum poslednej publikácie'
     ColumnProblemType: 'Problémový typ'
-    ColumnURL: URL
     HasBrokenFile: 'obsahuje porušený súbor'
     HasBrokenLink: 'obsahuje porušený odkaz'
     HasBrokenLinkAndFile: 'obsahuje porušený odkaz a súbor'
@@ -69,26 +66,22 @@ sk:
     PUBLISH_PAGES: Zverejniť
     UNPUBLISHED_PAGES: 'Ne-zverejnené %d stranky'
     UNPUBLISH_PAGES: Ne-zverejniť
-  CMSFileAddController:
-    MENUTITLE: Súbory
   CMSMain:
     ACCESS: 'Pristup k ''{title}'' sekcii'
     ACCESS_HELP: 'Povoliť prezeranie sekcie obsahujúcu strom stránok a obsah. Práva na prezeranie a úpravu môžu byť nastavené cez výber, ako aj jednotlivo  "Práva obsahu".'
     AddNew: 'Pridať novou stránku'
     AddNewButton: 'Pridať nový'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: 'Vyberte, kde vytvoriť túto stránku'
     ChoosePageType: 'Vyberte typ stránky'
     Create: Vytvoriť
     DELETE: 'Vymazať koncept'
-    DELETEFP: 'Vymazať z publikovaného webu'
+    DELETEFP: Vymazať z publikovaného webu
     DESCREMOVED: 'a {count} potomkov'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    EMAIL: 'Pošli e-mailom'
+    DUPLICATED: 'Duplikované ''{title}'' úspešne'
+    DUPLICATEDWITHCHILDREN: 'Duplikované ''{title}'' a potomkovia úspešne'
+    EMAIL: Pošli e-mailom
     EditTree: 'Editovať strom'
     ListFiltered: 'Filtrovaný zoznam.'
-    MENUTITLE: 'Upraviť stránku'
     NEWPAGE: 'Nová {pagetype}'
     PAGENOTEXISTS: 'Táto stránka neexistuje.'
     PAGES: Stránky
@@ -96,110 +89,87 @@ sk:
     PAGETYPEOPT: 'Typ stránky'
     PUBALLCONFIRM: 'Prosím, zverejnite všetky stránky webu, zkopírovaním obsahu na verejné'
     PUBALLFUN: 'Funkcia "Publikovať všetko"'
-    PUBALLFUN2: 'Stlačením tohto tlačidla vykonáte to isté ako keby ste navštívili každú stránku a stlačili "publikuj". Je určené na použite po rozsiahlych zmenách obsahu, napríklad keď bol web prvýkrát vytvorený.'
+    PUBALLFUN2: "Stlačením tohto tlačidla vykonáte to isté ako keby ste navštívili každú stránku a stlačili \"publikuj\". Je určené na použite po rozsiahlych zmenách obsahu, napríklad keď bol web prvýkrát vytvorený."
     PUBPAGES: 'Hotovo: Publikované {count} stránky'
     PageAdded: 'Stránka vytvorená úspešne'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
+    REMOVED: 'Smazané ''{title}''{description} z webu'
     REMOVEDPAGE: 'Smazané ''{title}'' z verejného webu'
     REMOVEDPAGEFROMDRAFT: 'Odstránené ''%s'' z konceptu webu'
     RESTORE: Obnoviť
     RESTORED: 'Obnovené ''{title}'' úspešne'
     ROLLBACK: 'Návrat späť na túto verziu'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
+    ROLLEDBACKPUBv2: 'Vrátené späť na zverejnenú verziu.'
+    ROLLEDBACKVERSIONv2: 'Vrátené späť na verziu #%d.'
     SAVE: Uložiť
-    SAVEDRAFT: 'Save draft'
+    SAVEDRAFT: 'Uložiť koncept'
     TabContent: Obsah
     TabHistory: História
     TabSettings: Nastavenia
     TreeFiltered: 'Filtrovaný strom.'
     TreeFilteredClear: 'Vyčistiť filter'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Použiť filter'
-    RESET: Reset
+    MENUTITLE: 'Upraviť stránku'
+    AddPageRestriction: 'Poznámka: Niektoré typy stránok nie sú povolené pre tento výber'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Použiť filter'
   CMSPageAddController:
-    MENUTITLE: 'Pridať stránku'
     ParentMode_child: 'Pod inú stránku'
     ParentMode_top: 'Najvyššia úroveň'
-  CMSPageEditController:
-    MENUTITLE: 'Upraviť stránku'
+    MENUTITLE: 'Pridať stránku'
   CMSPageHistoryController:
     COMPAREMODE: 'Mód porovnania (vyberte dva)'
     COMPAREVERSIONS: 'Porovnať verzie'
     COMPARINGVERSION: 'Porovnie verzií {version1} a {version2}.'
-    MENUTITLE: História
     REVERTTOTHISVERSION: 'Vrátiť sa k tejto verzii'
     SHOWUNPUBLISHED: 'Zobraziť nepublikované verzie'
     SHOWVERSION: 'Zobraziť verziu'
     VIEW: zobraziť
-    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Práve sa zobrazuje verzia {version}.'
-  CMSPageHistoryController_versions.ss:
-    AUTHOR: Autor
-    NOTPUBLISHED: Nepublikovaná
+    MENUTITLE: História
+    VIEWINGLATEST: 'Práve sa zobrazuje posledná verzia.'
+  CMSPageHistoryController_versions_ss:
+    NOTPUBLISHED: 'Nepublikovaná'
     PUBLISHER: Vydavateľ
     UNKNOWN: Neznáma
     WHEN: Keď
-  CMSPageSettingsController:
-    MENUTITLE: 'Upraviť stránku'
   CMSPagesController:
     GalleryView: 'Zobraziť galériu'
     ListView: 'Zobraziť zoznam'
-    MENUTITLE: Stránky
     TreeView: 'Zobraziť strom'
-  CMSPagesController_ContentToolbar.ss:
+  CMSPagesController_ContentToolbar_ss:
     ENABLEDRAGGING: 'Tiahni a pusť'
-    MULTISELECT: 'Multi výber'
-  CMSPagesController_Tools.ss:
+    MULTISELECT: Multi výber
+  CMSPagesController_Tools_ss:
     FILTER: Filtrovať
   CMSSearch:
     FILTERDATEFROM: Od
-    FILTERDATEHEADING: Dátum
-    FILTERDATETO: Do
-    FILTERLABELTEXT: Obsah
-  CMSSettingsController:
-    MENUTITLE: Nastavenia
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Zmenené stránky'
   CMSSiteTreeFilter_DeletedPages:
     Title: 'Všetky stránky, vrátane vymazaných'
-  CMSSiteTreeFilter_Search:
-    Title: 'Všetky stránky'
   ContentControl:
     NOTEWONTBESHOWN: 'Poznámka: Táto správa sa nebude zobrazovať vašim návštevníkom'
   ContentController:
     ARCHIVEDSITE: 'Zobrazenie verzie'
     ARCHIVEDSITEFROM: 'Archivovaný web z'
-    CMS: CMS
-    DRAFT: Draft
     DRAFTSITE: 'Koncept webu'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Pre zobrazenie návrhov alebo archivovaného obsahu sa musíte prihlásiť so svojím CMS heslom. <a href="%s">Pre návrat na publikovaný web kliknite Tu.</a>'
-    Email: Email
     INSTALL_SUCCESS: 'Inštalácia úspešná!'
     InstallFilesDeleted: 'Inštalačné súbory boli odstranené úspešne.'
     InstallSecurityWarning: 'Z bezpečnostných dôvodov by ste mali teraz odstrániť inštalačné súbory, ak  neplánujete preinštalovať neskôr (<em> vyžaduje admin prihlásenie, pozri vyššie </em>). Webový server teraz potrebuje už len prístup pre zápis do priečinka "assets", môžete odstrániť práva zápisu zo všetkých ostatných priečinkov. <a href="{link}" style="text-align: center;"> Kliknite tu pre odstránenie inštalačných súborov. </a>'
     InstallSuccessCongratulations: 'SilverStripe bol nainštalovaný úspešne!'
     LOGGEDINAS: 'Prihlásený ako'
     LOGIN: Prihlásiť
-    LOGOUT: Odhlásiť
-    NOTLOGGEDIN: Neprihlásený
-    PUBLISHED: Published
+    LOGOUT: 'Odhlásiť'
+    NOTLOGGEDIN: 'Neprihlásený'
     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: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
+    StartEditing: 'Môžte začať editáciu vášho 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:'
+    DRAFT: Koncept
+    PUBLISHED: Publikované
   ErrorPage:
-    CODE: 'Chybový kód'
-    DEFAULTERRORPAGECONTENT: '<p>Prepáčte, vyzerá to tak, že sa snažíte otvoriť stránku ktorá neexistuje.</p><p> Prosím skontrolujte napísané URL a skuste znova.</p>'
-    DEFAULTERRORPAGETITLE: 'Stránka nenájdená'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Prepáčte, ale bol problém s manipuláciou vášho požiadavku.</p>'
-    DEFAULTSERVERERRORPAGETITLE: 'Chyba servera'
-    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: 'Chybová stránka'
     400: '400 - Neplatná požiadavka'
     401: '401 - Neautorizovaný prístup'
     403: '403 - Zamietnuté'
@@ -223,6 +193,15 @@ sk:
     503: '503 - Služba nedostupná'
     504: '504 - Čas na požiadavky vypršal - Brána'
     505: '505 - HTTP verzia nie je podporovaná'
+    CODE: 'Chybový kód'
+    DEFAULTERRORPAGECONTENT: '<p>Prepáčte, vyzerá to tak, že sa snažíte otvoriť stránku ktorá neexistuje.</p><p> Prosím skontrolujte napísané URL a skuste znova.</p>'
+    DEFAULTERRORPAGETITLE: 'Stránka nenájdená'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>Prepáčte, ale bol problém s manipuláciou vášho požiadavku.</p>'
+    DEFAULTSERVERERRORPAGETITLE: 'Chyba servera'
+    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: 'Chybová stránka'
   Folder:
     AddFolderButton: 'Pridať priečinok'
     DELETEUNUSEDTHUMBNAILS: 'Vymazať nepoužité miniatúry'
@@ -234,7 +213,6 @@ sk:
     PreviewButton: Zobrazenie
     SAVEDUP: Uložené.
     STATUSPUBLISHEDSUCCESS: 'Uverejnené "{title}" úspešne'
-    SearchResults: 'Výsledky vyhľadávania'
     VersionUnknown: Neznáma
   Permission:
     CMS_ACCESS_CATEGORY: 'Prístup do CMS'
@@ -253,14 +231,10 @@ sk:
     SINGULARNAME: 'Presmerovacia stránka'
     YOURPAGE: 'Stránka na vašom webe'
   ReportAdmin:
-    MENUTITLE: Výkazy
     ReportTitle: Titulok
+    MENUTITLE: Výkazy
   ReportAdminForm:
     FILTERBY: 'Filtrovať podľa'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Choď
     SEARCH: Hľadať
@@ -277,8 +251,6 @@ sk:
     OtherGroupTitle: Ostatné
     ParameterLiveCheckbox: 'Skontolovať živú stránku'
     REPEMPTY: '{title} výkaz je prázdny.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Pre zdielanie tejto stránky, skopírujte linku nižšie.'
     ShareLink: 'Zdieľať odkaz'
@@ -311,9 +283,7 @@ sk:
     APPEARSVIRTUALPAGES: 'Tento obsah sa zobrazí aj na virtuálnych stránkach v {title} sekciách.'
     BUTTONCANCELDRAFT: 'Zrušiť zmeny v konceptu'
     BUTTONCANCELDRAFTDESC: 'Vymazať návrh a vrátiť sa k aktuálne zverejnenej stránke'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
+    BUTTONSAVEPUBLISH: 'Uložiť & zverjniť'
     BUTTONUNPUBLISH: Nezverejniť
     BUTTONUNPUBLISHDESC: 'Odstrániť túto stránku z publikovaných na webe'
     CREATED: 'Dátum vytvorenia'
@@ -330,7 +300,6 @@ sk:
     DEPENDENT_NOTE: 'Nasledujúce stránky sú závislé na tejto stránke. To zahŕňa virtuálne stránky, presmerovacie stránky a stránky s odkazmi obsahu.'
     DESCRIPTION: 'Obecný obsah stránky'
     DependtPageColumnLinkType: 'Typ odkazu'
-    DependtPageColumnURL: URL
     EDITANYONE: 'Ktokoľvek kto sa môže prihlásiť do CMS'
     EDITHEADER: 'Kto môže editovať túto stránnku?'
     EDITONLYTHESE: 'Iba títo ľudia (vyberte zo zoznamu)'
@@ -338,12 +307,9 @@ sk:
     EDIT_ALL_DESCRIPTION: 'Upraviť akúkoľvek stránku'
     EDIT_ALL_HELP: 'Schopnosť upravovať ktorúkoľvek stránku na webe, nedbajúc na nastavenia v záložke prístupov. Vyžaduje "Prístup k ''Stránkam'' sekcia" povolenie'
     Editors: 'Skupiny upravovateľov'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Táto stránka obsahuje nefunkčné odkazy.'
     HTMLEDITORTITLE: Obsah
     INHERIT: 'Dediť od nadradenej stránky'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Posledne aktualizované'
     LINKCHANGENOTE: 'Zmenenie odkazu tejto stránky ovplyvní tiež odkazy všetkých podstránok.'
     MENUTITLE: 'Navigačná menovka'
@@ -354,9 +320,7 @@ sk:
     MODIFIEDONDRAFTHELP: 'Stránka má nezverejnené zmeny'
     MODIFIEDONDRAFTSHORT: Zmenené
     MetadataToggle: Metaúdaje
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
+    OBSOLETECLASS: 'Táto stránka je zastaralého typu {type}. Uloženie spôsobí zrušenie jeho typu a vy môžte stratiť dáta'
     PAGELOCATION: 'Pozícia stránky'
     PAGETITLE: 'Názov stránky'
     PAGETYPE: 'Typ stránky'
@@ -385,7 +349,7 @@ sk:
     URLSegment: 'Čast URL'
     VIEWERGROUPS: 'Skupiny prezeračov'
     VIEW_ALL_DESCRIPTION: 'Prezerať akúkoľvek stránku'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
+    VIEW_ALL_HELP: 'Schopnosť zobrazovať ktorúkoľvek stránku na webe, nedbajúc na nastavenia v záložke prístupov. Vyžaduje povolenie "Prístup k sekcii ''Stránky''"'
     VIEW_DRAFT_CONTENT: 'Zobraziť obsah konceptu'
     VIEW_DRAFT_CONTENT_HELP: 'Vzťahuje sa na prezeranie stránok mimo CMS, v návrhovom móde. Užitočné pre externých spolupracovníkov bez prístupu do CMS-ka.'
     Viewers: 'Skupiny prezeračov'
@@ -394,20 +358,27 @@ sk:
     many_many_BackLinkTracking: 'Záznamy o Backlink-ov'
     many_many_ImageTracking: 'Záznamy o obrázkoch'
     many_many_LinkTracking: 'Záznamy o odkazoch'
+    BUTTONPUBLISHED: Publikované
+    BUTTONSAVED: Uložené
+    GroupPlaceholder: 'Kliknite pre vybratie skupiny'
+    LASTPUBLISHED: 'Posledne zverejnené'
+    LASTSAVED: 'Posledne uložené'
+    MoreOptions: 'Viacej volieb'
+    NOTPUBLISHED: 'Nepublikované'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Špeciálne znaky sú automaticky zkonvertované alebo ostránené.'
+    EMPTY: 'Zadajte prosím URL segment alebo kliknite zrušiť'
   StaticExporter:
     BASEURL: 'Základné URL'
     EXPORTTO: 'Exportovať do tohto priečinka'
     NAME: 'Statický export'
   TableListField:
     SELECT: 'Vyberte:'
-  TableListField.ss:
+  TableListField_ss:
     NOITEMSFOUND: 'Žiadne položky nájdené'
     SORTASC: 'Zoradiť poradie vzostupne'
     SORTDESC: 'Zoradiť poradie zostupne'
-  TableListField_PageControls.ss:
+  TableListField_PageControls_ss:
     DISPLAYING: Zobrazujem
     OF: z
     TO: do
@@ -417,20 +388,30 @@ sk:
     VIEWPREVIOUS: 'Zobraz predchádzajúce'
   TreeTools:
     DisplayLabel: 'Zobrazenie:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Archivovaný web môžete navštíviť týmto odkazom:'
     HAVEASKED: 'Požiadali ste o zobrazenie obsahu webu z'
   VirtualPage:
-    CHOOSE: 'Linked Page'
+    CHOOSE: 'Odkazovaná stránka'
     DESCRIPTION: 'Zobrazí obsah inej stránky'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
+    EDITCONTENT: 'Editovať obsah na odkazovanú stránku'
     HEADER: 'Toto je virtuálna stránka'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Virtuálne stránky'
     PageTypNotAllowedOnRoot: 'Pôvodná stránka typu "{type}" nie je povolená na najvyššej úrovni pre túto virtuálnu stránku'
     SINGULARNAME: 'Virtuálna stránka'
+    EditLink: editovať
+    HEADERWITHLINK: 'Toto je virtuálna stránka, kopíruje sa obsah z "{title}" ({link})'
+  CMSFileAddController:
+    MENUTITLE: Súbory
+  CMSPageEditController:
+    MENUTITLE: 'Upraviť stránku'
+  SITETREE:
+    VIRTUALPAGEDRAFTWARNING: 'Zverejnite prosím odkazovanú stránku pre zverejnenie virtuálnej stránky'
+    VIRTUALPAGEWARNING: 'Zvolte prosím odkazovanú stránku a uložte pre zverejnenie tejto stránky'
+    VIRTUALPAGEWARNINGSETTINGS: 'Zvolte prosím odkazovanú stránku v poliach hlavného obsahu pre zverejnenie'
+  SilverStripeNavigator:
+    ARCHIVED: Archivované
+  URLSegmentField:
+    Cancel: Zrušiť
+    Edit: Editovať
+    OK: Ok
diff --git a/lang/sl.yml b/lang/sl.yml
index b7d67519..6b76f05f 100644
--- a/lang/sl.yml
+++ b/lang/sl.yml
@@ -5,36 +5,27 @@ sl:
     AppCategoryArchive: Arhiv
     AppCategoryAudio: Avdio
     AppCategoryDocument: Dokument
-    AppCategoryFlash: Flash
     AppCategoryImage: Slika
-    AppCategoryVideo: Video
     BackToFolder: 'Nazaj v mapo'
     CREATED: Datum
-    CurrentFolderOnly: 'Limit to current folder?'
     DetailsView: Podrobno
     FILES: Datoteke
-    FILESYSTEMSYNC: 'Sync files'
     FILESYSTEMSYNCTITLE: 'Osveži vnose v bazo podatkov CMS ali fatoteke v datotečnem sistemu. Uporabno, kadar nalagate mimo CMS, npr. prek FTP. '
     FROMTHEINTERNET: 'S spleta'
     FROMYOURCOMPUTER: 'Z vašega računalnika'
     Filetype: 'Tip datoteke'
-    ListView: 'List View'
-    MENUTITLE: Datoteke
-    NEWFOLDER: 'Nova mapa'
+    NEWFOLDER: Nova mapa
     SIZE: Velikost
     THUMBSDELETED: '{count} neuporabljenih predoglednih sličic je bilo izbrisanih'
-    TreeView: 'Tree View'
     Upload: Naloži
+    MENUTITLE: Datoteke
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Izbriši mape'
-  AssetAdmin_Tools:
-    FILTER: Filter
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Pojdi
   AssetTableField:
-    BACKLINKCOUNT: 'Used on:'
     PAGES: Stran/Strani
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Nazaj
   BrokenLinksReport:
     Any: Poljuben
@@ -45,7 +36,6 @@ sl:
     ColumnDateLastModified: 'Datum zadnje spremembe'
     ColumnDateLastPublished: 'Datum zadnje objave'
     ColumnProblemType: 'Vrsta težave'
-    ColumnURL: URL
     HasBrokenFile: 'vsebuje datoteko z napako'
     HasBrokenLink: 'ima nedelujočo povezavo'
     HasBrokenLinkAndFile: 'ima nedelujočo povezavo in vsebuje datoteko z napako'
@@ -61,104 +51,57 @@ sl:
   CMSAddPageController:
     Title: 'Dodaj stran'
   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: 'Izbriši z osnutka spletnega mesta'
     DELETE_PAGES: 'Izbriši z objavljenega spletnega mesta'
     PUBLISHED_PAGES: 'Objavljenih je bilo %d strani. (Število napak %d)'
     PUBLISH_PAGES: Objavi
     UNPUBLISHED_PAGES: 'Število iz objave umaknjenih strani: %d'
-    UNPUBLISH_PAGES: 'Umakni iz objave'
-  CMSFileAddController:
-    MENUTITLE: Datoteke
+    UNPUBLISH_PAGES: Umakni iz objave
   CMSMain:
     ACCESS: 'Dostop do razdelka ''{title}'' '
     ACCESS_HELP: 'Dovoli vpogled  sklop z drevesno strukturo in vsebino. Pravice za ogled in urejanje je možno urejati prek dropdown-seznamov za vsako posamezno stran, ali pa ločeno v sklopu Nastavitve pravic za upravljanje z vsebino (Content permissions). '
     AddNew: 'Dodaj novo stran'
     AddNewButton: 'Dodaj novo'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: 'Izberite mesto, kjer želite ustvariti novo stran'
     ChoosePageType: 'Izberi tip strani'
     Create: Ustvari
     DELETE: 'Izbriši z osnutka spletnega mesta'
-    DELETEFP: 'Izbriši z objavljenega spletnega mesta'
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
+    DELETEFP: Izbriši z objavljenega spletnega mesta
     EMAIL: E-naslov
     EditTree: 'Uredi drevesno strukturo'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Uredi stran'
     NEWPAGE: 'Nov {pagetype}'
     PAGENOTEXISTS: 'Stran na tem naslovu ne obstaja'
     PAGES: Strani
-    PAGETYPEANYOPT: Any
     PAGETYPEOPT: 'Tip strani'
     PUBALLCONFIRM: 'Objavite vse strani spletnega mesta (vsebine bodo prekopirane v "objavljeno" različico spletnega mesta).'
     PUBALLFUN: 'Funkcionalnost "Objavi vse"'
-    PUBALLFUN2: 'Rezultat klika tega gumba bo enak, kot če bi kliknili "Objavi" na vsaki posamezni strani. Namenjen je uporabi pri večjih spremembah vsebine, kot na primer ob začetku postavljanja spletnega mesta.'
+    PUBALLFUN2: "Rezultat klika tega gumba bo enak, kot če bi kliknili \"Objavi\" na vsaki posamezni strani. Namenjen je uporabi pri večjih spremembah vsebine, kot na primer ob začetku postavljanja spletnega mesta."
     PUBPAGES: 'Opravljeno: Objavljenih je {count} strani'
     PageAdded: 'Stran je bila uspešno ustvarjena'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: '''{title}'' je odstranjen z objavljenega spletnega mesta. '
     REMOVEDPAGEFROMDRAFT: 'Vsebina, odstranjena iz osnutka spletnega mesta: ''%s'''
     RESTORE: Obnovi
-    RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Ponastavi na to različico'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Shrani
-    SAVEDRAFT: 'Save draft'
     TabContent: Vsebina
     TabHistory: Zgodovina
     TabSettings: Nastavitve
-    TreeFiltered: 'Filtered tree.'
-    TreeFilteredClear: 'Clear filter'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Apply Filter'
+    MENUTITLE: 'Uredi stran'
+  CMSMain_left_ss:
     RESET: Ponastavi
   CMSPageAddController:
-    MENUTITLE: 'Dodaj stran'
-    ParentMode_child: 'Under another page'
     ParentMode_top: 'Stran na prvem nivoju'
-  CMSPageEditController:
-    MENUTITLE: 'Uredi stran'
+    MENUTITLE: 'Dodaj stran'
   CMSPageHistoryController:
-    COMPAREMODE: 'Compare mode (select two)'
     COMPAREVERSIONS: 'Primerjaj različice'
     COMPARINGVERSION: 'Primerjava različic {version1} in {version2}.'
-    MENUTITLE: Zgodovina
     REVERTTOTHISVERSION: 'Povrni v to različico'
     SHOWUNPUBLISHED: 'Pokaži neobjavljeno različico'
     SHOWVERSION: 'Pokaži različico'
-    VIEW: view
-    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Trenutno prikazana različica {version}.'
-  CMSPageHistoryController_versions.ss:
-    AUTHOR: Avtor
-    NOTPUBLISHED: 'Ni objavljeno'
-    PUBLISHER: Publisher
-    UNKNOWN: Neznano
-    WHEN: Kdaj
-  CMSPageSettingsController:
-    MENUTITLE: 'Uredi stran'
-  CMSPagesController:
-    GalleryView: 'Gallery View'
-    ListView: Seznam
-    MENUTITLE: Strani
-    TreeView: 'Drevesna struktura'
-  CMSPagesController_ContentToolbar.ss:
+    MENUTITLE: Zgodovina
+  CMSPagesController_ContentToolbar_ss:
     ENABLEDRAGGING: 'Potegni in spusti'
-    MULTISELECT: Multi-selection
-  CMSPagesController_Tools.ss:
-    FILTER: Filter
-  CMSSearch:
-    FILTERDATEFROM: Od
-    FILTERDATEHEADING: Datum
-    FILTERDATETO: Do
-    FILTERLABELTEXT: Vsebina
-  CMSSettingsController:
-    MENUTITLE: Nastavitve
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Spremenjene strani'
   CMSSiteTreeFilter_DeletedPages:
@@ -170,36 +113,27 @@ sl:
   ContentController:
     ARCHIVEDSITE: 'Predogled različice'
     ARCHIVEDSITEFROM: 'Arhivirana različica iz'
-    CMS: CMS
-    DRAFT: Draft
     DRAFTSITE: 'Osnutek spletnega mesta'
-    DRAFT_SITE_ACCESS_RESTRICTION: 'Za ogled osnutka vsebine ali arhiva tega spletnega mesta, se morate prijaviti s podatki za dostop do CMS-vmesnika.<a href="%s">Nazaj na objavljeno različico spletnega mesta.</a>'
+    DRAFT_SITE_ACCESS_RESTRICTION: 'Za ogled osnutka vsebine ali arhiva tega spletnega mesta, se morate prijaviti s podatki za dostop do CMS-vmesnika.
+
+
+      <a href="%s">Nazaj na objavljeno različico spletnega mesta.</a>
+
+      '
     Email: E-naslov
     INSTALL_SUCCESS: 'Namestitev je bila uspešna!'
     InstallFilesDeleted: 'Namestitvene datoteke so bile uspešno izbrisane.'
-    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 je bil uspešno nameščen!'
     LOGGEDINAS: 'Prijavljen-a kot'
     LOGIN: Prijava
-    LOGOUT: Odjava
-    NOTLOGGEDIN: Neprijavljen-a
-    PUBLISHED: Published
+    LOGOUT: 'Odjava'
+    NOTLOGGEDIN: 'Neprijavljen-a'
     PUBLISHEDSITE: 'Objavljeno spletno mesto'
     Password: Geslo
     PostInstallTutorialIntro: 'To spletno mesto je poenostavljena različica spletnega mesta SilverStripe 3. Za razširjeno različico, prosim, obiščite {link}.'
-    StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Namestitvenih datotek ni bilo mogoče izbrisati. Prosim, spodnje datoteke izbrišite ročno.'
     VIEWPAGEIN: 'Ogled strani v:'
   ErrorPage:
-    CODE: 'Napačna koda'
-    DEFAULTERRORPAGECONTENT: '<p>Morda ste zahtevali dostop do strani, ki ne obstaja?</p><p>Za vsak slučaj preverite vpisani URL-naslov in poskusite ponovno.</p>'
-    DEFAULTERRORPAGETITLE: 'Strani ni mogoče najti'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Oprostite, pri vaši zahtevi je prišlo do težave.</p>'
-    DEFAULTSERVERERRORPAGETITLE: 'Napaka na strežniku'
-    DESCRIPTION: 'Prilagojena vsebina za različne primere napak (npr. "Želene strani nismo uspeli najti.")'
-    ERRORFILEPROBLEM: 'Napaka pri odpiranju datoteke "{filename}" za pisanje. Prosim, preverite pravice za urejanje datoteke.'
-    PLURALNAME: 'Error Pags'
-    SINGULARNAME: 'Error Page'
     400: 'Napaka 400'
     401: 'Napaka 401: Nimate dovoljena za dostop'
     403: 'Napaka 403: Nimate dovoljena za dostop'
@@ -223,6 +157,17 @@ sl:
     503: 'Napaka 503: Dostop trenutno ni možen'
     504: 'Napaka 504: Čas za dostop je potekel'
     505: 'Napaka 505: Strežnik ne podpira HTTP-različice zahtevka'
+    CODE: 'Napačna koda'
+    DEFAULTERRORPAGECONTENT: '<p>Morda ste zahtevali dostop do strani, ki ne obstaja?</p>
+
+      <p>Za vsak slučaj preverite vpisani URL-naslov in poskusite ponovno.</p>
+
+      '
+    DEFAULTERRORPAGETITLE: 'Strani ni mogoče najti'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>Oprostite, pri vaši zahtevi je prišlo do težave.</p>'
+    DEFAULTSERVERERRORPAGETITLE: 'Napaka na strežniku'
+    DESCRIPTION: 'Prilagojena vsebina za različne primere napak (npr. "Želene strani nismo uspeli najti.")'
+    ERRORFILEPROBLEM: 'Napaka pri odpiranju datoteke "{filename}" za pisanje. Prosim, preverite pravice za urejanje datoteke.'
   Folder:
     AddFolderButton: 'Dodaj mapo'
     DELETEUNUSEDTHUMBNAILS: 'Izbriši neuporabljene ikone'
@@ -231,11 +176,8 @@ sl:
     UploadFilesButton: Naloži
   LeftAndMain:
     DELETED: Izbrisano
-    PreviewButton: Predogled
     SAVEDUP: Shranjeno.
     STATUSPUBLISHEDSUCCESS: '''{title}'' je uspešno objavljen.'
-    SearchResults: 'Rezultati iskanja'
-    VersionUnknown: Neznano
   Permission:
     CMS_ACCESS_CATEGORY: 'Dostop do CMS-vmesnika'
   Permissions:
@@ -246,21 +188,15 @@ sl:
     HASBEENSETUP: 'Nastavljena preusmeritev še nima določenega cilja.'
     HEADER: 'Ta stran bo preusmerila uporabnike na drugo stran'
     OTHERURL: 'URL druge spletne strani'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Preusmeri na'
     REDIRECTTOEXTERNAL: 'Druga spletna stran'
     REDIRECTTOPAGE: 'Stran na tvojem spletnem mestu'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Stran na tvojem spletnem mestu'
   ReportAdmin:
-    MENUTITLE: Poročila
     ReportTitle: Naslov
+    MENUTITLE: Poročila
   ReportAdminForm:
     FILTERBY: 'Filtriraj po'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Pojdi
     SEARCH: Išči
@@ -277,8 +213,6 @@ sl:
     OtherGroupTitle: Drugo
     ParameterLiveCheckbox: 'Preveri na objavljenem spletnem mestu'
     REPEMPTY: 'Poročilo {title} je prazno.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Za posredovanje vsebine med tema dvema stranema, kopirajte povezavo in jo spodaj prilepite.'
     ShareLink: 'Posreduj povezavo'
@@ -289,10 +223,8 @@ sl:
     EDITHEADER: 'Kdo lahko ureja strani na tem spletnem mestu?'
     EDIT_PERMISSION: 'Upravljanje nastavitev spletnega mesta'
     EDIT_PERMISSION_HELP: 'Možnost upravljanja z dostopom na najvišji ravni'
-    PLURALNAME: 'Site Configs'
-    SINGULARNAME: 'Site Config'
     SITENAMEDEFAULT: 'Naziv vašega spletnega mesta'
-    SITETAGLINE: Slogan
+    SITETAGLINE: 'Slogan'
     SITETITLE: 'Naslov spletnega mesta (title)'
     TABACCESS: Dostop
     TABMAIN: Domov
@@ -308,13 +240,9 @@ sl:
     ADDEDTODRAFTHELP: 'Stran še ni bila objavljena'
     ADDEDTODRAFTSHORT: Osnutek
     ALLOWCOMMENTS: 'DOvoli komentarje na tej strani?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Prekliči spremembe osnutka'
     BUTTONCANCELDRAFTDESC: 'Izbriši osnutek in ponastavi na trenutno objavljeno stran'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Umakni iz objave'
+    BUTTONUNPUBLISH: Umakni iz objave
     BUTTONUNPUBLISHDESC: 'Umakni to stran iz objave'
     CREATED: 'Datum nastanka'
     Comments: Komentarji
@@ -322,15 +250,13 @@ sl:
     DEFAULTABOUTCONTENT: '<p>Na to stran lahko vnesete svojo vsebino ali pa jo izbrišete in sami ustvarjate strani po svoji meri.<br /></p>'
     DEFAULTABOUTTITLE: 'O nas'
     DEFAULTCONTACTCONTENT: '<p>Na to stran lahko vnesete svojo vsebino ali pa jo izbrišete in sami ustvarjate strani po svoji meri.<br /></p>'
-    DEFAULTCONTACTTITLE: Kontakt
+    DEFAULTCONTACTTITLE: 'Kontakt'
     DEFAULTHOMECONTENT: '<p>Pozdravljeni pri SilverStripe! To je privzeto spletno mesto, ki ga lahko urejate prek <a href="admin/">CMS-vmesnika</a>. Oglejte si <a href="http://doc.silverstripe.org">dokumentacijo za razvijalce</a> ali pa <a href="http://doc.silverstripe.org/doku.php?id=tutorials">napotke za uporabo.</a></p>'
     DEFAULTHOMETITLE: Domov
     DELETEDPAGEHELP: 'Stran ni več objavljena'
     DELETEDPAGESHORT: Izbrisano
     DEPENDENT_NOTE: 'Naslednje strani so odvisne od vsebine tukaj (vključuje navidezne strani, preusmerjevalne strani in strani s povezavami v vsebini)'
-    DESCRIPTION: 'Generic content page'
     DependtPageColumnLinkType: 'Tip povezave'
-    DependtPageColumnURL: URL
     EDITANYONE: 'Vsakdo, ki se prijavi v CMS-vmesnik'
     EDITHEADER: 'Kdo lahko ureja to stran?'
     EDITONLYTHESE: 'Samo ti uporabniki (izberite jih s seznama)'
@@ -338,25 +264,17 @@ sl:
     EDIT_ALL_DESCRIPTION: 'Urejanje vseh strani'
     EDIT_ALL_HELP: 'Možnost urejanja katerekoli strani na spletnem mestu, ne glede na nastavitve v sklopu "Dostop". Zahteva dovoljenje za dostop do vsebine spletnega mesta.'
     Editors: 'Skupine urednikov'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Ta stran ima neveljavne povezave.'
     HTMLEDITORTITLE: Vsebina
     INHERIT: 'Privzemi od nadrejene strani'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Nazadnje urejeno'
     LINKCHANGENOTE: 'Sprememba URL-naslova te strani bo povzročila spremembo URL-naslovov do vseh podrejenih strani.'
     MENUTITLE: 'Naziv navigacije'
-    METADESC: Opis
+    METADESC: 'Opis'
     METADESCHELP: 'Iskalniki to vsebino uporabljajo pri prikazu rezultatov. (Vsebina nima vpliva na vrstni red prikaza med zadetki v iskalniku.)'
     METAEXTRA: 'Meta tagi po meri'
-    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Stran vsebuje še neobjavljene spremembe.'
-    MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metapodatki
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
     PAGELOCATION: 'Lokacija strani'
     PAGETITLE: 'Ime strani'
     PAGETYPE: 'Tip strani'
@@ -378,15 +296,14 @@ sl:
     SHOWINSEARCH: 'Pokaži v iskalniku?'
     SINGULARNAME: Stran
     TABBEHAVIOUR: Vedenje
-    TABCONTENT: Vsebina
+    TABCONTENT: 'Vsebina'
     TABDEPENDENT: 'Odvisne strani'
     TOPLEVEL: 'Vsebina Strani (Zgornja Stopnja)'
     TOPLEVELCREATORGROUPS: 'Glavni uredniki.'
     URLSegment: 'URL naslov strani'
     VIEWERGROUPS: 'Skupine obiskovalcev'
     VIEW_ALL_DESCRIPTION: 'Prikaz vse strani'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
-    VIEW_DRAFT_CONTENT: Predogled.
+    VIEW_DRAFT_CONTENT: 'Predogled.'
     VIEW_DRAFT_CONTENT_HELP: 'Ogled osnutka vsebine za uporabnike brez dostopa do vmesnika.'
     Viewers: 'Skupine obiskovalcev (viewers)'
     Visibility: Vidnost
@@ -395,7 +312,6 @@ sl:
     many_many_ImageTracking: 'Spremljanje slik'
     many_many_LinkTracking: 'Spremljanje povezav'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Posebni znaki so samodejno spremenjeni ali odstranjeni.'
   StaticExporter:
     BASEURL: 'Osnovni URL'
@@ -403,34 +319,27 @@ sl:
     NAME: 'Statični izvoz'
   TableListField:
     SELECT: 'Izberi:'
-  TableListField.ss:
+  TableListField_ss:
     NOITEMSFOUND: 'Ni najdenih predmetov'
     SORTASC: 'Razvrsti naraščajoče'
     SORTDESC: 'Razvrsti padajoče'
-  TableListField_PageControls.ss:
-    DISPLAYING: Displaying
+  TableListField_PageControls_ss:
     OF: od
     TO: za
     VIEWFIRST: 'Na začetek'
     VIEWLAST: 'Na konec'
-    VIEWNEXT: Naslednja
-    VIEWPREVIOUS: Prejšnja
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+    VIEWNEXT: 'Naslednja'
+    VIEWPREVIOUS: 'Prejšnja'
+  ViewArchivedEmail_ss:
     CANACCESS: 'Do arhvirane različice spletnega mesta lahko dostopate na naslovu:'
     HAVEASKED: 'Za vpogled v vsebino našega spletnega mesta ste zaprosili'
   VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'To je navidezna stran'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Virtualne strani'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Virtualna stran'
+  CMSFileAddController:
+    MENUTITLE: Datoteke
+  CMSPageEditController:
+    MENUTITLE: 'Uredi stran'
+  CMSPageSettingsController:
+    MENUTITLE: 'Uredi stran'
diff --git a/lang/sr.yml b/lang/sr.yml
index e241111e..49bd580a 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -1,166 +1,33 @@
 sr:
   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: 'Нова фасцикла'
-    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:
+    NEWFOLDER: Нова фасцикла
+  AssetAdmin_left_ss:
     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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: Е-пошта
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Edit Page'
-    NEWPAGE: 'New {pagetype}'
     PAGENOTEXISTS: 'Ова страна не постоји'
-    PAGES: Pages
-    PAGETYPEANYOPT: Any
-    PAGETYPEOPT: 'Page Type'
     PUBALLCONFIRM: 'Објавите сваку страну на овом сајту копирањем садржај на жив сајт.'
     PUBALLFUN: 'Функција „Објави све“ '
-    PUBALLFUN2: 'Притиском на ово дугме постићи ћете исто што и одласком на сваку страну и притискањем дугмета „објави“ . Намењена је за коришћене након великих измена садржаја као када се сајт први пут објављује.'
-    PUBPAGES: 'Done: Published {count} pages'
-    PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
-    REMOVEDPAGEFROMDRAFT: 'Removed ''%s'' from the draft site'
-    RESTORE: Restore
-    RESTORED: 'Restored ''{title}'' successfully'
+    PUBALLFUN2: "Притиском на ово дугме постићи ћете исто што и одласком на сваку страну и притискањем дугмета „објави“ . Намењена је за коришћене након великих измена садржаја као када се сајт први пут објављује."
     ROLLBACK: 'Врати се на ову верзију'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     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: 'Uporedni metod (izaberi dva)'
     COMPAREVERSIONS: 'Uporediti verzije'
-    COMPARINGVERSION: 'Comparing versions {version1} and {version2}.'
-    MENUTITLE: History
     REVERTTOTHISVERSION: 'Vrati se na ovu verziju'
     SHOWUNPUBLISHED: 'Pokaži neobjavljene verzije'
     SHOWVERSION: 'Pokaži verziju'
     VIEW: pregled
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    VIEWINGVERSION: 'Currently viewing version {version}.'
-  CMSPageHistoryController_versions.ss:
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Autor
-    NOTPUBLISHED: Neobjavljeno
+    NOTPUBLISHED: 'Neobjavljeno'
     PUBLISHER: Izdavač
     UNKNOWN: Nepoznato
     WHEN: Datum
-  CMSPageSettingsController:
-    MENUTITLE: 'Izmeni stranicu'
   CMSPagesController:
     GalleryView: 'Prikaz galerije'
-    ListView: 'Prikaz liste'
     MENUTITLE: Stranice
     TreeView: 'Prikaz drveta'
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: 'Drag''n''drop'
-    MULTISELECT: Multi-selection
-  CMSPagesController_Tools.ss:
-    FILTER: Filter
-  CMSSearch:
-    FILTERDATEFROM: Od
-    FILTERDATEHEADING: Datum
-    FILTERDATETO: Za
-    FILTERLABELTEXT: Sadržaj
-  CMSSettingsController:
-    MENUTITLE: Podešavanja
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Changed pages'
   CMSSiteTreeFilter_DeletedPages:
     Title: 'Sve stranice, uključujući i izbrisane'
   CMSSiteTreeFilter_Search:
@@ -168,269 +35,104 @@ sr:
   ContentControl:
     NOTEWONTBESHOWN: 'Primedba: ova poruka neće biti prikazana vašim posetiocima'
   ContentController:
-    ARCHIVEDSITE: 'Preview version'
-    ARCHIVEDSITEFROM: 'Archived site from'
-    CMS: CMS
-    DRAFT: Draft
-    DRAFTSITE: 'Draft Site'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Морате да се пријавите својом лозинком на CMS да бисте приступили нацртима или архивираном садржају. <a href="%s">Кликните овде да бисте се вратили на завршен сајт.</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'
-    PUBLISHED: Published
-    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 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: 'Код грешке'
-    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: 'Страница није пронађена'
-    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 - Лош захтев'
-    401: '401 - Unauthorized'
     403: '403 - Забрањено'
     404: '404 - Није пронађено'
     405: '405 - Метода није дозвољена'
     406: '406 - није прихватљиво'
-    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 - Интерна грешка у серверу'
     501: '501 - Није имплементирано'
-    502: '502 - Bad Gateway'
     503: '503 - Сервис није доступан'
-    504: '504 - Gateway Timeout'
     505: '505 - HTTP верзија није подржана'
+    CODE: 'Код грешке'
+    DEFAULTERRORPAGETITLE: 'Страница није пронађена'
   Folder:
     AddFolderButton: 'Dodaj direktorijum'
     DELETEUNUSEDTHUMBNAILS: 'Obriši nekorišćene umanjene prikaze'
     UNUSEDFILESTITLE: 'Nekorišćeni fajlovi'
     UNUSEDTHUMBNAILSTITLE: 'Nekorišćeni umanjeni prikazi'
     UploadFilesButton: Postavi
-  LeftAndMain:
-    DELETED: Deleted.
-    PreviewButton: 'Opšti pregled'
-    SAVEDUP: Saved.
-    STATUSPUBLISHEDSUCCESS: 'Published ''{title}'' successfully'
-    SearchResults: 'Rezultati pretrage'
-    VersionUnknown: Nepoznato
-  Permission:
-    CMS_ACCESS_CATEGORY: 'CMS Access'
-  Permissions:
-    CONTENT_CATEGORY: 'Content permissions'
-    PERMISSIONS_CATEGORY: 'Roles and access permissions'
   RedirectorPage:
     DESCRIPTION: 'Preusmerava na drugu stranicu'
     HASBEENSETUP: 'Stranica za preusmeravanje je podešena bez parametara preusmeravanja.'
     HEADER: 'Ova stranica će preusmeriti korisnike na drugu stranicu'
     OTHERURL: 'URL drugog sajta'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Preusmeri na'
     REDIRECTTOEXTERNAL: 'Drugi sajt'
     REDIRECTTOPAGE: 'Stranicu na vašem sajtu'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Stranica na vašem sajtu'
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
-    GO: Pokreni
     SEARCH: Pretraga
-    SearchResults: 'Rezultati pretrage'
   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: 'Празне стране'
     LAST2WEEKS: 'Стране мењане у задње две недеље'
-    OtherGroupTitle: Other
-    ParameterLiveCheckbox: 'Check live site'
-    REPEMPTY: 'The {title} report is empty.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Da bi ste  podelili link ka ovoj stranici, kopirajte i dodajte link ispod.'
     ShareLink: 'Podeliti link'
   SilverStripeNavigatorLinkl:
     CloseLink: Zatvoriti
-  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: Свако
     ACCESSHEADER: 'Ko može da vidi ovu stranicu?'
     ACCESSLOGGEDIN: 'Пријављени корисници'
     ACCESSONLYTHESE: 'Samo ove osobe (izaberi sa liste)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'Дозволити коментаре на овој страни?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Откажи промене на нацрту'
     BUTTONCANCELDRAFTDESC: 'Избришите свој нацрт и вратите се на тренутно објављену страну'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Повуци објављивање'
+    BUTTONUNPUBLISH: Повуци објављивање
     BUTTONUNPUBLISHDESC: 'Izbriši ovu stranicu sa sajta na kome je objavljena'
     CREATED: 'Datum kreiranja'
     Comments: Komentari
-    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: 'O nama'
-    DEFAULTCONTACTCONTENT: '<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>'
     DEFAULTCONTACTTITLE: 'Контактирајте нас'
-    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: 'Početna stranica'
-    DELETEDPAGEHELP: 'Page is no longer published'
-    DELETEDPAGESHORT: Deleted
+    DEFAULTHOMETITLE: Početna stranica
     DEPENDENT_NOTE: 'Sledeće stranice oslanjaju se na ovu stranicu. Ovo podrazumeva virtuelne stranice, preusmeravajuće stranice i stranice sa linkovima sadržaja.'
-    DESCRIPTION: 'Generic content page'
     DependtPageColumnLinkType: 'Vrsta linka'
-    DependtPageColumnURL: URL
     EDITANYONE: 'Свако ко може да се пријави на CMS'
     EDITHEADER: 'Ко може да мења ову страницу у CMS-у?'
     EDITONLYTHESE: 'Samo ove osobe (izaberite sa liste)'
-    EDITORGROUPS: 'Editor Groups'
-    EDIT_ALL_DESCRIPTION: 'Edit any page'
     EDIT_ALL_HELP: 'Mogućnost menjanja bilo koje stranice na sajtu, bez obzira na podešavanja unutar kartice "Pristup". Zahteva dozvolu "Pristup odeljku ‚Stranice‚"'
     Editors: 'Grupe editora'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Ова страна има неважеће линкове.'
     HTMLEDITORTITLE: Садржај
     INHERIT: 'Naslediti od izvorne strane'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
     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).'
+    METADESC: 'Опис'
     METAEXTRA: 'Прилагођени мета тагови'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
     PAGELOCATION: 'Lokacija stranice'
     PAGETITLE: 'Naziv stranice'
     PAGETYPE: 'Тип стране'
     PARENTID: 'Izvorna strana'
     PARENTTYPE: 'Lokacija stranice'
-    PARENTTYPE_ROOT: 'Top-level page'
-    PARENTTYPE_SUBPAGE: 'Sub-page underneath a parent page'
     PERMISSION_GRANTACCESS_DESCRIPTION: 'Promeni dozvole pristupu sadržaju'
-    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: 'Izbrisano sa nacrta'
-    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: 'Приказати у менијима?'
     SHOWINSEARCH: 'Prikazati u pretrazi?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: Понашање
-    TABCONTENT: Садржај
-    TABDEPENDENT: 'Dependent pages'
+    TABCONTENT: 'Садржај'
     TOPLEVEL: 'Sadržaj sajta (glavni nivo)'
-    TOPLEVELCREATORGROUPS: 'Top level creators'
     URLSegment: 'Segment URL adrese'
     VIEWERGROUPS: 'Grupe pregledača'
-    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 ''Pages'' section" permission'
-    VIEW_DRAFT_CONTENT: 'View draft content'
     VIEW_DRAFT_CONTENT_HELP: 'Primenjuje se na gledanje stranica van CMS-a u nacrtnom modu. Korisno za spoljne sradnike bez pristupa CMS-u.'
-    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:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
   StaticExporter:
     BASEURL: 'Osnovni URL'
     EXPORTTO: 'Izvesti u ovaj direktorijum'
     NAME: 'Statički izvoznik'
-  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'
+  TableListField_PageControls_ss:
     VIEWNEXT: 'Погледај следеће'
     VIEWPREVIOUS: 'Погледај претходно'
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Можете да приступите архивираном садржају на овом линку:'
     HAVEASKED: 'Замољени сте да погледате садржај овог сајта'
   VirtualPage:
-    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Prikazuje sadržaj druge stranice'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Ovo je virtuelna strana'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Virtuelne stranice'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Virtuelna strana'
+  CMSPageSettingsController:
+    MENUTITLE: 'Izmeni stranicu'
+  CMSSettingsController:
+    MENUTITLE: Podešavanja
diff --git a/lang/sv.yml b/lang/sv.yml
index d610ca3a..d50887c4 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -5,9 +5,7 @@ sv:
     AppCategoryArchive: Arkivera
     AppCategoryAudio: Ljud
     AppCategoryDocument: Dokument
-    AppCategoryFlash: Flash
     AppCategoryImage: Bild
-    AppCategoryVideo: Video
     BackToFolder: 'Tillbaka till mappen'
     CREATED: Datum
     CurrentFolderOnly: 'Begränsa till aktuell mapp?'
@@ -17,40 +15,39 @@ sv:
     FILESYSTEMSYNCTITLE: 'Uppdatera CMS:ets databasposter för filer i filsystemet. Användbart när nya filer har laddats upp utanför CMS:et, t.ex. via FTP.'
     FROMTHEINTERNET: 'Från internet'
     FROMYOURCOMPUTER: 'Från din dator'
-    Filetype: Filtyp
-    ListView: Listvy
-    MENUTITLE: Filer
-    NEWFOLDER: 'Ny mapp'
+    Filetype: 'Filtyp'
+    ListView: 'Listvy'
+    NEWFOLDER: Ny mapp
     SIZE: Storlek
     THUMBSDELETED: '{count} oanvända tumnaglar har raderats'
-    TreeView: Trädvy
-    Upload: 'Ladda upp'
+    TreeView: 'Trädvy'
+    Upload: Ladda upp
+    MENUTITLE: Filer
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Radera mapparna'
   AssetAdmin_Tools:
     FILTER: Filtrera
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Kör
   AssetTableField:
     BACKLINKCOUNT: 'Använd på:'
     PAGES: sida(-or)
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Tillbaka
   BrokenLinksReport:
     Any: Alla
     BROKENLINKS: 'Rapport för brutna länkar'
     CheckSite: 'Kontrollera sajt'
-    CheckSiteDropdownDraft: Utkast
+    CheckSiteDropdownDraft: 'Utkast'
     CheckSiteDropdownPublished: 'Publicerad Sajt'
     ColumnDateLastModified: 'Datum vid senaste modifiering'
     ColumnDateLastPublished: 'Datum vid senaste publicering'
-    ColumnProblemType: Problemtyp
-    ColumnURL: URL
+    ColumnProblemType: 'Problemtyp'
     HasBrokenFile: 'har trasig fil'
     HasBrokenLink: 'har trasig länk'
     HasBrokenLinkAndFile: 'har trasig länk och fil'
     HoverTitleEditPage: 'Redigera sida'
-    PageName: Sidnamn
+    PageName: 'Sidnamn'
     ReasonDropdown: 'Problem att kontrollera'
     ReasonDropdownBROKENFILE: 'Trasig fil'
     ReasonDropdownBROKENLINK: 'Bruten länk'
@@ -69,96 +66,85 @@ sv:
     PUBLISH_PAGES: Publicera
     UNPUBLISHED_PAGES: 'Avpublicerade %d sidor'
     UNPUBLISH_PAGES: Avpublicera
-  CMSFileAddController:
-    MENUTITLE: Filer
   CMSMain:
     ACCESS: 'Tillgång till sektionen ''{title}'''
     ACCESS_HELP: 'Tillåt visning av sektionen innehållande sidträdet och dess innehåll. Rättigheter att visa och redigera sidan kan hanteras i dess rullgardinsmenyer, liksom i "Innehållsbehörigheter".'
     AddNew: 'Skapa ny sida'
     AddNewButton: 'Skapa ny'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: 'Välj var du vill skapa denna sida'
     ChoosePageType: 'Välj sidtyp'
     Create: Skapa
     DELETE: 'Radera utkast'
     DELETEFP: Radera
     DESCREMOVED: 'och {count} ättlingar'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
+    DUPLICATED: 'Duplicerade ''{title}'' utan problem'
+    DUPLICATEDWITHCHILDREN: 'Duplicerade ''{title}'' och undersidor utan problem'
     EMAIL: E-post
     EditTree: 'Redigera trädet'
     ListFiltered: 'Filtrerad lista'
-    MENUTITLE: 'Redigera sida'
     NEWPAGE: 'Ny {pagetype}'
     PAGENOTEXISTS: 'Den här sidan finns inte'
     PAGES: Sidor
-    PAGETYPEANYOPT: 'Vilken som helst'
-    PAGETYPEOPT: Sidtyp
+    PAGETYPEANYOPT: Vilken som helst
+    PAGETYPEOPT: 'Sidtyp'
     PUBALLCONFIRM: 'Publicera alla sidor på sajten och kopiera dem till "live"'
     PUBALLFUN: '"Publicera alla"-funktion'
-    PUBALLFUN2: 'Ett klick på den här knappen är samma sak som att gå till varje sida och klicka på "Publicera". Tanken är att den ska användas efter stora uppdateringar av innehållet på sidan, som när den skapas.'
+    PUBALLFUN2: "Ett klick på den här knappen är samma sak som att gå till varje sida och klicka på \"Publicera\". Tanken är att den ska användas efter stora uppdateringar av innehållet på sidan, som när den skapas."
     PUBPAGES: 'Klar: Publicerade {count} sidor'
     PageAdded: 'Lyckades skapa sida'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
+    REMOVED: 'Tog bort ''{title}''{description} från den publicerade sajten'
     REMOVEDPAGE: 'Tog bort ''{title}'' från den publicerade sajten'
     REMOVEDPAGEFROMDRAFT: 'Raderade ''%s'' från utkast'
-    RESTORE: 'Återskapa'
+    RESTORE: Återskapa
     RESTORED: 'Återskapandet av  ''{title}'' lyckades'
     ROLLBACK: 'Återställ den här versionen'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
+    ROLLEDBACKPUBv2: 'Återställde till den publicerade versionen.'
+    ROLLEDBACKVERSIONv2: 'Återställde till version #%d.'
     SAVE: Spara
-    SAVEDRAFT: 'Save draft'
+    SAVEDRAFT: 'Spara utkast'
     TabContent: Innehåll
     TabHistory: Historia
     TabSettings: Inställningar
     TreeFiltered: 'Filtrerat träd'
     TreeFilteredClear: 'Rensa lista'
-  CMSMain_left.ss:
-    'APPLY FILTER': Filtrera
+    MENUTITLE: 'Redigera sida'
+    AddPageRestriction: 'OBS: Vissa sidtyper är inte tillåtna här'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Filtrera'
     RESET: Rensa
   CMSPageAddController:
-    MENUTITLE: 'Skapa sida'
     ParentMode_child: 'Under en annan sida'
-    ParentMode_top: Toppnivå
-  CMSPageEditController:
-    MENUTITLE: 'Redigera sidan'
+    ParentMode_top: 'Toppnivå'
+    MENUTITLE: 'Skapa sida'
   CMSPageHistoryController:
     COMPAREMODE: 'Jämföringsläge (välj två)'
     COMPAREVERSIONS: 'Jämför versioner'
     COMPARINGVERSION: 'Jämför version {version1} och {version2}.'
-    MENUTITLE: Historia
     REVERTTOTHISVERSION: 'Ändra till denna version'
     SHOWUNPUBLISHED: 'Visa opublicerade versioner'
     SHOWVERSION: 'Visa version'
-    VIEW: 'Titta på'
-    VIEWINGLATEST: 'Nu visas den senaste versionen.'
+    VIEW: Titta på
     VIEWINGVERSION: 'Nu visas version {version}.'
-  CMSPageHistoryController_versions.ss:
+    MENUTITLE: Historia
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Författare
     NOTPUBLISHED: 'Ej publicerad'
     PUBLISHER: Utgivare
     UNKNOWN: Okänd
     WHEN: När
-  CMSPageSettingsController:
-    MENUTITLE: 'Redigera sida'
   CMSPagesController:
-    GalleryView: Gallerivy
-    ListView: Listvy
+    GalleryView: 'Gallerivy'
+    ListView: 'Listvy'
     MENUTITLE: Sidor
-    TreeView: Trädvy
-  CMSPagesController_ContentToolbar.ss:
+    TreeView: 'Trädvy'
+  CMSPagesController_ContentToolbar_ss:
     ENABLEDRAGGING: 'Dra och släpp'
     MULTISELECT: Flerval
-  CMSPagesController_Tools.ss:
-    FILTER: Filter
   CMSSearch:
     FILTERDATEFROM: Från
     FILTERDATEHEADING: Datum
     FILTERDATETO: Till
     FILTERLABELTEXT: Innehåll
-  CMSSettingsController:
-    MENUTITLE: Inställningar
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Ändrade sidor'
   CMSSiteTreeFilter_DeletedPages:
@@ -170,9 +156,7 @@ sv:
   ContentController:
     ARCHIVEDSITE: 'Utkast version'
     ARCHIVEDSITEFROM: 'Arkiverad sajt från'
-    CMS: CMS
-    DRAFT: Draft
-    DRAFTSITE: Utkast
+    DRAFTSITE: 'Utkast'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Du måste logga med ditt CMS-lösenord för att kunna se utkast och arkiverat material. <a href="%s">Klicka här för att gå tillbaks till den publicerade sajten.</a>'
     Email: E-post
     INSTALL_SUCCESS: 'Installation lyckades!'
@@ -180,26 +164,18 @@ sv:
     InstallSecurityWarning: 'Av säkerhetsskäl bör du nu radera installationsfilerna, förutom om du planerar att installera om (<em>kräver administratörs login, se ovan</em>). Webbservern behöver nu bara skrivrättigheter till katalogen "assets", du kan ta bort skrivrättigheter till alla andra kataloger. <a href="{link}" style="text-align: center;">Klicka här för att radera installationsfilerna.</a>'
     InstallSuccessCongratulations: 'Silverstripe har installerats!'
     LOGGEDINAS: 'Inloggad som'
-    LOGIN: 'Logga in'
+    LOGIN: Logga in
     LOGOUT: 'Logga ut'
     NOTLOGGEDIN: 'Inte inloggad'
-    PUBLISHED: Published
     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: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
+    StartEditing: 'Du kan börja redigera innehållet genom att öppna <a href="{link}">CMS:et</a>.'
     UnableDeleteInstall: 'Lyckades inte radera installationsfilerna. Radera följande filer manuellt.'
     VIEWPAGEIN: 'titta på sidan i:'
+    DRAFT: Utkast
+    PUBLISHED: Publicerad
   ErrorPage:
-    CODE: Felkod
-    DEFAULTERRORPAGECONTENT: '<p>Det verkar som om du försökter komma åt en sida som inte finns.</p><p>Var god kontrollera stavningen på adressen som du försökte nå och försök igen.'
-    DEFAULTERRORPAGETITLE: 'Sidan hittades inte'
-    DEFAULTSERVERERRORPAGECONTENT: '<p>Ursäkta, ett fel uppstod vid hanteringen av din förfrågan.</p>'
-    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: Felmeddelandesidor
-    SINGULARNAME: Felsida
     400: '400 - Felaktig förfrågan'
     401: '401 - Obehörig'
     403: '403 - Förbjuden'
@@ -212,7 +188,7 @@ sv:
     410: '410 - Borta'
     411: '411 - Längd krävs'
     412: '412 - Ett villkor är inte uppfyllt'
-    413: '413 - Den efterfrågade enheten är för stor'
+    413: '413 - Förfrågan för stor '
     414: '414 - URI:n för begäran är för lång'
     415: '415 - Mediatypen stöds inte'
     416: '416 - Det efterfrågade intervallet går inte att leverera'
@@ -223,23 +199,32 @@ sv:
     503: '503 - Tjänsten otillgänglig'
     504: '504 - Gateway timeout'
     505: '505 - HTTP-versionen stöds inte'
+    CODE: 'Felkod'
+    DEFAULTERRORPAGECONTENT: '<p>Det verkar som om du försökter komma åt en sida som inte finns.</p><p>Var god kontrollera stavningen på adressen som du försökte nå och försök igen.'
+    DEFAULTERRORPAGETITLE: 'Sidan hittades inte'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>Ursäkta, ett fel uppstod vid hanteringen av din förfrågan.</p>'
+    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: 'Felmeddelandesidor'
+    SINGULARNAME: 'Felsida'
   Folder:
     AddFolderButton: 'Skapa mapp'
     DELETEUNUSEDTHUMBNAILS: 'Radera oanvända tumnaglar'
     UNUSEDFILESTITLE: 'Oanvända filer'
     UNUSEDTHUMBNAILSTITLE: 'Oanvända tumnaglar'
-    UploadFilesButton: 'Ladda upp'
+    UploadFilesButton: Ladda upp
   LeftAndMain:
     DELETED: Raderad.
     PreviewButton: Förhandsgranska
     SAVEDUP: Sparad.
     STATUSPUBLISHEDSUCCESS: 'Publiseringen av  ''{title}'' lyckades'
-    SearchResults: Sökresultat
+    SearchResults: 'Sökresultat'
     VersionUnknown: Okänd
   Permission:
-    CMS_ACCESS_CATEGORY: CMS-tillgång
+    CMS_ACCESS_CATEGORY: 'CMS-tillgång'
   Permissions:
-    CONTENT_CATEGORY: Innehållsåtkomst
+    CONTENT_CATEGORY: 'Innehållsåtkomst'
     PERMISSIONS_CATEGORY: 'Roller och åtkomst'
   RedirectorPage:
     DESCRIPTION: 'Omdirigerar till en annan intern sida'
@@ -250,35 +235,29 @@ sv:
     REDIRECTTO: 'Omdirigera till'
     REDIRECTTOEXTERNAL: 'En annan sajt'
     REDIRECTTOPAGE: 'En sida på din sajt'
-    SINGULARNAME: Omdirigeringssida
+    SINGULARNAME: 'Omdirigeringssida'
     YOURPAGE: 'Sida på din sajt'
   ReportAdmin:
-    MENUTITLE: Rapporter
     ReportTitle: Titel
+    MENUTITLE: Rapporter
   ReportAdminForm:
     FILTERBY: 'Filtrera på'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Kör
     SEARCH: Sök
-    SearchResults: Sökresultat
+    SearchResults: 'Sökresultat'
   SideReport:
     BROKENFILES: 'Sidor med trasiga filer'
     BROKENLINKS: 'Sidor med trasiga länkar'
     BROKENREDIRECTORPAGES: 'Omdirigeringssidor som pekar på raderade sidor'
     BROKENVIRTUALPAGES: 'Virtuella sidor som pekar på raderade sidor'
     BrokenLinksGroupTitle: 'Rapport för trasiga länkar'
-    ContentGroupTitle: Innehållsrapport
+    ContentGroupTitle: 'Innehållsrapport'
     EMPTYPAGES: 'Tomma sidor'
     LAST2WEEKS: 'Sidor som har redigerats de senaste 2 veckorna'
     OtherGroupTitle: Annat
     ParameterLiveCheckbox: 'Kontrollera live sajt'
     REPEMPTY: 'Raporten {title} är tom.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Kopiera och klistra in länken nedan för att dela den här sidan.'
     ShareLink: 'Dela länk'
@@ -293,7 +272,7 @@ sv:
     SINGULARNAME: 'Sajt inställning'
     SITENAMEDEFAULT: 'Din Sajts Namn'
     SITETAGLINE: 'Din sajts Slogan'
-    SITETITLE: Sajttitel
+    SITETITLE: 'Sajttitel'
     TABACCESS: Tillgång
     TABMAIN: Allmänt
     TAGLINEDEFAULT: 'din underrubrik här'
@@ -311,55 +290,46 @@ sv:
     APPEARSVIRTUALPAGES: 'Detta innehåll förekommer även på en virtuell sida i sektionen {title}.'
     BUTTONCANCELDRAFT: 'Ångra utkaständringar'
     BUTTONCANCELDRAFTDESC: 'Radera utkast och återgå till den publicerade sidan'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
+    BUTTONSAVEPUBLISH: 'Spara & publicera'
     BUTTONUNPUBLISH: Avpublicera
     BUTTONUNPUBLISHDESC: 'Ta bort den här sidan från den publicerade sajten'
-    CREATED: Skapad
+    CREATED: 'Skapad'
     Comments: Kommentarer
     Content: Innehåll
     DEFAULTABOUTCONTENT: '<p>Du kan fylla den här sidan med ditt eget innehåll, eller radera den och skapa dina egna sidor.<br/></p>'
     DEFAULTABOUTTITLE: 'Om oss'
     DEFAULTCONTACTCONTENT: '<p>Du kan fylla den här sidan med ditt eget innehåll, eller radera den och skapa dina egna sidor.<br/></p>'
     DEFAULTCONTACTTITLE: 'Kontakta oss'
-    DEFAULTHOMECONTENT: '<p>Välkommen till SilverStripe! Det här är standardhemsidan. Du kan redigera sidan genom att öppna <a href="admin/">CMS:et</a>. Du kan använda <a href="http://doc.silverstripe.com">utvecklardokumentationen</a>, eller börja med  <a href="http://doc.silverstripe.com/doku.php?id=tutorials">guiderna</a></p>'
+    DEFAULTHOMECONTENT: '<p>Välkommen till SilverStripe! Det här är standardhemsidan. Du kan redigera sidan genom att öppna <a href="admin/">CMS:et</a>. Du kan även komma åt <a href="http://doc.silverstripe.com">utvecklardokumentationen</a>, eller börja med <a href="http://doc.silverstripe.com/doku.php?id=tutorials">guiderna</a></p>'
     DEFAULTHOMETITLE: Hem
     DELETEDPAGEHELP: 'Sidan är inte längre publicerad'
     DELETEDPAGESHORT: Raderad
     DEPENDENT_NOTE: 'Följande sidor berörs av den här sidan. Inklusive virtuella sidor, omdirigeringssidor, och sidor med innehållslänkar.'
     DESCRIPTION: 'Generisk innehållssida'
-    DependtPageColumnLinkType: Länktyp
-    DependtPageColumnURL: URL
+    DependtPageColumnLinkType: 'Länktyp'
     EDITANYONE: 'Alla som kan logga in'
     EDITHEADER: 'Vem kan redigera den här sidan?'
     EDITONLYTHESE: 'Bara de här (välj från listan)'
-    EDITORGROUPS: Redaktörsgrupper
+    EDITORGROUPS: 'Redaktörsgrupper'
     EDIT_ALL_DESCRIPTION: 'Redigera alla sidor'
     EDIT_ALL_HELP: 'Möjlighet att redigera alla sidor på sajten, oavsett inställningarna under Åtkomstfliken. Kräver "Tillgång till ''Sidor''-delen"'
-    Editors: Redaktörsgrupper
-    GroupPlaceholder: 'Click to select group'
+    Editors: 'Redaktörsgrupper'
     HASBROKENLINKS: 'Den här sidan har trasiga länkar.'
     HTMLEDITORTITLE: Innehåll
     INHERIT: 'Ärv från överordnad sida'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Senast uppdaterad'
     LINKCHANGENOTE: 'Om du ändrar sidans länkadress så kommer det också påverka länkarna på underliggande sidor'
-    MENUTITLE: Navigationsetikett
-    METADESC: Metabeskrivning
+    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'
     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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
+    OBSOLETECLASS: 'Denna sida är den föråldrade typen {type}. Att spara kommer att återställa dess typ och du kan förlora data'
     PAGELOCATION: 'Sidans position'
-    PAGETITLE: Sidnamn
-    PAGETYPE: Sidtyp
+    PAGETITLE: 'Sidnamn'
+    PAGETYPE: 'Sidtyp'
     PARENTID: 'Överordnad sida'
     PARENTTYPE: 'Sidans position'
     PARENTTYPE_ROOT: 'Översta nivån'
@@ -378,14 +348,14 @@ sv:
     SHOWINSEARCH: 'Visa i sökningar?'
     SINGULARNAME: Sida
     TABBEHAVIOUR: Beteende
-    TABCONTENT: Huvudinnehåll
+    TABCONTENT: 'Huvudinnehåll'
     TABDEPENDENT: 'Beroende sidor'
     TOPLEVEL: 'Sajtinnehåll (toppnivå)'
     TOPLEVELCREATORGROUPS: 'Topp-nivå skapare'
-    URLSegment: URL-segment
+    URLSegment: 'URL-segment'
     VIEWERGROUPS: 'Åtkomstgrupper'
     VIEW_ALL_DESCRIPTION: 'Visa alla sidor'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
+    VIEW_ALL_HELP: 'Möjlighet att redigera alla sidor på sajten, oavsett inställningarna under Åtkomstfliken. Kräver åtkomst till "Tillgång till ''Sidor''-delen"'
     VIEW_DRAFT_CONTENT: 'Se utkast'
     VIEW_DRAFT_CONTENT_HELP: 'Gäller sidor visade i utkastläge utanför CMS:et. Användbart för medarbetare utan CMS-åtkomst.'
     Viewers: 'Åskådargrupper'
@@ -394,20 +364,27 @@ sv:
     many_many_BackLinkTracking: 'Spåra inlänkar'
     many_many_ImageTracking: 'Spåra bild'
     many_many_LinkTracking: 'Spåra länk'
+    BUTTONPUBLISHED: Publicerad
+    BUTTONSAVED: Sparad
+    GroupPlaceholder: 'Klicka för att välja grupp'
+    LASTPUBLISHED: 'Datum för senaste publicering'
+    LASTSAVED: 'Senast sparad'
+    MoreOptions: 'Fler alternativ'
+    NOTPUBLISHED: 'Ej publicerad'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Specialtecken konverteras eller tas bort'
+    EMPTY: 'Ange ett URL-segment eller klicka på avbryt'
   StaticExporter:
-    BASEURL: Bas-URL
+    BASEURL: 'Bas-URL'
     EXPORTTO: 'Exportera till den mappen'
     NAME: 'Statisk exportör'
   TableListField:
     SELECT: 'Välj:'
-  TableListField.ss:
+  TableListField_ss:
     NOITEMSFOUND: 'Inga objekt hittade'
     SORTASC: 'Sortera i stigande ordning'
     SORTDESC: 'Sortera i fallande ordning'
-  TableListField_PageControls.ss:
+  TableListField_PageControls_ss:
     DISPLAYING: Visar
     OF: av
     TO: till
@@ -417,20 +394,26 @@ sv:
     VIEWPREVIOUS: 'Visa föregående'
   TreeTools:
     DisplayLabel: 'Visa:'
-  URLSegmentField:
-    Cancel: Avbryt
-    Edit: Redigera
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Du kan komma åt den arkiverade sajten med denna länk:'
     HAVEASKED: 'Du har efterfrågat att se innehållet på vår sajt på'
   VirtualPage:
-    CHOOSE: 'Länkad sida'
     DESCRIPTION: 'Visar innehåll från en annan sida'
-    EDITCONTENT: 'Redigera innehåll på länkad sida'
-    EditLink: redigera
     HEADER: 'Det här är en virutell sida'
-    HEADERWITHLINK: 'Detta är en virtuell sida med kopierat innehåll från "{title}" ({link})'
     PLURALNAME: 'Virtuella sidor'
     PageTypNotAllowedOnRoot: 'Ursprungliga sidan av typ "{type}" tillåts inte på rotnivå för denna virtuella sida'
     SINGULARNAME: 'Virtuell sida'
+  CMSFileAddController:
+    MENUTITLE: Filer
+  CMSPageEditController:
+    MENUTITLE: 'Redigera sidan'
+  CMSPageSettingsController:
+    MENUTITLE: 'Redigera sida'
+  CMSSettingsController:
+    MENUTITLE: Inställningar
+  SITETREE:
+    VIRTUALPAGEDRAFTWARNING: 'Publicera den länkade sidan för att kunna publicera den virtuella sidan'
+    VIRTUALPAGEWARNING: 'Välj en länkad sida och spara först för att kunna publicera den här sidan'
+    VIRTUALPAGEWARNINGSETTINGS: 'Välj en länkad sida i huvudinnehållsfälten för att kunna publicera'
+  SilverStripeNavigator:
+    ARCHIVED: Arkiverad
diff --git a/lang/th.yml b/lang/th.yml
index bd7ea00b..4dd1c180 100644
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -1,205 +1,169 @@
 th:
   AssetAdmin:
-    ADDFILES: เพิ่มไฟล์
-    ActionAdd: เพิ่มโฟลเดอร์
+    ADDFILES: 'เพิ่มไฟล์'
+    ActionAdd: 'เพิ่มโฟลเดอร์'
     AppCategoryArchive: รายการ
     AppCategoryAudio: ไฟล์เสียง
     AppCategoryDocument: เอกสาร
     AppCategoryFlash: แฟลช
-    AppCategoryImage: 'รูปภาพ'
+    AppCategoryImage: รูปภาพ
     AppCategoryVideo: วีดีโอ
-    BackToFolder: ย้อนกลับไปที่โฟลเดอร์
+    BackToFolder: 'ย้อนกลับไปที่โฟลเดอร์'
     CREATED: วันที่
     CurrentFolderOnly: 'จำกัดเฉพาะโฟลเดอร์นี้?'
     DetailsView: รายละเอียด
     FILES: ไฟล์
-    FILESYSTEMSYNC: ผสานไฟล์
+    FILESYSTEMSYNC: 'ผสานไฟล์'
     FILESYSTEMSYNCTITLE: 'อัพเดทรายการไฟลในฐานข้อมูล CMS ในระบบไฟล์ มีประโยชน์สำหรับการอัพโหลดไฟล์ใหม่นอกระบบ CMS เช่น ผ่านทาง FTP'
-    FROMTHEINTERNET: จากอินเทอร์เน็ต
-    FROMYOURCOMPUTER: จากเครื่องคอมพิวเตอร์ของคุณ
-    Filetype: ชนิดของไฟล์
-    ListView: มุมมองแบบแสดงรายการ
-    MENUTITLE: ไฟล์
+    FROMTHEINTERNET: 'จากอินเทอร์เน็ต'
+    FROMYOURCOMPUTER: 'จากเครื่องคอมพิวเตอร์ของคุณ'
+    Filetype: 'ชนิดของไฟล์'
+    ListView: 'มุมมองแบบแสดงรายการ'
     NEWFOLDER: สร้างโฟลเดอร์ใหม่
     SIZE: ขนาด
     THUMBSDELETED: '{count} รูปย่อที่ไม่ได้ถูกใช้งานได้ถูกลบทิ้งแล้ว'
     TreeView: 'มุมมองแบบ Tree'
     Upload: อัพโหลด
+    MENUTITLE: ไฟล์
   AssetAdmin_DeleteBatchAction:
-    TITLE: ลบโฟลเดอร์
+    TITLE: 'ลบโฟลเดอร์'
   AssetAdmin_Tools:
     FILTER: ตัวกรองข้อมูล
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: ไป
   AssetTableField:
     BACKLINKCOUNT: 'ถูกใช้งานเมื่อ:'
     PAGES: หน้า
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: ย้อนกลับ
   BrokenLinksReport:
     Any: ใดๆก็ได้
-    BROKENLINKS: รายงานลิงค์เสีย
-    CheckSite: ตรวจเว็บไซต์
-    CheckSiteDropdownDraft: เว็บไซต์ฉบับร่าง
-    CheckSiteDropdownPublished: เว็บไซต์ที่เผยแพร่แล้ว
-    ColumnDateLastModified: วันที่แก้ไขล่าสุด
-    ColumnDateLastPublished: วันที่เผยแพร่ล่าสุด
+    BROKENLINKS: 'รายงานลิงค์เสีย'
+    CheckSite: 'ตรวจเว็บไซต์'
+    CheckSiteDropdownDraft: 'เว็บไซต์ฉบับร่าง'
+    CheckSiteDropdownPublished: 'เว็บไซต์ที่เผยแพร่แล้ว'
+    ColumnDateLastModified: 'วันที่แก้ไขล่าสุด'
+    ColumnDateLastPublished: 'วันที่เผยแพร่ล่าสุด'
     ColumnProblemType: 'ประเภทปัญหา'
-    ColumnURL: URL
-    HasBrokenFile: มีไฟล์เสีย
-    HasBrokenLink: มีลิงค์เสีย
-    HasBrokenLinkAndFile: มีลิงค์เสียและไฟล์เสีย
-    HoverTitleEditPage: แก้ไขหน้าเว็บ
-    PageName: ชื่อของหน้าเว็บ
-    ReasonDropdown: ปัญหาที่ต้องตรวจสอบ
-    ReasonDropdownBROKENFILE: ไฟล์เสีย
-    ReasonDropdownBROKENLINK: ลิงค์เสีย
-    ReasonDropdownRPBROKENLINK: หน้าเว็บเปลี่ยนเส้นทางชี้ไปที่หน้าเว็บที่ไม่มีอยู่ในระบบ
-    ReasonDropdownVPBROKENLINK: หน้าเว็บจำลองชี้ไปยังหน้าเว็บที่ไม่มีอยู่ในระบบ
-    RedirectorNonExistent: หน้าเว็บเปลี่ยนเส้นทางชี้ไปที่หน้าเว็บที่ไม่มีอยู่ในระบบ
-    VirtualPageNonExistent: หน้าเว็บจำลองชี้ไปที่หน้าเว็บที่ไม่มีอยู่ในระบบ
+    HasBrokenFile: 'มีไฟล์เสีย'
+    HasBrokenLink: 'มีลิงค์เสีย'
+    HasBrokenLinkAndFile: 'มีลิงค์เสียและไฟล์เสีย'
+    HoverTitleEditPage: 'แก้ไขหน้าเว็บ'
+    PageName: 'ชื่อของหน้าเว็บ'
+    ReasonDropdown: 'ปัญหาที่ต้องตรวจสอบ'
+    ReasonDropdownBROKENFILE: 'ไฟล์เสีย'
+    ReasonDropdownBROKENLINK: 'ลิงค์เสีย'
+    ReasonDropdownRPBROKENLINK: 'หน้าเว็บเปลี่ยนเส้นทางชี้ไปที่หน้าเว็บที่ไม่มีอยู่ในระบบ'
+    ReasonDropdownVPBROKENLINK: 'หน้าเว็บจำลองชี้ไปยังหน้าเว็บที่ไม่มีอยู่ในระบบ'
+    RedirectorNonExistent: 'หน้าเว็บเปลี่ยนเส้นทางชี้ไปที่หน้าเว็บที่ไม่มีอยู่ในระบบ'
+    VirtualPageNonExistent: 'หน้าเว็บจำลองชี้ไปที่หน้าเว็บที่ไม่มีอยู่ในระบบ'
   CMSAddPageController:
-    Title: เพิ่มหน้า
+    Title: 'เพิ่มหน้า'
   CMSBatchActions:
     DELETED_DRAFT_PAGES: 'ลบ %d หน้าจากเว็บไซต์ฉบับร่างแล้ว, ล้มเหลว %d'
     DELETED_PAGES: 'ลบ %d หน้าจากเว็บไซต์ที่เผยแพร่อยู่แล้ว ล้มเหลว %d'
-    DELETE_DRAFT_PAGES: ลบออกจากเว็บไซต์ฉบับร่าง
-    DELETE_PAGES: ลบออกจากเว็บไซต์ที่เผยแพร่อยู่
+    DELETE_DRAFT_PAGES: 'ลบออกจากเว็บไซต์ฉบับร่าง'
+    DELETE_PAGES: 'ลบออกจากเว็บไซต์ที่เผยแพร่อยู่'
     PUBLISHED_PAGES: 'เผยแพร่แล้ว %d หน้า, ล้วเหลว %d'
     PUBLISH_PAGES: เผยแพร่
     UNPUBLISHED_PAGES: 'ยกเลิกการเผยแพร่หน้าเว็บแล้ว %d หน้า'
     UNPUBLISH_PAGES: ยกเลิกการเผยแพร่
-  CMSFileAddController:
-    MENUTITLE: ไฟล์
   CMSMain:
     ACCESS: 'เข้าถึงเซ็กชั่น ''{title}'''
     ACCESS_HELP: 'อนุญาตให้เปิดดูส่วนของเซ็กชั่นที่บรรจุรายการหน้าเว็บแบบทรีและเนื้อหาได้ สิทธิ์ในการเปิดดูและแก้ไขสามารถจัดการได้ผ่านทางหน้าเว็บทีระบุอยู่ในเมนูแบบดรอปดาวน์ เช่นเดียวกับ "สิทธิ์อนุญาตของเนื้อหา" ที่แยกออกมาต่างหากด้วยเช่นกัน'
-    AddNew: เพิ่มหน้าใหม่
-    AddNewButton: เพิ่มใหม่
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: เลือกว่าต้องการสร้างหน้าเว็บนี้ไว้ที่ไหน
+    AddNew: 'เพิ่มหน้าใหม่'
+    AddNewButton: 'เพิ่มใหม่'
+    ChoosePageParentMode: 'เลือกว่าต้องการสร้างหน้าเว็บนี้ไว้ที่ไหน'
     ChoosePageType: 'เลือกประเภทของหน้าเว็บ'
     Create: สร้าง
-    DELETE: ลบออกจากเว็บไซต์ฉบับร่าง
+    DELETE: 'ลบออกจากเว็บไซต์ฉบับร่าง'
     DELETEFP: ลบ
     DESCREMOVED: 'และ {count} รายการลูก'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: อีเมล
     EditTree: 'แก้ไขรายการแบบ Tree'
-    ListFiltered: แสดงรายการตามตัวกรองข้อมูล
-    MENUTITLE: แก้ไขหน้าเว็บ
+    ListFiltered: 'แสดงรายการตามตัวกรองข้อมูล'
     NEWPAGE: 'ใหม่ {pagetype}'
-    PAGENOTEXISTS: ไม่มีหน้านี้อยู่
+    PAGENOTEXISTS: 'ไม่มีหน้านี้อยู่'
     PAGES: หน้า
-    PAGETYPEANYOPT: 'ประเภทใดก็ได้'
+    PAGETYPEANYOPT: ประเภทใดก็ได้
     PAGETYPEOPT: 'ประเภทหน้าเว็บ'
     PUBALLCONFIRM: 'กรุณาเผยแพร่หน้าเว็บทุกหน้าในเว็บไซต์, คัดลอกเนื้อหาลงไปที่'
     PUBALLFUN: 'ฟังก์ชั่นการทำงาน "เผยแพร่ทั้งหมด"'
-    PUBALLFUN2: "การกดปุ่มนี้จะเทียบเท่ากับการไปที่หน้าต่างๆทุกๆหน้าแล้วกด \"เผยแพร่\".  It's\\nปุ่มดังกล่าวมีไว้ด้วยความตั้งใจที่ต้องการให้นำไปใช้กับการแก้ไขเนื้อหาเป็นจำนวนมาก เช่น เมื่อเว็บไซต์\\nถูกสร้างขึ้นเป็นครั้งแรก."
+    PUBALLFUN2: "การกดปุ่มนี้จะเทียบเท่ากับการไปที่หน้าต่างๆทุกๆหน้าแล้วกด \"เผยแพร่\".  It's\nปุ่มดังกล่าวมีไว้ด้วยความตั้งใจที่ต้องการให้นำไปใช้กับการแก้ไขเนื้อหาเป็นจำนวนมาก เช่น เมื่อเว็บไซต์\nถูกสร้างขึ้นเป็นครั้งแรก."
     PUBPAGES: 'เผยแแพร่หน้าเว็บแล้ว {count} หน้า'
-    PageAdded: หน้าเว็บที่สร้างเสร็จเรียบร้อยแล้ว
-    REMOVED: 'Deleted ''{title}''{description} from live site'
+    PageAdded: 'หน้าเว็บที่สร้างเสร็จเรียบร้อยแล้ว'
     REMOVEDPAGE: 'ลบ ''{title}'' ออกจากเว็บไซต์ที่เผยแพร่อยู่แล้ว'
     REMOVEDPAGEFROMDRAFT: 'ลบ ''%s'' ออกจากเว็บไซต์ฉบับร่างแล้ว'
     RESTORE: คืนค่า
     RESTORED: 'เรียกคืนค่า ''{title}'' เสร็จเรียบร้อยแล้ว'
-    ROLLBACK: ย้อนกลับไปที่รุ่นนี้
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
+    ROLLBACK: 'ย้อนกลับไปที่รุ่นนี้'
     SAVE: บันทึก
-    SAVEDRAFT: 'Save draft'
     TabContent: เนื้อหา
     TabHistory: ประวัติย้อนหลัง
     TabSettings: ตั้งค่า
     TreeFiltered: 'แสดงรายการแบบ Tree ตามตัวกรองข้อมูล'
-    TreeFilteredClear: ล้างค่าตัวกรองข้อมูล
-  CMSMain_left.ss:
-    'APPLY FILTER': นำตัวกรองข้อมูลไปใช้งาน
+    TreeFilteredClear: 'ล้างค่าตัวกรองข้อมูล'
+    MENUTITLE: 'แก้ไขหน้าเว็บ'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'นำตัวกรองข้อมูลไปใช้งาน'
     RESET: รีเซ็ต
   CMSPageAddController:
-    MENUTITLE: เพิ่มหน้า
-    ParentMode_child: อยู่ใต้หน้าอื่นๆ
-    ParentMode_top: ระดับสูงสุด
-  CMSPageEditController:
-    MENUTITLE: แก้ไขหน้าเว็บ
+    ParentMode_child: 'อยู่ใต้หน้าอื่นๆ'
+    ParentMode_top: 'ระดับสูงสุด'
+    MENUTITLE: 'เพิ่มหน้า'
   CMSPageHistoryController:
     COMPAREMODE: 'โหมดเปรียบเทียบ (เลือกสองรายการ)'
-    COMPAREVERSIONS: เปรียบเทียบรุ่น
+    COMPAREVERSIONS: 'เปรียบเทียบรุ่น'
     COMPARINGVERSION: 'กำลังเปรียบเทียบรุ่น {version1} และ {version2}.'
-    MENUTITLE: ประวัติย้อนหลัง
-    REVERTTOTHISVERSION: ย้อนกลับไปที่รุ่นนี้
-    SHOWUNPUBLISHED: แสดงรุ่นที่ระงับการเผยแพร่ไว้
-    SHOWVERSION: แสดงข้อมูลรุ่น
+    REVERTTOTHISVERSION: 'ย้อนกลับไปที่รุ่นนี้'
+    SHOWUNPUBLISHED: 'แสดงรุ่นที่ระงับการเผยแพร่ไว้'
+    SHOWVERSION: 'แสดงข้อมูลรุ่น'
     VIEW: มุมมอง
-    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'ขณะนี้กำลังเปิดดูในรุ่น {version}.'
-  CMSPageHistoryController_versions.ss:
+    MENUTITLE: ประวัติย้อนหลัง
+  CMSPageHistoryController_versions_ss:
     AUTHOR: ผู้แต่ง
-    NOTPUBLISHED: ยังไม่ได้เผยแพร่
+    NOTPUBLISHED: 'ยังไม่ได้เผยแพร่'
     PUBLISHER: ผู้เผยแพร่
     UNKNOWN: ไม่ทราบ
     WHEN: เมื่อ
-  CMSPageSettingsController:
-    MENUTITLE: แก้ไขหน้าเว็บ
   CMSPagesController:
-    GalleryView: มุมมองแบบแกลอรี่
-    ListView: มุมมองแบบแสดงรายการ
-    MENUTITLE: หน้า
-    TreeView: 'มุมมองแบบ Tree'
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: ลากแล้วปล่อย
+    GalleryView: 'มุมมองแบบแกลอรี่'
+  CMSPagesController_ContentToolbar_ss:
+    ENABLEDRAGGING: 'ลากแล้วปล่อย'
     MULTISELECT: การเลือกพร้อมกันหลายรายการ
-  CMSPagesController_Tools.ss:
+  CMSPagesController_Tools_ss:
     FILTER: ตัวกรองข้อมูล
   CMSSearch:
-    FILTERDATEFROM: จาก
     FILTERDATEHEADING: วันที่
-    FILTERDATETO: ถึง
-    FILTERLABELTEXT: เนื้อหา
-  CMSSettingsController:
-    MENUTITLE: ตั้งค่า
   CMSSiteTreeFilter_ChangedPages:
-    Title: หน้าที่ถูกเปลี่ยนแปลง
+    Title: 'หน้าที่ถูกเปลี่ยนแปลง'
   CMSSiteTreeFilter_DeletedPages:
     Title: 'ทุกหน้า รวมทั้งหน้าที่ถูกลบไปแล้วด้วย'
   CMSSiteTreeFilter_Search:
-    Title: หน้าทั้งหมด
+    Title: 'หน้าทั้งหมด'
   ContentControl:
     NOTEWONTBESHOWN: 'หมายเหตุ: ข้อความนี้จะไม่ถูกนำไปแสดงให้ผู้เยี่ยมชมเว็บไซต์ของคุณเห็น'
   ContentController:
-    ARCHIVEDSITE: รุ่นสำหรับดูตัวอย่าง
-    ARCHIVEDSITEFROM: เว็บไซต์ที่จัดเก็บไว้ถาวรจาก
-    CMS: CMS
-    DRAFT: Draft
-    DRAFTSITE: เว็บไซต์ฉบับร่าง
+    ARCHIVEDSITE: 'รุ่นสำหรับดูตัวอย่าง'
+    ARCHIVEDSITEFROM: 'เว็บไซต์ที่จัดเก็บไว้ถาวรจาก'
+    DRAFTSITE: 'เว็บไซต์ฉบับร่าง'
     DRAFT_SITE_ACCESS_RESTRICTION: 'คุณต้องเข้าสู่ระบบด้วยรหัสผ่าน CMS ของคุณ หากต้องการเปิดดูฉบับร่าง หรือเนื้อหาย้อนหลัง.  <a href="%s">คลิกที่นี่เพื่อย้อนกลับไปที่เว็บไซต์ที่เผยแพร่อยู่.</a>'
     Email: อีเมล
-    INSTALL_SUCCESS: การติดตั้งเสร็จสมบูรณ์
-    InstallFilesDeleted: ไฟล์ติดตั้งได้ถูกลบทิ้งเรียบร้อยแล้ว
+    INSTALL_SUCCESS: 'การติดตั้งเสร็จสมบูรณ์'
+    InstallFilesDeleted: 'ไฟล์ติดตั้งได้ถูกลบทิ้งเรียบร้อยแล้ว'
     InstallSecurityWarning: 'ด้วยเหตุผลด้านการรักษาความปลอดภัย คุณควรลบไฟล์ติดตั้งทันที เว้นเสียแต่ว่าคุณกำลังวางแผนที่จะติดตั้งซ้ำใหม่ในภายหลัง (<em>จำเป็นต้องเข้าสู่ระบบในส่วนของผู้ดูแล, กรุณาดูได้จากด้านบน</em>). เว็บเซิร์ฟเวอร์ขณะนี้จำเป็นต้องได้รับการกำหนดสิทธิ์ให้สามารถเข้าถึงเพื่อเขียนข้อมูลที่โฟลเดอร์ "assets" ได้ด้วยเช่นกัน คุณสามารถลบสิทธิ์การเข้าถึงเพื่อเขียนข้อมูลจากโฟลเดอร์อื่นๆทั้งหมดได้ด้วยเช่นกัน. <a href="{link}" style="text-align: center;">คลิกที่นี่เพื่อลบไฟล์ติดตั้งออก.</a>'
     InstallSuccessCongratulations: 'SilverStripe ได้รับการติดตั้งเรียบร้อยแล้ว!'
-    LOGGEDINAS: เข้าสู่ระบบในชื่อ
+    LOGGEDINAS: 'เข้าสู่ระบบในชื่อ'
     LOGIN: เข้าสู่ระบบ
-    LOGOUT: ออกจากระบบ
-    NOTLOGGEDIN: ยังไม่ได้เข้าสู่ระบบ
-    PUBLISHED: Published
-    PUBLISHEDSITE: เว็บไซต์ที่เผยแพร่อยู่
+    LOGOUT: 'ออกจากระบบ'
+    NOTLOGGEDIN: 'ยังไม่ได้เข้าสู่ระบบ'
+    PUBLISHEDSITE: 'เว็บไซต์ที่เผยแพร่อยู่'
     Password: รหัสผ่าน
     PostInstallTutorialIntro: 'เว็บไซต์นี้เป็นรุ่นอย่างง่ายของเว็บไซต์ที่สร้างจากรุ่น SiverStripe 3 หากต้องการขยายขีดความสามารถ กรุณาเข้าไปที่ {link}'
-    StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'ไม่สามารถลบไฟล์ติดตั้งได้ กรุณาลบไฟล์ดังกล่าวด้านล่างด้วยตนเอง'
     VIEWPAGEIN: 'เปิดดูหน้าเว็บใน:'
   ErrorPage:
-    CODE: รหัสข้อผิดพลาด
-    DEFAULTERRORPAGECONTENT: '<p>ขออภัย, แต่คุณดูเหมือนกำลังพยายามที่จะเข้าถึงหน้าเว็บที่ไม่มีอยู่ในระบบ.</p><p>กรุณาตรวจสอบการสะกดคำของ URL ของหน้าเว็บที่คุณพยายามจะเข้าถึงแล้วลองใหม่อีกครั้ง.</p>'
-    DEFAULTERRORPAGETITLE: ไม่พบหน้าที่ต้องการ
-    DEFAULTSERVERERRORPAGECONTENT: '<p>ขออภัย, เกิดข้อผิดพลาดบางประการในการจัดการตามคำร้องขอของคุณ</p>'
-    DEFAULTSERVERERRORPAGETITLE: เซิร์ฟเวอร์เกิดข้อผิดพลาด
-    DESCRIPTION: 'กำหนดเนื้อหาเองสำหรับข้อผิดพลาดต่างๆ (e.g. "ไม่พบหน้าเว็บที่ต้องการ")'
-    ERRORFILEPROBLEM: 'เกิดข้อผิดพลาดในการเปิดไฟล์ "{filename}" เพื่อเขียนข้อมูล. กรุณาตรวจสอบสิทธิ์.'
-    PLURALNAME: หน้าเว็บแสดงข้อผิดพลาด
-    SINGULARNAME: หน้าเว็บแสดงข้อผิดพลาด
     400: '400 - ข้อความร้องขอที่ส่งมามีความผิดพลาดทางไวยากรณ์ หรือไม่สามารถทำตามการร้องขอนั้นได้'
     401: '401 - ไม่สามารถยืนยันตัวบุคคลได้'
     403: '403 - ไม่สามารถดำเนินการตามที่ร้องขอได้'
@@ -223,214 +187,200 @@ th:
     503: '503 - เครื่องแม่ข่ายยังไม่ให้บริการในปัจจุบัน '
     504: '504 - หมดเวลารอรับข้อมูลจากเครื่องแม่ข่ายที่กำลังทำหน้าที่เป็นเกตเวย์หรือพร็อกซี่'
     505: '505 - เครื่องแม่ข่ายไม่รองรับรุ่นของเอชทีทีพีที่ใช้ในข้อความร้องขอ'
+    CODE: 'รหัสข้อผิดพลาด'
+    DEFAULTERRORPAGECONTENT: '<p>ขออภัย, แต่คุณดูเหมือนกำลังพยายามที่จะเข้าถึงหน้าเว็บที่ไม่มีอยู่ในระบบ.</p><p>กรุณาตรวจสอบการสะกดคำของ URL ของหน้าเว็บที่คุณพยายามจะเข้าถึงแล้วลองใหม่อีกครั้ง.</p>'
+    DEFAULTERRORPAGETITLE: 'ไม่พบหน้าที่ต้องการ'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>ขออภัย, เกิดข้อผิดพลาดบางประการในการจัดการตามคำร้องขอของคุณ</p>'
+    DEFAULTSERVERERRORPAGETITLE: 'เซิร์ฟเวอร์เกิดข้อผิดพลาด'
+    DESCRIPTION: 'กำหนดเนื้อหาเองสำหรับข้อผิดพลาดต่างๆ (e.g. "ไม่พบหน้าเว็บที่ต้องการ")'
+    ERRORFILEPROBLEM: 'เกิดข้อผิดพลาดในการเปิดไฟล์ "{filename}" เพื่อเขียนข้อมูล. กรุณาตรวจสอบสิทธิ์.'
+    PLURALNAME: 'หน้าเว็บแสดงข้อผิดพลาด'
+    SINGULARNAME: 'หน้าเว็บแสดงข้อผิดพลาด'
   Folder:
-    AddFolderButton: เพิ่มโฟลเดอร์
-    DELETEUNUSEDTHUMBNAILS: ลบรูปย่อที่ไม่ได้ใช้งาน
-    UNUSEDFILESTITLE: ไฟล์ที่ไม่ได้ใช้งาน
-    UNUSEDTHUMBNAILSTITLE: รูปย่อที่ไม่ได้ใช้งาน
+    AddFolderButton: 'เพิ่มโฟลเดอร์'
+    DELETEUNUSEDTHUMBNAILS: 'ลบรูปย่อที่ไม่ได้ใช้งาน'
+    UNUSEDFILESTITLE: 'ไฟล์ที่ไม่ได้ใช้งาน'
+    UNUSEDTHUMBNAILSTITLE: 'รูปย่อที่ไม่ได้ใช้งาน'
     UploadFilesButton: อัพโหลด
   LeftAndMain:
     DELETED: ถูกลบแล้ว
-    PreviewButton: ดูตัวอย่าง
     SAVEDUP: บันทึกแล้ว
     STATUSPUBLISHEDSUCCESS: 'เผยแพร่ ''{title}'' เสร็จเรียบร้อยแล้ว'
-    SearchResults: ผลการค้นหา
     VersionUnknown: ไม่ทราบ
   Permission:
     CMS_ACCESS_CATEGORY: 'การเข้าถึง CMS'
   Permissions:
-    CONTENT_CATEGORY: สิทธิ์อนุญาตของเนื้อหา
-    PERMISSIONS_CATEGORY: บทบาทและสิทธิ์อนุญาตการเข้าถึง
+    CONTENT_CATEGORY: 'สิทธิ์อนุญาตของเนื้อหา'
+    PERMISSIONS_CATEGORY: 'บทบาทและสิทธิ์อนุญาตการเข้าถึง'
   RedirectorPage:
     DESCRIPTION: 'เปลี่ยนเส้นทางไปยังหน้าเว็บภายในอื่นๆ'
-    HASBEENSETUP: หน้าเว็บที่มีการเปลี่ยนเส้นทางซึ่งได้รับการตั้งค่าโดยปราศจากตำแหน่งปลายทางที่ต้องการเปลี่ยนเส้นทางไป
-    HEADER: หน้าเว็บนี้จะเปลี่ยนเส้นทางผู้ใช้งานไปยังหน้าเว็บอื่นๆ
+    HASBEENSETUP: 'หน้าเว็บที่มีการเปลี่ยนเส้นทางซึ่งได้รับการตั้งค่าโดยปราศจากตำแหน่งปลายทางที่ต้องการเปลี่ยนเส้นทางไป'
+    HEADER: 'หน้าเว็บนี้จะเปลี่ยนเส้นทางผู้ใช้งานไปยังหน้าเว็บอื่นๆ'
     OTHERURL: 'ที่อยู่ URL ของเว็บไซต์อื่นๆ'
-    PLURALNAME: หน้าเว็บเปลี่ยนเส้นทาง
-    REDIRECTTO: เปลี่ยนเส้นทางไปที่
-    REDIRECTTOEXTERNAL: เว็บไซต์อื่นๆ
-    REDIRECTTOPAGE: หน้าเว็บในเว็บไซต์ของคุณ
-    SINGULARNAME: หน้าเว็บเปลี่ยนเส้นทาง
-    YOURPAGE: หน้าเว็บที่อยู่บนเว็บไซต์ของคุณ
+    PLURALNAME: 'หน้าเว็บเปลี่ยนเส้นทาง'
+    REDIRECTTO: 'เปลี่ยนเส้นทางไปที่'
+    REDIRECTTOEXTERNAL: 'เว็บไซต์อื่นๆ'
+    REDIRECTTOPAGE: 'หน้าเว็บในเว็บไซต์ของคุณ'
+    SINGULARNAME: 'หน้าเว็บเปลี่ยนเส้นทาง'
+    YOURPAGE: 'หน้าเว็บที่อยู่บนเว็บไซต์ของคุณ'
   ReportAdmin:
-    MENUTITLE: รายงาน
     ReportTitle: หัวเรื่อง
+    MENUTITLE: รายงาน
   ReportAdminForm:
-    FILTERBY: แสดงข้อมูลตาม
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
+    FILTERBY: 'แสดงข้อมูลตาม'
   SearchForm:
-    GO: ค้นหา
-    SEARCH: ค้นหา
-    SearchResults: ผลการค้นหา
+    SearchResults: 'ผลการค้นหา'
   SideReport:
-    BROKENFILES: หน้าเว็บที่มีไฟล์เสีย
-    BROKENLINKS: หน้าเว็บที่มีลิงค์เสีย
-    BROKENREDIRECTORPAGES: เปลี่ยนเส้นทางหน้าเว็บที่ชี้ไปที่หน้าเว็บที่ถูกลบแล้ว
-    BROKENVIRTUALPAGES: หน้าเว็บจำลองชี้ไปที่หน้าเว็บที่ถูกลบทิ้งไปแล้ว
-    BrokenLinksGroupTitle: รายงานลิงค์เสีย
-    ContentGroupTitle: รายงานเกี่ยวกับเนื้อหา
-    EMPTYPAGES: หน้าเว็บที่ยังไม่มีเนื้อหา
+    BROKENFILES: 'หน้าเว็บที่มีไฟล์เสีย'
+    BROKENLINKS: 'หน้าเว็บที่มีลิงค์เสีย'
+    BROKENREDIRECTORPAGES: 'เปลี่ยนเส้นทางหน้าเว็บที่ชี้ไปที่หน้าเว็บที่ถูกลบแล้ว'
+    BROKENVIRTUALPAGES: 'หน้าเว็บจำลองชี้ไปที่หน้าเว็บที่ถูกลบทิ้งไปแล้ว'
+    BrokenLinksGroupTitle: 'รายงานลิงค์เสีย'
+    ContentGroupTitle: 'รายงานเกี่ยวกับเนื้อหา'
+    EMPTYPAGES: 'หน้าเว็บที่ยังไม่มีเนื้อหา'
     LAST2WEEKS: 'หน้าเว็บที่ถูกแก้ไขใน 2 สัปดาห์ล่าสุด'
     OtherGroupTitle: อื่นๆ
-    ParameterLiveCheckbox: ดูเว็บไซต์แบบสดๆ
+    ParameterLiveCheckbox: 'ดูเว็บไซต์แบบสดๆ'
     REPEMPTY: 'รายงาน {title} ยังว่างอยู่'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'หากต้องการแชร์หน้าเว็บนี้, คัดลอกแล้วนำลิงก์ด้านล่างนี้ไปวาง'
-    ShareLink: ลิงก์ที่ต้องการแชร์
+    ShareLink: 'ลิงก์ที่ต้องการแชร์'
   SilverStripeNavigatorLinkl:
     CloseLink: ปิด
   SiteConfig:
-    DEFAULTTHEME: (ใช้ชุดธีมเริ่มต้น)
+    DEFAULTTHEME: '(ใช้ชุดธีมเริ่มต้น)'
     EDITHEADER: 'ใครสามารถแก้ไขหน้าเว็บบนเว็บไซต์นี้ได้บ้าง?'
-    EDIT_PERMISSION: การจัดการการกำหนดค่าของเว็บไซต์
-    EDIT_PERMISSION_HELP: สามารถแก้ไขการตั้งค่าการเข้าถึงระบบโดยรวมได้/แก้ไขสิทธิ์หน้าเว็บในระดับสูงสุดได้
-    PLURALNAME: กำหนดค่าเว็บไซต์
-    SINGULARNAME: กำหนดค่าเว็บไซต์
-    SITENAMEDEFAULT: ชื่อเว็บไซต์ของคุณ
-    SITETAGLINE: สโลแกนของเว็บไซต์
-    SITETITLE: ชื่อเว็บไซต์
+    EDIT_PERMISSION: 'การจัดการการกำหนดค่าของเว็บไซต์'
+    EDIT_PERMISSION_HELP: 'สามารถแก้ไขการตั้งค่าการเข้าถึงระบบโดยรวมได้/แก้ไขสิทธิ์หน้าเว็บในระดับสูงสุดได้'
+    PLURALNAME: 'กำหนดค่าเว็บไซต์'
+    SINGULARNAME: 'กำหนดค่าเว็บไซต์'
+    SITENAMEDEFAULT: 'ชื่อเว็บไซต์ของคุณ'
+    SITETAGLINE: 'สโลแกนของเว็บไซต์'
+    SITETITLE: 'ชื่อเว็บไซต์'
     TABACCESS: เข้าถึง
     TABMAIN: หน้าหลัก
-    TAGLINEDEFAULT: กรอกสโลแกนของคุณลงที่นี่
+    TAGLINEDEFAULT: 'กรอกสโลแกนของคุณลงที่นี่'
     THEME: ชุดธีม
     TOPLEVELCREATE: 'ใครบ้างที่สามารถสร้างหน้าเว็บที่ตำแหน่ง root ของเว็บไซต์ได้?'
     VIEWHEADER: 'ใครบ้่างที่สามารถเปิดดูหน้าเว็บบนเว็บไซต์นี้ได้?'
   SiteTree:
     ACCESSANYONE: ทุกคน
     ACCESSHEADER: 'ใครบ้างที่สามารถเปิดดูหน้านี้ได้?'
-    ACCESSLOGGEDIN: ผู้ใช้งานที่อยู่ในระบบ
+    ACCESSLOGGEDIN: 'ผู้ใช้งานที่อยู่ในระบบ'
     ACCESSONLYTHESE: 'เฉพาะบุคคลเหล่านี้เท่านั้น (เลือกจากรายการ)'
-    ADDEDTODRAFTHELP: หน้าเว็บยังไม่ได้ถูกเผยแพร่
+    ADDEDTODRAFTHELP: 'หน้าเว็บยังไม่ได้ถูกเผยแพร่'
     ADDEDTODRAFTSHORT: ฉบับร่าง
     ALLOWCOMMENTS: 'อนุญาตให้แสดงความเห็นในหน้านีหรือไม่?'
     APPEARSVIRTUALPAGES: 'เนื้อหานี้ปรากฏอยู่ในหน้าเว็บจำลองในส่วนของ {title} ด้วยเช่นกัน'
-    BUTTONCANCELDRAFT: ยกเลิกการเปลี่ยนแปลงในฉบับร่าง
-    BUTTONCANCELDRAFTDESC: ลบฉบับร่างของคุณแล้วย้อนกลับไปใช้หน้าเว็บที่เผยแพร่อยู่ในขณะนี้
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
+    BUTTONCANCELDRAFT: 'ยกเลิกการเปลี่ยนแปลงในฉบับร่าง'
+    BUTTONCANCELDRAFTDESC: 'ลบฉบับร่างของคุณแล้วย้อนกลับไปใช้หน้าเว็บที่เผยแพร่อยู่ในขณะนี้'
     BUTTONUNPUBLISH: ยังไม่ได้เผยแพร่
-    BUTTONUNPUBLISHDESC: ลบหน้าเว็บนี้ออกจากเว็บไซต์ที่เผยแพร่แล้ว
-    CREATED: วันที่สร้าง
+    BUTTONUNPUBLISHDESC: 'ลบหน้าเว็บนี้ออกจากเว็บไซต์ที่เผยแพร่แล้ว'
+    CREATED: 'วันที่สร้าง'
     Comments: ความคิดเห็น
     Content: เนื้อหา
     DEFAULTABOUTCONTENT: '<p>คุณสามารถใส่เนื้อหาของคุณเองลงไปในหน้านี้ได้ หรือลบหน้าดังกล่าวทิ้ง แล้วสร้างหน้าเว็บของคุณเองขึ้นมาใหม่ได้.<br /></p>'
-    DEFAULTABOUTTITLE: เกี่ยวกับเรา
+    DEFAULTABOUTTITLE: 'เกี่ยวกับเรา'
     DEFAULTCONTACTCONTENT: '<p>คุณสามารถใส่เนื้อหาของคุณลงไปในหน้าเว็บนี้ได้, หรือลบเนื้อหาออกแล้วสร้างหน้าเว็บที่เป็นของคุณเองใหม่ได้.<br /></p>'
-    DEFAULTCONTACTTITLE: ติดต่อเรา
+    DEFAULTCONTACTTITLE: 'ติดต่อเรา'
     DEFAULTHOMECONTENT: '<p>ยินดีต้อนรับเข้าสู่ SilverStripe! นี่คือคือหน้าแรกที่กำหนดไว้เริ่มต้น. คุณสามารถแก้ไขหน้าเว็บนี้ได้ด้วยการเปิด <a href="admin/">CMS</a>. คุณสามารถเข้าไปที่ <a href="http://doc.silverstripe.org">เอกสารคู่มือประกอบการใช้งานสำหรับนักพัฒนา</a>, หรือเข้าไปที่<a href="http://doc.silverstripe.org/doku.php?id=tutorials">เพื่อศึกษาบทเรียนต่างๆได้.</a></p>'
     DEFAULTHOMETITLE: หน้าแรก
-    DELETEDPAGEHELP: หน้าเว็บไม่ได้ถูกเผยแพร่อีกต่อไปแล้ว
+    DELETEDPAGEHELP: 'หน้าเว็บไม่ได้ถูกเผยแพร่อีกต่อไปแล้ว'
     DELETEDPAGESHORT: ถูกลบ
     DEPENDENT_NOTE: 'หน้าเว็บต่อไปนี้อาศัยหน้าเว็บนี้เป็นตัวอ้างอิง ซึ่งได้แก่หน้าเว็บจำลอง, หน้าเว็บที่เปลี่ยนเส้นทาง, และหน้าเว็บที่มีลิงก์เนื้อหาอยู่ด้วย'
-    DESCRIPTION: หน้าเนื้อหาทั่วไป
-    DependtPageColumnLinkType: ชนิดของลิงค์
-    DependtPageColumnURL: URL
+    DESCRIPTION: 'หน้าเนื้อหาทั่วไป'
+    DependtPageColumnLinkType: 'ชนิดของลิงค์'
     EDITANYONE: 'ทุกคนสามารถเข้าสู่ระบบของ CMS ได้ทั้งหมด'
     EDITHEADER: 'ใครสามารถแก้ไขหน้านี้ได้บ้าง?'
     EDITONLYTHESE: 'เฉพาะบุคคลเหล่านี้เท่านั้น (เลือกจากรายการ)'
-    EDITORGROUPS: กลุ่มของบรรณาธิการ
-    EDIT_ALL_DESCRIPTION: แก้ไขหน้าเว็บใดก็ได้
+    EDITORGROUPS: 'กลุ่มของบรรณาธิการ'
+    EDIT_ALL_DESCRIPTION: 'แก้ไขหน้าเว็บใดก็ได้'
     EDIT_ALL_HELP: 'ความสามารถในการแก้ไขหน้าเว็บใดๆในเว็บไซต์, โดยไม่ต้องคำนึงถึงการตั้งค่าที่อยู่ในส่วนของแท็บการเข้าถึง, จำเป็นต้องได้รับสิทธิ์อนุญาติ "เข้าถึงส่วนของ''หน้าเว็บ''"'
-    Editors: กลุ่มของบรรณาธิการ
-    GroupPlaceholder: 'Click to select group'
-    HASBROKENLINKS: หน้าเว็บนี้มีลิงค์เสีย
+    Editors: 'กลุ่มของบรรณาธิการ'
+    HASBROKENLINKS: 'หน้าเว็บนี้มีลิงค์เสีย'
     HTMLEDITORTITLE: เนื้อหา
-    INHERIT: สืบทอดค่าจากหน้าเว็บต้นทาง
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: อัพเดทล่าสุด
-    LINKCHANGENOTE: การเปลี่ยนลิงก์ของหน้าเว็บนี้จะส่งผลถึงลิงก์ต่างๆที่อยู่ในหน้าเว็บลูกด้วย
-    MENUTITLE: ป้ายบอกทาง
-    METADESC: รายละเอียด
+    INHERIT: 'สืบทอดค่าจากหน้าเว็บต้นทาง'
+    LASTUPDATED: 'อัพเดทล่าสุด'
+    LINKCHANGENOTE: 'การเปลี่ยนลิงก์ของหน้าเว็บนี้จะส่งผลถึงลิงก์ต่างๆที่อยู่ในหน้าเว็บลูกด้วย'
+    MENUTITLE: 'ป้ายบอกทาง'
+    METADESC: 'รายละเอียด'
     METADESCHELP: 'เว็บไซต์ค้นหาข้อมูลใช้เนื้อหาในส่วนนี้เพื่อแสดงผลการค้นหา (แม้ว่าจะไม่มีผลกระทบกับการจัดอันดับก็ตาม).'
     METAEXTRA: 'Meta Tags แบบกำหนดเอง'
     METAEXTRAHELP: 'แท็กคำสั่ง HTML สำหรับใช้เป็นข้อมูล meta เพิ่มเติม. ตัวอย่างเพิ่มเติม &lt;meta name="ชื่อที่ต้องการ" content="กำหนดเนื้อหาของคุณเองที่นี่" /&gt;'
-    MODIFIEDONDRAFTHELP: หน้าเว็บถูกเปลี่ยนค่าเป็นระงับการเผยแพร่แล้ว
+    MODIFIEDONDRAFTHELP: 'หน้าเว็บถูกเปลี่ยนค่าเป็นระงับการเผยแพร่แล้ว'
     MODIFIEDONDRAFTSHORT: แก้ไขเมื่อ
-    MetadataToggle: Metadata
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: ตำแหน่งหน้าเว็บ
-    PAGETITLE: ชื่อหน้าเว็บ
+    PAGELOCATION: 'ตำแหน่งหน้าเว็บ'
+    PAGETITLE: 'ชื่อหน้าเว็บ'
     PAGETYPE: 'ประเภท เอกสาร'
-    PARENTID: หน้าเว็บแม่
-    PARENTTYPE: ตำแหน่งที่อยู่หน้าเวป
-    PARENTTYPE_ROOT: หน้าเว็บระดับสูงสุด
-    PARENTTYPE_SUBPAGE: หน้าเว็บย่อยที่อยู่ใต้หน้าเว็บแม่
-    PERMISSION_GRANTACCESS_DESCRIPTION: การจัดการสิทธิ์การเข้าถึงเนื้อหา
+    PARENTID: 'หน้าเว็บแม่'
+    PARENTTYPE: 'ตำแหน่งที่อยู่หน้าเวป'
+    PARENTTYPE_ROOT: 'หน้าเว็บระดับสูงสุด'
+    PARENTTYPE_SUBPAGE: 'หน้าเว็บย่อยที่อยู่ใต้หน้าเว็บแม่'
+    PERMISSION_GRANTACCESS_DESCRIPTION: 'การจัดการสิทธิ์การเข้าถึงเนื้อหา'
     PERMISSION_GRANTACCESS_HELP: 'อนุญาตให้มีการตั้งค่าข้อจำกัดในการเข้าถึงหน้าเว็บเฉพาะหน้าได้จากส่วนของ "หน้าเว็บ"'
     PLURALNAME: หน้า
     PageTypNotAllowedOnRoot: 'ประเภทของหน้าเว็บ "{type}" ไม่ได้รับอนุญาตให้สามารถใช้งานได้ที่ตำแหน่ง root'
     PageTypeNotAllowed: 'ชนิดของหน้าเว็บ "{type}" ไม่ได้รับอนุญาตให้ใช้เป็นหน้าเว็บลูกของหน้าเว็บแม่นี้'
     REMOVEDFROMDRAFTHELP: 'หน้าเว็บถูกเผยแพร่แล้ว แต่ถูกลบออกจากฉบับร่างด้วยเช่นกัน'
-    REMOVEDFROMDRAFTSHORT: ลบออกจากฉบับร่าง
+    REMOVEDFROMDRAFTSHORT: 'ลบออกจากฉบับร่าง'
     REMOVE_INSTALL_WARNING: 'คำเตือน: คุณควรลบไฟล์ install.php ออกหลังการติดตั้ง SilverStripe เพื่อความปลอดภัย'
-    REORGANISE_DESCRIPTION: เปลี่ยนโครงสร้างเว็บไซต์
-    REORGANISE_HELP: จัดเรียงหน้าเว็บที่อยู่ในแผนผังเว็บไซต์แบบต้นไม้โดยการลากและวาง
+    REORGANISE_DESCRIPTION: 'เปลี่ยนโครงสร้างเว็บไซต์'
+    REORGANISE_HELP: 'จัดเรียงหน้าเว็บที่อยู่ในแผนผังเว็บไซต์แบบต้นไม้โดยการลากและวาง'
     SHOWINMENUS: 'แสดงในเมนู?'
     SHOWINSEARCH: 'แสดงในผลลัพธ์ของการค้นหาหรือไม่?'
     SINGULARNAME: หน้า
     TABBEHAVIOUR: พฤติกรรม
-    TABCONTENT: เนื้อหา
-    TABDEPENDENT: หน้าย่อย
+    TABCONTENT: 'เนื้อหา'
+    TABDEPENDENT: 'หน้าย่อย'
     TOPLEVEL: 'เนื้อหาเว็บไซต์ (ระดับสูงสุด)'
-    TOPLEVELCREATORGROUPS: ผู้สร้างระดับสูงสุด
+    TOPLEVELCREATORGROUPS: 'ผู้สร้างระดับสูงสุด'
     URLSegment: 'ส่วนการจัดการ URL'
-    VIEWERGROUPS: กลุ่มผู้ชม
-    VIEW_ALL_DESCRIPTION: เปิดดูหน้าเว็บใดก็ได้
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
-    VIEW_DRAFT_CONTENT: เปิดดูเนื้อหาฉบับร่าง
+    VIEWERGROUPS: 'กลุ่มผู้ชม'
+    VIEW_ALL_DESCRIPTION: 'เปิดดูหน้าเว็บใดก็ได้'
+    VIEW_DRAFT_CONTENT: 'เปิดดูเนื้อหาฉบับร่าง'
     VIEW_DRAFT_CONTENT_HELP: 'นำไปใช้ในการดูหน้าเว็บที่อยู่ด้านนอก CMS ในโหมดฉบับร่าง มีประโยชน์สำหรับการทำงานร่วมกันจากภายนอก โดยไม่จำเป็นต้องเข้าถึง CMS'
-    Viewers: กลุ่มผู้เข้าชม
+    Viewers: 'กลุ่มผู้เข้าชม'
     Visibility: สามารถมองเห็นได้
-    has_one_Parent: หน้าเว็บต้นทาง
-    many_many_BackLinkTracking: แกะรอยลิงก์ย้อนกลับ
+    has_one_Parent: 'หน้าเว็บต้นทาง'
+    many_many_BackLinkTracking: 'แกะรอยลิงก์ย้อนกลับ'
     many_many_ImageTracking: 'แกะรอยรูปภาพ'
-    many_many_LinkTracking: แกะรอยลิงก์
+    many_many_LinkTracking: 'แกะรอยลิงก์'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ตัวอักษรพิเศษได้ถูกแปลงค่าหรือลบออกโดยอัตโนมัติแล้ว
+    HelpChars: 'ตัวอักษรพิเศษได้ถูกแปลงค่าหรือลบออกโดยอัตโนมัติแล้ว'
   StaticExporter:
     BASEURL: 'URL หลักสำหรับอ้างอิง'
-    EXPORTTO: ส่งออกข้อมูลไปยังโฟลเดอร์
-    NAME: ตัวส่งออกข้อมูลแบบนิ่งอยู่กับที่
+    EXPORTTO: 'ส่งออกข้อมูลไปยังโฟลเดอร์'
+    NAME: 'ตัวส่งออกข้อมูลแบบนิ่งอยู่กับที่'
   TableListField:
-    SELECT: เลือก
-  TableListField.ss:
-    NOITEMSFOUND: ไม่พบรายการที่ต้องการ
-    SORTASC: จัดเรียงลำดับจากน้อยมามาก
-    SORTDESC: จัดเรียงลำดับจากมากมาน้อย
-  TableListField_PageControls.ss:
+    SELECT: 'เลือก'
+  TableListField_ss:
+    NOITEMSFOUND: 'ไม่พบรายการที่ต้องการ'
+    SORTASC: 'จัดเรียงลำดับจากน้อยมามาก'
+    SORTDESC: 'จัดเรียงลำดับจากมากมาน้อย'
+  TableListField_PageControls_ss:
     DISPLAYING: กำลังแสดง
     OF: จาก
     TO: ถึง
-    VIEWFIRST: เปิดดูหน้าแรก
-    VIEWLAST: เปิดดูหน้าสุดท้าย
-    VIEWNEXT: เปิดดูถัดไป
-    VIEWPREVIOUS: เปิดดูก่อนหน้า
+    VIEWFIRST: 'เปิดดูหน้าแรก'
+    VIEWLAST: 'เปิดดูหน้าสุดท้าย'
+    VIEWNEXT: 'เปิดดูถัดไป'
+    VIEWPREVIOUS: 'เปิดดูก่อนหน้า'
   TreeTools:
     DisplayLabel: 'แสดง:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'คุณสามารถเข้าถึงเว็บไซต์รุ่นย้อนหลังได้จากลิงก์นี้:'
-    HAVEASKED: คุณได้ร้องขอเพื่อเปิดดูเนื้อหาในเว็บไซต์ของเราเมื่อ
+    HAVEASKED: 'คุณได้ร้องขอเพื่อเปิดดูเนื้อหาในเว็บไซต์ของเราเมื่อ'
   VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: แสดงเนื้อหาของหน้าเว็บอื่นๆ
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
-    HEADER: นี่เป็นหน้าเว็บจำลอง
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: หน้าเว็บจำลอง
+    DESCRIPTION: 'แสดงเนื้อหาของหน้าเว็บอื่นๆ'
+    HEADER: 'นี่เป็นหน้าเว็บจำลอง'
+    PLURALNAME: 'หน้าเว็บจำลอง'
     PageTypNotAllowedOnRoot: 'ชนิดของหน้าเว็บดั้งเดิม "{type}" ไม่ได้รับอนุญาตให้ใช้งานกับหน้าเว็บจำลองที่ตำแหน่ง root'
-    SINGULARNAME: หน้าจำลอง
+    SINGULARNAME: 'หน้าจำลอง'
+  CMSFileAddController:
+    MENUTITLE: ไฟล์
+  CMSPageEditController:
+    MENUTITLE: 'แก้ไขหน้าเว็บ'
+  CMSPageSettingsController:
+    MENUTITLE: 'แก้ไขหน้าเว็บ'
+  CMSSettingsController:
+    MENUTITLE: ตั้งค่า
diff --git a/lang/tl.yml b/lang/tl.yml
index 7b73ff58..e9eeec42 100644
--- a/lang/tl.yml
+++ b/lang/tl.yml
@@ -1,436 +1,3 @@
 tl:
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    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 ''{title}''{description} 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'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    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'
-    PUBLISHED: Published
-    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 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'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  SearchForm:
-    GO: Go
-    SEARCH: Search
-    SearchResults: 'Search Results'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   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'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    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'
-    GroupPlaceholder: 'Click to select group'
-    HASBROKENLINKS: 'This page has broken links.'
-    HTMLEDITORTITLE: Content
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its 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 ''Pages'' section" 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:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    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:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  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: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
-    HEADER: 'This is a virtual page'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: 'Virtual Pags'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
-    SINGULARNAME: 'Virtual Page'
diff --git a/lang/tr.yml b/lang/tr.yml
index 79bb4ff7..0dd6f88d 100644
--- a/lang/tr.yml
+++ b/lang/tr.yml
@@ -1,205 +1,90 @@
 tr:
   AssetAdmin:
-    ADDFILES: 'Dosya Ekle'
     ActionAdd: 'Klasör ekle'
     AppCategoryArchive: Arşiv
     AppCategoryAudio: Ses
-    AppCategoryDocument: Document
-    AppCategoryFlash: Flash
     AppCategoryImage: Görüntü
-    AppCategoryVideo: Video
-    BackToFolder: 'Back to folder'
-    CREATED: Tarih
-    CurrentFolderOnly: 'Limit to current folder?'
-    DetailsView: Ayrıntılar
     FILES: Dosyalar
-    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: 'Dosya türü'
-    ListView: 'Liste Görünümü'
-    MENUTITLE: Dosyalar
     NEWFOLDER: YeniKlasör
-    SIZE: Boyut
-    THUMBSDELETED: '{count} unused thumbnails have been deleted'
-    TreeView: 'Tree View'
-    Upload: 'Karşıya yükleme'
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Klasörleri sil'
-  AssetAdmin_Tools:
-    FILTER: Filter
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Git
   AssetTableField:
-    BACKLINKCOUNT: 'Used on:'
     PAGES: sayfa(lar)
-  BackLink_Button.ss:
-    Back: Geri
   BrokenLinksReport:
-    Any: Any
-    BROKENLINKS: 'Broken links report'
     CheckSite: 'Siteyi kontrol et'
-    CheckSiteDropdownDraft: 'Draft Site'
-    CheckSiteDropdownPublished: 'Published Site'
-    ColumnDateLastModified: 'Date last modified'
-    ColumnDateLastPublished: 'Date last published'
-    ColumnProblemType: 'Problem type'
-    ColumnURL: URL
-    HasBrokenFile: 'has broken file'
     HasBrokenLink: 'kırık link var'
-    HasBrokenLinkAndFile: 'has broken link and file'
     HoverTitleEditPage: 'Sayfayı düzenle'
     PageName: 'Sayfa ismi'
-    ReasonDropdown: 'Problem to check'
-    ReasonDropdownBROKENFILE: 'Broken file'
     ReasonDropdownBROKENLINK: 'Kırık 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: 'Sayfa ekle'
   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: 'Yayındaki siteden sil'
-    PUBLISHED_PAGES: 'Published %d pages, %d failures'
     PUBLISH_PAGES: Yayınla
-    UNPUBLISHED_PAGES: 'Un-published %d pages'
-    UNPUBLISH_PAGES: 'Yayından kaldır'
-  CMSFileAddController:
-    MENUTITLE: Dosyalar
+    UNPUBLISH_PAGES: Yayından kaldır
   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: 'Yeni sayfa ekle'
     AddNewButton: 'Yeni ekle'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: 'Sayfanın nereye oluşturulacağını seç'
     ChoosePageType: 'Sayfa tipini seç'
     Create: Oluştur
     DELETE: 'Taslak siteden kaldır'
-    DELETEFP: 'Yayındaki siteden kaldır'
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
+    DELETEFP: Yayındaki siteden kaldır
     EMAIL: Eposta
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Sayfayı düzenle'
-    NEWPAGE: 'New {pagetype}'
     PAGENOTEXISTS: 'Sayfa bulunamadı'
     PAGES: Sayfalar
-    PAGETYPEANYOPT: Any
     PAGETYPEOPT: 'Sayfa Tipi'
     PUBALLCONFIRM: 'Lütfen taslak sitedeki tüm sayfaları yayınlanmakta olan siteye kopyalayıp yayınla.'
     PUBALLFUN: '"Hepsini Yayınla" özelliği'
-    PUBALLFUN2: 'Bu butona bastığınız zaman, tüm sayfaları tek tek açıp "yayınla" butonuna basmışsınız gibi işlem yapılacaktır.  Bunun amacı sitede toplu miktarda içerik düzenleyip eklediyseniz (örneğin sitenin ilk yayınlanması gibi) size kolaylık sağlamaktır.'
-    PUBPAGES: 'Done: Published {count} pages'
+    PUBALLFUN2: "Bu butona bastığınız zaman, tüm sayfaları tek tek açıp \"yayınla\" butonuna basmışsınız gibi işlem yapılacaktır.  Bunun amacı sitede toplu miktarda içerik düzenleyip eklediyseniz (örneğin sitenin ilk yayınlanması gibi) size kolaylık sağlamaktır."
     PageAdded: 'Sayfa başarıyla oluşturuldu'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
     REMOVEDPAGEFROMDRAFT: '''%s'' taslak siteden silindi'
-    RESTORE: 'Geri yükle'
-    RESTORED: 'Restored ''{title}'' successfully'
+    RESTORE: Geri yükle
     ROLLBACK: 'Bu sürüme geri dön'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Kaydet
-    SAVEDRAFT: 'Save draft'
     TabContent: İçerik
     TabHistory: Geçmiş
     TabSettings: Ayarlar
-    TreeFiltered: 'Filtered tree.'
-    TreeFilteredClear: 'Clear filter'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Filteri Uygula'
+    MENUTITLE: 'Sayfayı düzenle'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Filteri Uygula'
     RESET: Sıfırla
   CMSPageAddController:
     MENUTITLE: 'Sayfa ekle'
-    ParentMode_child: 'Under another page'
-    ParentMode_top: 'Top level'
-  CMSPageEditController:
-    MENUTITLE: 'Sayfayı Düzenle'
   CMSPageHistoryController:
-    COMPAREMODE: 'Kıyaslama modu (iki tane seçiniz)'
     COMPAREVERSIONS: 'Versiyonları karşılaştır'
-    COMPARINGVERSION: 'Comparing versions {version1} and {version2}.'
     MENUTITLE: Geçmiş
-    REVERTTOTHISVERSION: 'Bu versiyona düşür'
-    SHOWUNPUBLISHED: 'Yayınlanmamış versiyonları göster'
-    SHOWVERSION: 'Versiyonu Göster'
-    VIEW: 'Göz at'
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    VIEWINGVERSION: 'Currently viewing version {version}.'
-  CMSPageHistoryController_versions.ss:
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Yazar
-    NOTPUBLISHED: Yayınlanmamış
+    NOTPUBLISHED: 'Yayınlanmamış'
     PUBLISHER: Yayınlayan
     UNKNOWN: Bilinmeyen
-    WHEN: 'Ne zaman'
-  CMSPageSettingsController:
-    MENUTITLE: 'Sayfayı düzenle'
+    WHEN: Ne zaman
   CMSPagesController:
     GalleryView: 'Galeri Görünümü'
-    ListView: 'Liste Görünümü'
     MENUTITLE: Sayfalar
-    TreeView: 'Ağaç Görünümü'
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: Sürükle-ve-Bırak
-    MULTISELECT: Multi-selection
-  CMSPagesController_Tools.ss:
+  CMSPagesController_ContentToolbar_ss:
+    ENABLEDRAGGING: 'Sürükle-ve-Bırak'
+  CMSPagesController_Tools_ss:
     FILTER: Filtre
-  CMSSearch:
-    FILTERDATEFROM: Kimden
-    FILTERDATEHEADING: Tarih
-    FILTERDATETO: Kime
-    FILTERLABELTEXT: İçerik
-  CMSSettingsController:
-    MENUTITLE: Ayarlar
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Değiştirilen sayfalar'
-  CMSSiteTreeFilter_DeletedPages:
-    Title: 'Silinmişler dahil bütün sayfalar'
   CMSSiteTreeFilter_Search:
     Title: 'Tüm sayfalar'
   ContentControl:
     NOTEWONTBESHOWN: 'Not: Bu mesaj ziyaretçilerinize gösterilmeyecektir.'
   ContentController:
-    ARCHIVEDSITE: 'Preview version'
-    ARCHIVEDSITEFROM: 'Archived site from'
-    CMS: CMS
-    DRAFT: Draft
-    DRAFTSITE: 'Draft Site'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Taslak veya arşivlenmiş içeriği görebilmek için CMS şifrenizle giriş yapmış olmanız gerekmektedir. <a href="%s">Yayınlanmış siteye geri dönmek için buraya tıklayın.</a>'
     Email: Eposta
     INSTALL_SUCCESS: 'Kurulum Başarılı!'
     InstallFilesDeleted: 'Kurulum dosyaları başarıyla silindi.'
-    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 başarıyla kuruldu!'
-    LOGGEDINAS: 'Logged in as'
-    LOGIN: Login
     LOGOUT: 'Çıkış Yap'
-    NOTLOGGEDIN: 'Not logged in'
-    PUBLISHED: Published
-    PUBLISHEDSITE: 'Published Site'
     Password: Parola
-    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 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: 'Hata kodu'
-    DEFAULTERRORPAGECONTENT: '<p>Varolmayan bir sayfaya ulaşmaya çalışıyorsunuz.</p><p>Lütfen ulaşmak istediğiniz URL''i kontrol edip tekrar deneyiniz.</p>'
-    DEFAULTERRORPAGETITLE: 'Sayfa bulunamadı'
-    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 - Hatalı İstek'
     401: '401 - Erişim Engellenmiş'
     403: '403 - Yasak'
@@ -223,214 +108,133 @@ tr:
     503: '503 - Servis Mevcut Değil'
     504: '504 - Arayapı Zaman Aşımı'
     505: '505 - HTTP Versiyonu Desteklenmiyor'
+    CODE: 'Hata kodu'
+    DEFAULTERRORPAGECONTENT: '<p>Varolmayan bir sayfaya ulaşmaya çalışıyorsunuz.</p><p>Lütfen ulaşmak istediğiniz URL''i kontrol edip tekrar deneyiniz.</p>'
+    DEFAULTERRORPAGETITLE: 'Sayfa bulunamadı'
   Folder:
-    AddFolderButton: 'Klasör ekle'
     DELETEUNUSEDTHUMBNAILS: 'Kullanılmamış thumbnail leri sil'
     UNUSEDFILESTITLE: 'Kullanılmamış dosyalar'
     UNUSEDTHUMBNAILSTITLE: 'Kullanılmamış thumbnail ler'
-    UploadFilesButton: Yükle
   LeftAndMain:
     DELETED: Silindi.
-    PreviewButton: Önizleme
     SAVEDUP: Kaydedildi.
     STATUSPUBLISHEDSUCCESS: '''{title}'' başarıyla yayınlandı'
-    SearchResults: 'Arama Sonuçları'
-    VersionUnknown: Bilinmeyen
   Permission:
     CMS_ACCESS_CATEGORY: 'CMS Erişimi'
-  Permissions:
-    CONTENT_CATEGORY: 'Content permissions'
-    PERMISSIONS_CATEGORY: 'Roles and access permissions'
   RedirectorPage:
     DESCRIPTION: 'Başka iç sayfaya yönlendir'
     HASBEENSETUP: 'Yönlendirilecek yeri olmayan bir yönlendirme sayfası ayarlandı.'
     HEADER: 'Bu sayfa, kullanıcıları başka bir sayfaya yönlendirir'
     OTHERURL: 'Başka bir siteye ait URL'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Şuraya yönlendir'
     REDIRECTTOEXTERNAL: 'Başka bir site'
     REDIRECTTOPAGE: 'Web sitenizdeki bir sayfa'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Web sitenizdeki bir sayfa'
   ReportAdmin:
     MENUTITLE: Raporlar
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Git
     SEARCH: Ara
-    SearchResults: 'Arama Sonuçları'
   SideReport:
     BROKENFILES: 'Kırık link bulunan sayfalar'
     BROKENLINKS: 'Kırık link bulunan sayfalar'
-    BROKENREDIRECTORPAGES: 'RedirectorPages pointing to deleted pages'
-    BROKENVIRTUALPAGES: 'VirtualPages pointing to deleted pages'
     BrokenLinksGroupTitle: 'Kırık linki rapor et'
     ContentGroupTitle: 'İçerik raporları'
     EMPTYPAGES: 'Boş sayfalar'
     LAST2WEEKS: 'Son 2 haftada düzenlenmiş sayfalar'
     OtherGroupTitle: Diğeri
     ParameterLiveCheckbox: 'Yayındaki siteyi kontrol et'
-    REPEMPTY: 'The {title} report is empty.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
-    ShareInstructions: 'Bu sayfayı paylaşmak için, aşağıdaki linki kopyalayıp yapıştırınız.'
+    ShareInstructions: 'To share a this to this page, copy and paste the link below.'
     ShareLink: 'Linki paylaş'
   SilverStripeNavigatorLinkl:
     CloseLink: Kapat
   SiteConfig:
     DEFAULTTHEME: '(Varsayılan temayı kullan)'
-    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: 'Site Adınız'
-    SITETAGLINE: 'Site Tagline/Slogan'
     SITETITLE: 'Site başlığı'
     TABACCESS: Erişim
     TABMAIN: Ana
-    TAGLINEDEFAULT: 'your tagline here'
     THEME: Tema
-    TOPLEVELCREATE: 'Who can create pages in the root of the site?'
-    VIEWHEADER: 'Who can view pages on this site?'
   SiteTree:
     ACCESSANYONE: Herkes
     ACCESSHEADER: 'Bu sayfayı kimler görüntüleyebilir?'
     ACCESSLOGGEDIN: 'Giriş yapmış kullanıcılar'
     ACCESSONLYTHESE: 'Sadece bu kişiler (listeden seçiniz)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
     ADDEDTODRAFTSHORT: Taslak
     ALLOWCOMMENTS: 'Bu sayfada yorumlara izin verilsin mi?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Taslak değikliklerini iptal et'
     BUTTONCANCELDRAFTDESC: 'Taslağı sil ve şu an yayında olan sayfaya geri döndür'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Yayından kaldır'
+    BUTTONUNPUBLISH: Yayından kaldır
     BUTTONUNPUBLISHDESC: 'Bu sayfayı yayından kaldır'
-    CREATED: 'Oluşturulma Tarihi'
     Comments: Yorumlar
     Content: İçerik
     DEFAULTABOUTCONTENT: '<p>Bu sayfayı kendi içeriğinizle doldurabilir, ya da bu sayfayı silip kendi sayfalarınızı oluşturabilirsiniz.<br /></p>'
-    DEFAULTABOUTTITLE: Hakkımızda
+    DEFAULTABOUTTITLE: 'Hakkımızda'
     DEFAULTCONTACTCONTENT: '<p>Bu sayfayı kendi içeriğinizle doldurabilir, ya da bu sayfayı silip kendi sayfalarınızı oluşturabilirsiniz.<br /></p>'
-    DEFAULTCONTACTTITLE: İletişim
+    DEFAULTCONTACTTITLE: 'İletişim'
     DEFAULTHOMECONTENT: '<p>SilverStripe''a hoşgeldiniz! Burası anasayfanız. <a href="admin/">Yönetim panelinden</a> bu sayfayı düzenleyebilirsiniz. Geliştirici dökümanlarına <a href="http://doc.silverstripe.com">buradan</a> ulaşabilir, veya <a href="http://doc.silverstripe.com/doku.php?id=tutorials">eğitim videolarını</a> izleyebilirsiniz.</p>'
     DEFAULTHOMETITLE: Anasayfa
-    DELETEDPAGEHELP: 'Page is no longer published'
-    DELETEDPAGESHORT: Silindi
-    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 tipi'
-    DependtPageColumnURL: URL
     EDITANYONE: 'CMS''e giriş yapabilen herkes'
     EDITHEADER: 'Bu sayfayı kimler düzenleyebilir?'
     EDITONLYTHESE: 'Sadece bu kişiler (listeden seçiniz)'
-    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: 'Editör Grupları'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Bu sayfada hatalı linkler var.'
     HTMLEDITORTITLE: İçerik
     INHERIT: 'Üst sayfadan kalan'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Son Güncellenen'
-    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).'
+    METADESC: 'Tanım'
     METAEXTRA: 'Kişisel Meta Etiketleri'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: 'Sayfa yeri'
     PAGETITLE: 'Sayfa ismi'
     PAGETYPE: 'Sayfa tipi'
     PARENTID: 'Ana sayfa'
     PARENTTYPE: 'Sayfa konumu'
     PARENTTYPE_ROOT: 'Üst seviye sayfa'
-    PARENTTYPE_SUBPAGE: 'Sub-page underneath a parent page'
     PERMISSION_GRANTACCESS_DESCRIPTION: 'Grupların işlem ve düzenlemelerinin kontrolü'
-    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: 'Sayfa yayınlandı ve taslaklardan silindi'
-    REMOVEDFROMDRAFTSHORT: 'Taslaktan kaldırıldı'
-    REMOVE_INSTALL_WARNING: 'Warning: You should remove install.php from this SilverStripe install for security reasons.'
     REORGANISE_DESCRIPTION: 'Site yapısını değiştir'
     REORGANISE_HELP: 'Site ağacının sürükle&bırak şeklinde tekrardan düzenle'
     SHOWINMENUS: 'Menülerde gösterilsin mi?'
     SHOWINSEARCH: 'Aramalarda gösterilsin mi?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: Davranış
-    TABCONTENT: İçerik
-    TABDEPENDENT: 'Dependent pages'
+    TABCONTENT: 'İçerik'
     TOPLEVEL: 'Site İçeriği (Üst Seviye)'
-    TOPLEVELCREATORGROUPS: 'Top level creators'
     URLSegment: 'URL Kısmı'
-    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 ''Pages'' section" 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: 'Görüntüleyici Grupları'
     Visibility: Görünürlük
     has_one_Parent: 'Üst Sayfa'
     many_many_BackLinkTracking: 'Geri bağlantı izi'
     many_many_ImageTracking: 'İmaj izi'
     many_many_LinkTracking: 'Bağlantı izi'
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
   StaticExporter:
     BASEURL: 'Ana URL'
     EXPORTTO: 'Bu dosyaya dışa aktar'
     NAME: 'Statik Aktarıcı'
   TableListField:
     SELECT: 'Seç:'
-  TableListField.ss:
-    NOITEMSFOUND: 'No items found'
+  TableListField_ss:
     SORTASC: 'Artan olarak sırala'
     SORTDESC: 'Azalan olarak sırala'
-  TableListField_PageControls.ss:
-    DISPLAYING: Displaying
-    OF: of
-    TO: to
+  TableListField_PageControls_ss:
     VIEWFIRST: 'Birinciyi görüntüle'
     VIEWLAST: 'Sonuncuyu görüntüle'
     VIEWNEXT: 'Sonrakini görüntüle'
     VIEWPREVIOUS: 'Öncekini görüntüle'
-  TreeTools:
-    DisplayLabel: 'Display:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Arşivdeki siteye şu bağlantıdan erişebilirsiniz:'
     HAVEASKED: 'Şu tarihe kadar olan site içeriğini görüntülemek istediniz:'
   VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 'Başka sayfanın içeriğini gösterir'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Bu sanal bir sayfadır'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Sanal Sayfalar'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Sanal Sayfa'
+  CMSFileAddController:
+    MENUTITLE: Dosyalar
+  CMSPageEditController:
+    MENUTITLE: 'Sayfayı Düzenle'
+  CMSPageSettingsController:
+    MENUTITLE: 'Sayfayı düzenle'
+  CMSSettingsController:
+    MENUTITLE: Ayarlar
diff --git a/lang/uk.yml b/lang/uk.yml
index 599a69bf..a128a091 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -2,10 +2,8 @@ uk:
   AssetAdmin:
     ADDFILES: 'Додати файли'
     ActionAdd: 'Додати папку'
-    AppCategoryArchive: 'Архівувати'
+    AppCategoryArchive: Архівувати
     AppCategoryAudio: Аудіо
-    AppCategoryDocument: Document
-    AppCategoryFlash: Flash
     AppCategoryImage: Зображення
     AppCategoryVideo: Відео
     BackToFolder: 'Повернутися до папки'
@@ -13,28 +11,27 @@ uk:
     CurrentFolderOnly: 'Обмежити до поточної папки?'
     DetailsView: Деталі
     FILES: Файли
-    FILESYSTEMSYNC: 'Sync files'
     FILESYSTEMSYNCTITLE: 'Оновлення бази даних файлів у файловій системі. Корисно, коли нові файли були завантажені поза CMS, наприклад, через FTP.'
     FROMTHEINTERNET: 'З інтернету'
     FROMYOURCOMPUTER: 'З мого комп''ютера'
     Filetype: 'Тип файлу'
     ListView: 'У вигляді списку'
-    MENUTITLE: Файли
-    NEWFOLDER: 'Нова Тека'
-    SIZE: 'Розмір'
+    NEWFOLDER: Нова Тека
+    SIZE: Розмір
     THUMBSDELETED: '{count} невикористаних ескізів було видалено'
     TreeView: 'У вигляді дерева'
     Upload: Завантажити
+    MENUTITLE: Файли
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Видалені папки'
   AssetAdmin_Tools:
     FILTER: Фільтр
-  AssetAdmin_left.ss:
+  AssetAdmin_left_ss:
     GO: Уперед
   AssetTableField:
     BACKLINKCOUNT: 'Використовується в:'
     PAGES: сторінка(и)
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     Back: Назад
   BrokenLinksReport:
     Any: Будь-який
@@ -45,7 +42,6 @@ uk:
     ColumnDateLastModified: 'Дата останньої зміни'
     ColumnDateLastPublished: 'Дата останньої публікації'
     ColumnProblemType: 'Тип проблеми'
-    ColumnURL: URL
     HasBrokenFile: 'Має битий файл'
     HasBrokenLink: 'має бите посилання'
     HasBrokenLinkAndFile: 'має бите посилання та файл'
@@ -61,104 +57,70 @@ uk:
   CMSAddPageController:
     Title: 'Додати сторінку'
   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_PAGES: 'Видалити з опублікованого сайту'
     PUBLISHED_PAGES: 'Опубліковано %d сторінок, %d навдач'
     PUBLISH_PAGES: Опублікувати
     UNPUBLISHED_PAGES: 'Знято з публікації %d сторінок'
-    UNPUBLISH_PAGES: 'Зняти з публікації'
-  CMSFileAddController:
-    MENUTITLE: Файли
+    UNPUBLISH_PAGES: Зняти з публікації
   CMSMain:
     ACCESS: 'Доступ до секції ''{title}'' '
     ACCESS_HELP: 'Дозволити перегляд розділу, що містить дерево сторінок і зміст. Дозволами на перегляд та редагування, а також окремими дозволами на контент, можна керувати на відповідних сторінках.'
     AddNew: 'Додати нову сторінку'
     AddNewButton: 'Додати новий'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: 'Виберіть де створити цю сторінку'
     ChoosePageType: 'Виберіть тип сторінки'
     Create: Створити
     DELETE: 'Видалити з чорнового сайту'
     DELETEFP: Видалити
     DESCREMOVED: 'і {count} нащадків'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    EMAIL: 'Електронна пошта'
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Редагувати сторінку'
-    NEWPAGE: 'New {pagetype}'
+    EMAIL: Електронна пошта
     PAGENOTEXISTS: 'Ця сторінка не існує'
     PAGES: Сторінки
     PAGETYPEANYOPT: Будь-який
     PAGETYPEOPT: 'Тип сторінки'
     PUBALLCONFIRM: 'Будь ласка, опублікуйте кожну сторінку. Для цього перенесіть проміжний варіант до існуючого.'
     PUBALLFUN: 'Дія "Опублікувати все"'
-    PUBALLFUN2: 'Натиснувши цю кнопку Ви зробите те ж саме, що й перейшовши до кожної сторінки та натиснувши "Публікувати". Це внесено для тих випадків, коли Ви маєте намір маштабно змінити вміст, наприклад, після першого створення сайту.'
-    PUBPAGES: 'Done: Published {count} pages'
+    PUBALLFUN2: "Натиснувши цю кнопку Ви зробите те ж саме, що й перейшовши до кожної сторінки та натиснувши \"Публікувати\". Це внесено для тих випадків, коли Ви маєте намір маштабно змінити вміст, наприклад, після першого створення сайту."
     PageAdded: 'Сторінка успішно створена'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: '''{title}'' видалено з публічного сайту'
     REMOVEDPAGEFROMDRAFT: 'Видалено ''%s'' з чорнового сайту'
     RESTORE: Відновити
-    RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Повернутися до цієї версії'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Зберегти
-    SAVEDRAFT: 'Save draft'
     TabContent: Вміст
     TabHistory: Історія
     TabSettings: Налаштування
-    TreeFiltered: 'Filtered tree.'
-    TreeFilteredClear: 'Clear filter'
-  CMSMain_left.ss:
-    'APPLY FILTER': 'Застосувати фільтр'
+    MENUTITLE: 'Редагувати сторінку'
+  CMSMain_left_ss:
+    APPLY_FILTER: 'Застосувати фільтр'
     RESET: Відновити
   CMSPageAddController:
-    MENUTITLE: 'Додати сторінку'
     ParentMode_child: 'Під іншою сторінкою'
     ParentMode_top: 'Вищий рівень'
-  CMSPageEditController:
-    MENUTITLE: 'Редагувати сторінку'
+    MENUTITLE: 'Додати сторінку'
   CMSPageHistoryController:
     COMPAREMODE: 'Режим порівняння (виберіть два)'
     COMPAREVERSIONS: 'Порівняти версії'
     COMPARINGVERSION: 'Порівняння версій {version1} та {version2}.'
-    MENUTITLE: Історія
     REVERTTOTHISVERSION: 'Відновити цю версію'
     SHOWUNPUBLISHED: 'Показати неопубліковані версії'
     SHOWVERSION: 'Показати версію'
     VIEW: вигляд
-    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Переглядається версія {version}.'
-  CMSPageHistoryController_versions.ss:
+    MENUTITLE: Історія
+  CMSPageHistoryController_versions_ss:
     AUTHOR: Автор
     NOTPUBLISHED: 'Не опубліковано'
     PUBLISHER: Видавець
     UNKNOWN: Невідомий
     WHEN: Коли
-  CMSPageSettingsController:
-    MENUTITLE: 'Редагувати сторінку'
-  CMSPagesController:
-    GalleryView: 'У вигляді галереї'
-    ListView: 'У вигляді списку'
-    MENUTITLE: Сторінки
-    TreeView: 'У вигляді дерева'
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: 'Drag''n''drop'
-    MULTISELECT: 'Множинний вибір'
-  CMSPagesController_Tools.ss:
+  CMSPagesController_ContentToolbar_ss:
+    MULTISELECT: Множинний вибір
+  CMSPagesController_Tools_ss:
     FILTER: Фільтр
   CMSSearch:
     FILTERDATEFROM: Від
-    FILTERDATEHEADING: Дата
-    FILTERDATETO: Кому
-    FILTERLABELTEXT: Вміст
-  CMSSettingsController:
-    MENUTITLE: Налаштування
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Змінені сторінки'
   CMSSiteTreeFilter_DeletedPages:
@@ -168,26 +130,17 @@ uk:
   ContentControl:
     NOTEWONTBESHOWN: 'Примітка: це повідомлення не буде відображатися для відвідувачів'
   ContentController:
-    ARCHIVEDSITE: 'Preview version'
     ARCHIVEDSITEFROM: 'Заархівований сайт з'
-    CMS: CMS
-    DRAFT: Draft
     DRAFTSITE: 'Чорновий сайт'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Ви повинні увійти у систему для перегляду чернетки даного матеріалу. <a href="%s">Натсиніть для переходу на опублікований матеріал.</a>'
     Email: Е-пошта
-    INSTALL_SUCCESS: 'Installation Successful!'
     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>'
-    InstallSuccessCongratulations: 'SilverStripe has been successfully installed!'
     LOGGEDINAS: 'Залогований як '
     LOGIN: Логін
-    LOGOUT: Вилогуватися
+    LOGOUT: 'Вилогуватися'
     NOTLOGGEDIN: 'Не залогований'
-    PUBLISHED: Published
     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 content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Не вдається видалити інсталяційні файли. Будь ласка, видаліть вручну наведені нижче файли'
     VIEWPAGEIN: 'Переглянути сторінку в:'
   ErrorPage:
@@ -198,31 +151,6 @@ uk:
     DEFAULTSERVERERRORPAGETITLE: 'Помилка сервера'
     DESCRIPTION: 'Власний вміст для різних випадків помилки (наприклад, "Сторінку не знайдено")'
     ERRORFILEPROBLEM: 'Помилка при відкритті файлу "{filename}" для запису. Перевірте, будь-ласка, дозволи на файл.'
-    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: 'Додати папку'
     DELETEUNUSEDTHUMBNAILS: 'Видалити невикористані ескізи'
@@ -231,11 +159,9 @@ uk:
     UploadFilesButton: Завантажити
   LeftAndMain:
     DELETED: Видалено
-    PreviewButton: 'Попередній перегляд'
     SAVEDUP: Збережено.
     STATUSPUBLISHEDSUCCESS: 'Публікація ''{title}'' пройшла успішно'
     SearchResults: 'Результати пошуку'
-    VersionUnknown: Невідомий
   Permission:
     CMS_ACCESS_CATEGORY: 'Доступ до CMS'
   Permissions:
@@ -246,21 +172,14 @@ uk:
     HASBEENSETUP: 'Сторінка перенаправлення була встановлена без указання цілі перенаправлення'
     HEADER: 'Ця сторінка перенаправляє користувачів на іншу сторінку'
     OTHERURL: 'URL іншого сайту'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Перенапралено на'
     REDIRECTTOEXTERNAL: 'Інший сайт'
     REDIRECTTOPAGE: 'Сторінку на Вашому сайті'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Сторінки на Вашому сайті'
   ReportAdmin:
     MENUTITLE: Звіти
-    ReportTitle: Title
   ReportAdminForm:
     FILTERBY: 'Фільтр по'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Уперед
     SEARCH: Пошук
@@ -276,9 +195,6 @@ uk:
     LAST2WEEKS: 'Сторінки, відредаговані за останні два тижні'
     OtherGroupTitle: Інше
     ParameterLiveCheckbox: 'Перевірити робочий сайт'
-    REPEMPTY: 'The {title} report is empty.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Щоб поділитися цією сторінкою, скопіюйте та вставте посилання нижче.'
     ShareLink: 'Поділитися посиланням'
@@ -289,19 +205,17 @@ uk:
     EDITHEADER: 'Хто може редагувати сторінки на цьому сайті?'
     EDIT_PERMISSION: 'Керувати конфігурацією сайту'
     EDIT_PERMISSION_HELP: 'Можливість редагування глобальних налаштувань доступу / дозволів сторінок верхнього рівня.'
-    PLURALNAME: 'Site Configs'
-    SINGULARNAME: 'Site Config'
     SITENAMEDEFAULT: 'Назва Вашого Сайту'
     SITETAGLINE: 'Гасло сайту'
     SITETITLE: 'Заголовок сайту'
     TABACCESS: Доступ
     TABMAIN: Головна
     TAGLINEDEFAULT: 'тут ваш слоган'
-    THEME: 'Тема оформлення'
+    THEME: Тема оформлення
     TOPLEVELCREATE: 'Хто може створювати сторінки верхнього рівня на сайті?'
     VIEWHEADER: 'Хто може переглядати сторінки на цьому сайті?'
   SiteTree:
-    ACCESSANYONE: 'Будь-хто'
+    ACCESSANYONE: Будь-хто
     ACCESSHEADER: 'Хто може переглядати цю сторінку?'
     ACCESSLOGGEDIN: 'Тільки ті, що увійшли'
     ACCESSONLYTHESE: 'Тільки ці люди (виберіть зі списку)'
@@ -311,10 +225,7 @@ uk:
     APPEARSVIRTUALPAGES: 'Цей вміст також відображається на віртуальній сторінці в розділі {title}.'
     BUTTONCANCELDRAFT: 'Відмінити зміни чернетки'
     BUTTONCANCELDRAFTDESC: 'Видалити черентку та повернутися до теперішнього опублікованого варіанту'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
-    BUTTONUNPUBLISH: 'Відміна публікування'
+    BUTTONUNPUBLISH: Відміна публікування
     BUTTONUNPUBLISHDESC: 'Видалити цю сторінку з опублікованого'
     CREATED: 'Дата створення'
     Comments: Коментарі
@@ -322,15 +233,13 @@ uk:
     DEFAULTABOUTCONTENT: '<p>Ви можете заповнити цю сторінку власним вмістом або видалити її та створити інші сторінки.<br /></p>'
     DEFAULTABOUTTITLE: 'Про нас'
     DEFAULTCONTACTCONTENT: '<p>Ви можете заповнити цю сторінку власним вмістом або видалити її та створити інші сторінки.<br /></p>'
-    DEFAULTCONTACTTITLE: Контакти
+    DEFAULTCONTACTTITLE: 'Контакти'
     DEFAULTHOMECONTENT: '<p>Ласкаво просимо до SilverStripe! Це стандартна домашня сторінка. Ви можете редагувати цю сторінку відкривши <a href="admin/">CMS</a>. Ви можете переглянути <a href="http://doc.silverstripe.org">документацію для розробників</a>, або почати з <a href="http://doc.silverstripe.org/doku.php?id=tutorials"> туторіалів.</a></p>'
     DEFAULTHOMETITLE: Домівка
     DELETEDPAGEHELP: 'Сторінка вже не є опублікованою'
     DELETEDPAGESHORT: Видалений
     DEPENDENT_NOTE: 'Наступні сторінки залежать від цієї сторінки. Вони включають віртуальні сторінки, сторінки переадресації і сторінки з посиланням у змісті'
-    DESCRIPTION: 'Загальний вміст сторінки'
     DependtPageColumnLinkType: 'Тип посилання'
-    DependtPageColumnURL: URL
     EDITANYONE: 'Будь-хто, хто може увійти до системи'
     EDITHEADER: 'Хто може змінювати цю сторінку?'
     EDITONLYTHESE: 'Тільки ці люди (виберіть зі списку)'
@@ -338,25 +247,16 @@ uk:
     EDIT_ALL_DESCRIPTION: 'Редагувати будь-яку сторінку'
     EDIT_ALL_HELP: 'Можливість редагувати будь-яку сторінку сайту, незалежно від налаштувань на вкладці Доступ. Потрібен дозвіл "Доступ до розділу "Сторінки "'
     Editors: 'Групи редакторів'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Ця сторінка має зламані посилання.'
     HTMLEDITORTITLE: Вміст
     INHERIT: 'Наслідувати з батьківської сторінки'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Останнє оновлення'
     LINKCHANGENOTE: 'Зміна адреси цієї сторінки вплине на адреси всіх дочірніх сторінок'
     MENUTITLE: 'Мітка навігації'
-    METADESC: Опис
-    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
+    METADESC: 'Опис'
     METAEXTRA: 'Власні Мета-теги'
-    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'Сторінка має неопубліковані зміни'
     MODIFIEDONDRAFTSHORT: Змінений
-    MetadataToggle: Metadata
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
     PAGELOCATION: 'Розміщення сторінки'
     PAGETITLE: 'Назва сторінки'
     PAGETYPE: 'Тип сторінки'
@@ -366,7 +266,6 @@ uk:
     PARENTTYPE_SUBPAGE: 'Дочірня сторінки під батьківською сторінкою'
     PERMISSION_GRANTACCESS_DESCRIPTION: 'Керувати правами доступу до контенту'
     PERMISSION_GRANTACCESS_HELP: 'Дозволити встановлювати обмеження доступу окремо для кожної сторінки в розділі "Сторінки"'
-    PLURALNAME: Pages
     PageTypNotAllowedOnRoot: 'Сторінки типу "{type}" не можуть бути кореневими'
     PageTypeNotAllowed: 'Не дозоволяється створювати сторінки типу "{type}" як дочірні сторінки цієї сторінки'
     REMOVEDFROMDRAFTHELP: 'Сторінка опублікована, але видалена з чорнового сайту'
@@ -376,16 +275,14 @@ uk:
     REORGANISE_HELP: 'Переставляти сторінки в дереві сайту за допомогою drag&drop'
     SHOWINMENUS: 'Показувати у навігації?'
     SHOWINSEARCH: 'Показувати у пошуку?'
-    SINGULARNAME: Page
     TABBEHAVIOUR: Поводження
-    TABCONTENT: Вміст
+    TABCONTENT: 'Вміст'
     TABDEPENDENT: 'Залежні сторінки'
     TOPLEVEL: 'Вміст Сайту (Верхній Рівень)'
     TOPLEVELCREATORGROUPS: 'Автори найвищого рівня'
     URLSegment: 'URL адреса'
     VIEWERGROUPS: 'Групи глядачів'
     VIEW_ALL_DESCRIPTION: 'Перегляд будь-якої сторінки'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: 'Переглянути чорновий вміст'
     VIEW_DRAFT_CONTENT_HELP: 'Застосовується для перегляду сторінки за межами CMS в чорновому режимі. Корисно для позаштатних співробітників, що не мають доступу до CMS.'
     Viewers: 'Групи глядачів'
@@ -395,7 +292,6 @@ uk:
     many_many_ImageTracking: 'Відстеження зображень'
     many_many_LinkTracking: 'Відстеження посилань'
   SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Спеціальні символи автоматично перетворені або видалені.'
   StaticExporter:
     BASEURL: 'Основний URL'
@@ -403,34 +299,30 @@ uk:
     NAME: 'Статичний експортер'
   TableListField:
     SELECT: 'Вибрати:'
-  TableListField.ss:
-    NOITEMSFOUND: 'No items found'
+  TableListField_ss:
     SORTASC: 'Сортувати у порядку зростання'
     SORTDESC: 'Сортувати у порядку зменшення'
-  TableListField_PageControls.ss:
-    DISPLAYING: Displaying
-    OF: of
-    TO: to
+  TableListField_PageControls_ss:
     VIEWFIRST: 'Переглянути першу'
     VIEWLAST: 'Переглянути останню'
     VIEWNEXT: 'Переглянути наступну'
     VIEWPREVIOUS: 'Переглянути попередню'
   TreeTools:
     DisplayLabel: 'Відобразити:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: 'Ви можете перейти до архівного сайту за посиланням:'
     HAVEASKED: 'Ви надіслали запит на перегляд вмісту нашої сторінки'
   VirtualPage:
-    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Відображення вмісту іншої сторінки'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: 'Це віртуальна сторінка'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Віртуальні сторінки'
     PageTypNotAllowedOnRoot: 'Тип сторінки "{type}" не допускається на кореневому рівні для цієї віртуальної сторінки'
     SINGULARNAME: 'Віртуальна сторінка'
+  CMSFileAddController:
+    MENUTITLE: Файли
+  CMSPageEditController:
+    MENUTITLE: 'Редагувати сторінку'
+  CMSPageSettingsController:
+    MENUTITLE: 'Редагувати сторінку'
+  CMSSettingsController:
+    MENUTITLE: Налаштування
diff --git a/lang/uz.yml b/lang/uz.yml
index 498c7df5..d385a9d6 100644
--- a/lang/uz.yml
+++ b/lang/uz.yml
@@ -1,436 +1,9 @@
 uz:
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    EMAIL: Email
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Edit Page'
-    NEWPAGE: 'New {pagetype}'
     PAGENOTEXISTS: 'Bu sahifa mavjud emas.'
-    PAGES: Pages
-    PAGETYPEANYOPT: Any
-    PAGETYPEOPT: 'Page Type'
     PUBALLCONFIRM: 'Iltimos, saytdagi bor hamma sahifalarni chop eting. '
     PUBALLFUN: '"Hammasi chop etish" funktsiyasi'
-    PUBALLFUN2: 'Bu tugmani bosish bilan siz saytda bor bo''lgan hamma sahifalar chop etgan bo''lasiz.'
-    PUBPAGES: 'Done: Published {count} pages'
-    PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''{title}''{description} 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'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
+    PUBALLFUN2: "Bu tugmani bosish bilan siz saytda bor bo'lgan hamma sahifalar chop etgan bo'lasiz."
     SAVE: Saqlash
-    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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: তারিখ
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    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'
-    PUBLISHED: Published
-    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 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'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  SearchForm:
-    GO: Go
-    SEARCH: Search
-    SearchResults: 'Search Results'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   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'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    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'
-    GroupPlaceholder: 'Click to select group'
-    HASBROKENLINKS: 'This page has broken links.'
-    HTMLEDITORTITLE: Content
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its 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 ''Pages'' section" 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:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    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:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  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: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
-    HEADER: 'This is a virtual page'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: 'Virtual Pags'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
-    SINGULARNAME: 'Virtual Page'
diff --git a/lang/vi_VN.yml b/lang/vi_VN.yml
index 4560af27..f4480fd3 100644
--- a/lang/vi_VN.yml
+++ b/lang/vi_VN.yml
@@ -1,436 +1,55 @@
 vi_VN:
-  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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
-    EMAIL: Email
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Edit Page'
-    NEWPAGE: 'New {pagetype}'
     PAGENOTEXISTS: 'Không tìm thấy trang này.'
-    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 ''{title}''{description} 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'
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Lưu
-    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
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  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
-    DRAFT: Draft
-    DRAFTSITE: 'Draft Site'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Bạn phải đăng nhập để xem trang nháp hoặc trang lưu trữ.  <a href="%s">Trở lại trang cũ.</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'
-    PUBLISHED: Published
-    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 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: 'Mã lỗi'
-    DEFAULTERRORPAGECONTENT: '<p>Bạn truy cập vào một trang không tồn tại</p><p>Xin vui lòng kiểm tra lại đường dẩn hoặc quay lại trang chủ</p>'
+    DEFAULTERRORPAGECONTENT: '<p>Bạn truy cập vào một trang không tồn tại</p>
+
+      <p>Xin vui lòng kiểm tra lại đường dẩn hoặc quay lại trang chủ</p>
+
+      '
     DEFAULTERRORPAGETITLE: 'Không tìm thấy'
-    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: 'Một trang di chuyển chưa cấu hình đích di chuyển đến.'
     HEADER: 'Trang này sẽ di chuyển người dùng đến một trang khác'
     OTHERURL: 'Đường dẩn website khác'
-    PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 'Di chuyển đến'
     REDIRECTTOEXTERNAL: 'Website khác'
     REDIRECTTOPAGE: 'Một trang trên website'
-    SINGULARNAME: 'Redirector Page'
-    YOURPAGE: Trang
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  SearchForm:
-    GO: Go
-    SEARCH: Search
-    SearchResults: 'Search Results'
-  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.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
+    YOURPAGE: 'Trang'
   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: 'Bất cứ ai'
+    ACCESSANYONE: Bất cứ ai
     ACCESSHEADER: 'Ai có thể xem trang này ?'
     ACCESSLOGGEDIN: 'Người dùng đã đăng nhập'
     ACCESSONLYTHESE: 'Chỉ những người sau đây (chọn từ danh sách)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: 'Cho phép bình luận trên trang này?'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Hủy thay đổi nháp'
     BUTTONCANCELDRAFTDESC: 'Xóa khỏi mục nháp và khôi phục lại trang gốc'
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Ẩn
     BUTTONUNPUBLISHDESC: 'Xóa trang này khỏi trang hoạt động'
-    CREATED: 'Date Created'
-    Comments: Comments
-    Content: Content
     DEFAULTABOUTCONTENT: '<p>Bạn có thể điền vào thông tin trang này với nội dung của bạn, hoặc xóa trang này và tạo một trang riêng phù hợp hơn.<br /></p>'
     DEFAULTABOUTTITLE: 'Giới thiệu'
     DEFAULTCONTACTCONTENT: '<p>Bạn có thể điền vào thông tin trang này với nội dung của bạn, hoặc xóa trang này và tạo một trang riêng phù hợp hơn.<br /></p>'
     DEFAULTCONTACTTITLE: 'Liên hệ'
-    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: 'Trang chủ'
-    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
+    DEFAULTHOMETITLE: Trang chủ
     EDITANYONE: 'Bất cứ ai có thể đăng nhập vào phần quản lý'
     EDITHEADER: 'Ai có thể thay đổi trang này ?'
     EDITONLYTHESE: 'Chỉ những người sau đây (chọn từ danh sách)'
-    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'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Trang này có liên kết hỏng.'
-    HTMLEDITORTITLE: 'Nội dung'
-    INHERIT: 'Inherit from parent page'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
-    LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
-    MENUTITLE: Nhãn
+    HTMLEDITORTITLE: Nội dung
+    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'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: 'Page location'
     PAGETITLE: 'Tên trang'
-    PAGETYPE: Loại
-    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.'
+    PAGETYPE: 'Loại'
     SHOWINMENUS: 'Hiển thị trên menu?'
     SHOWINSEARCH: 'Hiển thị khi tìm kiếm?'
-    SINGULARNAME: Page
-    TABBEHAVIOUR: 'Hoạt động'
+    TABBEHAVIOUR: Hoạt động
     TABCONTENT: 'Thông tin'
-    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 ''Pages'' section" 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:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    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:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
-    CANACCESS: 'You can access the archived site at this link:'
+  ViewArchivedEmail_ss:
     HAVEASKED: 'Bạn được mời để xem nội dung của web chúng tôi trên'
-  VirtualPage:
-    CHOOSE: 'Linked Page'
-    DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
-    HEADER: 'This is a virtual page'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: 'Virtual Pags'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
-    SINGULARNAME: 'Virtual Page'
diff --git a/lang/zh_CN.yml b/lang/zh_CN.yml
index 8b1196ce..370f04d2 100644
--- a/lang/zh_CN.yml
+++ b/lang/zh_CN.yml
@@ -1,436 +1,82 @@
 zh_CN:
   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: 新建文件夹
-    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:
+  AssetAdmin_left_ss:
     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'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
     DELETE: '从测试网站中删除'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: 电子邮件
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Edit Page'
-    NEWPAGE: 'New {pagetype}'
-    PAGENOTEXISTS: 该网页不存在
-    PAGES: Pages
-    PAGETYPEANYOPT: Any
-    PAGETYPEOPT: 'Page Type'
+    PAGENOTEXISTS: '该网页不存在'
     PUBALLCONFIRM: '请发布该站的每一网页，这样，预备发布站上的内容就会复制到正式发布站上'
     PUBALLFUN: '“全部发布“功能'
-    PUBALLFUN2: 按下这一按键将等同于逐一发布每一网页。此功能适用于被大量编辑过的网页，如在网站被第一次使用时。
-    PUBPAGES: 'Done: Published {count} pages'
-    PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
+    PUBALLFUN2: "按下这一按键将等同于逐一发布每一网页。此功能适用于被大量编辑过的网页，如在网站被第一次使用时。"
     REMOVEDPAGEFROMDRAFT: '已从测试站点删除 ''%s'''
-    RESTORE: Restore
-    RESTORED: 'Restored ''{title}'' successfully'
-    ROLLBACK: 恢复到这一版本
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
+    ROLLBACK: '恢复到这一版本'
     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: 显示未发布版本
-    SHOWVERSION: 显示版本
-    VIEW: 视图
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    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: 相册视图
-    ListView: 列表视图
-    MENUTITLE: 页面
-    TreeView: '树形视图'
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: 'Drag''n''drop'
-    MULTISELECT: Multi-selection
-  CMSPagesController_Tools.ss:
-    FILTER: Filter
-  CMSSearch:
-    FILTERDATEFROM: From
-    FILTERDATEHEADING: Date
-    FILTERDATETO: To
-    FILTERLABELTEXT: Content
-  CMSSettingsController:
-    MENUTITLE: Settings
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Changed pages'
   CMSSiteTreeFilter_DeletedPages:
     Title: '所有页面(包含已删除)'
-  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
-    DRAFT: Draft
-    DRAFTSITE: 'Draft Site'
     DRAFT_SITE_ACCESS_RESTRICTION: '您必需用您的CMS密码来登录，才可浏览预备发布或已归档内容。<a href="%s">点击这里可回到正式发布站<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'
-    PUBLISHED: Published
-    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 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: '错误代码'
-    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: '添加文件夹'
     DELETEUNUSEDTHUMBNAILS: '删除未使用缩略图'
-    UNUSEDFILESTITLE: 未使用文件
-    UNUSEDTHUMBNAILSTITLE: 未使用缩略图
-    UploadFilesButton: '上传'
-  LeftAndMain:
-    DELETED: Deleted.
-    PreviewButton: 预览
-    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'
+    UNUSEDFILESTITLE: '未使用文件'
+    UNUSEDTHUMBNAILSTITLE: '未使用缩略图'
+    UploadFilesButton: 上传
   RedirectorPage:
     DESCRIPTION: '跳转至其他的内部页面'
-    HASBEENSETUP: 重导网页被生成，却没有什么地方由它来重导。
-    HEADER: 该页会将用户重新导向另一网页
-    OTHERURL: 另一网站的URL
-    PLURALNAME: 'Redirector Pags'
-    REDIRECTTO: 重新导向
-    REDIRECTTOEXTERNAL: 另一网站
-    REDIRECTTOPAGE: 您网站中的一个网页
-    SINGULARNAME: 'Redirector Page'
-    YOURPAGE: 您网站中的网页
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  SearchForm:
-    GO: Go
-    SEARCH: Search
-    SearchResults: 'Search Results'
+    HASBEENSETUP: '重导网页被生成，却没有什么地方由它来重导。'
+    HEADER: '该页会将用户重新导向另一网页'
+    OTHERURL: '另一网站的URL'
+    REDIRECTTO: '重新导向'
+    REDIRECTTOEXTERNAL: '另一网站'
+    REDIRECTTOPAGE: '您网站中的一个网页'
+    YOURPAGE: '您网站中的网页'
   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: 空白页
+    EMPTYPAGES: '空白页'
     LAST2WEEKS: '在过去2周内编辑过的网页'
-    OtherGroupTitle: Other
-    ParameterLiveCheckbox: 'Check live site'
-    REPEMPTY: 'The {title} report is empty.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
-    ShareInstructions: 分享此页，请复制粘贴下面的链接
-    ShareLink: 分享链接
+    ShareInstructions: '分享此页，请复制粘贴下面的链接'
+    ShareLink: '分享链接'
   SilverStripeNavigatorLinkl:
-    CloseLink: '关闭'
-  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?'
+    CloseLink: 关闭
   SiteTree:
     ACCESSANYONE: 任何人
-    ACCESSHEADER: 在我的网站上，谁可以浏览此页？
-    ACCESSLOGGEDIN: 已登录的用户
+    ACCESSHEADER: '在我的网站上，谁可以浏览此页？'
+    ACCESSLOGGEDIN: '已登录的用户'
     ACCESSONLYTHESE: '只有这些人（请从下列清单中选择）'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: '是否允许对次页进行评论？'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
-    BUTTONCANCELDRAFT: 取消草稿的改动
-    BUTTONCANCELDRAFTDESC: 将您的草稿恢复到目前正式发布的版本
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
+    BUTTONCANCELDRAFT: '取消草稿的改动'
+    BUTTONCANCELDRAFTDESC: '将您的草稿恢复到目前正式发布的版本'
     BUTTONUNPUBLISH: 撤消发布
     BUTTONUNPUBLISHDESC: '将此页从正式发布站删除'
-    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>'
+    CREATED: '创建日期'
     DEFAULTABOUTTITLE: '关于我们'
-    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: 任何可以登录CMS的人
-    EDITHEADER: 谁能在CMS中编辑此页？
+    EDITANYONE: '任何可以登录CMS的人'
+    EDITHEADER: '谁能在CMS中编辑此页？'
     EDITONLYTHESE: '只有这些人（请从下列清单中选择）'
-    EDITORGROUPS: 'Editor Groups'
-    EDIT_ALL_DESCRIPTION: 'Edit any page'
-    EDIT_ALL_HELP: 'Ability to edit any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
-    Editors: 'Editors Groups'
-    GroupPlaceholder: 'Click to select group'
-    HASBROKENLINKS: 该页有失效链接。
-    HTMLEDITORTITLE: '内容'
-    INHERIT: 从父页面继承
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 'Last Updated'
-    LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.'
+    HASBROKENLINKS: '该页有失效链接。'
+    HTMLEDITORTITLE: 内容
+    INHERIT: '从父页面继承'
     MENUTITLE: '导航标签'
     METADESC: '网页描述标签'
-    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     METAEXTRA: '自定义Meta标签'
-    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
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGELOCATION: 'Page location'
-    PAGETITLE: 网页名称
-    PAGETYPE: 网页类型
-    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: 是否出现在菜单中？
+    PAGETITLE: '网页名称'
+    PAGETYPE: '网页类型'
+    SHOWINMENUS: '是否出现在菜单中？'
     SHOWINSEARCH: '是否包括在搜索结果中？'
-    SINGULARNAME: Page
     TABBEHAVIOUR: 行为特点
     TABCONTENT: '内容'
-    TABDEPENDENT: 'Dependent pages'
     TOPLEVEL: '网站内容（顶层）'
-    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 ''Pages'' section" 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:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
   StaticExporter:
-    BASEURL: 基本URL
-    EXPORTTO: 导出到该文件夹
-    NAME: 网站静态拷贝导出器
-  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:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+    BASEURL: '基本URL'
+    EXPORTTO: '导出到该文件夹'
+    NAME: '网站静态拷贝导出器'
+  ViewArchivedEmail_ss:
     CANACCESS: '您可通过这个链接进入已归挡的网页：'
     HAVEASKED: '在%s,您要求浏览我们网站'
   VirtualPage:
-    CHOOSE: 'Linked Page'
     DESCRIPTION: '显示其他页的内容'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
-    HEADER: 这是一个虚拟页
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
-    PLURALNAME: 虚拟页面
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
-    SINGULARNAME: 虚拟页面
+    HEADER: '这是一个虚拟页'
diff --git a/lang/zh_TW.yml b/lang/zh_TW.yml
index 451d6983..ab389afe 100644
--- a/lang/zh_TW.yml
+++ b/lang/zh_TW.yml
@@ -1,166 +1,44 @@
 zh_TW:
   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: 新資料夾
-    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:
+  AssetAdmin_left_ss:
     GO: 執行
-  AssetTableField:
-    BACKLINKCOUNT: 'Used on:'
-    PAGES: page(s)
-  BackLink_Button.ss:
+  BackLink_Button_ss:
     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_PAGES: 從已出版網站刪除
+    DELETE_DRAFT_PAGES: '從草稿網站刪除'
+    DELETE_PAGES: '從已出版網站刪除'
     PUBLISHED_PAGES: '已出版 %d 網頁, %d 失敗'
     PUBLISH_PAGES: 出版
     UNPUBLISHED_PAGES: '未出版 %d 網頁'
     UNPUBLISH_PAGES: 未出版的
-  CMSFileAddController:
-    MENUTITLE: Files
   CMSMain:
-    ACCESS: 'Access to ''{title}'' section'
-    ACCESS_HELP: 'Allow viewing of the section containing page tree and content. View and edit permissions can be handled through page specific dropdowns, as well as the separate "Content permissions".'
-    AddNew: 'Add new page'
-    AddNewButton: 'Add new'
-    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageParentMode: 'Choose where to create this page'
-    ChoosePageType: 'Choose page type'
-    Create: Create
-    DELETE: 'Delete draft'
-    DELETEFP: Delete
-    DESCREMOVED: 'and {count} descendants'
-    DUPLICATED: 'Duplicated ''{title}'' successfully'
-    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: 電子郵件
-    EditTree: 'Edit Tree'
-    ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Edit Page'
-    NEWPAGE: 'New {pagetype}'
     PAGENOTEXISTS: '這頁不存在'
-    PAGES: Pages
-    PAGETYPEANYOPT: Any
-    PAGETYPEOPT: 'Page Type'
     PUBALLCONFIRM: '請發布所有網頁'
     PUBALLFUN: '"全部發布" 功能'
-    PUBALLFUN2: '按下這個按鈕就是如同到每頁按「發布」。當有很多內容更變時，這個功能可以省時。'
-    PUBPAGES: 'Done: Published {count} pages'
-    PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published site'
-    REMOVEDPAGEFROMDRAFT: 'Removed ''%s'' from the draft site'
-    RESTORE: Restore
-    RESTORED: 'Restored ''{title}'' successfully'
-    ROLLBACK: 回複到這個的版本
-    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
+    PUBALLFUN2: "按下這個按鈕就是如同到每頁按「發布」。當有很多內容更變時，這個功能可以省時。"
+    ROLLBACK: '回複到這個的版本'
     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: '比較模式(選擇兩個)'
-    COMPAREVERSIONS: 比較版本
-    COMPARINGVERSION: 'Comparing versions {version1} and {version2}.'
-    MENUTITLE: 歷史
-    REVERTTOTHISVERSION: 回復到此版本
-    SHOWUNPUBLISHED: 顯示未出版的版本
-    SHOWVERSION: 顯示版本
+    COMPAREVERSIONS: '比較版本'
+    REVERTTOTHISVERSION: '回復到此版本'
+    SHOWUNPUBLISHED: '顯示未出版的版本'
+    SHOWVERSION: '顯示版本'
     VIEW: 瀏覽
-    VIEWINGLATEST: 'Currently viewing the latest version.'
-    VIEWINGVERSION: 'Currently viewing version {version}.'
-  CMSPageHistoryController_versions.ss:
-    AUTHOR: '作者'
-    NOTPUBLISHED: 未發行的
-    PUBLISHER: '發行者'
+    MENUTITLE: 歷史
+  CMSPageHistoryController_versions_ss:
+    AUTHOR: 作者
+    NOTPUBLISHED: '未發行的'
+    PUBLISHER: 發行者
     UNKNOWN: 未知的
     WHEN: 何時
-  CMSPageSettingsController:
-    MENUTITLE: '編輯網頁'
   CMSPagesController:
-    GalleryView: 圖庫瀏覽
+    GalleryView: '圖庫瀏覽'
     ListView: '清單瀏覽'
-    MENUTITLE: '網頁'
-    TreeView: 樹狀瀏覽
-  CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: 'Drag''n''drop'
-    MULTISELECT: Multi-selection
-  CMSPagesController_Tools.ss:
-    FILTER: Filter
-  CMSSearch:
-    FILTERDATEFROM: 從
-    FILTERDATEHEADING: 日期
-    FILTERDATETO: 到
-    FILTERLABELTEXT: 現在
-  CMSSettingsController:
-    MENUTITLE: 設定值
-  CMSSiteTreeFilter_ChangedPages:
-    Title: 'Changed pages'
+    MENUTITLE: 網頁
+    TreeView: '樹狀瀏覽'
   CMSSiteTreeFilter_DeletedPages:
     Title: '所有網頁, 包括已刪除的'
   CMSSiteTreeFilter_Search:
@@ -168,168 +46,58 @@ zh_TW:
   ContentControl:
     NOTEWONTBESHOWN: '備註: 此訊息將不會顯示給您的訪客看'
   ContentController:
-    ARCHIVEDSITE: 'Preview version'
-    ARCHIVEDSITEFROM: 'Archived site from'
-    CMS: CMS
-    DRAFT: Draft
-    DRAFTSITE: 'Draft Site'
     DRAFT_SITE_ACCESS_RESTRICTION: '你必須先登入才能瀏覽草稿或歸檔內容。<a href="%s">回到正式發布站</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'
-    PUBLISHED: Published
-    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 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: 錯誤代碼
+    CODE: '錯誤代碼'
     DEFAULTERRORPAGECONTENT: '<p>抱歉, 看來您正再嘗試存取一個不存在的網頁</p><p>請檢查您正在嘗試存取網址的拼寫並再試一次.</p>'
     DEFAULTERRORPAGETITLE: '未發現網頁'
     DEFAULTSERVERERRORPAGECONTENT: '<p>抱歉, 處裡您的要求發生一個問題</p>'
-    DEFAULTSERVERERRORPAGETITLE: 伺服器錯誤
-    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'
+    DEFAULTSERVERERRORPAGETITLE: '伺服器錯誤'
   Folder:
-    AddFolderButton: 新增資料夾
-    DELETEUNUSEDTHUMBNAILS: 刪除未使用的縮圖
-    UNUSEDFILESTITLE: 未使用的檔案
-    UNUSEDTHUMBNAILSTITLE: 未使用的縮圖
+    AddFolderButton: '新增資料夾'
+    DELETEUNUSEDTHUMBNAILS: '刪除未使用的縮圖'
+    UNUSEDFILESTITLE: '未使用的檔案'
+    UNUSEDTHUMBNAILSTITLE: '未使用的縮圖'
     UploadFilesButton: 上傳
-  LeftAndMain:
-    DELETED: Deleted.
-    PreviewButton: '預覽'
-    SAVEDUP: Saved.
-    STATUSPUBLISHEDSUCCESS: 'Published ''{title}'' successfully'
-    SearchResults: 搜尋結果
-    VersionUnknown: 未知
-  Permission:
-    CMS_ACCESS_CATEGORY: 'CMS Access'
-  Permissions:
-    CONTENT_CATEGORY: 'Content permissions'
-    PERMISSIONS_CATEGORY: 'Roles and access permissions'
   RedirectorPage:
     DESCRIPTION: '重新導向到一個內部不同的網頁'
     HASBEENSETUP: '沒有任何地方被重新導向的一個重新導向網頁已被設定.'
     HEADER: '本網頁將重新導向用戶至別的網頁'
     OTHERURL: '其他網站網址'
-    PLURALNAME: 'Redirector Pags'
-    REDIRECTTO: 重新導向到
-    REDIRECTTOEXTERNAL: 別的網站
+    REDIRECTTO: '重新導向到'
+    REDIRECTTOEXTERNAL: '別的網站'
     REDIRECTTOPAGE: '在您網站上的一個網頁'
-    SINGULARNAME: 'Redirector Page'
     YOURPAGE: '在您網站上的網頁'
-  ReportAdmin:
-    MENUTITLE: Reports
-    ReportTitle: Title
-  ReportAdminForm:
-    FILTERBY: 'Filter by'
-  SITETREE:
-    VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page'
-    VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page'
-    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
-  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: '空頁'
     LAST2WEEKS: '網頁在過去兩個禮拜有被更改過'
-    OtherGroupTitle: Other
-    ParameterLiveCheckbox: 'Check live site'
-    REPEMPTY: 'The {title} report is empty.'
-  SilverStripeNavigator:
-    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: '分享一個由此到此的網頁, 複製與貼上下面的鏈結.'
-    ShareLink: 分享鏈結
+    ShareLink: '分享鏈結'
   SilverStripeNavigatorLinkl:
     CloseLink: 關閉
-  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: 所有人
     ACCESSHEADER: '誰可以瀏覽這頁？'
     ACCESSLOGGEDIN: '已登入的使用者'
     ACCESSONLYTHESE: '只有這些人(從清單選擇)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
     ALLOWCOMMENTS: '允許留言嗎？'
-    APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
-    BUTTONCANCELDRAFT: 取消草稿更變
-    BUTTONCANCELDRAFTDESC: 刪除草稿並回複到正式發布的版本
-    BUTTONPUBLISHED: Published
-    BUTTONSAVED: Saved
-    BUTTONSAVEPUBLISH: 'Save & publish'
+    BUTTONCANCELDRAFT: '取消草稿更變'
+    BUTTONCANCELDRAFTDESC: '刪除草稿並回複到正式發布的版本'
     BUTTONUNPUBLISH: 取消發布
-    BUTTONUNPUBLISHDESC: 從正式發布站移除
-    CREATED: 建立日期
+    BUTTONUNPUBLISHDESC: '從正式發布站移除'
+    CREATED: '建立日期'
     Comments: 意見
-    Content: '內容'
+    Content: 內容
     DEFAULTABOUTCONTENT: '<p>您可以用您自己的內容填入本網頁, 或是刪除它並建立您自己的網頁<br /></p>'
-    DEFAULTABOUTTITLE: 關於我們
+    DEFAULTABOUTTITLE: '關於我們'
     DEFAULTCONTACTCONTENT: '<p>您可以用您自己的內容填入本網頁, 或是刪除它並建立您自己的網頁<br /></p>'
-    DEFAULTCONTACTTITLE: 連絡我們
+    DEFAULTCONTACTTITLE: '連絡我們'
     DEFAULTHOMECONTENT: '<p>歡迎光臨 SilverStrip! 這是預設的主頁. 您可以開啟<a href="admin/">the CMS</a>來編輯這個網頁. 您現在可存取<a href="http://doc.silverstripe.org">developer documentation</a>, 或是開始<a href="http://doc.silverstripe.org/doku.php?id=tutorials">the tutorials.</a></p>'
-    DEFAULTHOMETITLE: '首頁'
-    DELETEDPAGEHELP: 'Page is no longer published'
+    DEFAULTHOMETITLE: 首頁
     DELETEDPAGESHORT: 已刪除
     DEPENDENT_NOTE: '以下的網頁是依附在本網頁的. 這包含了虛擬網頁, 重新導向網頁, 以及有內容鏈結的網頁.'
-    DESCRIPTION: 'Generic content page'
-    DependtPageColumnLinkType: 鏈結類型
+    DependtPageColumnLinkType: '鏈結類型'
     DependtPageColumnURL: 網址
     EDITANYONE: '所有可以登入CMS的人'
     EDITHEADER: '誰可以編輯這頁？'
@@ -338,25 +106,15 @@ zh_TW:
     EDIT_ALL_DESCRIPTION: '編輯任何網頁'
     EDIT_ALL_HELP: '不管在存取Tab上的設定值, 在網站上有能力去編輯任何網頁. 需要 "到''網頁''部分的存取"許可'
     Editors: '編輯者群體'
-    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: '網頁含有失效的連結。'
-    HTMLEDITORTITLE: '內容'
+    HTMLEDITORTITLE: 內容
     INHERIT: '從母頁繼承'
-    LASTPUBLISHED: 'Last published'
-    LASTSAVED: 'Last saved'
-    LASTUPDATED: 最近更新
+    LASTUPDATED: '最近更新'
     LINKCHANGENOTE: '改變這個網頁鏈結將也會影響所有子網頁的鏈結'
-    MENUTITLE: 捷徑標籤
-    METADESC: 敘述
-    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
+    MENUTITLE: '捷徑標籤'
+    METADESC: '敘述'
     METAEXTRA: '自訂元標籤(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: 已修改
-    MetadataToggle: Metadata
-    MoreOptions: 'More options'
-    NOTPUBLISHED: 'Not published'
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
     PAGELOCATION: '網頁位置'
     PAGETITLE: '網頁名稱'
     PAGETYPE: '網頁類型'
@@ -366,71 +124,41 @@ zh_TW:
     PARENTTYPE_SUBPAGE: '在母頁下面的次頁'
     PERMISSION_GRANTACCESS_DESCRIPTION: '管理內容的存取權限'
     PERMISSION_GRANTACCESS_HELP: '允許設定在"網頁"部分的網頁-特定存取限制.'
-    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: 從草稿移除
+    REMOVEDFROMDRAFTSHORT: '從草稿移除'
     REMOVE_INSTALL_WARNING: '警告: 為了安全理由你應該從SilverStripe的安裝中移除install.php.'
-    REORGANISE_DESCRIPTION: 改變網站結構
+    REORGANISE_DESCRIPTION: '改變網站結構'
     REORGANISE_HELP: '經由 拉&放 於網站樹狀架構內重新安排網頁.'
-    SHOWINMENUS: 在選單裡顯示嗎？
-    SHOWINSEARCH: 在搜尋結果裡顯示嗎？
-    SINGULARNAME: Page
+    SHOWINMENUS: '在選單裡顯示嗎？'
+    SHOWINSEARCH: '在搜尋結果裡顯示嗎？'
     TABBEHAVIOUR: 作用
     TABCONTENT: '內容'
     TABDEPENDENT: '依賴網頁'
     TOPLEVEL: '網站內容 (高層)'
     TOPLEVELCREATORGROUPS: '頂級創作者'
-    URLSegment: 網址分類
+    URLSegment: '網址分類'
     VIEWERGROUPS: '瀏覽者群組'
     VIEW_ALL_DESCRIPTION: '瀏覽任何網頁'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     VIEW_DRAFT_CONTENT: '瀏覽內容草稿'
     VIEW_DRAFT_CONTENT_HELP: '應用於在草稿模式下觀看CMS以外的網頁. 沒有CMS存取權的外部合作者是有用的.'
     Viewers: '瀏覽者群組'
     Visibility: 能見度
     has_one_Parent: '母頁'
-    many_many_BackLinkTracking: 背面鏈結追蹤
-    many_many_ImageTracking: 影像追蹤
-    many_many_LinkTracking: 鏈結追蹤
-  SiteTreeURLSegmentField:
-    EMPTY: 'Please enter a URL Segment or click cancel'
-    HelpChars: ' Special characters are automatically converted or removed.'
+    many_many_BackLinkTracking: '背面鏈結追蹤'
+    many_many_ImageTracking: '影像追蹤'
+    many_many_LinkTracking: '鏈結追蹤'
   StaticExporter:
-    BASEURL: 基本網址
-    EXPORTTO: 匯出至那個資料夾
+    BASEURL: '基本網址'
+    EXPORTTO: '匯出至那個資料夾'
     NAME: '網站靜態匯出'
-  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:'
-  URLSegmentField:
-    Cancel: Cancel
-    Edit: Edit
-    OK: OK
-  ViewArchivedEmail.ss:
+  ViewArchivedEmail_ss:
     CANACCESS: '您可以利用哲格連結到已歸檔站：'
     HAVEASKED: '您要瀏覽這一天的網站內容：'
   VirtualPage:
-    CHOOSE: 'Linked Page'
     DESCRIPTION: '顯示其他網頁的內容'
-    EDITCONTENT: 'Edit content on linked page'
-    EditLink: edit
     HEADER: '這是一個虛擬網頁'
-    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: '虛擬網頁'
-    PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: '虛擬網頁'
+  CMSPageSettingsController:
+    MENUTITLE: '編輯網頁'
+  CMSSettingsController:
+    MENUTITLE: 設定值
diff --git a/templates/CMSPageHistoryController_versions.ss b/templates/CMSPageHistoryController_versions.ss
index 57e9a4ba..3b873b4f 100755
--- a/templates/CMSPageHistoryController_versions.ss
+++ b/templates/CMSPageHistoryController_versions.ss
@@ -2,12 +2,12 @@
 	<thead>
 		<tr>
 			<th class="ui-helper-hidden"></th>
-			<th><% _t('CMSPageHistoryController_versions.ss.WHEN','When') %></th>
-			<th><% _t('CMSPageHistoryController_versions.ss.AUTHOR','Author') %></th>
-			<th><% _t('CMSPageHistoryController_versions.ss.PUBLISHER','Publisher') %></th>
+			<th><% _t('CMSPageHistoryController_versions_ss.WHEN','When') %></th>
+			<th><% _t('CMSPageHistoryController_versions_ss.AUTHOR','Author') %></th>
+			<th><% _t('CMSPageHistoryController_versions_ss.PUBLISHER','Publisher') %></th>
 		</tr>
 	</thead>
-	
+
 	<tbody>
 		<% loop Versions %>
 		<tr id="page-$RecordID-version-$Version" class="$EvenOdd $PublishedClass<% if not WasPublished %><% if not Active %> ui-helper-hidden<% end_if %><% end_if %><% if Active %> active<% end_if %>" data-published="<% if WasPublished %>true<% else %>false<% end_if %>">
@@ -15,8 +15,8 @@
 			<% with LastEdited %>
 				<td class="last-edited first-column" title="$Ago - $Nice">$Nice</td>
 			<% end_with %>
-			<td><% if Author %>$Author.FirstName $Author.Surname.Initial<% else %><% _t('CMSPageHistoryController_versions.ss.UNKNOWN','Unknown') %><% end_if %></td>
-			<td class="last-column"><% if Published %><% if Publisher %>$Publisher.FirstName $Publisher.Surname.Initial<% else %><% _t('CMSPageHistoryController_versions.ss.UNKNOWN','Unknown') %><% end_if %><% else %><% _t('CMSPageHistoryController_versions.ss.NOTPUBLISHED','Not published') %><% end_if %></td>			
+			<td><% if Author %>$Author.FirstName $Author.Surname.Initial<% else %><% _t('CMSPageHistoryController_versions_ss.UNKNOWN','Unknown') %><% end_if %></td>
+			<td class="last-column"><% if Published %><% if Publisher %>$Publisher.FirstName $Publisher.Surname.Initial<% else %><% _t('CMSPageHistoryController_versions_ss.UNKNOWN','Unknown') %><% end_if %><% else %><% _t('CMSPageHistoryController_versions_ss.NOTPUBLISHED','Not published') %><% end_if %></td>			
 		</tr>
 		<% end_loop %>
 	</tbody>
diff --git a/templates/Includes/CMSPagesController_ContentToolbar.ss b/templates/Includes/CMSPagesController_ContentToolbar.ss
index 24dace8e..038f8a6a 100644
--- a/templates/Includes/CMSPagesController_ContentToolbar.ss
+++ b/templates/Includes/CMSPagesController_ContentToolbar.ss
@@ -1,7 +1,7 @@
 <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>
+		<label for="view-mode-batchactions"><% _t("CMSPagesController_ContentToolbar_ss.MULTISELECT","Multi-selection") %></label>
 	</div>
 
 	$BatchActionsForm
diff --git a/templates/Includes/CMSPagesController_Tools.ss b/templates/Includes/CMSPagesController_Tools.ss
index c90e904f..d2b0accd 100644
--- a/templates/Includes/CMSPagesController_Tools.ss
+++ b/templates/Includes/CMSPagesController_Tools.ss
@@ -1,9 +1,9 @@
 <div class="cms-content-tools west cms-panel cms-panel-layout collapsed" data-expandOnClick="true" data-layout-type="border" id="cms-content-tools-CMSPagesController">
 	<div class="cms-panel-content center">
-		<h3 class="cms-panel-header"><% _t('CMSPagesController_Tools.ss.FILTER', 'Filter') %></h3>
+		<h3 class="cms-panel-header"><% _t('CMSPagesController_Tools_ss.FILTER', 'Filter') %></h3>
 		$SearchForm
 	</div>
 	<div class="cms-panel-content-collapsed">
-		<h3 class="cms-panel-header"><% _t('CMSPagesController_Tools.ss.FILTER', 'Filter') %></h3>
+		<h3 class="cms-panel-header"><% _t('CMSPagesController_Tools_ss.FILTER', 'Filter') %></h3>
 	</div>
 </div>
\ No newline at end of file
diff --git a/templates/email/ViewArchivedEmail.ss b/templates/email/ViewArchivedEmail.ss
index c7863e01..74acfbb5 100644
--- a/templates/email/ViewArchivedEmail.ss
+++ b/templates/email/ViewArchivedEmail.ss
@@ -1,3 +1,3 @@
-<% _t('ViewArchivedEmail.ss.HAVEASKED','You have asked to view the content of our site on',30,'Followed by a date') %> $ArchiveDate.Date
+<% _t('ViewArchivedEmail_ss.HAVEASKED','You have asked to view the content of our site on',30,'Followed by a date') %> $ArchiveDate.Date
 
-<% _t('ViewArchivedEmail.ss.CANACCESS','You can access the archived site at this link:') %> $ArchiveURL
\ No newline at end of file
+<% _t('ViewArchivedEmail_ss.CANACCESS','You can access the archived site at this link:') %> $ArchiveURL
\ No newline at end of file