Merge remote-tracking branch 'origin/3.1'

code/model/SiteTree.php

@@ -203,6 +203,14 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 	 */
 	private static $enforce_strict_hierarchy = true;
 
+	/**
+	 * The value used for the meta generator tag.  Leave blank to omit the tag.
+	 *
+	 * @config
+	 * @var string
+	 */
+	private static $meta_generator = 'SilverStripe - http://silverstripe.org';
+
 	protected $_cache_statusFlags = null;
 	
 	/**
@@ -1298,7 +1306,10 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 			$tags .= "<title>" . $this->Title . "</title>\n";
 		}
 
-		$tags .= "<meta name=\"generator\" content=\"SilverStripe - http://silverstripe.org\" />\n";
+		$generator = trim(Config::inst()->get('SiteTree', 'meta_generator'));
+		if (!empty($generator)) {
+			$tags .= "<meta name=\"generator\" content=\"" . Convert::raw2att($generator) . "\" />\n";
+		}
 
 		$charset = Config::inst()->get('ContentNegotiator', 'encoding');
 		$tags .= "<meta http-equiv=\"Content-type\" content=\"text/html; charset=$charset\" />\n";
@@ -2651,17 +2662,25 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 	 */
 	public function CMSTreeClasses() {
 		$classes = sprintf('class-%s', $this->class);
-		if($this->HasBrokenFile || $this->HasBrokenLink)
+		if($this->HasBrokenFile || $this->HasBrokenLink) {
 			$classes .= " BrokenLink";
+		}
 
-		if(!$this->canAddChildren())
+		if(!$this->canAddChildren()) {
 			$classes .= " nochildren";
+		}
 
-		if(!$this->canView() && !$this->canEdit() && !$this->canAddChildren())
+		if(!$this->canEdit() && !$this->canAddChildren()) {
-			$classes .= " disabled";
+			if (!$this->canView()) {
+				$classes .= " disabled";
+			} else {
+				$classes .= " edit-disabled";
+			}
+		}
 
-		if(!$this->ShowInMenus) 
+		if(!$this->ShowInMenus) {
 			$classes .= " notinmenu";
+		}
 			
 		//TODO: Add integration
 		/*

css/screen.css

@@ -11,7 +11,7 @@
 .CMSPageHistoryController del { background-color: #FDD; padding: 2px; color: #ff4444; }
 
 /** -------------------------------------------- Tree View (collapsed for sidebar) -------------------------------------------- */
-#cms-content-treeview .cms-tree-expand-trigger { display: none; }
+#cms-content-treeview .cms-tree-expand-trigger, #cms-content-listview .cms-tree-expand-trigger { display: none; }
 
 .cms-content-tools #cms-content-treeview .cms-content-toolbar { border-bottom: none; box-shadow: none; margin-bottom: 8px; }
 .cms-content-tools #cms-content-treeview .cms-tree-view-modes, .cms-content-tools #cms-content-treeview .cms-content-batchactions { display: none; }
@@ -38,9 +38,9 @@
 .cms .AssetAdmin .cms-content-toolbar .cms-page-add-button span.btn-icon-add { height: 17px; }
 .cms .AssetAdmin .cms-content-toolbar .cms-page-add-button span.ui-button-text { color: #393939; text-shadow: white 0 1px 1px; }
 .cms .AssetAdmin #Root_TreeView .cms-tree ul .class-Folder a span.text span.jstree-foldericon { background: url(../images/blue-folder-horizontal.png) no-repeat; width: 16px; height: 16px; float: left; display: block; margin-right: 4px; }
-.cms .AssetAdmin #Form_EditForm_File td { padding-top: 0; padding-bottom: 0; }
+.cms table.ss-gridfield-table td { padding-top: 0; padding-bottom: 0; }
-.cms .AssetAdmin #Form_EditForm_File td.bottom-all { padding: 0.7em; }
+.cms table.ss-gridfield-table td.bottom-all { padding: 0.7em; }
-.cms .AssetAdmin #Form_EditForm_File td.col-StripThumbnail { padding: 1px 5px; width: 32px; height: 32px; }
+.cms table.ss-gridfield-table td.col-StripThumbnail { padding: 1px 5px; width: 32px; height: 32px; }
-.cms .AssetAdmin #Form_EditForm_File td.col-StripThumbnail img { width: 32px; height: 32px; }
+.cms table.ss-gridfield-table td.col-StripThumbnail img { width: 32px; height: 32px; }
-.cms .AssetAdmin #Form_EditForm_File tr[data-class=Folder] td.col-StripThumbnail { background: transparent url(../images/treeicons/blue-folder-horizontal.png) no-repeat center; }
+.cms table.ss-gridfield-table tr[data-class=Folder] td.col-StripThumbnail { background: transparent url(../images/treeicons/blue-folder-horizontal.png) no-repeat center; }
-.cms .AssetAdmin #Form_EditForm_File tr[data-class=File] td.col-StripThumbnail { background: transparent url(../images/treeicons/blue-document.png) no-repeat center; }
+.cms table.ss-gridfield-table tr[data-class=File] td.col-StripThumbnail { background: transparent url(../images/treeicons/blue-document.png) no-repeat center; }

lang/af.yml

@@ -76,12 +76,15 @@ af:
     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.'
@@ -96,16 +99,16 @@ af:
     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: 'Het ''%s''%s verwyder van lewendige werf'
+    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: 'Rol terug na hierdie weergawe'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Terug na weergawe #%d gerol. Nuwe weergawe is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Save
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ af:
     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
@@ -167,6 +171,7 @@ af:
     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
@@ -178,10 +183,11 @@ af:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ af:
     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
@@ -267,8 +277,10 @@ af:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Deel skakel'
   SilverStripeNavigatorLinkl:
     CloseLink: 'Maak toe'
@@ -299,7 +311,9 @@ af:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancel draft changes'
     BUTTONCANCELDRAFTDESC: 'Delete your draft and revert to the currently published page'
-    BUTTONSAVEPUBLISH: 'Save & Publish'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Onpubliseer
     BUTTONUNPUBLISHDESC: 'Verwyder hierdie bladsy van die gepubliseerde werf'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ af:
     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'
@@ -337,7 +354,9 @@ af:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ af:
     URLSegment: 'URL Segment'
     VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'View any page'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to Site Content" permission'
+    VIEW_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'
@@ -376,6 +395,7 @@ af:
     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.'
   TableListField:
     SELECT: 'Select:'
@@ -393,14 +413,20 @@ af:
     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:'
     HAVEASKED: 'U het gevra om die inhoud van ons werf te sien op'
   VirtualPage:
-    CHOOSE: 'Kies ''n bladsy om na te skakel'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'kliek hier om die inhoud te verander'
+    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'

lang/ar.yml

@@ -76,12 +76,15 @@ ar:
     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.'
@@ -96,16 +99,16 @@ ar:
     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: '''%s''%s محذوفة من الموقع المباشر'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Removed ''{title}'' from the published site'
     REMOVEDPAGEFROMDRAFT: '''%s'' محذوف من مسودة الموقع'
     RESTORE: تخزين
     RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'عودة إلى هذا الإصدار'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'عودة للإصدار #%d. الإصدار الجديد يحمل الرقم #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: حفظ
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,13 +132,14 @@ ar:
     SHOWUNPUBLISHED: 'عرض النسخ الغير منشورة'
     SHOWVERSION: 'عرض النسخ'
     VIEW: view
+    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Currently viewing version {version}.'
   CMSPageHistoryController_versions.ss:
     AUTHOR: الكاتب
     NOTPUBLISHED: 'غير منشور'
     PUBLISHER: الناشر
     UNKNOWN: 'غير معروف'
-    WHEN: متى
+    WHEN: 'متى'
   CMSPageSettingsController:
     MENUTITLE: 'تحرير صفحة'
   CMSPagesController:
@@ -149,10 +153,10 @@ ar:
   CMSPagesController_Tools.ss:
     FILTER: Filter
   CMSSearch:
-    FILTERDATEFROM: من
+    FILTERDATEFROM: 'من'
     FILTERDATEHEADING: التاريخ
     FILTERDATETO: إلى
-    FILTERLABELTEXT: المحتوى
+    FILTERLABELTEXT: 'المحتوى'
   CMSSettingsController:
     MENUTITLE: الإعدادات
   CMSSiteTreeFilter_ChangedPages:
@@ -167,6 +171,7 @@ ar:
     ARCHIVEDSITE: 'Preview version'
     ARCHIVEDSITEFROM: 'موقع تمت أرشفته منذ'
     CMS: 'نظام إدارة المحتوى'
+    DRAFT: Draft
     DRAFTSITE: 'موقع في المسودة'
     DRAFT_SITE_ACCESS_RESTRICTION: 'بجب تسجيل الدخول ببيانات نظام إدارة المحتوى للتمكن من مشاهدة المسودات أو محتوى الأرشيف. <a href="%s">اضغط هنا للرجوع إلى الموقع المنشور.</a>'
     Email: Email
@@ -178,10 +183,11 @@ ar:
     LOGIN: الدخول
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ ar:
     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: بحث
@@ -267,6 +277,8 @@ ar:
     OtherGroupTitle: أخرى
     ParameterLiveCheckbox: 'التأكد من حيوية الموقع'
     REPEMPTY: 'The {title} report is empty.'
+  SilverStripeNavigator:
+    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'لمشاركة هذا إلى هذه النسخة، انسخ وإلصق الرابط أدناه....'
     ShareLink: 'رابط مشترك'
@@ -285,11 +297,11 @@ ar:
     TABACCESS: الوصول
     TABMAIN: الرئيسي
     TAGLINEDEFAULT: 'علامتك هنا'
-    THEME: الثيم
+    THEME: 'الثيم'
     TOPLEVELCREATE: 'من يستطيع إنشاء صفحات في جذر الموقع؟'
     VIEWHEADER: 'من يستطيع عرض الصفحات على هذا الموقع؟...'
   SiteTree:
-    ACCESSANYONE: الجميع
+    ACCESSANYONE: 'الجميع'
     ACCESSHEADER: 'من يستطيع مشاهدة هذه الصفحة ؟'
     ACCESSLOGGEDIN: 'الأعضاء المسجلين'
     ACCESSONLYTHESE: 'فقط هؤلاء الأشخاص ( اختر من القائمة)'
@@ -299,12 +311,14 @@ ar:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'إلغاء التغييرات في المسودة'
     BUTTONCANCELDRAFTDESC: 'إلغاء المسودة و العودة إلى الموقع المنشور حالياً'
-    BUTTONSAVEPUBLISH: 'حفظ و نشر'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'غير منشور'
     BUTTONUNPUBLISHDESC: 'حذف هذه الصفحة من الموقع المنشور'
     CREATED: 'Date Created'
     Comments: التعليقات
-    Content: المحتوى
+    Content: 'المحتوى'
     DEFAULTABOUTCONTENT: '<p>يمكنك ملء هذه الصفحة بمحتوى خاص بك أو حذفها و إنشاء صفحات جديدة خاصة بك<br /></p>'
     DEFAULTABOUTTITLE: حول
     DEFAULTCONTACTCONTENT: '<p>يمكنك ملء هذه الصفحة بمحتوى خاص بك أو حذفها و إنشاء صفحات جديدة خاصة بك<br /></p>'
@@ -324,20 +338,25 @@ 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: القائمة
+    MENUTITLE: 'القائمة'
     METADESC: الوصف
     METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
     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: معدل
+    MODIFIEDONDRAFTSHORT: 'معدل'
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose 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: 'نوع الصفحة'
@@ -359,14 +378,14 @@ ar:
     SHOWINSEARCH: 'عرض في البحث ؟'
     SINGULARNAME: Page
     TABBEHAVIOUR: الشسلوك
-    TABCONTENT: المحتوى
+    TABCONTENT: 'المحتوى'
     TABDEPENDENT: 'الصفحات المعتدة'
     TOPLEVEL: 'محتوى الموقع ( مستوى أعلى )'
     TOPLEVELCREATORGROUPS: 'منشيء المستوى الأعلى'
     URLSegment: 'جزء رابط الموقع'
     VIEWERGROUPS: 'مجموعات الزوار'
     VIEW_ALL_DESCRIPTION: 'Can view any page on the site, bypassing page specific security'
-    VIEW_ALL_HELP: 'القدرة على تحرير أي صفحة على الموقع ، بغض النظر عن الإعدادات على علامة تبويب الوصول. يتطلب تصريح "الوصول إلى محتوى الموقع" '
+    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: 'مجموعات المشاهدين'
@@ -376,6 +395,7 @@ ar:
     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: 'الرابط الأساسي'
@@ -397,14 +417,20 @@ ar:
     VIEWPREVIOUS: 'عرض السابق'
   TreeTools:
     DisplayLabel: 'Display:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'يمكنك الدخول إلى أرشيف الموقع عن طريق الرابط التالي :'
     HAVEASKED: 'تم طلب مشاهدة محتوى الموقع في'
   VirtualPage:
-    CHOOSE: 'اختر صفحة ليتم ربطها في'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'أعرض محتويات الصفحة الأخرى'
-    EDITCONTENT: 'اضغط هنا لتعديل المحتوى'
+    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: 'الصفحة الافتراضية'

lang/ast.yml

@@ -76,12 +76,15 @@ ast:
     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.'
@@ -96,16 +99,16 @@ ast:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Save
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ ast:
     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
@@ -167,6 +171,7 @@ ast:
     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
@@ -178,10 +183,11 @@ ast:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ ast:
     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
@@ -267,8 +277,10 @@ ast:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Zarrar
@@ -299,7 +311,9 @@ ast:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancel draft changes'
     BUTTONCANCELDRAFTDESC: 'Delete your draft and revert to the currently published page'
-    BUTTONSAVEPUBLISH: 'Salvar y publicar'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Unpublish
     BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ ast:
     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'
@@ -337,7 +354,9 @@ ast:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ ast:
     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 Site Content" permission'
+    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'
@@ -376,6 +395,7 @@ ast:
     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'
@@ -397,14 +417,20 @@ ast:
     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: 'Choose a page to link to'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Calca equí pa editar el conteníu'
+    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'

lang/az.yml

@@ -76,12 +76,15 @@ az:
     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.'
@@ -96,16 +99,16 @@ az:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: 'Yadda saxla'
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ az:
     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
@@ -167,6 +171,7 @@ az:
     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
@@ -178,10 +183,11 @@ az:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ az:
     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
@@ -267,6 +277,8 @@ az:
     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ş'
@@ -299,7 +311,9 @@ az:
     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'
-    BUTTONSAVEPUBLISH: 'Yadda saxla və dərc et'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Dərci ləğv et'
     BUTTONUNPUBLISHDESC: 'Bu səhifəni dərc olunmuş saytdan sil'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ az:
     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ı'
@@ -337,7 +354,9 @@ az:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ az:
     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 Site Content" permission'
+    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'
@@ -376,6 +395,7 @@ az:
     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'
@@ -397,14 +417,20 @@ az:
     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: 'Linkləmə üçün səhifəni seçin'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'məzmunu dəyişmək üçün buraya keçin'
+    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ə'

lang/bg.yml

@@ -2,7 +2,7 @@ bg:
   AssetAdmin:
     ADDFILES: 'Добави файлове'
     ActionAdd: 'Добави директория'
-    AppCategoryArchive: Архив
+    AppCategoryArchive: 'Архив'
     AppCategoryAudio: Аудио
     AppCategoryDocument: Document
     AppCategoryFlash: Flash
@@ -21,7 +21,7 @@ bg:
     ListView: 'Изглед в списък'
     MENUTITLE: Файлове
     NEWFOLDER: 'Нова директория'
-    SIZE: Размер
+    SIZE: 'Размер'
     THUMBSDELETED: '{count} unused thumbnails have been deleted'
     TreeView: 'Дървовиден изглед'
     Upload: 'Качи '
@@ -76,12 +76,15 @@ bg:
     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: 'Филтриран списък.'
@@ -96,16 +99,16 @@ bg:
     PUBALLFUN2: 'Натискайки този бутон все едно, публикувате всяка страница по отделно. Идеята е тази функционалност да се използва при мащабна редакция на съдържанието, като например случая когато сайта бива първоначално попълнен.'
     PUBPAGES: 'Готово. Публикувани {count} броя страници'
     PageAdded: 'успешно създадена страница'
-    REMOVED: 'Изтрити ''%s''%s от реалния сайт'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Примахнато ''{title}'' от публикувания сайт'
     REMOVEDPAGEFROMDRAFT: 'Премахната(и) ''%s'' от черновите'
     RESTORE: Възтанови
     RESTORED: 'Успешно възтановен/а ''{title}'''
     ROLLBACK: 'Върни към тази версия'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Върната на верися #%d. Новата версия е с номер #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Запис
-    SAVEDRAFT: 'Запази чернова'
+    SAVEDRAFT: 'Save draft'
     TabContent: Съдържание
     TabHistory: История
     TabSettings: Настройки
@@ -129,6 +132,7 @@ bg:
     SHOWUNPUBLISHED: 'Покажи непублекуваната версия'
     SHOWVERSION: 'Покажи версията'
     VIEW: Изглед
+    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Currently viewing version {version}.'
   CMSPageHistoryController_versions.ss:
     AUTHOR: Автор
@@ -167,6 +171,7 @@ bg:
     ARCHIVEDSITE: 'Preview version'
     ARCHIVEDSITEFROM: 'Архивиран сайт от'
     CMS: 'СУС (CMS)'
+    DRAFT: Draft
     DRAFTSITE: Чернови
     DRAFT_SITE_ACCESS_RESTRICTION: 'Трябва да влезете с вашата CMS парола, за да видите черновата или архивираното съдържание. <a href="%s">Натиснете тук, за да се върнете обратно към публикувания сайт.</a>'
     Email: Email
@@ -175,13 +180,14 @@ bg:
     InstallSecurityWarning: 'For security reasons you should now delete the install files, unless you are planning to reinstall later (<em>requires admin login, see above</em>). The web server also now only needs write access to the "assets" folder, you can remove write access from all other folders. <a href="{link}" style="text-align: center;">Click here to delete the install files.</a>'
     InstallSuccessCongratulations: 'SilverStripe has been successfully installed!'
     LOGGEDINAS: 'Влязъл като'
-    LOGIN: Вход
+    LOGIN: 'Вход'
-    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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Не може да бъдат изтрити инсталационните файлове. Моля изтриите ги "на ръка"'
     VIEWPAGEIN: 'Изглед на страница в:'
   ErrorPage:
@@ -251,6 +257,10 @@ bg:
     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: Търси
@@ -267,6 +277,8 @@ bg:
     OtherGroupTitle: собственник
     ParameterLiveCheckbox: 'Провери реалния сайт'
     REPEMPTY: 'Отчетът {title}  е празен'
+  SilverStripeNavigator:
+    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'За да споделиш тая страница, копирай и постави връзката по- долу'
     ShareLink: 'Сподели линк'
@@ -299,7 +311,9 @@ bg:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Отмени промените в черновата'
     BUTTONCANCELDRAFTDESC: 'Изтрий черновата и отиди на текущата публикувана страница'
-    BUTTONSAVEPUBLISH: 'Съхрани и Публикувай'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Премахни от публикация'
     BUTTONUNPUBLISHDESC: 'Премахни тази страница от публикувания сайт'
     CREATED: 'Дата на създаване'
@@ -324,9 +338,12 @@ bg:
     EDIT_ALL_DESCRIPTION: 'Редактиране на всяка от странциите'
     EDIT_ALL_HELP: 'Възможност за редактиране на всяка страница на сайта, независимо от настройките в раздела за достъп. Изисква "Достъп до раздел" секция достъп'
     Editors: 'Групи на редактори'
+    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Тази страница съдържа невалидни препратки.'
     HTMLEDITORTITLE: Съдържание
     INHERIT: 'Наследи от предишната в йерархията страница'
+    LASTPUBLISHED: 'Last published'
+    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Последна промяна'
     LINKCHANGENOTE: 'Промяната на адреса на тази страница ще окаже влияние на всичките й подстраници'
     MENUTITLE: 'Етикет на навигация'
@@ -337,7 +354,9 @@ bg:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Променен
     MetadataToggle: Meta-data
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose 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: 'Вид страница'
@@ -366,7 +385,7 @@ bg:
     URLSegment: 'URL - Сегмент'
     VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'Достъп до всяка страница'
-    VIEW_ALL_HELP: 'Възможност за отваряне на всяка страница от сайта, без значение от настройките за достъп. Изисква опцията "Достъп до съдържанието на сайта"'
+    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'
@@ -376,6 +395,7 @@ bg:
     many_many_ImageTracking: 'Следене на снимките'
     many_many_LinkTracking: 'Следене на линовете'
   SiteTreeURLSegmentField:
+    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Специалните символи са автоматично конвертирани или изтрити.'
   StaticExporter:
     BASEURL: 'Базов URL'
@@ -397,14 +417,20 @@ bg:
     VIEWPREVIOUS: 'Преглед на предишното'
   TreeTools:
     DisplayLabel: 'Покажи:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'Можете да достигнете архивирания сайт, чрез тази връзка'
     HAVEASKED: 'You have asked to view the content of our site on'
   VirtualPage:
-    CHOOSE: 'Изберете страница към която да обвържете'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Показва съдържанието на друга страница'
-    EDITCONTENT: 'натиснете тук за да промените съдържанието'
+    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: 'Виртуална страница'

lang/bs.yml

@@ -76,12 +76,15 @@ bs:
     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.'
@@ -96,16 +99,16 @@ bs:
     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: 'Izbrisano ''%s''%s sa aktivne stranice'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Removed ''{title}'' from the published site'
     REMOVEDPAGEFROMDRAFT: 'Uklonjeno ''%s'' sa privremenog nacrta stranice'
     RESTORE: Restore
     RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Vrati na ovo izdanje'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Vraćeno na izdanje #%d. Broj novog izdanja je #%d.'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Snimi
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ bs:
     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
@@ -167,6 +171,7 @@ bs:
     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
@@ -178,10 +183,11 @@ bs:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ bs:
     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
@@ -267,8 +277,10 @@ bs:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -299,7 +311,9 @@ bs:
     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'
-    BUTTONSAVEPUBLISH: 'Snimi i objavi'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Opozovi objavljivanje'
     BUTTONUNPUBLISHDESC: 'Ukloni ovu stavku sa objavljene stranice'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ bs:
     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'
@@ -337,7 +354,9 @@ bs:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ bs:
     URLSegment: 'URL Segment'
     VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'View any page'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to Site Content" permission'
+    VIEW_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'
@@ -376,6 +395,7 @@ bs:
     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'
@@ -397,14 +417,20 @@ bs:
     VIEWPREVIOUS: 'View previous'
   TreeTools:
     DisplayLabel: 'Display:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'Arhiviranoj stranici možete pristupiti korištenjem ovog linka:'
     HAVEASKED: 'Zahtjevali ste pregled sadržaja naše stranice na'
   VirtualPage:
-    CHOOSE: 'Izaberite stranicu koju želite povezati'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'kliknite ovdje da biste izmijenili sadržaj'
+    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'

lang/ca.yml

@@ -76,12 +76,15 @@ ca:
     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.'
@@ -96,16 +99,16 @@ ca:
     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: 'S''ha suprimit ''%s''%s del lloc publicat'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Removed ''{title}'' from the published site'
     REMOVEDPAGEFROMDRAFT: 'S''ha suprimit  ''%s'' del lloc esborrany'
     RESTORE: Restaura
     RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Torna a aquesta versió'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'S''ha tornat a la versió #%d. El nou número de versió és #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Desa
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ ca:
     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
@@ -167,6 +171,7 @@ ca:
     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
@@ -178,10 +183,11 @@ ca:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ ca:
     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
@@ -267,8 +277,10 @@ ca:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -299,7 +311,9 @@ ca:
     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'
-    BUTTONSAVEPUBLISH: 'Desa i publica'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Despublica
     BUTTONUNPUBLISHDESC: 'Suprimeix aquesta pàgina del lloc publicat'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ ca:
     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ó'
@@ -337,7 +354,9 @@ ca:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ ca:
     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 Site Content" permission'
+    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'
@@ -376,6 +395,7 @@ ca:
     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'
@@ -397,14 +417,20 @@ ca:
     VIEWPREVIOUS: 'Veure l''anterior'
   TreeTools:
     DisplayLabel: 'Display:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   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: 'Trieu una pàgina on enllaçar'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'premeu aquí per editar el contingut'
+    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'

lang/cs.yml

@@ -76,16 +76,19 @@ cs:
     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'
     DESCREMOVED: 'a {count} potomků'
+    DUPLICATED: 'Duplicated ''{title}'' successfully'
+    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: Email
-    EditTree: 'Editovat strom'
+    EditTree: 'Upravit strom'
     ListFiltered: 'Filtrovaný seznam.'
-    MENUTITLE: 'Editovat stránku'
+    MENUTITLE: 'Upravit stránku'
     NEWPAGE: 'Nová {pagetype}'
     PAGENOTEXISTS: 'Tato stránka neexistuje'
     PAGES: Stránky
@@ -96,16 +99,16 @@ cs:
     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: 'Smazán ''%s''%s ze živé stránky'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     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'
-    ROLLEDBACKPUB: 'Vrací se zpět na zveřejněnou verzi. Číslo nové verze je #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Vracím se zpět na verzi #%d. Číslo nové verze je #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Uložit
-    SAVEDRAFT: 'Uložit koncept'
+    SAVEDRAFT: 'Save draft'
     TabContent: Obsah
     TabHistory: Historie
     TabSettings: Nastavení
@@ -119,7 +122,7 @@ cs:
     ParentMode_child: 'Pod jinou stránku'
     ParentMode_top: 'Nejvyšší úroveň'
   CMSPageEditController:
-    MENUTITLE: 'Editovat stránku'
+    MENUTITLE: 'Upravit stránku'
   CMSPageHistoryController:
     COMPAREMODE: 'Mód porovnání (vyberte dva)'
     COMPAREVERSIONS: 'Porovnat verze'
@@ -129,7 +132,8 @@ cs:
     SHOWUNPUBLISHED: 'Zobrazit nezveřejněné verze'
     SHOWVERSION: 'Zobrazit verzi'
     VIEW: zobrazit
-    VIEWINGVERSION: 'Právě prohlížíte verzi {version}.'
+    VIEWINGLATEST: 'Currently viewing the latest version.'
+    VIEWINGVERSION: 'Právě prohlížíte verzi číslo {version}.'
   CMSPageHistoryController_versions.ss:
     AUTHOR: Autor
     NOTPUBLISHED: Nezveřejněno
@@ -167,6 +171,7 @@ cs:
     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
@@ -178,16 +183,17 @@ cs:
     LOGIN: Přihláš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: 'Můžete začít editovat váš obsah webu otevřením <a href="{link}">CMS</a>.'
+    StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Nelze smazat instalační soubory. Prosím, odstraňte soubory níže ručně'
     VIEWPAGEIN: 'Zobrazit stránku v:'
   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 pravopis URL, na které jste se pokoušeli o přístup a zkuste to znovu</p>'
+    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: 'Strana nenelazena'
+    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")'
@@ -238,11 +244,11 @@ cs:
   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'
+    HEADER: 'Tato stránka přesměruje uživatele na jinou stránku'
-    OTHERURL: 'Jinou webovou adresu'
+    OTHERURL: 'Jiná web adresa'
     PLURALNAME: 'Přesměrovací stránky'
     REDIRECTTO: 'Přesměrovat na'
-    REDIRECTTOEXTERNAL: 'Jinou webovou stránku'
+    REDIRECTTOEXTERNAL: 'Jiná web stránka'
     REDIRECTTOPAGE: 'Stránka na vašem webu'
     SINGULARNAME: 'Přesměrovací stránka'
     YOURPAGE: 'Stránka na vašem webu'
@@ -251,6 +257,10 @@ cs:
     ReportTitle: Titulek
   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
@@ -267,6 +277,8 @@ 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'
@@ -284,7 +296,7 @@ cs:
     SITETITLE: 'Titulek webu'
     TABACCESS: Přístup
     TABMAIN: Hlavní
-    TAGLINEDEFAULT: 'zde tvůj štítek'
+    TAGLINEDEFAULT: 'Slogan Vašeho webu'
     THEME: Téma
     TOPLEVELCREATE: 'Kdo může vytvářet stránky v kořenu webu?'
     VIEWHEADER: 'Kdo může vidět stránky na tomto webu?'
@@ -299,7 +311,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'
-    BUTTONSAVEPUBLISH: 'Uložit a Zveřejnit'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Nezveřejňovat
     BUTTONUNPUBLISHDESC: 'Odstranit tuto stránku z publikovaných na webu'
     CREATED: 'Datum vytvoření'
@@ -324,9 +338,12 @@ 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'
@@ -337,7 +354,9 @@ cs:
     MODIFIEDONDRAFTHELP: 'Stránka má nezveřejněné změny'
     MODIFIEDONDRAFTSHORT: Změněno
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'Tato stránka je zastaralý typ {type}. Uložení spůsobí zrušení jeho typu a vy můžete přijít o svá 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: 'Umístění stránky'
     PAGETITLE: 'Název stránky'
     PAGETYPE: 'Typ stránky'
@@ -366,7 +385,7 @@ cs:
     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: 'Možnost zobrazit libovolnou stránku na webu, bez ohledu na nastavení na kartě Přístup. Vyžaduje povolení "Přístup k obsahu webu"'
+    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: '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ů'
@@ -376,6 +395,7 @@ cs:
     many_many_ImageTracking: 'Stopování obrázku'
     many_many_LinkTracking: 'Stopování odkazu'
   SiteTreeURLSegmentField:
+    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Zvláštní znaky jsou automaticky zkonvertovány nebo odstraněny'
   StaticExporter:
     BASEURL: 'Základní URL'
@@ -397,14 +417,20 @@ cs:
     VIEWPREVIOUS: 'Zobrazit předchozí'
   TreeTools:
     DisplayLabel: 'Zobrazení:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   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: 'Vyberte, kam má stránka odkazovat'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Zobrazit obsah jiné stránky'
-    EDITCONTENT: 'klikněte sem pro editaci obsahu'
+    EDITCONTENT: 'Edit content on linked page'
+    EditLink: edit
     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'

lang/da.yml

@@ -76,12 +76,15 @@ da:
     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.'
@@ -96,16 +99,16 @@ da:
     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: 'Slet ''%s''%s fra live-sitet'
+    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'
-    ROLLEDBACKPUB: 'Rullet tilbage til udgivne udgave. Nyt udgavenummer er # {version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Tilbagerullet til version #%d. Nyt versionsnummer er #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Gem
-    SAVEDRAFT: 'Gem kladde'
+    SAVEDRAFT: 'Save draft'
     TabContent: Indhold
     TabHistory: Historik
     TabSettings: Indstillinger
@@ -129,6 +132,7 @@ da:
     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:
     AUTHOR: Forfatter
@@ -167,6 +171,7 @@ da:
     ARCHIVEDSITE: 'Preview version'
     ARCHIVEDSITEFROM: 'Arkiveret side fra'
     CMS: CMS
+    DRAFT: Draft
     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
@@ -178,10 +183,11 @@ da:
     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: 'Du kan starte med at redigere dit websteds indhold ved at åbne <a href="{link}">CMS\\''en</a>.'
+    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:
@@ -251,6 +257,10 @@ da:
     ReportTitle: Titel
   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
@@ -267,6 +277,8 @@ da:
     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'
@@ -299,7 +311,9 @@ 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'
-    BUTTONSAVEPUBLISH: 'Gem og udgiv'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Annuller udgivelse'
     BUTTONUNPUBLISHDESC: 'Fjern denne side fra det udgivne websted'
     CREATED: 'Dato for oprettelse'
@@ -324,9 +338,12 @@ da:
     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
@@ -337,7 +354,9 @@ da:
     MODIFIEDONDRAFTHELP: 'Siden har ikke-udgivne ændringer'
     MODIFIEDONDRAFTSHORT: Ændret
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose 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: Sideplacering
     PAGETITLE: Sidenavn
     PAGETYPE: Sidetype
@@ -366,7 +385,7 @@ da:
     URLSegment: 'URL Segment'
     VIEWERGROUPS: Visningsgrupper
     VIEW_ALL_DESCRIPTION: 'Vis enhver side'
-    VIEW_ALL_HELP: 'Mulighed for at redigere enhver side på webstedet, uanset indstillingerne på fanen Adgang. Kræver tilladelsen "Adgang til ''Sider'' sektionen"'
+    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
@@ -376,6 +395,7 @@ da:
     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'
@@ -397,14 +417,20 @@ da:
     VIEWPREVIOUS: 'Vis forrige'
   TreeTools:
     DisplayLabel: 'Display:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   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: 'Vælg en side at linke til'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Viser indholdet fra en anden side'
-    EDITCONTENT: 'Klik her for at redigere indholdet'
+    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'

lang/de.yml

@@ -76,12 +76,15 @@ de:
     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'
     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'
     EMAIL: E-Mail
     EditTree: 'Seitenbaum bearbeiten'
     ListFiltered: 'Gefilterte Liste'
@@ -96,16 +99,16 @@ de:
     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: '''%s''%s von der Live-Seite gelöscht'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     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'
-    ROLLEDBACKPUB: 'Die Änderungen seit der letzten Veröffentlichung wurden verworfen. Neue Versionsnummer ist #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Version #%d wiederhergestellt. Neue Versionsnummer ist #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Speichern
-    SAVEDRAFT: 'Entwurf speichern'
+    SAVEDRAFT: 'Save draft'
     TabContent: Inhalt
     TabHistory: Historie
     TabSettings: Einstellungen
@@ -129,6 +132,7 @@ de:
     SHOWUNPUBLISHED: 'Zeige unveröffentlichte Versionen'
     SHOWVERSION: 'Zeige Version'
     VIEW: anzeigen
+    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Momentan angezeigte Version: {version}.'
   CMSPageHistoryController_versions.ss:
     AUTHOR: Autor
@@ -167,6 +171,7 @@ de:
     ARCHIVEDSITE: Vorschauversion
     ARCHIVEDSITEFROM: 'Site archiviert von'
     CMS: CMS
+    DRAFT: Draft
     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
@@ -178,10 +183,11 @@ de:
     LOGIN: Anmelden
     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: 'Sie können mit der Bearbeitung der Inhalte Ihrer Site beginnen, indem Sie <a href="{link}">das CMS</a> öffnen.'
+    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:'
   ErrorPage:
@@ -192,8 +198,8 @@ de:
     DEFAULTSERVERERRORPAGETITLE: Serverfehler
     DESCRIPTION: 'Spezieller Inhalt für andere Fehlerfälle (z.B. "Seite nicht gefunden")'
     ERRORFILEPROBLEM: 'Die Datei "{filename}" konnte nicht zum Schreiben geöffnet werden. Bitte überprüfen Sie die Dateiberechtigungen.'
-    PLURALNAME: 'Error Pags'
+    PLURALNAME: Fehlerseiten
-    SINGULARNAME: 'Error Page'
+    SINGULARNAME: Fehlerseite
     400: '400 - Fehlerhafter Zugriff'
     401: '401 - Unerlaubter Zugriff'
     403: '403 - Verbotener Zugriff'
@@ -240,17 +246,21 @@ de:
     HASBEENSETUP: 'Eine Weiterleitungsseite wurde erstellt ohne das eine Weiterleitung definiert wurde.'
     HEADER: 'Diese Seite wird Nutzer auf eine andere Seite weiterleiten'
     OTHERURL: 'Andere Webseiten URL'
-    PLURALNAME: 'Redirector Pags'
+    PLURALNAME: Umleitungsseite
     REDIRECTTO: 'Weiterleiten zu'
     REDIRECTTOEXTERNAL: 'Andere Website'
     REDIRECTTOPAGE: 'Eine Seite auf Ihrer Website'
-    SINGULARNAME: 'Redirector Page'
+    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
@@ -267,6 +277,8 @@ de:
     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'
@@ -299,7 +311,9 @@ 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.'
-    BUTTONSAVEPUBLISH: 'Speichern und Veröffentlichen'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Veröffentlichung zurücknehmen'
     BUTTONUNPUBLISHDESC: 'Entferne diese Seite aus der veröffentlichten Website'
     CREATED: 'Datum der Erstellung'
@@ -324,20 +338,25 @@ de:
     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: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
+    METADESCHELP: Suchergebnisse
     METAEXTRA: 'Benutzerdefinierte Meta-Tags'
-    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
+    METAEXTRAHELP: 'Benutzerdefinierte Meta-Tags'
     MODIFIEDONDRAFTHELP: 'Die Seite hat unveröffentlichte Änderungen'
     MODIFIEDONDRAFTSHORT: 'Zuletzt geändert'
     MetadataToggle: Metadaten
-    OBSOLETECLASS: 'Der Seitentyp {type} dieser Seite existiert nicht mehr. Durch Speichern wird der Seitentyp zurückgesetzt, dies könnte Datenverluste zur Folge haben.'
+    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
@@ -366,7 +385,7 @@ de:
     URLSegment: URL-Segment
     VIEWERGROUPS: Betrachtergruppen
     VIEW_ALL_DESCRIPTION: 'Kann beliebige Seiten betrachten'
-    VIEW_ALL_HELP: 'Kann beliebige Seiten auf der Site betrachten; seitenspezifische Sicherheitseinstellungen werden ignoriert.'
+    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'
@@ -376,6 +395,7 @@ de:
     many_many_ImageTracking: Bild-Verfolgung
     many_many_LinkTracking: Link-Verfolgung
   SiteTreeURLSegmentField:
+    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Sonderzeichen werden automatisch umgewandelt oder entfernt.'
   StaticExporter:
     BASEURL: 'Ausgangs URL'
@@ -397,14 +417,20 @@ de:
     VIEWPREVIOUS: Vorheriger
   TreeTools:
     DisplayLabel: 'Anzeigen:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   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: 'Wählen Sie eine Seite, auf die Sie verweisen möchten'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Zeigt den Inhalt einer anderen Seite'
-    EDITCONTENT: 'Klicken Sie hier, um den Inhalt zu bearbeiten'
+    EDITCONTENT: 'Edit content on linked page'
+    EditLink: edit
     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'

lang/el.yml

@@ -76,12 +76,15 @@ el:
     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.'
@@ -96,16 +99,16 @@ el:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
-    SAVE: Αποθήκευση
+    SAVE: 'Αποθήκευση'
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ el:
     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
@@ -167,6 +171,7 @@ el:
     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
@@ -178,10 +183,11 @@ el:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ el:
     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
@@ -267,8 +277,10 @@ el:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -299,7 +311,9 @@ el:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancel draft changes'
     BUTTONCANCELDRAFTDESC: 'Delete your draft and revert to the currently published page'
-    BUTTONSAVEPUBLISH: 'Save & Publish'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Unpublish
     BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ el:
     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'
@@ -337,7 +354,9 @@ el:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ el:
     URLSegment: 'URL Segment'
     VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'View any page'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to Site Content" permission'
+    VIEW_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'
@@ -376,6 +395,7 @@ el:
     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'
@@ -397,14 +417,20 @@ el:
     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: 'Επιθυμείται να εμφανιστεί το περιεχόμενο του ιστοχώρου σας την '
   VirtualPage:
-    CHOOSE: 'Choose a page to link to'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'click here to edit the content'
+    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'

lang/en.yml

@@ -95,7 +95,7 @@ en:
     PUBALLFUN2: "Pressing this button will do the equivalent of going to every page and pressing \"publish\".  It's\n				intended to be used after there have been massive edits of the content, such as when the site was\n				first built."
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Removed ''{title}'' from the published site'
     REMOVEDPAGEFROMDRAFT: 'Removed ''%s'' from the draft site'
     RESTORE: Restore
@@ -104,13 +104,14 @@ en:
     ROLLEDBACKPUBv2: 'Rolled back to published version.'
     ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Save
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
     TreeFiltered: 'Filtered tree.'
     TreeFilteredClear: 'Clear filter'
     MENUTITLE: 'Edit Page'
+    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
   CMSMain_left.ss:
     'APPLY FILTER': 'Apply Filter'
     RESET: Reset
@@ -128,6 +129,7 @@ en:
     VIEW: view
     VIEWINGVERSION: 'Currently viewing version {version}.'
     MENUTITLE: History
+    VIEWINGLATEST: 'Currently viewing the latest version.'
   CMSPageHistoryController_versions.ss:
     AUTHOR: Author
     NOTPUBLISHED: 'Not published'
@@ -175,9 +177,11 @@ en:
     PUBLISHEDSITE: 'Published Site'
     Password: Password
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site\''s content by opening <a href="{link}">the CMS</a>.'
+    StartEditing: 'You can start editing your 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:'
+    DRAFT: Draft
+    PUBLISHED: Published
   ErrorPage:
     400: '400 - Bad Request'
     401: '401 - Unauthorized'
@@ -262,7 +266,7 @@ en:
     ParameterLiveCheckbox: 'Check live site'
     REPEMPTY: 'The {title} report is empty.'
   SilverStripeNavigatorLink:
-    ShareInstructions: 'To share a this to this page, copy and paste the link below.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -293,7 +297,7 @@ en:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancel draft changes'
     BUTTONCANCELDRAFTDESC: 'Delete your draft and revert to the currently published page'
-    BUTTONSAVEPUBLISH: 'Save & Publish'
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Unpublish
     BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
     CREATED: 'Date Created'
@@ -331,7 +335,7 @@ en:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -360,7 +364,7 @@ en:
     URLSegment: 'URL Segment'
     VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'View any page'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to Site Content" permission'
+    VIEW_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'
@@ -369,8 +373,16 @@ en:
     many_many_BackLinkTracking: 'Backlink Tracking'
     many_many_ImageTracking: 'Image Tracking'
     many_many_LinkTracking: 'Link Tracking'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    GroupPlaceholder: 'Click to select group'
+    LASTPUBLISHED: 'Last published'
+    LASTSAVED: 'Last saved'
+    MoreOptions: 'More options'
+    NOTPUBLISHED: 'Not published'
   SiteTreeURLSegmentField:
     HelpChars: ' Special characters are automatically converted or removed.'
+    EMPTY: 'Please enter a URL Segment or click cancel'
   StaticExporter:
     BASEURL: 'Base URL'
     EXPORTTO: 'Export to that folder'
@@ -402,6 +414,8 @@ en:
     PLURALNAME: 'Virtual Pags'
     PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page'
     SINGULARNAME: 'Virtual Page'
+    EditLink: edit
+    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
   CMSFileAddController:
     MENUTITLE: Files
   CMSPageEditController:
@@ -410,3 +424,13 @@ en:
     MENUTITLE: 'Edit Page'
   CMSSettingsController:
     MENUTITLE: Settings
+  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'
+  SilverStripeNavigator:
+    ARCHIVED: Archived
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK

lang/en_GB.yml

@@ -76,6 +76,7 @@ en_GB:
     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
@@ -98,16 +99,16 @@ en_GB:
     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 ''%s''%s from live site'
+    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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d. New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Save
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -131,6 +132,7 @@ en_GB:
     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
@@ -169,6 +171,7 @@ en_GB:
     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
@@ -180,10 +183,11 @@ en_GB:
     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 site''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -253,6 +257,10 @@ en_GB:
     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
@@ -269,6 +277,8 @@ en_GB:
     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'
@@ -301,7 +311,9 @@ en_GB:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancel draft changes'
     BUTTONCANCELDRAFTDESC: 'Delete your draft and revert to the currently published page'
-    BUTTONSAVEPUBLISH: 'Save and Publish'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Unpublish
     BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
     CREATED: 'Date Created'
@@ -326,9 +338,12 @@ en_GB:
     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'
@@ -339,7 +354,9 @@ en_GB:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -368,7 +385,7 @@ en_GB:
     URLSegment: 'URL Segment'
     VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'View any page'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to Site Content" permission'
+    VIEW_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'
@@ -378,6 +395,7 @@ en_GB:
     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'
@@ -399,14 +417,20 @@ en_GB:
     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: 'Choose a page to link to'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'click here to edit the content'
+    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'

lang/eo.yml

@@ -76,12 +76,15 @@ eo:
     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'
     DESCREMOVED: 'kaj {count} posteuloj'
+    DUPLICATED: 'Duplicated ''{title}'' successfully'
+    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: Retpoŝto
     EditTree: 'Redakta arbo'
     ListFiltered: 'Filtrita listo.'
@@ -96,16 +99,16 @@ eo:
     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: 'Forigis  ''%s''%s el la publika retejo'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     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'
-    ROLLEDBACKPUB: 'Malfaris ĝis publikigita versio. Nombro de nova versio estas  #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Malfaris al versio #%d. Nova versia nombro estas #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Konservi
-    SAVEDRAFT: 'Konservi malnetan'
+    SAVEDRAFT: 'Save draft'
     TabContent: Enhavo
     TabHistory: Historio
     TabSettings: Agordoj
@@ -129,6 +132,7 @@ eo:
     SHOWUNPUBLISHED: 'Vidigi nepublikigitajn versiojn'
     SHOWVERSION: 'Vidigi version'
     VIEW: vido
+    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Aktuale vidiĝas versio {version}.'
   CMSPageHistoryController_versions.ss:
     AUTHOR: Aŭtoro
@@ -167,6 +171,7 @@ eo:
     ARCHIVEDSITE: 'Antaŭvida versio'
     ARCHIVEDSITEFROM: 'Enarkivigita retejo el'
     CMS: CMS
+    DRAFT: Draft
     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
@@ -178,10 +183,11 @@ eo:
     LOGIN: Ensaluti
     LOGOUT: Elsaluti
     NOTLOGGEDIN: 'Ne ensalutinte'
+    PUBLISHED: Published
     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: 'Vi povas ekredakti la enhavon de via retejo malfermante je <a href="{link}">la CMS</a>.'
+    StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Ne eblas forigi instalajn dosierojn. Bonvolu mane forigi la jenajn dosierojn'
     VIEWPAGEIN: 'Vidigi Paĝon en:'
   ErrorPage:
@@ -251,6 +257,10 @@ eo:
     ReportTitle: Titolo
   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
@@ -267,6 +277,8 @@ eo:
     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'
@@ -299,7 +311,9 @@ eo:
     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'
-    BUTTONSAVEPUBLISH: 'Konservi kaj Publikigi'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Maleldonu
     BUTTONUNPUBLISHDESC: 'Forigi ĉi tiun paĝon de la publikigita retejo'
     CREATED: 'Dato de kreo'
@@ -324,9 +338,12 @@ eo:
     EDIT_ALL_DESCRIPTION: 'Povas redakti ajnan paĝon en la retejo, preterpasante paĝspecifan sekurecon'
     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'
@@ -337,7 +354,9 @@ eo:
     MODIFIEDONDRAFTHELP: 'Paĝo havas nepublikigitajn paĝojn'
     MODIFIEDONDRAFTSHORT: Ŝanĝita
     MetadataToggle: Metadatumoj
-    OBSOLETECLASS: 'Ĉi tiu paĝo estas de malaktuala tipo {type}. Konservi ĝin reagordos ĝian tipon kaj vi eble perdos datumojn.'
+    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: 'Situo de paĝo'
     PAGETITLE: 'Nomo de paĝo'
     PAGETYPE: 'Tipo de paĝo'
@@ -366,7 +385,7 @@ eo:
     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: 'Eblo vidigi ajnan paĝon en la retejo, senrigarde de la agordoj en la langeto Aliro. Necesas la permeso "Aliro al reteja enhavo"'
+    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: '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'
@@ -376,6 +395,7 @@ eo:
     many_many_ImageTracking: 'Spuri Bildojn'
     many_many_LinkTracking: 'Spuri Ligilojn'
   SiteTreeURLSegmentField:
+    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Aŭtomate konvertas aŭ forigas specialajn signojn.'
   StaticExporter:
     BASEURL: 'Baza URL'
@@ -397,14 +417,20 @@ eo:
     VIEWPREVIOUS: 'Vidigi antaŭan'
   TreeTools:
     DisplayLabel: 'Vido:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'Vi povas aliri la enarkivigitan retejon je ĉi tiu ligilo:'
     HAVEASKED: 'Vi petis vidi la enhavon de nia retejo je'
   VirtualPage:
-    CHOOSE: 'Elektu paĝon al kiu ligi'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Vidigi la enhavon de alia paĝo'
-    EDITCONTENT: 'klaku ĉi tie redakti la enhavon'
+    EDITCONTENT: 'Edit content on linked page'
+    EditLink: edit
     HEADER: 'Ĉi tiu estas virtuala paĝo'
+    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Virtual Pags'
     PageTypNotAllowedOnRoot: 'Origina paĝa tipo "{type}" ne estas permesita ĉe la root-nivelo por ĉi tiu virtuala paĝo.'
     SINGULARNAME: 'Virtuala paĝo'

lang/es.yml

@@ -76,12 +76,15 @@ es:
     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'
     DESCREMOVED: 'y {count} descendientes'
+    DUPLICATED: 'Duplicated ''{title}'' successfully'
+    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: E-mail
     EditTree: 'Editar árbol'
     ListFiltered: 'Lista filtrada'
@@ -96,16 +99,16 @@ es:
     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: 'Borrado ''%s''%s desde el sitio publicado'
+    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'
-    ROLLEDBACKPUB: 'Restaurado a la versión publicada. El número de la nueva versión es #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Se ha restaurdo a la versión #%d. La nueva  versión es #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Guardar
-    SAVEDRAFT: 'Guardar Borrador'
+    SAVEDRAFT: 'Save draft'
     TabContent: Contenido
     TabHistory: Historial
     TabSettings: Ajustes
@@ -129,6 +132,7 @@ es:
     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:
     AUTHOR: Autor
@@ -167,6 +171,7 @@ es:
     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'
@@ -178,10 +183,11 @@ es:
     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: 'Puedes empezar a editar el  contenido de tu sitio abriendo <a href="{link}">el CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ es:
     ReportTitle: Título
   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
@@ -267,6 +277,8 @@ 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'
@@ -299,7 +311,9 @@ 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'
-    BUTTONSAVEPUBLISH: 'Guardar y Publicar'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Sin Publicar'
     BUTTONUNPUBLISHDESC: 'Elimine esta página del sitio publicado'
     CREATED: 'Fecha de creación'
@@ -324,9 +338,12 @@ 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'
@@ -337,7 +354,9 @@ es:
     MODIFIEDONDRAFTHELP: 'La página tiene cambios sin publicar'
     MODIFIEDONDRAFTSHORT: Modificado
     MetadataToggle: Metadatos
-    OBSOLETECLASS: 'Esta página es de tipo obsoleto {type}. Guardando resetearás su tipo y puedes perder datos'
+    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'
@@ -366,7 +385,7 @@ es:
     URLSegment: 'Segmento de URL'
     VIEWERGROUPS: 'Visor de Grupos'
     VIEW_ALL_DESCRIPTION: 'Ver cualquier página'
-    VIEW_ALL_HELP: 'Capacidad para ver cualquier página del sitio, independientemente de la configuración de la pestaña de Acceso. Requiere que el permiso "Acceso a contenido del sitio"'
+    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'
@@ -376,6 +395,7 @@ 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'
@@ -397,14 +417,20 @@ es:
     VIEWPREVIOUS: 'Ver anterior'
   TreeTools:
     DisplayLabel: 'Mostrar:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'Puede acceder al sitio archivado con este enlace:'
     HAVEASKED: 'Ha pedido ver el contenido de nuestro sitio el'
   VirtualPage:
-    CHOOSE: 'Elija una página a enlazar'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Muestra el contenido de otra página'
-    EDITCONTENT: 'haga click aquí para editar el contenido'
+    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'

lang/es_AR.yml

@@ -76,12 +76,15 @@ es_AR:
     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.'
@@ -96,16 +99,16 @@ es_AR:
     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: 'Eliminados ''%s''%s del sitio en línea'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Removed ''{title}'' from the published site'
     REMOVEDPAGEFROMDRAFT: 'Quitados ''%s'' del borrador del sitio'
     RESTORE: Restaurar
     RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Restaurar a ésta versión'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Se ha restaurado a la versión #%d. La nueva  versión es #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Guardar
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ es_AR:
     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
@@ -167,6 +171,7 @@ es_AR:
     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
@@ -178,10 +183,11 @@ es_AR:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ es_AR:
     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
@@ -267,6 +277,8 @@ es_AR:
     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'
@@ -299,7 +311,9 @@ es_AR:
     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'
-    BUTTONSAVEPUBLISH: 'Guardar y Publicar'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'No Publicar'
     BUTTONUNPUBLISHDESC: 'Quitar ésta página del sitio público'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ es_AR:
     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'
@@ -337,7 +354,9 @@ es_AR:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ es_AR:
     URLSegment: 'Segmento del URL'
     VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'Ver cualquier página'
-    VIEW_ALL_HELP: 'Capacidad para ver cualquier página en el sitio, independientemente de la configuración en la pestaña Acceso. Necesita del permiso "Acceder al contenido del sitio".'
+    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'
@@ -376,6 +395,7 @@ es_AR:
     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'
@@ -397,14 +417,20 @@ es_AR:
     VIEWPREVIOUS: 'Ver anterior'
   TreeTools:
     DisplayLabel: 'Display:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'Puedes acceder al sitio archivado con este enlace:'
     HAVEASKED: 'Has solicitado ver el contenido de nuestro sitio en'
   VirtualPage:
-    CHOOSE: 'Selecciona una página con la que enlazar'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'haz click aquí para modificar el contenido'
+    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'

lang/es_MX.yml

@@ -76,12 +76,15 @@ es_MX:
     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.'
@@ -96,16 +99,16 @@ es_MX:
     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: 'Eliminados ''%s''%s del sitio'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Removed ''{title}'' from the published site'
     REMOVEDPAGEFROMDRAFT: 'Se ha eliminado ''%s'' del boceto del sitio'
     RESTORE: Restaurar
     RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Restaurar a ésta versión'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Se ha restaurado a la versión #%d. La nueva  versión es #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Guardar
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ es_MX:
     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
@@ -167,6 +171,7 @@ es_MX:
     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
@@ -178,10 +183,11 @@ es_MX:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ es_MX:
     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
@@ -267,6 +277,8 @@ es_MX:
     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'
@@ -299,7 +311,9 @@ es_MX:
     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'
-    BUTTONSAVEPUBLISH: 'Guardar y Publicar'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Ocultar al público'
     BUTTONUNPUBLISHDESC: 'Quitar ésta página del sitio público'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ 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'
@@ -337,7 +354,9 @@ es_MX:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ es_MX:
     URLSegment: 'Segmento de la URL'
     VIEWERGROUPS: 'Ver grupos'
     VIEW_ALL_DESCRIPTION: 'Ver cualquier página'
-    VIEW_ALL_HELP: 'Habilidad para ver cualquier página en el sitio, independientemente de la configuración en la ficha Acceso. Requiere el permiso de "Acceso al contenido del sitio".'
+    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'
@@ -376,6 +395,7 @@ es_MX:
     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'
@@ -397,14 +417,20 @@ es_MX:
     VIEWPREVIOUS: 'Ver anterior'
   TreeTools:
     DisplayLabel: 'Display:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'Puedes acceder al sitio archivado con este enlace:'
     HAVEASKED: 'Has solicitado ver el contenido de nuestro sitio en'
   VirtualPage:
-    CHOOSE: 'Selecciona una página con la que enlazar'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'haz click aquí para modificar el contenido'
+    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'

lang/et_EE.yml

@@ -28,7 +28,7 @@ et_EE:
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Kustuta kaustad'
   AssetAdmin_Tools:
-    FILTER: Filter
+    FILTER: Filtreeri
   AssetAdmin_left.ss:
     GO: Mine
   AssetTableField:
@@ -76,12 +76,15 @@ et_EE:
     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'
     DESCREMOVED: 'ja {count} järglast'
+    DUPLICATED: 'Duplicated ''{title}'' successfully'
+    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: E-post
     EditTree: Redigeeri
     ListFiltered: 'Filtreeritud loend'
@@ -96,16 +99,16 @@ et_EE:
     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: '''%s''%s kustutatud päris lehelt'
+    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'
-    ROLLEDBACKPUB: 'Pöörati tagasi avaldatud versioonile. Uus versiooninumber on {version}.'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Taastatud versioon #%d. Uue versiooni number on #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Salvesta
-    SAVEDRAFT: 'Salvesta mustand'
+    SAVEDRAFT: 'Save draft'
     TabContent: Sisu
     TabHistory: Ajalugu
     TabSettings: Seaded
@@ -121,7 +124,7 @@ et_EE:
   CMSPageEditController:
     MENUTITLE: 'Muuda lehte'
   CMSPageHistoryController:
-    COMPAREMODE: 'Võrdlus reziim (vali kaks)'
+    COMPAREMODE: 'Võrdlusrežiim (valige kaks)'
     COMPAREVERSIONS: 'Võrdle versioone'
     COMPARINGVERSION: 'Versioonide {version1} ja {version2} võrdlus.'
     MENUTITLE: Ajalugu
@@ -129,20 +132,21 @@ et_EE:
     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
     PUBLISHER: Avaldaja
-    UNKNOWN: Teadmata
+    UNKNOWN: Tundmatu
     WHEN: Millal
   CMSPageSettingsController:
     MENUTITLE: 'Muuda lehte'
   CMSPagesController:
-    GalleryView: 'Galerii vaade'
+    GalleryView: Galeriivaade
-    ListView: 'Nimekirja vaade'
+    ListView: Loendivaade
-    MENUTITLE: Leheküljed
+    MENUTITLE: Lehed
-    TreeView: 'Puu vaade'
+    TreeView: Puuvaade
   CMSPagesController_ContentToolbar.ss:
     ENABLEDRAGGING: Pukseeri
     MULTISELECT: Mitmikvalik
@@ -160,13 +164,14 @@ et_EE:
   CMSSiteTreeFilter_DeletedPages:
     Title: 'Kõik lehed, k.a kustutatud'
   CMSSiteTreeFilter_Search:
-    Title: 'Kõik leheküljed'
+    Title: 'Kõik lehed'
   ContentControl:
     NOTEWONTBESHOWN: 'Märkus. Seda teadet ei kuvata lehe külastajatele'
   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
@@ -178,10 +183,11 @@ et_EE:
     LOGIN: 'Logi sisse'
     LOGOUT: 'Logi välja'
     NOTLOGGEDIN: 'Pole sisse logitud'
+    PUBLISHED: Published
     PUBLISHEDSITE: 'Avaldatud sait'
     Password: Salasõna
-    PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
+    PostInstallTutorialIntro: 'See veebisait on SilverStripe 3 lihtsustatud versioon. Lehe laiendamiseks külastage aadressi {link}.'
-    StartEditing: 'Saate alustada oma saidi sisu redigeerimisega, kui avate <a href="{link}">CMS-i</a>.'
+    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:
@@ -228,8 +234,8 @@ et_EE:
     PreviewButton: Eelvaade
     SAVEDUP: Salvestatud.
     STATUSPUBLISHEDSUCCESS: '''{title}'' on edukalt avaldatud'
-    SearchResults: 'Otsingu tulemused'
+    SearchResults: Otsingutulemused
-    VersionUnknown: Teadmata
+    VersionUnknown: Tundmatu
   Permission:
     CMS_ACCESS_CATEGORY: CMS-juurdepääs
   Permissions:
@@ -251,6 +257,10 @@ et_EE:
     ReportTitle: Pealkiri
   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'
   SearchForm:
     GO: Mine
     SEARCH: Otsi
@@ -267,6 +277,8 @@ et_EE:
     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'
@@ -299,7 +311,9 @@ 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'
-    BUTTONSAVEPUBLISH: 'Salvesta ja avalda'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Võta maha'
     BUTTONUNPUBLISHDESC: 'Eemalda see lehekülg avalikult saidilt'
     CREATED: Loomiskuupäev
@@ -324,20 +338,25 @@ et_EE:
     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"
     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
-    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
+    METADESCHELP: 'Otsingumootor kasutab seda sisu otsingutulemuste kuvamiseks (kuigi see ei mõjuta nende järjestust).'
     METAEXTRA: 'Kohandatud metamärgendid'
-    METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
+    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
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose 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: 'Lehe asukoht'
     PAGETITLE: 'Lehekülje nimi'
     PAGETYPE: 'Lehe tüüp'
@@ -366,7 +385,7 @@ et_EE:
     URLSegment: 'URL-i jagu'
     VIEWERGROUPS: Vaatajagrupid
     VIEW_ALL_DESCRIPTION: 'Kuva mis tahes leht'
-    VIEW_ALL_HELP: 'Võimalus vaadata mis tahes lehte saidil, hoolimata vahekaardi Juurdepääs seadetest. Vajab jaotise "Juurdepääs saidi sisule" õigusi'
+    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'
@@ -376,6 +395,7 @@ 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
@@ -397,14 +417,20 @@ et_EE:
     VIEWPREVIOUS: 'Vaata eelmist'
   TreeTools:
     DisplayLabel: 'Kuva:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'Arhiveeritud lehele pääsed ligi selle lingi kaudu:'
     HAVEASKED: 'Soovid vaadata meie lehe sisu kuupäeval'
   VirtualPage:
-    CHOOSE: 'Vali leht millega linkida'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Kuvab sisu teiselt lehelt'
-    EDITCONTENT: 'Vajuta siia et sisu muuta'
+    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'

lang/fa_IR.yml

@@ -76,12 +76,15 @@ fa_IR:
     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.'
@@ -96,16 +99,16 @@ fa_IR:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: ذخیره
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ fa_IR:
     SHOWUNPUBLISHED: 'Show unpublished versions'
     SHOWVERSION: 'نمایش ویرایش'
     VIEW: view
+    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Currently viewing version {version}.'
   CMSPageHistoryController_versions.ss:
     AUTHOR: Author
@@ -154,7 +158,7 @@ fa_IR:
     FILTERDATETO: به
     FILTERLABELTEXT: 'محتواي اصلي'
   CMSSettingsController:
-    MENUTITLE: تنظیمات
+    MENUTITLE: 'تنظیمات'
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Changed pages'
   CMSSiteTreeFilter_DeletedPages:
@@ -167,6 +171,7 @@ fa_IR:
     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
@@ -178,10 +183,11 @@ fa_IR:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ fa_IR:
     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: جستجو
@@ -267,8 +277,10 @@ fa_IR:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -289,7 +301,7 @@ fa_IR:
     TOPLEVELCREATE: 'چه کسی میتواند صفحه جدیدی در ریشه(root) سایت ایجاد کند؟'
     VIEWHEADER: 'چه کسی میتواند صفحات سایت را مشاهده کند؟'
   SiteTree:
-    ACCESSANYONE: همه
+    ACCESSANYONE: 'همه'
     ACCESSHEADER: 'چه کسی بتواند این صفحه را مشاهده کنید ؟'
     ACCESSLOGGEDIN: 'کاربران وارد شده'
     ACCESSONLYTHESE: 'فقط این افراد (انتخاب از لیست)'
@@ -299,7 +311,9 @@ fa_IR:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancel draft changes'
     BUTTONCANCELDRAFTDESC: 'Delete your draft and revert to the currently published page'
-    BUTTONSAVEPUBLISH: 'ذخیره و انتشار'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Unpublish
     BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ fa_IR:
     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: درون‌مایه
+    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: 'برچسب ناوبری'
@@ -337,7 +354,9 @@ fa_IR:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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: 'نوع برگ'
@@ -359,14 +378,14 @@ fa_IR:
     SHOWINSEARCH: 'نمایش در جستجو ؟'
     SINGULARNAME: Page
     TABBEHAVIOUR: Behavior
-    TABCONTENT: مطلب
+    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 Site Content" permission'
+    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'
@@ -376,6 +395,7 @@ fa_IR:
     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 پایه'
@@ -397,14 +417,20 @@ fa_IR:
     VIEWPREVIOUS: 'نشان دادن پیشین'
   TreeTools:
     DisplayLabel: 'Display:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'You can access the archived site at this link:'
     HAVEASKED: 'شما خواسته اید که درون‌مایه تارگاه ما را ببینید در'
   VirtualPage:
-    CHOOSE: 'Choose a page to link to'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'click here to edit the content'
+    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: 'صفحه مجازی'

lang/fi.yml

@@ -76,12 +76,15 @@ fi:
     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'
     DESCREMOVED: 'ja {count} alasivua'
+    DUPLICATED: 'Duplicated ''{title}'' successfully'
+    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: Sähköposti
     EditTree: 'Muokkaa rakennepuuta'
     ListFiltered: 'Suodatettu lista.'
@@ -96,16 +99,16 @@ fi:
     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: '''%s''%s poistettu julkaistulta sivustolta'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: '''{title}'' poistettiin julkaistulta sivustolta'
     REMOVEDPAGEFROMDRAFT: 'Poistettu ''%s'' luonnossivustolta'
     RESTORE: Palauta
     RESTORED: '''{title}'' palautettiin onnistuneesti'
     ROLLBACK: 'Siirry takaisin tähän versioon.'
-    ROLLEDBACKPUB: 'Siirrytty takaisin julkaistuun versioon. Uusi versionumero on #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Siirrytty takaisin versioon #%d. Uusi versionumero on #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Tallenna
-    SAVEDRAFT: 'Tallenna luonnos'
+    SAVEDRAFT: 'Save draft'
     TabContent: Sisältö
     TabHistory: Historia
     TabSettings: Asetukset
@@ -129,6 +132,7 @@ fi:
     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:
     AUTHOR: Tekijä
@@ -167,21 +171,23 @@ fi:
     ARCHIVEDSITE: 'Esikatselu versio'
     ARCHIVEDSITEFROM: 'Arkistoitu sivusto lähteestä:'
     CMS: CMS
+    DRAFT: Draft
     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!'
     InstallFilesDeleted: 'Asennustiedostot poistettiin onnistuneesti.'
-    InstallSecurityWarning: 'Tietoturvan takia, kannattaa poistaa asennustiedostot palvelimelta, ellet aio asentaa järjestelmää uudelleen. (<em>pääkäyttäjän kirjautuminen vaaditaan, 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>'
+    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'
     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: 'Voit aloittaa sivuston muokkauksen avaamalla <a href="{link}">CMS-järjestelmän</a>.'
+    StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Asennustiedostojen automaattinen poistaminen ei onnistunut. Ole hyvä ja poista seuraavat tiedostot manuaalisesti.'
     VIEWPAGEIN: 'Tarkastele sivua:'
   ErrorPage:
@@ -251,6 +257,10 @@ fi:
     ReportTitle: Otsikko
   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'
   SearchForm:
     GO: Mene
     SEARCH: Haku
@@ -267,6 +277,8 @@ fi:
     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'
@@ -299,7 +311,9 @@ 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'
-    BUTTONSAVEPUBLISH: 'Tallenna & julkaise'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Poista julkaisu'
     BUTTONUNPUBLISHDESC: 'Poista tämä sivu julkaistulta sivustolta'
     CREATED: Luotu
@@ -309,7 +323,7 @@ fi:
     DEFAULTABOUTTITLE: 'Tietoa meistä'
     DEFAULTCONTACTCONTENT: '<p>Voit täyttää tämän sivun omalla sisällölläsi tai poistaa sen ja luoda omia sivujasi.<br /></p>'
     DEFAULTCONTACTTITLE: 'Ota yhteyttä meihin'
-    DEFAULTHOMECONTENT: '<p>Tervetuloa SilverStripeen! Tämä on oletus-kotisivu. Voit muokata tätä sivua avaamalla <a href="admin/">CMS:n</a>. Voit myös lukea <a href="http://doc.silverstripe.com">kehittäjä-dokumentaatiota</a> tai aloittaa <a href="http://doc.silverstripe.com/doku.php?id=tutorials">johdatuskursseista</a>.</p>'
+    DEFAULTHOMECONTENT: '<p>Tervetuloa SilverStripeen! Tämä on oletus-kotisivu. Voit muokata tätä sivua kirjautumalla <a href="admin/">ylläpitonäkymään</a>. Voit myös lukea <a href="http://doc.silverstripe.com">kehittäjä-dokumentaatiota</a> tai aloittaa tutustumisen järjestelmään <a href="http://doc.silverstripe.com/doku.php?id=tutorials">johdatuskursseista</a>.</p>'
     DEFAULTHOMETITLE: Koti
     DELETEDPAGEHELP: 'Sivu ei ole enää julkaistuna'
     DELETEDPAGESHORT: Poistettu
@@ -324,20 +338,25 @@ fi:
     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'
     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'
     METADESC: 'Meta kuvaus'
-    METADESCHELP: 'Hakukoneet näyttää tämä sisältö hakutuloksessa (tämä sisältö ei kuitenkin vaikuttaa sijaintia hakutuloksessa).'
+    METADESCHELP: 'Hakukoneet näyttävät tämän sisällön hakutuloksissa (sisältö ei kuitenkaan vaikuttaa sijoitukseen hakutuloksessa).'
     METAEXTRA: 'Omat meta-tagit'
     METAEXTRAHELP: 'Omat meta-tagit'
     MODIFIEDONDRAFTHELP: 'Sivulla on tehty muutoksia, joita ei ole julkaistu'
     MODIFIEDONDRAFTSHORT: Muokattu
     MetadataToggle: Meta-tiedot
-    OBSOLETECLASS: 'Tämä sivu on vanhentunutta tyyppiä ({type}). Tallentaminen nollaa tyypin ja saatat menettää tietoja.'
+    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: 'Sivun sijainti'
     PAGETITLE: 'Sivun nimi'
     PAGETYPE: 'Sivun tyyppi'
@@ -366,7 +385,7 @@ fi:
     URLSegment: URL-osoite
     VIEWERGROUPS: Katsojaryhmät
     VIEW_ALL_DESCRIPTION: 'Näytä mikä tahansa sivu'
-    VIEW_ALL_HELP: 'Mahdollisuus tarkastella mitä tahansa sivua sivustosta, riippumatta Käyttöoikeus-välilehden asetuksista. Vaatii "Käyttöoikeus sivuston sisältöön" -lupaa'
+    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: '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
@@ -376,6 +395,7 @@ fi:
     many_many_ImageTracking: 'Kuvan seuranta'
     many_many_LinkTracking: 'Linkin seuranta'
   SiteTreeURLSegmentField:
+    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Erikoismerkit muunnetaan automaattisesti tai poistetaan.'
   StaticExporter:
     BASEURL: 'Kannan URL-osoite'
@@ -397,14 +417,20 @@ fi:
     VIEWPREVIOUS: 'Näytä edellinen'
   TreeTools:
     DisplayLabel: 'Näytä:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'Pääset arkistoidulle sivulle tällä linkillä:'
     HAVEASKED: 'Sinua on pyydetty katsomaan sivun sisältöä '
   VirtualPage:
-    CHOOSE: 'Valitse sivu, jolle linkitetään'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Näytä toisen sivun sisältö'
-    EDITCONTENT: 'muokataksesi sisältöä paina tästä'
+    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'
     PageTypNotAllowedOnRoot: 'Alkuperäinen sivutyyppi "{type}" ei ole sallittu tämän virtuaalisen sivun päätasolla'
     SINGULARNAME: 'Virtuaalinen sivu'

lang/fo.yml

@@ -76,12 +76,15 @@ fo:
     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'
     EMAIL: Teldupostur
     EditTree: 'Edit Tree'
     ListFiltered: 'Filtered list.'
@@ -96,16 +99,16 @@ fo:
     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: 'Strikaði ''%s''%s frá tí almennu heimasíðuni'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Removed ''{title}'' from the published site'
     REMOVEDPAGEFROMDRAFT: 'Strikaði ''%s'' frá kladdu heimasíðuni'
     RESTORE: Endurstovna
     RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Far aftur til hesa útgávuna'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Fór aftur til útgávu #%d. Nýtt útgávanummar er #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Goym
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ fo:
     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
@@ -167,6 +171,7 @@ fo:
     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
@@ -178,10 +183,11 @@ fo:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ fo:
     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
@@ -267,8 +277,10 @@ fo:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -299,7 +311,9 @@ fo:
     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'
-    BUTTONSAVEPUBLISH: 'Goym og almenna kunngerð'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Óalmenna kunngerð'
     BUTTONUNPUBLISHDESC: 'Strika hesa síðuna frá tí almennu heimasíðuni'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ fo:
     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'
@@ -337,7 +354,9 @@ fo:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ fo:
     URLSegment: 'URL Segment'
     VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'View any page'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to Site Content" permission'
+    VIEW_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'
@@ -376,6 +395,7 @@ fo:
     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'
@@ -397,14 +417,20 @@ fo:
     VIEWPREVIOUS: 'Vís fyrra'
   TreeTools:
     DisplayLabel: 'Display:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   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: 'Vel eina síðu at vísa til'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Trýst her fyri at broyta í innihaldinum'
+    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'

lang/fr.yml

@@ -76,12 +76,15 @@ fr:
     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'
     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é'
     DESCREMOVED: 'et {count} descendants'
+    DUPLICATED: 'Duplicated ''{title}'' successfully'
+    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: Email
     EditTree: 'Ağacı düzenle'
     ListFiltered: 'Filtrelenmiş liste.'
@@ -96,16 +99,16 @@ fr:
     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: 'Supprimé ''%s''%s du site public'
+    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'
-    ROLLEDBACKPUB: 'Retour à la version publiée. La nouvelle version est la nº {version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Retour à la version nº %d. La nouvelle version est la nº %d.'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Sauvegarder
-    SAVEDRAFT: 'Sauvegarder brouillon'
+    SAVEDRAFT: 'Save draft'
     TabContent: Contenu
     TabHistory: Historique
     TabSettings: Paramètres
@@ -129,6 +132,7 @@ fr:
     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:
     AUTHOR: Auteur
@@ -151,7 +155,7 @@ fr:
   CMSSearch:
     FILTERDATEFROM: De
     FILTERDATEHEADING: Date
-    FILTERDATETO: à
+    FILTERDATETO: 'à'
     FILTERLABELTEXT: Terme
   CMSSettingsController:
     MENUTITLE: Paramètres
@@ -167,6 +171,7 @@ fr:
     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'
@@ -178,10 +183,11 @@ fr:
     LOGIN: Connectez-vous
     LOGOUT: 'Se déconnecter'
     NOTLOGGEDIN: Non-connecté
+    PUBLISHED: Published
     PUBLISHEDSITE: 'Site Publié'
     Password: 'Mot de passe'
     PostInstallTutorialIntro: 'Ce site est une version simplifiée d’un site SilverStripe 3. Pour le développer, consultez {link}.'
-    StartEditing: 'Vous pouvez commencer à éditer votre site en ouvrant <a href="{link}">le CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ fr:
     ReportTitle: Titre
   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
@@ -267,6 +277,8 @@ 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'
@@ -299,7 +311,9 @@ 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'
-    BUTTONSAVEPUBLISH: 'Enregistrer & Publier'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Retirer du site publié'
     BUTTONUNPUBLISHDESC: 'Retirer cette page du site publié'
     CREATED: 'Date de création'
@@ -324,9 +338,12 @@ 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'
@@ -337,7 +354,9 @@ fr:
     MODIFIEDONDRAFTHELP: 'La page comporte des modifications non publiées'
     MODIFIEDONDRAFTSHORT: Modifiée
     MetadataToggle: Métadonnées
-    OBSOLETECLASS: 'Cette page est de type {type}. Celui-ci est obsolète. Vous pourriez perdre des données en sauvegardant dans ce type.'
+    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 +385,7 @@ fr:
     URLSegment: 'Segment d''URL'
     VIEWERGROUPS: 'Groupes de Visualisation'
     VIEW_ALL_DESCRIPTION: 'Voir toute la page'
-    VIEW_ALL_HELP: 'Possibilité de voir toutes les pages du site, quelque-soient les réglages de l’onglet Accès. Nécessite la permission "Accès au contenu du site"'
+    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'
@@ -376,6 +395,7 @@ 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'
@@ -397,14 +417,20 @@ fr:
     VIEWPREVIOUS: 'Voir le(s) précédent(s)'
   TreeTools:
     DisplayLabel: 'Afficher :'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   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: 'Choisir le lien d''une page'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Affiche le contenu d’une autre page'
-    EDITCONTENT: 'Faites clic ici pour modifier le contenu'
+    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'

lang/gl_ES.yml

@@ -76,12 +76,15 @@ gl_ES:
     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.'
@@ -96,16 +99,16 @@ gl_ES:
     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: 'Eliminado ''%s''%s do sitio en vivo'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Removed ''{title}'' from the published site'
     REMOVEDPAGEFROMDRAFT: 'Eliminado ''%s''  do borrador do sitio'
     RESTORE: Restaurar
     RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Desfacer a esta versión'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rsstablecida a versión #%d. O novo número de versión é #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Gardar
-    SAVEDRAFT: 'Gardar Borrador'
+    SAVEDRAFT: 'Save draft'
     TabContent: Contido
     TabHistory: Historial
     TabSettings: Configuracións
@@ -129,6 +132,7 @@ gl_ES:
     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
@@ -167,6 +171,7 @@ gl_ES:
     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
@@ -178,10 +183,11 @@ gl_ES:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ gl_ES:
     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
@@ -267,8 +277,10 @@ gl_ES:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Ligazón compartir'
   SilverStripeNavigatorLinkl:
     CloseLink: Pechar
@@ -299,7 +311,9 @@ gl_ES:
     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'
-    BUTTONSAVEPUBLISH: 'Gardar e Publicar'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Sen publicar'
     BUTTONUNPUBLISHDESC: 'Eliminar esta páxina do sitio publicado'
     CREATED: 'Data de Creación'
@@ -324,9 +338,12 @@ gl_ES:
     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'
@@ -337,7 +354,9 @@ gl_ES:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modificado
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose 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: 'Localización da páxina'
     PAGETITLE: 'Nome da páxina'
     PAGETYPE: 'Tipo de Páxina'
@@ -366,7 +385,7 @@ 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 Site Content" permission'
+    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'
@@ -376,6 +395,7 @@ gl_ES:
     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'
@@ -397,14 +417,20 @@ gl_ES:
     VIEWPREVIOUS: 'Ver anterior'
   TreeTools:
     DisplayLabel: 'Visualizar:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'Podes acceder ao sitio arquivado nesta ligazón:'
     HAVEASKED: 'Solicitaches ver o contido do sitio sobre'
   VirtualPage:
-    CHOOSE: 'Escoller a páxina para ligar a'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Visualizar o contido doutra páxina'
-    EDITCONTENT: 'preme aquí para editar o contido'
+    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'

lang/grk.yml

@@ -76,12 +76,15 @@ grk:
     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.'
@@ -96,16 +99,16 @@ grk:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Save
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ grk:
     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
@@ -167,6 +171,7 @@ grk:
     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
@@ -178,10 +183,11 @@ grk:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ grk:
     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
@@ -267,8 +277,10 @@ grk:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -299,7 +311,9 @@ grk:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancel draft changes'
     BUTTONCANCELDRAFTDESC: 'Delete your draft and revert to the currently published page'
-    BUTTONSAVEPUBLISH: 'Save & Publish'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Unpublish
     BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ grk:
     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'
@@ -337,7 +354,9 @@ grk:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ grk:
     URLSegment: 'URL Segment'
     VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'View any page'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to Site Content" permission'
+    VIEW_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'
@@ -376,6 +395,7 @@ grk:
     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'
@@ -397,14 +417,20 @@ grk:
     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: 'Choose a page to link to'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'click here to edit the content'
+    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'

lang/he_IL.yml

@@ -6,7 +6,7 @@ he_IL:
     AppCategoryAudio: שמע
     AppCategoryDocument: מסמך
     AppCategoryFlash: פלאש
-    AppCategoryImage: תמונה
+    AppCategoryImage: 'תמונה'
     AppCategoryVideo: וידאו
     BackToFolder: 'חזרה לתיקייה'
     CREATED: תאריך
@@ -15,7 +15,7 @@ he_IL:
     FILES: קבצים
     FILESYSTEMSYNC: 'סנכרון קבצים'
     FILESYSTEMSYNCTITLE: 'עדכון רשומות מסד הנתונים של ה־CMS במערכת הקבצים. שימושי כאשר הועלו קבצים חדשים מחוץ ל־CMS, לדוגמה באמצעות FTP.'
-    FROMTHEINTERNET: מהאינטרנט
+    FROMTHEINTERNET: 'מהאינטרנט'
     FROMYOURCOMPUTER: 'מהמחשב שלך'
     Filetype: 'סוג הקובץ'
     ListView: 'תצוגת רשימה'
@@ -28,7 +28,7 @@ he_IL:
   AssetAdmin_DeleteBatchAction:
     TITLE: 'למחוק תיקיות'
   AssetAdmin_Tools:
-    FILTER: מסנן
+    FILTER: 'מסנן'
   AssetAdmin_left.ss:
     GO: לעבור
   AssetTableField:
@@ -76,12 +76,15 @@ he_IL:
     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: 'רשימה מסוננת.'
@@ -96,16 +99,16 @@ he_IL:
     PUBALLFUN2: 'לחיצה על כפתור זה מקבילה לאישור פרסום על כל העמודים באתר. הכפתור נועד לאישורים גורפים שבאו בעקבות עריכה נרחבת באתר דוגמת ההגדרות הראשוניות בעת יצירת אתר זה'
     PUBPAGES: 'בוצע: פורסמו {count} עמודים'
     PageAdded: 'העמוד נוצר בהצלחה'
-    REMOVED: '''%s''%s נמחק מהאתר'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: '''{title}'' הוסר מהאתר שפורסם'
     REMOVEDPAGEFROMDRAFT: '''$s'' הוסר מאתר הטיוטה'
     RESTORE: שחזור
     RESTORED: '''{title}'' שוחזר בהצלחה'
     ROLLBACK: 'שחזור לגרסה זו'
-    ROLLEDBACKPUB: 'בוצע שחזור לגרסה שפורסמה. מספר הגרסה החדש הוא  #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'שוחזר לגרסה  #%d. הגרסה הנוכחית היא #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: שמירה
-    SAVEDRAFT: 'שמירת הטיוטה'
+    SAVEDRAFT: 'Save draft'
     TabContent: תוכן
     TabHistory: היסטורייה
     TabSettings: הגדרות
@@ -129,6 +132,7 @@ he_IL:
     SHOWUNPUBLISHED: 'הצגת גרסאות שלא פוסרמו'
     SHOWVERSION: 'הצגת הגרסה'
     VIEW: צפייה
+    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'הגרסה הנוכחית המופיעה {version}.'
   CMSPageHistoryController_versions.ss:
     AUTHOR: 'נוצר על ידי'
@@ -147,7 +151,7 @@ he_IL:
     ENABLEDRAGGING: 'גרירה והשלכה'
     MULTISELECT: 'בחירה מרובה'
   CMSPagesController_Tools.ss:
-    FILTER: מסנן
+    FILTER: 'מסנן'
   CMSSearch:
     FILTERDATEFROM: מ־
     FILTERDATEHEADING: תאריך
@@ -167,6 +171,7 @@ he_IL:
     ARCHIVEDSITE: 'הצגה מקדימה של הגרסה'
     ARCHIVEDSITEFROM: 'אתר ארכיון מהתאריך'
     CMS: CMS
+    DRAFT: Draft
     DRAFTSITE: 'אתר טיוטה'
     DRAFT_SITE_ACCESS_RESTRICTION: 'עליך להיכנס עם ססמת המערכת כדי לצפות בדף טיוטה או בתוכן שמור. <a href="%s">לחזרה לאתר יש ללחוץ כאן</a>'
     Email: דוא״ל
@@ -175,13 +180,14 @@ he_IL:
     InstallSecurityWarning: 'מטעמי אבטחה עליך למחוק כעת את קובצי ההתקנה, אלמלא תכניותיך הן להתקין מחדש מאוחר יותר (<em>נדרשת כניסת מנהל, פרטים להלן</em>). שרת האינטרנט יזדקק רק לעת עתה לגישה לכתיבה לתיקייה „assets“, ניתן להסיר את גישת הכתיבה מכל שאר התיקיות. <a href="{link}" style="text-align: center;">יש ללחוץ כאן כדי למחוק את קובצי ההתקנה.</a>'
     InstallSuccessCongratulations: 'מערכת ה־SilverStripe הותקנה בהצלחה!'
     LOGGEDINAS: 'נכנסת בשם'
-    LOGIN: כניסה
+    LOGIN: 'כניסה'
     LOGOUT: יציאה
     NOTLOGGEDIN: 'לא נכנסת'
+    PUBLISHED: Published
     PUBLISHEDSITE: 'אתר שפורסם'
     Password: ססמה
     PostInstallTutorialIntro: 'אתר זה הנו גרסה מופשטת של אתר SilverStrip 3. כדי להרחיב את האתר, נא לגשת לכתובת {link}.'
-    StartEditing: 'ניתן להתחיל לערוך את תוכן האתר שלך על ידי פתיחת <a href="{link}">ה־CMS</a>.'
+    StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'לא ניתן למחוק את קובצי ההתקנה. נא למחוק את הקבצים שלהלן ידנית'
     VIEWPAGEIN: 'צפייה בעמוד תחת:'
   ErrorPage:
@@ -224,9 +230,9 @@ he_IL:
     UNUSEDTHUMBNAILSTITLE: 'תמונות ממוזערות שאינן בשימוש'
     UploadFilesButton: העלאה
   LeftAndMain:
-    DELETED: נמחק.
+    DELETED: 'נמחק.'
     PreviewButton: 'תצוגה מקדימה'
-    SAVEDUP: נשמר.
+    SAVEDUP: 'נשמר.'
     STATUSPUBLISHEDSUCCESS: '''{title}'' פורסם בהצלחה'
     SearchResults: 'תוצאות החיפוש'
     VersionUnknown: 'לא ידועה'
@@ -251,6 +257,10 @@ he_IL:
     ReportTitle: כותרת
   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: חיפוש
@@ -267,6 +277,8 @@ he_IL:
     OtherGroupTitle: אחר
     ParameterLiveCheckbox: 'בדיקת האתר החי'
     REPEMPTY: 'הדוח {title} ריק.'
+  SilverStripeNavigator:
+    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'כדי לשתף קישור עמוד זה יש להעתיק ולהדביק את הקישור שלהלן.'
     ShareLink: 'שיתוף הקישור'
@@ -299,7 +311,9 @@ he_IL:
     APPEARSVIRTUALPAGES: 'תוכן זה מופיע גם בעמודים הווירטואליים באגפים של {title}.'
     BUTTONCANCELDRAFT: 'ביטול שינויי הטיוטה'
     BUTTONCANCELDRAFTDESC: 'למחוק את הטיוטה שלך ולהחזיר לעמוד הנוכחי שפורסם'
-    BUTTONSAVEPUBLISH: 'שמירה ופרסום'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'ביטול הפרסום'
     BUTTONUNPUBLISHDESC: 'הסרת עמוד זה מהאתר שפורסם'
     CREATED: 'תאריך היצירה'
@@ -312,7 +326,7 @@ he_IL:
     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: נמחק
+    DELETEDPAGESHORT: 'נמחק'
     DEPENDENT_NOTE: 'העמודים הבאים תלויים בעמוד זה. בין אלו נכללים, עמודים וירטואליים, עמודי הפנייה ועמודים עם קישורי תוכן.'
     DESCRIPTION: 'דף תוכן גנרי'
     DependtPageColumnLinkType: 'סוג הקישור'
@@ -324,9 +338,12 @@ 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: 'תווית ניווט'
@@ -335,9 +352,11 @@ he_IL:
     METAEXTRA: 'תגי על נוספים'
     METAEXTRAHELP: 'תגיות HTML לנתוני על נוספים. לדוגמה &lt;meta name="שם_מותאם_אישית" content="התוכן שלך כאן" /&gt;'
     MODIFIEDONDRAFTHELP: 'בעמוד יש שינויים שלא פורסמו'
-    MODIFIEDONDRAFTSHORT: השתנה
+    MODIFIEDONDRAFTSHORT: 'השתנה'
     MetadataToggle: 'נתוני על'
-    OBSOLETECLASS: 'עמוד זה הוא מסוג מיושן {type}. השמירה עלולה לאפס את הסוג שלך והנתונים שלך עלולים ללכת לאיבוד'
+    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: 'סוג דף'
@@ -358,7 +377,7 @@ he_IL:
     SHOWINMENUS: 'להציג בתפריטים?'
     SHOWINSEARCH: 'לכלול בחיפוש?'
     SINGULARNAME: עמוד
-    TABBEHAVIOUR: התנהגות
+    TABBEHAVIOUR: 'התנהגות'
     TABCONTENT: 'תוכן ראשי'
     TABDEPENDENT: 'עמודים תלויים'
     TOPLEVEL: 'תוכן האתר (רמה עליונה)'
@@ -366,7 +385,7 @@ he_IL:
     URLSegment: 'מקטע כתובת'
     VIEWERGROUPS: 'קבוצות צופים'
     VIEW_ALL_DESCRIPTION: 'צפייה בכל עמוד שהוא'
-    VIEW_ALL_HELP: 'היכולת לצפות בכל עמוד שהוא באתר זה, ללא תלות בהגדרות בלשונית הגישה.  דורש את ההרשאה „גישה לתוכן האתר“.'
+    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: 'קבוצות צופים'
@@ -376,6 +395,7 @@ he_IL:
     many_many_ImageTracking: 'מעקב אחר תמונה'
     many_many_LinkTracking: 'מעקב אחר קישורים'
   SiteTreeURLSegmentField:
+    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: ' תווים מיוחדים מומרים אוטומטית או שהם מוסרים.'
   StaticExporter:
     BASEURL: 'כתובת בסיס'
@@ -397,14 +417,20 @@ he_IL:
     VIEWPREVIOUS: 'הצגת הקודם'
   TreeTools:
     DisplayLabel: 'תצוגה:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'ניתן להיכנס לארכיון האתר בקישור הזה:'
     HAVEASKED: 'ביקשת לצפות בתוכן האתר שלנו תחת'
   VirtualPage:
-    CHOOSE: 'נא לבחור עמוד לקשר אליו'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'הצגת תוכן של עמוד אחר'
-    EDITCONTENT: 'יש ללחוץ כאן כדי לערוך את התוכן'
+    EDITCONTENT: 'Edit content on linked page'
+    EditLink: edit
     HEADER: 'זהו עמוד וירטואלי'
+    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'דפים וירטואליים'
     PageTypNotAllowedOnRoot: 'סוג העמוד המקורי „{type}“ אינו מורשה ברמת העל של עמוד וירטואלי זה'
     SINGULARNAME: 'דף וירטואלי'

lang/hr.yml

@@ -76,12 +76,15 @@ hr:
     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.'
@@ -96,16 +99,16 @@ hr:
     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 ''%s''%s from live site'
+    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: 'Vrati na ovu verziju'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Vraćen na verziju #%d. Novi broj verzije je #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Snimi
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ hr:
     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
@@ -167,6 +171,7 @@ hr:
     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
@@ -178,10 +183,11 @@ hr:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ hr:
     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
@@ -267,8 +277,10 @@ hr:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -299,7 +311,9 @@ hr:
     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'
-    BUTTONSAVEPUBLISH: 'Spremi i Objavi'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Unpublish
     BUTTONUNPUBLISHDESC: 'Izbrišite ovu stranicu sa objavljene'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ hr:
     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'
@@ -337,7 +354,9 @@ hr:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ hr:
     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 Site Content" permission'
+    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'
@@ -376,6 +395,7 @@ hr:
     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'
@@ -397,14 +417,20 @@ hr:
     VIEWPREVIOUS: 'Pogledaj prethodni'
   TreeTools:
     DisplayLabel: 'Display:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'Na slijedećem linku možete pristupiti arhiviranoj stranici:'
     HAVEASKED: 'Zatražili ste sadržaj naše stranice '
   VirtualPage:
-    CHOOSE: 'Odaberite stranicu na koju se želite povezati'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'kliknite za uređivanje sadržaja'
+    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'

lang/hu.yml

@@ -76,12 +76,15 @@ hu:
     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.'
@@ -96,16 +99,16 @@ hu:
     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'
     PageAdded: 'Oldal sikeresen létrehozva'
-    REMOVED: '''%s'' törölve az éles oldalról'
+    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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Visszaálítva a #%d verzióra. Az új verziószám #%d.'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Mentés
-    SAVEDRAFT: 'Vázlat mentése'
+    SAVEDRAFT: 'Save draft'
     TabContent: Tartalom
     TabHistory: History
     TabSettings: Beállítások
@@ -129,6 +132,7 @@ hu:
     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ő
@@ -167,6 +171,7 @@ hu:
     ARCHIVEDSITE: 'Előnézeti verzió'
     ARCHIVEDSITEFROM: Archiválva
     CMS: CMS
+    DRAFT: Draft
     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
@@ -178,10 +183,11 @@ hu:
     LOGIN: Bejelentkezés
     LOGOUT: Kijelentkezés
     NOTLOGGEDIN: 'Not logged in'
+    PUBLISHED: Published
     PUBLISHEDSITE: 'Publikált oldal'
     Password: Jelszó
     PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
-    StartEditing: 'You can start editing your site\\''s content by opening <a href="{link}">the CMS</a>.'
+    StartEditing: 'You can start editing your 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:
@@ -251,6 +257,10 @@ hu:
     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
@@ -267,8 +277,10 @@ hu:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Hivatkozás megosztása'
   SilverStripeNavigatorLinkl:
     CloseLink: Bezárni
@@ -299,7 +311,9 @@ hu:
     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'
-    BUTTONSAVEPUBLISH: 'Mentés és publikálás'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Publikálás visszavonása'
     BUTTONUNPUBLISHDESC: 'Oldal eltávolítása a publikált oldalról'
     CREATED: 'Létrehozás dátuma'
@@ -324,9 +338,12 @@ hu:
     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'
@@ -337,7 +354,9 @@ hu:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Változtatva
     MetadataToggle: Metaadatok
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose 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: 'Page location'
     PAGETITLE: 'Oldal neve'
     PAGETYPE: 'Oldal típusa'
@@ -366,7 +385,7 @@ hu:
     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 Site Content" permission'
+    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'
@@ -376,6 +395,7 @@ hu:
     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'
@@ -397,14 +417,20 @@ hu:
     VIEWPREVIOUS: 'Előző mutatása'
   TreeTools:
     DisplayLabel: 'Display:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'Az archivált oldalt elérheted ezen a linken:'
     HAVEASKED: 'Azt kérted, hogy megnézhesd a honlapunk tartalmát ekkor:'
   VirtualPage:
-    CHOOSE: 'Válassz belinkelendő oldalt'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'kattints ide a tartalom szerkesztéséhez'
+    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'

lang/hy_AM.yml

@@ -76,12 +76,15 @@ hy_AM:
     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.'
@@ -96,16 +99,16 @@ hy_AM:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Save
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ hy_AM:
     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
@@ -167,6 +171,7 @@ hy_AM:
     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
@@ -178,10 +183,11 @@ hy_AM:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ hy_AM:
     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
@@ -267,8 +277,10 @@ hy_AM:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -299,7 +311,9 @@ hy_AM:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancel draft changes'
     BUTTONCANCELDRAFTDESC: 'Delete your draft and revert to the currently published page'
-    BUTTONSAVEPUBLISH: 'Save & Publish'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Unpublish
     BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ hy_AM:
     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'
@@ -337,7 +354,9 @@ hy_AM:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ hy_AM:
     URLSegment: 'URL Segment'
     VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'View any page'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to Site Content" permission'
+    VIEW_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'
@@ -376,6 +395,7 @@ hy_AM:
     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'
@@ -397,14 +417,20 @@ hy_AM:
     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: 'Choose a page to link to'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'click here to edit the content'
+    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'

lang/id.yml

@@ -76,12 +76,15 @@ id:
     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.'
@@ -96,16 +99,16 @@ id:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Removed ''{title}'' from the published site'
     REMOVEDPAGEFROMDRAFT: 'Removed ''%s'' from the draft site'
     RESTORE: Pulihkan
     RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Roll back to this version'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Simpan
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ id:
     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
@@ -167,6 +171,7 @@ id:
     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
@@ -178,10 +183,11 @@ id:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ id:
     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
@@ -267,8 +277,10 @@ id:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Tutup
@@ -299,7 +311,9 @@ id:
     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'
-    BUTTONSAVEPUBLISH: 'Simpan & Publikasikan'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Tidak Dipublikasi'
     BUTTONUNPUBLISHDESC: 'Pindahkan halaman ini dari situs yang dipublikasikan'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ id:
     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'
@@ -337,7 +354,9 @@ id:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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: 'Lokasi halaman'
     PAGETITLE: 'Nama Halaman'
     PAGETYPE: 'Tipe halaman'
@@ -366,7 +385,7 @@ id:
     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 Site Content" permission'
+    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'
@@ -376,6 +395,7 @@ id:
     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'
@@ -397,14 +417,20 @@ id:
     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: 'Pilih halaman yang menghubungkan ke'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'klik disini untuk mengedit konten'
+    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'

lang/is.yml

@@ -76,12 +76,15 @@ is:
     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.'
@@ -96,16 +99,16 @@ is:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Removed ''{title}'' from the published site'
     REMOVEDPAGEFROMDRAFT: 'Removed ''%s'' from the draft site'
     RESTORE: Endurheimta
     RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Roll back to this version'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Vista
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ is:
     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
@@ -167,6 +171,7 @@ is:
     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
@@ -178,10 +183,11 @@ is:
     LOGIN: Innskrá
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ is:
     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
@@ -267,8 +277,10 @@ is:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Loka
@@ -299,7 +311,9 @@ is:
     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'
-    BUTTONSAVEPUBLISH: 'Vista og birta'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Taka úr birtingu'
     BUTTONUNPUBLISHDESC: 'Fjarlægja þessa síðu úr birtum síðum'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ is:
     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'
@@ -337,7 +354,9 @@ is:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ is:
     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 Site Content" permission'
+    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'
@@ -376,6 +395,7 @@ is:
     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'
@@ -397,14 +417,20 @@ is:
     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: 'Veldu síðu til að vísa á'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'smelltu hérna til að breyta efninu'
+    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'

lang/it.yml

@@ -76,12 +76,15 @@ it:
     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'
     DESCREMOVED: 'e {count} discendenti'
+    DUPLICATED: 'Duplicated ''{title}'' successfully'
+    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: Email
     EditTree: 'Modifica albero'
     ListFiltered: 'Lista filtrata.'
@@ -96,16 +99,16 @@ it:
     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: 'Eliminata ''%s''%s dal sito pubblicato'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Eliminata ''{title}'' dal sito pubblicato'
     REMOVEDPAGEFROMDRAFT: 'Eliminata ''%s'' dal sito bozza'
     RESTORE: Ripristina
     RESTORED: 'Ripristinata ''{title}'' con successo'
     ROLLBACK: 'Ripristina a questa versione'
-    ROLLEDBACKPUB: 'Ripristinata la versione pubblicata. Il nuovo numero di versione è #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Ripristinata la versione #%d. Il nuovo numero di versione è #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Salva
-    SAVEDRAFT: 'Salva bozza'
+    SAVEDRAFT: 'Save draft'
     TabContent: Contenuto
     TabHistory: Archivio
     TabSettings: Impostazioni
@@ -129,6 +132,7 @@ it:
     SHOWUNPUBLISHED: 'Mostra versioni non pubblicate'
     SHOWVERSION: 'Mostra versione'
     VIEW: vista
+    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Versione attualmente visualizzata {version}.'
   CMSPageHistoryController_versions.ss:
     AUTHOR: Autore
@@ -167,6 +171,7 @@ it:
     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
@@ -178,10 +183,11 @@ it:
     LOGIN: Accedi
     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: 'Puoi iniziare a modificare i contenuti del sito aprendo <a href="{link}">il CMS</a>.'
+    StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Impossibile eliminare i file di installazione. Cancella manualmente i file sotto indicati'
     VIEWPAGEIN: 'Mostra pagina in:'
   ErrorPage:
@@ -251,6 +257,10 @@ it:
     ReportTitle: Titolo
   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
@@ -267,6 +277,8 @@ 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'
@@ -299,7 +311,9 @@ 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'
-    BUTTONSAVEPUBLISH: 'Salva & pubblica'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Non pubblicare'
     BUTTONUNPUBLISHDESC: 'Rimuovi questa pagina dal sito pubblicato'
     CREATED: 'Data creazione'
@@ -324,9 +338,12 @@ 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'
@@ -337,7 +354,9 @@ it:
     MODIFIEDONDRAFTHELP: 'La pagina ha modifiche non pubblicate'
     MODIFIEDONDRAFTSHORT: Modificata
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'Quasta pagina è del tipo obsoleto {type}. Salvarla ripristinerà il suo tipo e potrai perdere dati'
+    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: 'Collocazione pagina'
     PAGETITLE: 'Nome della pagina'
     PAGETYPE: 'Tipo di pagina'
@@ -366,16 +385,17 @@ it:
     URLSegment: 'Segmento URL'
     VIEWERGROUPS: 'Gruppi di visualizzatori'
     VIEW_ALL_DESCRIPTION: 'Visualizza qualsiasi pagina'
-    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_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: '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'
   SiteTreeURLSegmentField:
+    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'I caratteri speciali sono automaticamente convertiti o eliminati.'
   StaticExporter:
     BASEURL: 'URL di base'
@@ -397,14 +417,20 @@ it:
     VIEWPREVIOUS: 'Visualizza precedente'
   TreeTools:
     DisplayLabel: 'Visualizza:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'Puoi accedere al sito archiviato da questo indirizzo:'
     HAVEASKED: 'Hai chiesto di visualizzare il contenuto del nostro sito il'
   VirtualPage:
-    CHOOSE: 'Scegli una pagina a cui collegarla'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Visualizza il contenuto di un''altra pagina'
-    EDITCONTENT: 'Clicca qui per modificare il contenuto'
+    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'

lang/ja_JP.yml

@@ -1,7 +1,7 @@
 ja_JP:
   AssetAdmin:
-    ADDFILES: ファイルを追加
+    ADDFILES: 'ファイルを追加'
-    ActionAdd: フォルダを追加
+    ActionAdd: 'フォルダを追加'
     AppCategoryArchive: アーカイブ
     AppCategoryAudio: 音楽
     AppCategoryDocument: Document
@@ -14,7 +14,7 @@ ja_JP:
     DetailsView: 詳細
     FILES: ファイル
     FILESYSTEMSYNC: 'Sync files'
-    FILESYSTEMSYNCTITLE: ファイルに関するCMSデータベースエントリーを更新する。例えば、FTPなどCMS以外を経由してファイルをアップロードした場合に便利です。
+    FILESYSTEMSYNCTITLE: 'ファイルに関するCMSデータベースエントリーを更新する。例えば、FTPなどCMS以外を経由してファイルをアップロードした場合に便利です。'
     FROMTHEINTERNET: インターネットから
     FROMYOURCOMPUTER: コンピュータから
     Filetype: ファイルの種類
@@ -41,9 +41,9 @@ ja_JP:
     BROKENLINKS: 壊れたリンクのレポート
     CheckSite: 'Check site'
     CheckSiteDropdownDraft: 下書きサイト
-    CheckSiteDropdownPublished: 公開済みサイト
+    CheckSiteDropdownPublished: '公開済みサイト'
     ColumnDateLastModified: 最終更新日
-    ColumnDateLastPublished: 最終公開日
+    ColumnDateLastPublished: '最終公開日'
     ColumnProblemType: 問題の種類
     ColumnURL: URL
     HasBrokenFile: 'has broken file'
@@ -59,29 +59,32 @@ ja_JP:
     RedirectorNonExistent: 存在しないページを指しているリダイレクトページ
     VirtualPageNonExistent: 存在しないページを指している仮想ページ
   CMSAddPageController:
-    Title: ページを追加
+    Title: 'ページを追加'
   CMSBatchActions:
     DELETED_DRAFT_PAGES: '%dページを下書きサイトから削除しましたが、%dページの削除に失敗しました。'
     DELETED_PAGES: '%dページを公開サイトから削除しましたが、%dページの削除に失敗しました。'
     DELETE_DRAFT_PAGES: 下書きサイトから削除
-    DELETE_PAGES: 公開サイトから削除
+    DELETE_PAGES: '公開サイトから削除'
     PUBLISHED_PAGES: '%dページを公開しましたが、%dページの公開に失敗しました。'
-    PUBLISH_PAGES: 公開
+    PUBLISH_PAGES: '公開'
     UNPUBLISHED_PAGES: '%dページを非公開にしました'
-    UNPUBLISH_PAGES: 非公開
+    UNPUBLISH_PAGES: '非公開'
   CMSFileAddController:
     MENUTITLE: ファイル
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESS_HELP: 'Allow viewing of the section containing page tree and content. View and edit permissions can be handled through page specific dropdowns, as well as the separate "Content permissions".'
-    AddNew: 新しいページを追加
+    AddNew: '新しいページを追加'
-    AddNewButton: 新しく追加
+    AddNewButton: '新しく追加'
-    ChoosePageParentMode: このページを作成する場所を選択
+    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
+    ChoosePageParentMode: 'このページを作成する場所を選択'
     ChoosePageType: ページの種類を選択
     Create: 作成
     DELETE: ドラフトサイトから削除
-    DELETEFP: 公開サイトから削除
+    DELETEFP: '公開サイトから削除'
     DESCREMOVED: 'and {count} descendants'
+    DUPLICATED: 'Duplicated ''{title}'' successfully'
+    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: Eメール
     EditTree: ツリーを編集
     ListFiltered: フィルタリングされたリスト
@@ -96,16 +99,16 @@ ja_JP:
     PUBALLFUN2: 'このボタンを押すことはすべてのページへ移動して"公開"を押すことと同じです。この機能は、サイトをはじめて作成した時など多くのコンテンツの編集がある場合に利用されることを想定されています。'
     PUBPAGES: '完了: {count}ページを公開しました'
     PageAdded: ページの作成に成功
-    REMOVED: '''%s''%sを実サイトから削除しました'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: '''{title}''を公開されているサイトから削除しました'
     REMOVEDPAGEFROMDRAFT: '%sを下書きサイトから削除しました'
-    RESTORE: 復元
+    RESTORE: '復元'
     RESTORED: '{title}を復旧しました'
     ROLLBACK: このバージョンへ戻す
-    ROLLEDBACKPUB: '公開された版へロールバックしました。新しいバージョン番号は#{version}です'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'バージョン#%dへロールバックしました。新しいバージョン番号は#%dです。'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: 保存
-    SAVEDRAFT: 下書きとして保存
+    SAVEDRAFT: 'Save draft'
     TabContent: コンテンツ
     TabHistory: 履歴
     TabSettings: 設定
@@ -115,7 +118,7 @@ ja_JP:
     'APPLY FILTER': フィルタを適用
     RESET: リセット
   CMSPageAddController:
-    MENUTITLE: ページを追加
+    MENUTITLE: 'ページを追加'
     ParentMode_child: 他のページの下に作成
     ParentMode_top: 最上位層
   CMSPageEditController:
@@ -126,13 +129,14 @@ ja_JP:
     COMPARINGVERSION: '{version1}と{version2}を比較しています。'
     MENUTITLE: 履歴
     REVERTTOTHISVERSION: このバージョンに戻す
-    SHOWUNPUBLISHED: 公開されていないバージョンを表示
+    SHOWUNPUBLISHED: '公開されていないバージョンを表示'
     SHOWVERSION: バージョンを表示
     VIEW: 表示
+    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: '現在表示しているバージョンは{version}です。'
   CMSPageHistoryController_versions.ss:
-    AUTHOR: 作成者
+    AUTHOR: '作成者'
-    NOTPUBLISHED: 未公開
+    NOTPUBLISHED: '未公開'
     PUBLISHER: パブリッシャー
     UNKNOWN: 不明
     WHEN: いつ
@@ -158,15 +162,16 @@ ja_JP:
   CMSSiteTreeFilter_ChangedPages:
     Title: 変更されたページ
   CMSSiteTreeFilter_DeletedPages:
-    Title: 全ページ（削除されたページも含む）
+    Title: '全ページ（削除されたページも含む）'
   CMSSiteTreeFilter_Search:
-    Title: 全ページ
+    Title: '全ページ'
   ContentControl:
     NOTEWONTBESHOWN: 'お知らせ: このメッセージは訪問者には表示されません'
   ContentController:
     ARCHIVEDSITE: 'Preview version'
     ARCHIVEDSITEFROM: 'Archived site from'
     CMS: CMS
+    DRAFT: Draft
     DRAFTSITE: 下書きサイト
     DRAFT_SITE_ACCESS_RESTRICTION: '草案かアーカイブされた内容を見るためにはログインしてください。<a href="%s">公開サイトにもどるにはコチラをクリックしてください。</a>'
     Email: Eメール
@@ -178,11 +183,12 @@ ja_JP:
     LOGIN: ログイン
     LOGOUT: ログアウト
     NOTLOGGEDIN: ログインされていません
-    PUBLISHEDSITE: 公開サイト
+    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: '<a href="{link}">CMS</a>のリンクをクリックすることであなたのサイトのコンテンツの編集を開始することができます。'
+    StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
-    UnableDeleteInstall: インストールファイルを削除することができませんでした。次のファイルを手動で削除してください。
+    UnableDeleteInstall: 'インストールファイルを削除することができませんでした。次のファイルを手動で削除してください。'
     VIEWPAGEIN: 'View Page in:'
   ErrorPage:
     CODE: エラーコード
@@ -218,10 +224,10 @@ ja_JP:
     504: '504 - Gatewayが時間切れです'
     505: '505 - サポートされていないHTTPのバージョンです'
   Folder:
-    AddFolderButton: フォルダの追加
+    AddFolderButton: 'フォルダの追加'
-    DELETEUNUSEDTHUMBNAILS: 未使用のサムネイルを削除
+    DELETEUNUSEDTHUMBNAILS: '未使用のサムネイルを削除'
     UNUSEDFILESTITLE: 未使用のファイル
-    UNUSEDTHUMBNAILSTITLE: 未使用のサムネイル
+    UNUSEDTHUMBNAILSTITLE: '未使用のサムネイル'
     UploadFilesButton: アップロード
   LeftAndMain:
     DELETED: 削除済
@@ -236,8 +242,8 @@ ja_JP:
     CONTENT_CATEGORY: コンテンツに関する権限
     PERMISSIONS_CATEGORY: 役割とアクセス権限
   RedirectorPage:
-    DESCRIPTION: 別の内部ページにリダイレクト
+    DESCRIPTION: '別の内部ページにリダイレクト'
-    HASBEENSETUP: 転送URLを含むページには、転送先がない状態で設定されています。
+    HASBEENSETUP: '転送URLを含むページには、転送先がない状態で設定されています。'
     HEADER: このページをユーザーを変更して他のページにしますか？
     OTHERURL: 他のウェブサイトのURL
     PLURALNAME: リダイレクトページ
@@ -251,6 +257,10 @@ ja_JP:
     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: 検索
@@ -259,7 +269,7 @@ ja_JP:
     BROKENFILES: 壊れているファイルがあるページ
     BROKENLINKS: 'Pages with broken links'
     BROKENREDIRECTORPAGES: 'RedirectorPages pointing to deleted pages'
-    BROKENVIRTUALPAGES: 削除されたページを参照している仮想ページ
+    BROKENVIRTUALPAGES: '削除されたページを参照している仮想ページ'
     BrokenLinksGroupTitle: 壊れているリンクのレポート
     ContentGroupTitle: 'Content reports'
     EMPTYPAGES: 空のページ
@@ -267,9 +277,11 @@ ja_JP:
     OtherGroupTitle: その他
     ParameterLiveCheckbox: 'Check live site'
     REPEMPTY: '{title}のレポートは空です'
+  SilverStripeNavigator:
+    ARCHIVED: Archived
   SilverStripeNavigatorLink:
-    ShareInstructions: このページを共有するには、以下のリンクをコピー＆ペーストとします。
+    ShareInstructions: 'このページを共有するには、以下のリンクをコピー＆ペーストとします。'
-    ShareLink: 共有リンク
+    ShareLink: '共有リンク'
   SilverStripeNavigatorLinkl:
     CloseLink: 閉じる
   SiteConfig:
@@ -284,7 +296,7 @@ ja_JP:
     SITETITLE: サイトタイトル
     TABACCESS: アクセス権限
     TABMAIN: メイン
-    TAGLINEDEFAULT: サイトのキャッチフレーズをここに入力
+    TAGLINEDEFAULT: 'サイトのキャッチフレーズをここに入力'
     THEME: テーマ
     TOPLEVELCREATE: サイトのルートにおいてページを作成できる人
     VIEWHEADER: このサイト上でページを閲覧できる人
@@ -293,15 +305,17 @@ ja_JP:
     ACCESSHEADER: このページを閲覧できる人
     ACCESSLOGGEDIN: ログインしたユーザ
     ACCESSONLYTHESE: 'この人達だけ (リストから選択してください)'
-    ADDEDTODRAFTHELP: ページはまだ公開されていません
+    ADDEDTODRAFTHELP: 'ページはまだ公開されていません'
     ADDEDTODRAFTSHORT: 下書き
     ALLOWCOMMENTS: コメントを許可しますか？
     APPEARSVIRTUALPAGES: 'このコンテンツは{title}として仮想ページにおいても表示されます。'
-    BUTTONCANCELDRAFT: 草稿の編集内容を取り消します
+    BUTTONCANCELDRAFT: '草稿の編集内容を取り消します'
-    BUTTONCANCELDRAFTDESC: 草稿と前回公開されたページを削除します
+    BUTTONCANCELDRAFTDESC: '草稿と前回公開されたページを削除します'
-    BUTTONSAVEPUBLISH: 保存して公開
+    BUTTONPUBLISHED: Published
-    BUTTONUNPUBLISH: 非公開
+    BUTTONSAVED: Saved
-    BUTTONUNPUBLISHDESC: 公開サイトから取り除きました
+    BUTTONSAVEPUBLISH: 'Save & publish'
+    BUTTONUNPUBLISH: '非公開'
+    BUTTONUNPUBLISHDESC: '公開サイトから取り除きました'
     CREATED: 作成日
     Comments: コメント
     Content: コンテンツ
@@ -310,8 +324,8 @@ ja_JP:
     DEFAULTCONTACTCONTENT: '<p>あなた自身、自由にページに書き込むことが出来、もちろん添削も自由に行えます。<br /></p>'
     DEFAULTCONTACTTITLE: 連絡はこちらまで
     DEFAULTHOMECONTENT: '<p>SilverStripeへようこそ！これはデフォルトのホームページです。このページを編集するには、<a href="admin/">CMS</a>にアクセスしてください。<a href="http://doc.silverstripe.org">開発者向けドキュメント</a>や、<a href="http://doc.silverstripe.org/doku.php?id=tutorials">チュートリアル</a>もご覧いただけます。</p>'
-    DEFAULTHOMETITLE: ホーム
+    DEFAULTHOMETITLE: 'ホーム'
-    DELETEDPAGEHELP: このページは今は公開されていません。
+    DELETEDPAGEHELP: 'このページは今は公開されていません。'
     DELETEDPAGESHORT: 削除済
     DEPENDENT_NOTE: 'The following pages depend on this page. This includes virtual pages, redirector pages, and pages with content links.'
     DESCRIPTION: 通常のコンテンツページ
@@ -320,29 +334,34 @@ ja_JP:
     EDITANYONE: 誰でもCMSにログインが可能
     EDITHEADER: このページを編集できる人
     EDITONLYTHESE: 'この人達だけ (リストから選択してください)'
-    EDITORGROUPS: 編集者グループ
+    EDITORGROUPS: '編集者グループ'
     EDIT_ALL_DESCRIPTION: すべてのページを編集
     EDIT_ALL_HELP: 'Ability to edit any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     Editors: 編集グループ
+    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).'
-    METAEXTRA: メタタグをカスタム
+    METAEXTRA: 'メタタグをカスタム'
     METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;'
-    MODIFIEDONDRAFTHELP: 公開されていない変更がページにあります
+    MODIFIEDONDRAFTHELP: '公開されていない変更がページにあります'
     MODIFIEDONDRAFTSHORT: 更新日時
     MetadataToggle: メタデータ
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    MoreOptions: 'More options'
-    PAGELOCATION: ページの場所
+    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: 'ページの場所'
     PARENTTYPE_ROOT: 最上位層のページ
     PARENTTYPE_SUBPAGE: 親ページの下にあるサブページ
     PERMISSION_GRANTACCESS_DESCRIPTION: コンテンツへのアクセス権限を編集
@@ -353,8 +372,8 @@ ja_JP:
     REMOVEDFROMDRAFTHELP: 'Page is published, but has been deleted from draft'
     REMOVEDFROMDRAFTSHORT: 下書きから削除
     REMOVE_INSTALL_WARNING: '警告: セキュリティ上の理由から、SilverStripeのインストール先にあるinstall.phpを削除してください。'
-    REORGANISE_DESCRIPTION: サイト構造を変更
+    REORGANISE_DESCRIPTION: 'サイト構造を変更'
-    REORGANISE_HELP: サイトツリー内のページをドラッグ・アンド・ドロップで再編集
+    REORGANISE_HELP: 'サイトツリー内のページをドラッグ・アンド・ドロップで再編集'
     SHOWINMENUS: メニューに表示しますか？
     SHOWINSEARCH: 検索に表示しますか？
     SINGULARNAME: Page
@@ -362,20 +381,21 @@ ja_JP:
     TABCONTENT: コンテンツ
     TABDEPENDENT: 依存ページ
     TOPLEVEL: 'サイトの内容 (最上位層)'
-    TOPLEVELCREATORGROUPS: 最上位層のページ作成者
+    TOPLEVELCREATORGROUPS: '最上位層のページ作成者'
     URLSegment: URLセグメント
-    VIEWERGROUPS: 閲覧者グループ
+    VIEWERGROUPS: '閲覧者グループ'
     VIEW_ALL_DESCRIPTION: すべてのページを閲覧
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to Site Content" permission'
+    VIEW_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: '閲覧者のグループ'
     Visibility: 表示・非表示
     has_one_Parent: 親ページ
-    many_many_BackLinkTracking: リンク元を追跡
+    many_many_BackLinkTracking: 'リンク元を追跡'
     many_many_ImageTracking: 画像へのリンクを追跡
     many_many_LinkTracking: リンクを追跡
   SiteTreeURLSegmentField:
+    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 特殊文字は自動的に変換されたか取り除かれました
   StaticExporter:
     BASEURL: ベースURL
@@ -384,9 +404,9 @@ ja_JP:
   TableListField:
     SELECT: 選択：
   TableListField.ss:
-    NOITEMSFOUND: 見つかった項目はありませんでした
+    NOITEMSFOUND: '見つかった項目はありませんでした'
-    SORTASC: 昇順に並び替える
+    SORTASC: '昇順に並び替える'
-    SORTDESC: 降順に並び替える
+    SORTDESC: '降順に並び替える'
   TableListField_PageControls.ss:
     DISPLAYING: 表示中
     OF: of
@@ -397,14 +417,20 @@ ja_JP:
     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'
   VirtualPage:
-    CHOOSE: リンクするページを選択してください
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 別のページのコンテンツを表示
-    EDITCONTENT: クリックしてコンテンツを編集
+    EDITCONTENT: 'Edit content on linked page'
+    EditLink: edit
     HEADER: これがバーチャルページです
+    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 仮想ページ
     PageTypNotAllowedOnRoot: 'この仮想ページに対して元のページの種類{type}はルートレベルに配置されることが許可されていません。'
     SINGULARNAME: 仮想ページ

lang/km.yml

@@ -76,12 +76,15 @@ km:
     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.'
@@ -96,16 +99,16 @@ km:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Save
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ km:
     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
@@ -167,6 +171,7 @@ km:
     ARCHIVEDSITE: 'Preview version'
     ARCHIVEDSITEFROM: 'Archived site from'
     CMS: CMS
+    DRAFT: Draft
     DRAFTSITE: 'Draft Site'
     DRAFT_SITE_ACCESS_RESTRICTION: 'ដើម្បីមើលទំព័រប្រៀងសូម ចូលកាន់ប្រព័ន្ធគ្រប់គ្រងដោយប្រើយឈ្មោះ និងពាក្យសំងាត់របស់អ្នក សូមចុចត្រនេះ <a href="%s"> ដើម្បីត្រលប់ទៅ កាន់ទំព័ររួចរាល់។</a>'
     Email: Email
@@ -178,10 +183,11 @@ km:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ km:
     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
@@ -267,8 +277,10 @@ km:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -299,7 +311,9 @@ km:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancel draft changes'
     BUTTONCANCELDRAFTDESC: 'Delete your draft and revert to the currently published page'
-    BUTTONSAVEPUBLISH: 'Save & Publish'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Unpublish
     BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ km:
     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'
@@ -337,7 +354,9 @@ km:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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: ប្រភេទទំព័រ
@@ -366,7 +385,7 @@ km:
     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 Site Content" permission'
+    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'
@@ -376,6 +395,7 @@ km:
     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'
@@ -397,14 +417,20 @@ km:
     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: 'Choose a page to link to'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'click here to edit the content'
+    EDITCONTENT: 'Edit content on linked page'
+    EditLink: edit
     HEADER: 'This is a virtual page'
-    PLURALNAME: ទំព័រដូច
+    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: ទំព័រដូច
+    SINGULARNAME: 'ទំព័រដូច'

lang/ko.yml

@@ -76,12 +76,15 @@ ko:
     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.'
@@ -96,16 +99,16 @@ ko:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Save
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ ko:
     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
@@ -167,6 +171,7 @@ ko:
     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
@@ -178,10 +183,11 @@ ko:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ ko:
     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
@@ -267,8 +277,10 @@ ko:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -299,7 +311,9 @@ ko:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancel draft changes'
     BUTTONCANCELDRAFTDESC: 'Delete your draft and revert to the currently published page'
-    BUTTONSAVEPUBLISH: 'Save & Publish'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Unpublish
     BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ ko:
     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'
@@ -337,7 +354,9 @@ ko:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ ko:
     URLSegment: 'URL Segment'
     VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'View any page'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to Site Content" permission'
+    VIEW_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'
@@ -376,6 +395,7 @@ ko:
     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'
@@ -397,14 +417,20 @@ ko:
     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: 'Choose a page to link to'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'click here to edit the content'
+    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'

lang/lt.yml

@@ -76,12 +76,15 @@ lt:
     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'
     EditTree: 'Redaguoti Medį'
     ListFiltered: 'Filtruotas sąrašas.'
@@ -96,16 +99,16 @@ lt:
     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 ''%s''%s from live site'
+    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'
-    ROLLEDBACKPUB: 'Buvo sugrįžta prie publikuojamos versijos. Naujas versijos numeris yra #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Buvo sugrįžta prie versijos #%d. Naujas versijos numeris yra #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Išsaugoti
-    SAVEDRAFT: 'Išsaugoti juodraštį'
+    SAVEDRAFT: 'Save draft'
     TabContent: Turinys
     TabHistory: Istorija
     TabSettings: Nustatymai
@@ -129,6 +132,7 @@ lt:
     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:
     AUTHOR: Autorius
@@ -167,6 +171,7 @@ lt:
     ARCHIVEDSITE: 'Preview version'
     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'
@@ -178,10 +183,11 @@ lt:
     LOGIN: Prisijungti
     LOGOUT: Atsijungti
     NOTLOGGEDIN: Neprisijungęs
+    PUBLISHED: Published
     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: 'Jūs galite pradėti redaguoti svetainės turinį, atidarydami <a href="{link}">TVS</a>.'
+    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į:'
   ErrorPage:
@@ -251,6 +257,10 @@ lt:
     ReportTitle: Antraštė
   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
@@ -267,6 +277,8 @@ 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'
@@ -299,7 +311,9 @@ lt:
     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'
-    BUTTONSAVEPUBLISH: 'Išsaugoti ir publikuoti'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Nebepublikuoti
     BUTTONUNPUBLISHDESC: 'Pašalinti šį puslapį iš publikuojamos svetainės'
     CREATED: 'Sukūrimo data'
@@ -324,9 +338,12 @@ 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'
@@ -337,7 +354,9 @@ lt:
     MODIFIEDONDRAFTHELP: 'Puslapyje yra nepublikuoto turinio'
     MODIFIEDONDRAFTSHORT: Pakeistas
     MetadataToggle: Metaduomenys
-    OBSOLETECLASS: 'Šis puslapis yra nebenaudojamo tipo {type}. Išsaugojimas iš naujo nustatys jo tipą, ko pasekoje galite prarasti duomenis'
+    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'
@@ -366,7 +385,7 @@ 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: 'Galimybė peržiūrėti bet kurį puslapį svetainėje, nepriklausomai nuo "Priėjimo/Leidimų" skyriaus nustatymų. Būtinas leidimas "Prieiti prie svetainės turinio"'
+    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'
@@ -376,6 +395,7 @@ lt:
     many_many_ImageTracking: 'Paveikslėlių sekimas'
     many_many_LinkTracking: 'Nuorodos sekimas'
   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'
@@ -397,14 +417,20 @@ lt:
     VIEWPREVIOUS: 'Žiūrėti ankstesnį'
   TreeTools:
     DisplayLabel: 'Rodyti:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   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: 'Pasirinkti puslapį nuorodai'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Rodo kito puslapio turinį'
-    EDITCONTENT: 'turiniui redaguoti spauskite čia'
+    EDITCONTENT: 'Edit content on linked page'
+    EditLink: edit
     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'

lang/lv.yml

@@ -76,12 +76,15 @@ lv:
     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.'
@@ -96,16 +99,16 @@ lv:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Removed ''{title}'' from the published site'
     REMOVEDPAGEFROMDRAFT: 'Removed ''%s'' from the draft site'
     RESTORE: Restaurēt
     RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Roll back to this version'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Saglabāt
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ lv:
     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
@@ -167,6 +171,7 @@ lv:
     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
@@ -178,10 +183,11 @@ lv:
     LOGIN: Pieslē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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ lv:
     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
@@ -267,6 +277,8 @@ lv:
     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'
@@ -299,7 +311,9 @@ lv:
     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'
-    BUTTONSAVEPUBLISH: 'Saglabāt un publicēt'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Nebpublicēt
     BUTTONUNPUBLISHDESC: 'Izņemt šo lapu no publicētās vietnes'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ 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'
@@ -337,7 +354,9 @@ lv:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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,7 +385,7 @@ lv:
     URLSegment: 'URL Segments'
     VIEWERGROUPS: 'Skatītāju grupas'
     VIEW_ALL_DESCRIPTION: 'Skatī jebkuru lapu'
-    VIEW_ALL_HELP: 'Iespēja skatīt jebkuru vietnes lapu, neskatoties uz uzstādījumiem Piekļuves cilnē. Nepieciešama "Piekļuve vietnes saturam" atļauja.'
+    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'
@@ -376,6 +395,7 @@ lv:
     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'
@@ -397,14 +417,20 @@ lv:
     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: 'Izvēlieties lapu uz kuru veidot saiti'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'Lai labotu saturu, klikšķiniet šeit '
+    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'

lang/mi_NZ.yml

@@ -76,12 +76,15 @@ mi_NZ:
     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'
@@ -96,16 +99,16 @@ mi_NZ:
     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: 'I mukua te ''%s''%s i te pae ora'
+    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.'
-    ROLLEDBACKPUB: 'I hoki whakamuri atu ki te putangakua whakaputaina. Ko te tau putanga hōu ko te #{version}.'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'I hoki whakamuri atu ki te putanga #%d. Ko te tau putanga hou ko te #%d.'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: tiakina
-    SAVEDRAFT: 'Tiaki Hukihuki'
+    SAVEDRAFT: 'Save draft'
     TabContent: 'Ngā Ihirangi'
     TabHistory: Hītori
     TabSettings: 'Ngā Tautuhinga'
@@ -129,6 +132,7 @@ mi_NZ:
     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:
     AUTHOR: Kaituhi
@@ -167,6 +171,7 @@ mi_NZ:
     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
@@ -178,10 +183,11 @@ mi_NZ:
     LOGIN: Takiuru
     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: 'Ka taea te whakatika i ngā ihirangi o t/ō pae mā te whakatuwhera i <a href="{link}">te CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ mi_NZ:
     ReportTitle: Taitara
   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
@@ -267,6 +277,8 @@ mi_NZ:
     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'
@@ -299,7 +311,9 @@ 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'
-    BUTTONSAVEPUBLISH: 'Tiaki me te Whakaputa'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Wetewhakaputa
     BUTTONUNPUBLISHDESC: 'Tangohia tēnei whārangi i te pae kua whakaputaina'
     CREATED: 'Rā Hanga'
@@ -324,9 +338,12 @@ 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'
@@ -337,7 +354,9 @@ mi_NZ:
     MODIFIEDONDRAFTHELP: 'He huringa kāore anō kia whakaputaina ō te whārangi'
     MODIFIEDONDRAFTSHORT: 'Kua Whakakētia'
     MetadataToggle: Raraungameta
-    OBSOLETECLASS: 'He neha {type} tēnei tūmomo whārangi. Mā te te tiaki ka tautuhi anō i te tūmomo, ka ngaro pea he raraunga'
+    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
     PAGETITLE: 'Ingoa whārangi'
     PAGETYPE: 'Tūmomo wharangi '
@@ -366,7 +385,7 @@ mi_NZ:
     URLSegment: 'Wāhanga PRO'
     VIEWERGROUPS: 'Ngā Ropū Kaitirotiro'
     VIEW_ALL_DESCRIPTION: 'Tirohia tētahi whārangi'
-    VIEW_ALL_HELP: 'Te āhei ki te tiro 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''"'
+    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'
@@ -376,6 +395,7 @@ 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'
@@ -397,14 +417,20 @@ mi_NZ:
     VIEWPREVIOUS: 'Tirohia tōmua'
   TreeTools:
     DisplayLabel: 'Whakaatu:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   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: 'Kōwhiria he whārangi kia honoa '
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Ka whakaatu i ngā ihirangi o tētahi atu whārangi'
-    EDITCONTENT: 'pāwhiri ki konei hei whakatika i ngā ihirangi'
+    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'

lang/ms.yml

@@ -76,12 +76,15 @@ ms:
     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.'
@@ -96,16 +99,16 @@ ms:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Save
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ ms:
     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
@@ -167,6 +171,7 @@ ms:
     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
@@ -178,10 +183,11 @@ ms:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ ms:
     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
@@ -267,8 +277,10 @@ ms:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -299,7 +311,9 @@ ms:
     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'
-    BUTTONSAVEPUBLISH: 'SImpan & terbitkan'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Tidak diterbitkan'
     BUTTONUNPUBLISHDESC: 'Hapus mukasurat ini dari laman sebenar'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ ms:
     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'
@@ -337,7 +354,9 @@ ms:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ ms:
     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 Site Content" permission'
+    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'
@@ -376,6 +395,7 @@ ms:
     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'
@@ -397,14 +417,20 @@ ms:
     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: 'Pilih mukasurat yang ingin di pautkan'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'klik di sini untuk menyunting kandungan'
+    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'

lang/my.yml

@@ -76,12 +76,15 @@ my:
     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.'
@@ -96,16 +99,16 @@ my:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Save
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ my:
     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
@@ -167,6 +171,7 @@ my:
     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
@@ -178,10 +183,11 @@ my:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ my:
     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
@@ -267,8 +277,10 @@ my:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -299,7 +311,9 @@ my:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancel draft changes'
     BUTTONCANCELDRAFTDESC: 'Delete your draft and revert to the currently published page'
-    BUTTONSAVEPUBLISH: 'Save & Publish'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Unpublish
     BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ my:
     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'
@@ -337,7 +354,9 @@ my:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ my:
     URLSegment: 'URL Segment'
     VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'View any page'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to Site Content" permission'
+    VIEW_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'
@@ -376,6 +395,7 @@ my:
     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'
@@ -397,14 +417,20 @@ my:
     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: 'Choose a page to link to'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'click here to edit the content'
+    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'

lang/nb.yml

@@ -76,12 +76,15 @@ nb:
     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.'
@@ -96,16 +99,16 @@ nb:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Removed ''{title}'' from the published site'
     REMOVEDPAGEFROMDRAFT: 'Removed ''%s'' from the draft site'
     RESTORE: Gjenopprett
     RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Roll back to this version'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Lagre
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ nb:
     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
@@ -167,6 +171,7 @@ nb:
     ARCHIVEDSITE: 'Preview version'
     ARCHIVEDSITEFROM: 'Archived site from'
     CMS: CMS
+    DRAFT: Draft
     DRAFTSITE: 'Draft Site'
     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
@@ -178,10 +183,11 @@ nb:
     LOGIN: Login
     LOGOUT: 'Log out'
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ nb:
     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: Utfør
     SEARCH: Søk
@@ -267,8 +277,10 @@ nb:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Del link'
   SilverStripeNavigatorLinkl:
     CloseLink: Lukk
@@ -299,7 +311,9 @@ nb:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Avbryt endringer i utkast'
     BUTTONCANCELDRAFTDESC: 'Slett utkast og gå tilbake til publisert versjon av denne siden'
-    BUTTONSAVEPUBLISH: 'Lagre & Publiser'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Av-publiser
     BUTTONUNPUBLISHDESC: 'Fjern denne siden fra det publiserte nettstedet'
     CREATED: 'Kreasjons dato'
@@ -324,9 +338,12 @@ nb:
     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'
     HASBROKENLINKS: 'Denne siden har ødelagte lenker.'
     HTMLEDITORTITLE: Innhold
     INHERIT: 'Arvet fra foreldre side'
+    LASTPUBLISHED: 'Last published'
+    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Sist oppdatert'
     LINKCHANGENOTE: 'Endring av denne sidens lenke vil også påvirke lenkene til alle underliggende sider.'
     MENUTITLE: 'Navigasjons etikett'
@@ -337,7 +354,9 @@ nb:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modifisert
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose 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: Sideplassering
     PAGETITLE: Sidenavn
     PAGETYPE: Sidetype
@@ -366,7 +385,7 @@ nb:
     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 Site Content" permission'
+    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: '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
@@ -376,6 +395,7 @@ nb:
     many_many_ImageTracking: Bildesporing
     many_many_LinkTracking: Lenkesporing
   SiteTreeURLSegmentField:
+    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: ' Special characters are automatically converted or removed.'
   StaticExporter:
     BASEURL: 'Base URL'
@@ -397,14 +417,20 @@ nb:
     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'
   VirtualPage:
-    CHOOSE: 'Velg en side å lenke til'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Viser innholdet av en annen side'
-    EDITCONTENT: 'Klikk her for å endre innholdet'
+    EDITCONTENT: 'Edit content on linked page'
+    EditLink: edit
     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'

lang/ne.yml

@@ -76,12 +76,15 @@ ne:
     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.'
@@ -96,16 +99,16 @@ ne:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Save
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ ne:
     SHOWUNPUBLISHED: 'Show unpublished versions'
     SHOWVERSION: 'Show Version'
     VIEW: view
+    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Currently viewing version {version}.'
   CMSPageHistoryController_versions.ss:
     AUTHOR: लेखक
@@ -167,6 +171,7 @@ ne:
     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
@@ -178,10 +183,11 @@ ne:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ ne:
     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
@@ -267,8 +277,10 @@ ne:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: बन्द
@@ -299,7 +311,9 @@ ne:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'द्राफ्ट्रमा भएका परिवर्तनहरु क्यान्सिल गर्नुहोस् '
     BUTTONCANCELDRAFTDESC: 'द्राफ्ट्र हटाउनुहोस् र प्रकाशित पेजमा जानुहोस्'
-    BUTTONSAVEPUBLISH: 'सेभ र प्रकाशित गरनुहोस्'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'प्रकाशित नगरनुहोस्'
     BUTTONUNPUBLISHDESC: 'प्रकाशित साईटबाट यो पेजलाई हटाउनुहोस्'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ ne:
     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: 'अबलोकन नाम '
@@ -337,7 +354,9 @@ ne:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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: 'पेज किसिम'
@@ -366,7 +385,7 @@ ne:
     URLSegment: 'URL Segment'
     VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'View any page'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to Site Content" permission'
+    VIEW_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'
@@ -376,6 +395,7 @@ ne:
     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'
@@ -397,14 +417,20 @@ ne:
     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: 'लिन्क गर्न पेज छानुहोस् '
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'सामाग्री मिलाउन यहाँ थिचुन्नुहोस्'
+    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'

lang/nl.yml

@@ -76,12 +76,15 @@ nl:
     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'
     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'
     DESCREMOVED: 'en {count} onderliggende'
+    DUPLICATED: '''{title}'' succesvol gedupliceerd'
+    DUPLICATEDWITHCHILDREN: '''{title}'' en kinderen succesvol gedupliceerd'
     EMAIL: Email
     EditTree: 'Menu indelen'
     ListFiltered: 'Gefilterde lijst.'
@@ -96,14 +99,14 @@ nl:
     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: 'Verwijderde ''%s''%s van live site'
+    REMOVED: '''{title}''{description} verwijderd van de live site'
     REMOVEDPAGE: '''{title}'' is van de gepubliceerde site verwijderd'
     REMOVEDPAGEFROMDRAFT: '''%s'' is verwijderd uit de concept-site'
     RESTORE: Herstel
     RESTORED: '''{title}'' is succesvol hersteld'
     ROLLBACK: 'Terugzetten naar deze versie'
-    ROLLEDBACKPUB: 'Teruggezet naar de gepubliceerde versie. Het nieuwe versie nummer is #{version}.'
+    ROLLEDBACKPUBv2: 'Teruggezet naar gepubliceerde versie.'
-    ROLLEDBACKVERSION: 'Teruggezet naar versie #%d. Het nieuwe versie nummer is #%d'
+    ROLLEDBACKVERSIONv2: 'Teruggezet naar versie #%d.'
     SAVE: Opslaan
     SAVEDRAFT: 'Concept opslaan'
     TabContent: Inhoud
@@ -129,6 +132,7 @@ nl:
     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:
     AUTHOR: Auteur
@@ -167,6 +171,7 @@ nl:
     ARCHIVEDSITE: 'Voorbeeld versie'
     ARCHIVEDSITEFROM: 'Gearchiveerde site van'
     CMS: CMS
+    DRAFT: Concept
     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
@@ -178,10 +183,11 @@ nl:
     LOGIN: Inloggen
     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: 'U kunt beginnen met het bewerken van uw site door <a href="{link}">het CMS</a> te openen.'
+    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:'
   ErrorPage:
@@ -251,6 +257,10 @@ nl:
     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
@@ -267,6 +277,8 @@ nl:
     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'
@@ -299,7 +311,9 @@ 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'
-    BUTTONSAVEPUBLISH: 'Bewaar en Publiceer'
+    BUTTONPUBLISHED: Gepubliceerd
+    BUTTONSAVED: Bewaard.
+    BUTTONSAVEPUBLISH: 'Opslaan & publiceren'
     BUTTONUNPUBLISH: 'Publicatie intrekken'
     BUTTONUNPUBLISHDESC: 'Deze pagina verwijderen uit de gepubliceerde site'
     CREATED: 'Datum gemaakt'
@@ -324,9 +338,12 @@ nl:
     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'
     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'
@@ -337,6 +354,8 @@ nl:
     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 +385,7 @@ nl:
     URLSegment: 'URL Segment'
     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 bekijken, onafhankelijk van instellingen op het Toegangstapblad. Vereist "Toegang tot site Inhoud" rechten.'
+    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
@@ -376,6 +395,7 @@ nl:
     many_many_ImageTracking: 'Afbeelding Volgen'
     many_many_LinkTracking: 'Link Volgen'
   SiteTreeURLSegmentField:
+    EMPTY: 'Vul een URL Segment in of selecteer annuleren'
     HelpChars: 'Speciale tekens worden automatische omgezet of verwijderd.'
   StaticExporter:
     BASEURL: 'Basis URL'
@@ -397,14 +417,20 @@ nl:
     VIEWPREVIOUS: 'Bekijk vorige'
   TreeTools:
     DisplayLabel: 'Weergeven:'
+  URLSegmentField:
+    Cancel: Annuleer
+    Edit: Bewerken
+    OK: Ok
   ViewArchivedEmail.ss:
     CANACCESS: 'U kunt de gearchiveerde site bekijken via deze link:'
     HAVEASKED: 'U heeft de inhoud van onze site opgevraagd op'
   VirtualPage:
-    CHOOSE: 'Kies een pagina om naar te verwijzen'
+    CHOOSE: 'Gekoppelde pagina'
     DESCRIPTION: 'Geeft de inhoud van een andere pagina weer'
-    EDITCONTENT: 'Klik hier om de inhoud te wijzigen'
+    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'

lang/pa.yml

@@ -76,12 +76,15 @@ pa:
     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.'
@@ -96,16 +99,16 @@ pa:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Save
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ pa:
     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
@@ -167,6 +171,7 @@ pa:
     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
@@ -178,10 +183,11 @@ pa:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ pa:
     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
@@ -267,8 +277,10 @@ pa:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -299,7 +311,9 @@ pa:
     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'
-    BUTTONSAVEPUBLISH: 'ਬਚਾਓ ਅਤੇ ਛਾਪੋ'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'ਅਣਛਾਪੋ       '
     BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ pa:
     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'
@@ -337,7 +354,9 @@ pa:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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: 'ਸਫ਼ੇ ਦੀ ਿਕਸਮ  '
@@ -366,7 +385,7 @@ pa:
     URLSegment: 'URL Segment'
     VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'View any page'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to Site Content" permission'
+    VIEW_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'
@@ -376,6 +395,7 @@ pa:
     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'
@@ -397,14 +417,20 @@ pa:
     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: 'Choose a page to link to'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'ਸਮਾਨ ਐਿਡਟ ਕਰਨ ਲਈ ਇੱਥ ਕਿਲੱਕ ਕਰੋ'
+    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'

lang/pes_IR.yml

@@ -76,12 +76,15 @@ pes_IR:
     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.'
@@ -96,16 +99,16 @@ pes_IR:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Save
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ pes_IR:
     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
@@ -152,7 +156,7 @@ pes_IR:
     FILTERDATEFROM: از
     FILTERDATEHEADING: تاریخ
     FILTERDATETO: به
-    FILTERLABELTEXT: محتوی
+    FILTERLABELTEXT: 'محتوی'
   CMSSettingsController:
     MENUTITLE: Settings
   CMSSiteTreeFilter_ChangedPages:
@@ -167,6 +171,7 @@ pes_IR:
     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
@@ -178,10 +183,11 @@ pes_IR:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ pes_IR:
     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: جستجو
@@ -267,8 +277,10 @@ pes_IR:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -299,7 +311,9 @@ pes_IR:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancel draft changes'
     BUTTONCANCELDRAFTDESC: 'Delete your draft and revert to the currently published page'
-    BUTTONSAVEPUBLISH: 'Save & Publish'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Unpublish
     BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ pes_IR:
     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'
@@ -337,7 +354,9 @@ pes_IR:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ pes_IR:
     URLSegment: 'URL Segment'
     VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'View any page'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to Site Content" permission'
+    VIEW_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'
@@ -376,6 +395,7 @@ pes_IR:
     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'
@@ -397,14 +417,20 @@ pes_IR:
     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: 'Choose a page to link to'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'click here to edit the content'
+    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'

lang/pl.yml

@@ -76,12 +76,15 @@ pl:
     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'
     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.'
@@ -96,14 +99,14 @@ pl:
     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: 'Usunięto ''%s''%s z opublikowanej witryny'
+    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'
-    ROLLEDBACKPUB: 'Przywrócono do opublikowanej wersji. Nowy numer wersji to #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Przywrócono wersję #%d. Nowy numer wersji to #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Zapisz
     SAVEDRAFT: 'Zapisz szkic'
     TabContent: Zawartość
@@ -129,6 +132,7 @@ pl:
     SHOWUNPUBLISHED: 'Pokaż nieopublikowane wersje'
     SHOWVERSION: 'Pokaż wersję'
     VIEW: zobacz
+    VIEWINGLATEST: 'Obecnie oglądasz najnowszą wersję'
     VIEWINGVERSION: 'Obecnie oglądasz wersję {version}.'
   CMSPageHistoryController_versions.ss:
     AUTHOR: Autor
@@ -167,6 +171,7 @@ pl:
     ARCHIVEDSITE: 'Podgląd wersji'
     ARCHIVEDSITEFROM: 'Zarchiwizowana witryna od'
     CMS: 'System Zarządzania Treścią'
+    DRAFT: Szkic
     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'
@@ -178,10 +183,11 @@ pl:
     LOGIN: Zaloguj
     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 rozpocząć edycję zawartości witryn(y) otwierając <a href="{link}">CMS</a>.'
+    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:'
   ErrorPage:
@@ -225,7 +231,7 @@ pl:
     UploadFilesButton: Prześlij
   LeftAndMain:
     DELETED: Usunięty
-    PreviewButton: Podgląd
+    PreviewButton: 'Podgląd'
     SAVEDUP: Zapisane
     STATUSPUBLISHEDSUCCESS: 'Opublikowano ''{title}'' '
     SearchResults: 'Wyniki wyszukiwania'
@@ -251,8 +257,12 @@ pl:
     ReportTitle: Tytuł
   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: Ok
+    GO: Przejdź
     SEARCH: Szukaj
     SearchResults: 'Wyniki wyszukiwania'
   SideReport:
@@ -267,6 +277,8 @@ pl:
     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'
@@ -299,6 +311,8 @@ 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'
@@ -324,9 +338,12 @@ 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'
@@ -337,7 +354,9 @@ pl:
     MODIFIEDONDRAFTHELP: 'Na stronie znajdują się nieopublikowane zmiany'
     MODIFIEDONDRAFTSHORT: Zmodyfikowana
     MetadataToggle: Metadane
-    OBSOLETECLASS: 'Ta strona należy do zdezaktualizowanego typu {type}. Zapisanie jej spowoduje zresetowanie jej typu i możliwą utratę danych'
+    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'
@@ -366,7 +385,7 @@ pl:
     URLSegment: 'Segment adresu URL'
     VIEWERGROUPS: 'Grupy przeglądających'
     VIEW_ALL_DESCRIPTION: 'Przeglądanie stron'
-    VIEW_ALL_HELP: 'Zdolność oglądania jakiejkolwiek strony na witrynie, bez względu na ustawienia w zakładce Dostęp. Wymaga uprawnienia "Dostęp do edycji treści"'
+    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'
@@ -376,6 +395,7 @@ pl:
     many_many_ImageTracking: 'Śledzenie obrazków'
     many_many_LinkTracking: 'Śledzenie linków'
   SiteTreeURLSegmentField:
+    EMPTY: 'Proszę podać część adresu lub kliknąć anuluj'
     HelpChars: 'Znaki specjalne są automatycznie zamienione lub usunięte.'
   StaticExporter:
     BASEURL: 'Bazowy URL'
@@ -397,14 +417,20 @@ pl:
     VIEWPREVIOUS: 'Zobacz poprzednie'
   TreeTools:
     DisplayLabel: 'Wyświetl:'
+  URLSegmentField:
+    Cancel: Anuluj
+    Edit: Edytuj
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'Dostęp do zarchiwizowanej witryny:'
     HAVEASKED: 'Poprosiłeś o obejrzenie treści naszej strony na'
   VirtualPage:
-    CHOOSE: 'Zmień link do strony'
+    CHOOSE: 'Linkowana strona'
     DESCRIPTION: 'Wyświetla zawartość innej strony'
-    EDITCONTENT: 'kliknij tutaj aby edytować zawartość'
+    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'

lang/pt.yml

@@ -76,12 +76,15 @@ pt:
     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'
     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'
     DESCREMOVED: 'e {count} descendentes'
+    DUPLICATED: 'Duplicated ''{title}'' successfully'
+    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: Email
     EditTree: 'Editar árvore'
     ListFiltered: 'Lista filtrada.'
@@ -96,16 +99,16 @@ pt:
     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: 'Apagado ''%s''%s do site publicado'
+    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'
-    ROLLEDBACKPUB: 'Voltar para a versão publicada. Nova versão nº #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Voltar para a versão #%d. Nova versão nº #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Guardar
-    SAVEDRAFT: 'Salvar rascunho'
+    SAVEDRAFT: 'Save draft'
     TabContent: Conteúdo
     TabHistory: Histórico
     TabSettings: Configurações
@@ -129,6 +132,7 @@ pt:
     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:
     AUTHOR: Autor
@@ -167,6 +171,7 @@ pt:
     ARCHIVEDSITE: Pré-visualização
     ARCHIVEDSITEFROM: 'Arquivar o site de'
     CMS: 'Gestor de Conteúdos'
+    DRAFT: Draft
     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
@@ -178,10 +183,11 @@ pt:
     LOGIN: Autenticar
     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: 'Pode começar a editar o conteúdo do seu site acedendo ao <a href="{link}">CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ pt:
     ReportTitle: Título
   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
@@ -267,6 +277,8 @@ 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'
@@ -299,7 +311,9 @@ 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'
-    BUTTONSAVEPUBLISH: 'Gravar e Publicar'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Remover do site Publicado'
     BUTTONUNPUBLISHDESC: 'Remover esta página do site publicado'
     CREATED: 'Data de criação'
@@ -324,9 +338,12 @@ pt:
     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'
@@ -337,7 +354,9 @@ pt:
     MODIFIEDONDRAFTHELP: 'A página contem alterações não publicadas'
     MODIFIEDONDRAFTSHORT: Modificado
     MetadataToggle: Meta-data
-    OBSOLETECLASS: 'O tipo de página {type} é obsuleto. Ao gravar esta página poderá perder alguns dos dados. '
+    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'
@@ -366,7 +385,7 @@ pt:
     URLSegment: 'Segmento de URL'
     VIEWERGROUPS: 'Ver grupos '
     VIEW_ALL_DESCRIPTION: 'Ver qualquer página'
-    VIEW_ALL_HELP: 'Capacidade de visualizar qualquer página do site, independentemente das configurações. Requer as permissões "Acesso ao conteúdo do site"'
+    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'
@@ -376,6 +395,7 @@ pt:
     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'
@@ -397,14 +417,20 @@ pt:
     VIEWPREVIOUS: 'Ver o anterior'
   TreeTools:
     DisplayLabel: 'Apresentar:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   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: 'Escolha uma página para onde redireccionar'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Apresentar o conteúdo de outra página'
-    EDITCONTENT: 'clique aqui para editar o conteúdo'
+    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: 'Páginas do tipo "{type}" não tem permissões para serem criadas a este nível.'
     SINGULARNAME: 'Página Virtual'

lang/pt_BR.yml

@@ -76,12 +76,15 @@ pt_BR:
     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'
     EMAIL: E-mail
     EditTree: 'Edit Tree'
     ListFiltered: 'Filtered list.'
@@ -96,16 +99,16 @@ pt_BR:
     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: 'Excluído ''%s''%s do site publicado'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Removed ''{title}'' from the published site'
     REMOVEDPAGEFROMDRAFT: 'Removido ''%s''  do site de rascunho'
     RESTORE: Restaurar
     RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Reverter para esta versão'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Reverteu para a versão #%d. O número da nova versão é #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Salvar
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ pt_BR:
     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
@@ -167,6 +171,7 @@ pt_BR:
     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
@@ -178,10 +183,11 @@ pt_BR:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ pt_BR:
     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
@@ -267,8 +277,10 @@ pt_BR:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -299,7 +311,9 @@ pt_BR:
     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'
-    BUTTONSAVEPUBLISH: 'Salvar e Publicar'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Anular publicação'
     BUTTONUNPUBLISHDESC: 'Remova esta página do site publicado'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ pt_BR:
     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'
@@ -337,7 +354,9 @@ pt_BR:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ pt_BR:
     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 Site Content" permission'
+    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'
@@ -376,6 +395,7 @@ pt_BR:
     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'
@@ -397,14 +417,20 @@ pt_BR:
     VIEWPREVIOUS: 'Ver anterior'
   TreeTools:
     DisplayLabel: 'Display:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   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: 'Escolha uma página para fazer link'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'clique aqui para editar o conteúdo'
+    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'

lang/ro.yml

@@ -76,12 +76,15 @@ ro:
     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.'
@@ -96,16 +99,16 @@ ro:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Save
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ ro:
     SHOWUNPUBLISHED: 'Показать неизданную версию'
     SHOWVERSION: 'Показать версию'
     VIEW: просмотр
+    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Currently viewing version {version}.'
   CMSPageHistoryController_versions.ss:
     AUTHOR: Автор
@@ -167,6 +171,7 @@ ro:
     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
@@ -178,10 +183,11 @@ ro:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ ro:
     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: Поиск
@@ -267,8 +277,10 @@ ro:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -299,7 +311,9 @@ ro:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancel draft changes'
     BUTTONCANCELDRAFTDESC: 'Delete your draft and revert to the currently published page'
-    BUTTONSAVEPUBLISH: 'Salvează si Publică '
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Unpublish
     BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ ro:
     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'
@@ -337,7 +354,9 @@ ro:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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: 'Nume pagină'
     PAGETYPE: 'Tipul paginii'
@@ -366,7 +385,7 @@ ro:
     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 Site Content" permission'
+    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'
@@ -376,6 +395,7 @@ ro:
     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: 'Основной адрес'
@@ -397,14 +417,20 @@ ro:
     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: 'Выбрать страницы перехода'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Показать содержание другой страницы'
-    EDITCONTENT: 'click aici pentru a edita conţinutul'
+    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'

lang/ru.yml

@@ -2,7 +2,7 @@ ru:
   AssetAdmin:
     ADDFILES: 'Добавить файлы'
     ActionAdd: 'Добавить папку'
-    AppCategoryArchive: Архив
+    AppCategoryArchive: 'Архив'
     AppCategoryAudio: Аудио
     AppCategoryDocument: Документ
     AppCategoryFlash: Flash
@@ -13,7 +13,7 @@ ru:
     CurrentFolderOnly: 'Только в этой папке?'
     DetailsView: Детали
     FILES: Файлы
-    FILESYSTEMSYNC: Синхронизировать
+    FILESYSTEMSYNC: 'Синхронизировать'
     FILESYSTEMSYNCTITLE: 'Обновление базы данных файлов в файловой системе. Стоит использовать, если новые файлы были загружены без использования CMS, например, через FTP.'
     FROMTHEINTERNET: 'Из интернета'
     FROMYOURCOMPUTER: 'С диска'
@@ -21,7 +21,7 @@ ru:
     ListView: 'В виде списка'
     MENUTITLE: Файлы
     NEWFOLDER: 'Новая папка'
-    SIZE: Размер
+    SIZE: 'Размер'
     THUMBSDELETED: '{count} неиспользуемых миниатюр удалено'
     TreeView: 'В виде дерева'
     Upload: Загрузить
@@ -76,12 +76,15 @@ ru:
     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: Email
     EditTree: 'Редактировать дерево'
     ListFiltered: 'Отфильтрованный список.'
@@ -96,15 +99,15 @@ ru:
     PUBALLFUN2: 'Нажатие этой кнопки выполнит ту же функцию, что и нажатие кнопки "Опубликовать" для каждой отдельной страницы. Данная функция предназначена для использования после значительных изменений содержимого, например, в момент создания нового сайта.'
     PUBPAGES: 'Готово: опубликовано {count} страниц'
     PageAdded: 'Страница успешно создана'
-    REMOVED: '''%s''%s удалено с опубликованного сайта'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Страница ''{title}'' удалена с опубликованного сайта'
     REMOVEDPAGEFROMDRAFT: 'Страница ''%s'' удалена с чернового сайта'
     RESTORE: Восстановить
     RESTORED: '''{title}'' успешно восстановлен'
     ROLLBACK: 'Откатить до этой версии'
-    ROLLEDBACKPUB: 'Произведен откат до опубликованной версии. Номер новой версии #{version}'
+    ROLLEDBACKPUBv2: 'Выполнен откат к опубликованной версии.'
-    ROLLEDBACKVERSION: 'Произведен откат до версии #%d. Номер новой версии #%d'
+    ROLLEDBACKVERSIONv2: 'Выполнен откат к версии #%d.'
-    SAVE: Сохранить
+    SAVE: 'Сохранить'
     SAVEDRAFT: 'Сохранить черновик'
     TabContent: Содержимое
     TabHistory: История
@@ -129,6 +132,7 @@ ru:
     SHOWUNPUBLISHED: 'Показать неопубликованные версии'
     SHOWVERSION: 'Показать версию'
     VIEW: обзор
+    VIEWINGLATEST: 'Вы просматриваете самую новую версию.'
     VIEWINGVERSION: 'Вы просматриваете версию {version}.'
   CMSPageHistoryController_versions.ss:
     AUTHOR: Автор
@@ -167,6 +171,7 @@ ru:
     ARCHIVEDSITE: 'Версия для просмотра'
     ARCHIVEDSITEFROM: 'Архив сайта от'
     CMS: CMS
+    DRAFT: Черновик
     DRAFTSITE: 'Черновой сайт'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Вы должны войти с паролем для Системы Управления (CMS), чтобы увидеть черновое или архивное содержимое. <a href="%s">Нажмите сюда, чтобы вернуться на опубликованный сайт.</a>'
     Email: Email
@@ -175,13 +180,14 @@ ru:
     InstallSecurityWarning: 'Если вы не планируете в ближайшее время переустанавливать CMS, по соображениям безопасности рекомендуется удалить инсталляционные файлы (<em>для этого необходим администраторский доступ, см. выше</em>). Теперь веб-серверу требуется доступ для записи только к папке "assets"; вы можете защитить от записи все остальные папки. <a href="{link}" style="text-align: center;">Щелкните здесь, чтобы удалить инсталляционные файлы.</a>'
     InstallSuccessCongratulations: 'SilverStripe успешно установлен!'
     LOGGEDINAS: 'Залогинен как'
-    LOGIN: Вход
+    LOGIN: 'Вход'
-    LOGOUT: Выход
+    LOGOUT: 'Выход'
     NOTLOGGEDIN: 'Не вошли в систему'
+    PUBLISHED: Published
     PUBLISHEDSITE: 'Опубликованный сайт'
     Password: Пароль
     PostInstallTutorialIntro: 'Это упрощенная версия сайта, созданного с помощью SilverStripe 3. О возможностях расширения сайта можно узнать, щелкнув эту ссылку: {link}.'
-    StartEditing: ' Вы можете приступить к редактированию сайта, открыв <a href="{link}">CMS</a>.'
+    StartEditing: 'Вы можете приступить к редактированию содержимого сайта, открыв <a href="{link}">CMS</a>.'
     UnableDeleteInstall: 'Не удалось удалить инсталляционные файлы. Пожалуйста, удалите следующие файлы вручную'
     VIEWPAGEIN: 'Просмотреть страницу в:'
   ErrorPage:
@@ -226,7 +232,7 @@ ru:
   LeftAndMain:
     DELETED: Удалено.
     PreviewButton: Просмотр
-    SAVEDUP: Сохранено.
+    SAVEDUP: 'Сохранено.'
     STATUSPUBLISHEDSUCCESS: '''{title}'' успешно опубликован'
     SearchResults: 'Результаты поиска'
     VersionUnknown: Неизвестно
@@ -251,6 +257,10 @@ ru:
     ReportTitle: Название
   ReportAdminForm:
     FILTERBY: 'Фильтровать по'
+  SITETREE:
+    VIRTUALPAGEDRAFTWARNING: 'Для опубликования виртуальной страницы опубликуйте связанную страницу'
+    VIRTUALPAGEWARNING: 'Для опубликования этой страницы выберите связанную страницу и сохраните изменения'
+    VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish'
   SearchForm:
     GO: Выполн.
     SEARCH: Поиск
@@ -267,6 +277,8 @@ ru:
     OtherGroupTitle: Другие
     ParameterLiveCheckbox: 'Проверить опубликованный сайт'
     REPEMPTY: 'Отчет {title} пуст.'
+  SilverStripeNavigator:
+    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Чтобы поделиться ссылкой на эту страницу, скопируйте URL ниже.'
     ShareLink: 'Поделиться ссылкой'
@@ -299,7 +311,9 @@ ru:
     APPEARSVIRTUALPAGES: 'Это содержимое также отображается на виртуальных страницах в разделе {title}.'
     BUTTONCANCELDRAFT: 'Отменить изменения черновика'
     BUTTONCANCELDRAFTDESC: 'Удалить черновик и вернуться к уже опубликованной странице'
-    BUTTONSAVEPUBLISH: 'Сохр. и опублик.'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Сохранить и опубликовать'
     BUTTONUNPUBLISH: 'Отмена публикации'
     BUTTONUNPUBLISHDESC: 'Удалить эту страницу с опубликованного сайта'
     CREATED: 'Дата создания'
@@ -324,9 +338,12 @@ ru:
     EDIT_ALL_DESCRIPTION: 'Редактирование любой страницы'
     EDIT_ALL_HELP: 'Возможность редактировать любую страницу на сайте независимо от настроек во вкладке "Доступ". Необходимо право доступа к разделу "Страницы".'
     Editors: 'Группы редактирования'
+    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 'Эта страница содержит неверные ссылки.'
     HTMLEDITORTITLE: Содержимое
     INHERIT: 'Перенять от родительской страницы'
+    LASTPUBLISHED: 'Last published'
+    LASTSAVED: 'Last saved'
     LASTUPDATED: 'Последнее обновление'
     LINKCHANGENOTE: 'Изменение ссылки на эту страницу повлияет и на ссылки всех дочерних страниц.'
     MENUTITLE: 'Метка в навигации'
@@ -337,6 +354,8 @@ ru:
     MODIFIEDONDRAFTHELP: 'На этой странице есть неопубликованные изменения'
     MODIFIEDONDRAFTSHORT: Изменено
     MetadataToggle: Метаданные
+    MoreOptions: 'More options'
+    NOTPUBLISHED: 'Not published'
     OBSOLETECLASS: 'Тип страницы {type} больше не поддерживается. При сохранении тип страницы будет сброшен, что может привести к потере данных'
     PAGELOCATION: 'Расположение страницы'
     PAGETITLE: 'Название страницы'
@@ -366,7 +385,7 @@ ru:
     URLSegment: 'Адрес страницы'
     VIEWERGROUPS: 'Группы чтения'
     VIEW_ALL_DESCRIPTION: 'Просмотр любой страницы'
-    VIEW_ALL_HELP: 'Возможность просматривать любую страницу на сайте независимо от настроек во вкладке "Доступ". Требуется право доступа к содержимому сайта.'
+    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: 'Группы чтения'
@@ -376,6 +395,7 @@ ru:
     many_many_ImageTracking: 'Отслеживание изображений'
     many_many_LinkTracking: 'Отслеживание ссылок'
   SiteTreeURLSegmentField:
+    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Спецсимволы автоматически конвертируются или удаляются.'
   StaticExporter:
     BASEURL: 'Базовый URL'
@@ -397,14 +417,20 @@ ru:
     VIEWPREVIOUS: 'См. предыдущ.'
   TreeTools:
     DisplayLabel: 'Отображать:'
+  URLSegmentField:
+    Cancel: Отмена
+    Edit: 'Редактировать'
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'Вы можете посмотреть архивную версию сайта по этой ссылке:'
     HAVEASKED: 'Вы запросили просмотр содержимого нашего сайта за'
   VirtualPage:
-    CHOOSE: 'Выберите страницу, на которую ссылаетесь'
+    CHOOSE: 'Связанная страница'
     DESCRIPTION: 'Показать содержимое других страниц'
-    EDITCONTENT: 'Нажмите здесь для редактирования содержимого'
+    EDITCONTENT: 'Редактировать содержимое на связанной странице'
+    EditLink: редактировать
     HEADER: 'Это виртуальная страница'
+    HEADERWITHLINK: 'Это виртуальная страница, копирующая содержимое из "{title}" ({link})'
     PLURALNAME: 'Виртуальная страница'
     PageTypNotAllowedOnRoot: 'Страницы типа "{type}" недопустимы в качестве корневых для этой виртуальной страницы'
     SINGULARNAME: 'Виртуальная страница'

lang/si.yml

@@ -76,12 +76,15 @@ si:
     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.'
@@ -96,16 +99,16 @@ si:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Removed ''{title}'' from the published site'
     REMOVEDPAGEFROMDRAFT: 'කටු අඩවියෙන් ''%s'' මකන ලදී'
     RESTORE: Restore
     RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'මෙම සංස්රනය ඉවත් කරනන්න'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: '#%d වැනි සංස්රනය ඉවත් කරන ලදී, අලුත සංස්කරනය  #%d වේ'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: 'සේවි කරන්න'
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ si:
     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
@@ -167,6 +171,7 @@ si:
     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
@@ -178,10 +183,11 @@ si:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ si:
     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
@@ -267,8 +277,10 @@ si:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -299,12 +311,14 @@ si:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'කටු වෙනස් කිරීම් අවලංගු කරන්න'
     BUTTONCANCELDRAFTDESC: 'කටු සටහන මකා, දැනට ප්රසිද්ධ පිටුවට ඵකතු කරන්න'
-    BUTTONSAVEPUBLISH: 'සේව් කර ප්රසිද්ධ කරන්න'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     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>'
@@ -324,20 +338,25 @@ si:
     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: අන්තර්ගතය
+    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: අර්තකතනය
+    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
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose 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: 'Page location'
     PAGETITLE: 'පිටු නම'
     PAGETYPE: 'පිටු වර්ගය'
@@ -359,14 +378,14 @@ si:
     SHOWINSEARCH: 'සර්ච් ඵකේ පෙන්වන්නද?'
     SINGULARNAME: Page
     TABBEHAVIOUR: හැසිරීම
-    TABCONTENT: අන්තර්ගතය
+    TABCONTENT: 'අන්තර්ගතය'
     TABDEPENDENT: 'Dependent pages'
-    TOPLEVEL: අන්ර්ගතය
+    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 Site Content" permission'
+    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'
@@ -376,6 +395,7 @@ si:
     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'
@@ -397,14 +417,20 @@ si:
     VIEWPREVIOUS: 'පෙර පෙන්වන්න'
   TreeTools:
     DisplayLabel: 'Display:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'මෙම බැදීමෙන් පැරනි අඩවියට ප්රවිෂ්ට විය හැක'
     HAVEASKED: 'ඹබට අපගේ වෙබ් අඩවිය නිරීක්ශනය කරන ලෙස ඉල්ලා ඇත'
   VirtualPage:
-    CHOOSE: 'බැදීමට පිටුවක් තෝරන්න'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'සංස්කරනය කරන්න මෙතන ඹබන්න'
+    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: 'මනඃකල්පිත පිටුව'

lang/sk.yml

@@ -76,12 +76,15 @@ sk:
     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'
     DESCREMOVED: 'a {count} potomkov'
+    DUPLICATED: 'Duplicated ''{title}'' successfully'
+    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: 'Pošli e-mailom'
     EditTree: 'Editovať strom'
     ListFiltered: 'Filtrovaný zoznam.'
@@ -96,16 +99,16 @@ sk:
     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: 'Vymazané ''%s''%s z publikovaného webu'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     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'
-    ROLLEDBACKPUB: 'Vrátené späť na zverejnenú verziu. Číslo novej verzie je #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Vrátené späť na verziu: #%d. Číslo novej verzie je #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Uložiť
-    SAVEDRAFT: 'Uložiť koncept'
+    SAVEDRAFT: 'Save draft'
     TabContent: Obsah
     TabHistory: História
     TabSettings: Nastavenia
@@ -129,6 +132,7 @@ sk:
     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
@@ -167,6 +171,7 @@ sk:
     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
@@ -178,10 +183,11 @@ sk:
     LOGIN: Prihlásiť
     LOGOUT: Odhlásiť
     NOTLOGGEDIN: Neprihlásený
+    PUBLISHED: Published
     PUBLISHEDSITE: 'Verejný web'
     Password: Heslo
     PostInstallTutorialIntro: 'Tento web je zjednodušená verzia SilverStripe 3. webu. Pre rošírenie, pozrite sa na {link}, prosím.'
-    StartEditing: 'Môžte začať editáciu vášho web obsahu otvorením <a href="{link}">CMS</a>.'
+    StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Nepodarilo sa smazať inštalačné súbory. Smažte ručne súbory uvedené dole'
     VIEWPAGEIN: 'Prezrieť stránku v:'
   ErrorPage:
@@ -239,10 +245,10 @@ sk:
     DESCRIPTION: 'Presmeruje na inú internú stránku'
     HASBEENSETUP: 'Stránka na presmerovanie bola nastavená bez cieľa.'
     HEADER: 'Táto stránka presmeruje používateľov na inú stránku'
-    OTHERURL: 'Iné webové URL.'
+    OTHERURL: 'Iné web URL.'
     PLURALNAME: 'Presmerovacie stránky'
     REDIRECTTO: 'Presmerovať na'
-    REDIRECTTOEXTERNAL: 'Iná webová stránka'
+    REDIRECTTOEXTERNAL: 'Iná web stránka'
     REDIRECTTOPAGE: 'Stránka na vašom webe'
     SINGULARNAME: 'Presmerovacia stránka'
     YOURPAGE: 'Stránka na vašom webe'
@@ -251,6 +257,10 @@ sk:
     ReportTitle: Titulok
   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ť
@@ -267,6 +277,8 @@ 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'
@@ -299,7 +311,9 @@ 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'
-    BUTTONSAVEPUBLISH: 'Uložiť & publikovať'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Nezverejniť
     BUTTONUNPUBLISHDESC: 'Odstrániť túto stránku z publikovaných na webe'
     CREATED: 'Dátum vytvorenia'
@@ -324,9 +338,12 @@ 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'
@@ -337,7 +354,9 @@ sk:
     MODIFIEDONDRAFTHELP: 'Stránka má nezverejnené zmeny'
     MODIFIEDONDRAFTSHORT: Zmenené
     MetadataToggle: Metaúdaje
-    OBSOLETECLASS: 'Táto stránka je zastaralý typ {type}. Uloženie spôsobí stratu jeho typu a vy môžte stratiť dáta'
+    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: 'Pozícia stránky'
     PAGETITLE: 'Názov stránky'
     PAGETYPE: 'Typ stránky'
@@ -366,7 +385,7 @@ sk:
     URLSegment: 'Čast URL'
     VIEWERGROUPS: 'Skupiny prezeračov'
     VIEW_ALL_DESCRIPTION: 'Prezerať akúkoľvek stránku'
-    VIEW_ALL_HELP: 'Schopnosť prezerať akúkoľvek stránku na webe, nedbajúc na nastavenia v záložke prístupov. Vyžaduje "Prístupu k obsahu webu" práva'
+    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: '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'
@@ -376,6 +395,7 @@ sk:
     many_many_ImageTracking: 'Záznamy o obrázkoch'
     many_many_LinkTracking: 'Záznamy o odkazoch'
   SiteTreeURLSegmentField:
+    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Špeciálne znaky sú automaticky zkonvertované alebo ostránené.'
   StaticExporter:
     BASEURL: 'Základné URL'
@@ -397,14 +417,20 @@ sk:
     VIEWPREVIOUS: 'Zobraz predchádzajúce'
   TreeTools:
     DisplayLabel: 'Zobrazenie:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'Archivovaný web môžete navštíviť týmto odkazom:'
     HAVEASKED: 'Požiadali ste o zobrazenie obsahu webu z'
   VirtualPage:
-    CHOOSE: 'Vyberte kam má stránka odkazovať'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Zobrazí obsah inej stránky'
-    EDITCONTENT: 'kliknite tu pre editáciu obsahu'
+    EDITCONTENT: 'Edit content on linked page'
+    EditLink: edit
     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'

lang/sl.yml

@@ -1,41 +1,41 @@
 sl:
   AssetAdmin:
-    ADDFILES: 'Add Files'
+    ADDFILES: 'Dodaj datoteke'
-    ActionAdd: 'Add folder'
+    ActionAdd: 'Dodaj mapo'
-    AppCategoryArchive: Archive
+    AppCategoryArchive: Arhiv
-    AppCategoryAudio: Audio
+    AppCategoryAudio: Avdio
-    AppCategoryDocument: Document
+    AppCategoryDocument: Dokument
     AppCategoryFlash: Flash
-    AppCategoryImage: Image
+    AppCategoryImage: Slika
     AppCategoryVideo: Video
-    BackToFolder: 'Back to folder'
+    BackToFolder: 'Nazaj v mapo'
-    CREATED: Date
+    CREATED: Datum
     CurrentFolderOnly: 'Limit to current folder?'
-    DetailsView: Details
+    DetailsView: Podrobno
-    FILES: Files
+    FILES: Datoteke
     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.'
+    FILESYSTEMSYNCTITLE: 'Osveži vnose v bazo podatkov CMS ali fatoteke v datotečnem sistemu. Uporabno, kadar nalagate mimo CMS, npr. prek FTP. '
-    FROMTHEINTERNET: 'From the internet'
+    FROMTHEINTERNET: 'S spleta'
-    FROMYOURCOMPUTER: 'From your computer'
+    FROMYOURCOMPUTER: 'Z vašega računalnika'
-    Filetype: 'File type'
+    Filetype: 'Tip datoteke'
     ListView: 'List View'
-    MENUTITLE: Files
+    MENUTITLE: Datoteke
     NEWFOLDER: 'Nova mapa'
-    SIZE: Size
+    SIZE: Velikost
-    THUMBSDELETED: '{count} unused thumbnails have been deleted'
+    THUMBSDELETED: '{count} neuporabljenih predoglednih sličic je bilo izbrisanih'
     TreeView: 'Tree View'
-    Upload: Upload
+    Upload: Naloži
   AssetAdmin_DeleteBatchAction:
-    TITLE: 'Delete folders'
+    TITLE: 'Izbriši mape'
   AssetAdmin_Tools:
     FILTER: Filter
   AssetAdmin_left.ss:
     GO: Pojdi
   AssetTableField:
     BACKLINKCOUNT: 'Used on:'
-    PAGES: page(s)
+    PAGES: Stran/Strani
   BackLink_Button.ss:
-    Back: Back
+    Back: Nazaj
   BrokenLinksReport:
     Any: Poljuben
     BROKENLINKS: 'Poročilo o nedelujočih povezavah'
@@ -59,7 +59,7 @@ sl:
     RedirectorNonExistent: 'preusmerjevalna stran, ki kaže na neobstoječo stran'
     VirtualPageNonExistent: 'navidezna stran, ki kaže na neobstoječo stran'
   CMSAddPageController:
-    Title: 'Add page'
+    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'
@@ -70,128 +70,134 @@ sl:
     UNPUBLISHED_PAGES: 'Število iz objave umaknjenih strani: %d'
     UNPUBLISH_PAGES: 'Umakni iz objave'
   CMSFileAddController:
-    MENUTITLE: Files
+    MENUTITLE: Datoteke
   CMSMain:
-    ACCESS: 'Access to ''{title}'' section'
+    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: 'Add new page'
+    AddNew: 'Dodaj novo stran'
-    AddNewButton: 'Add new'
+    AddNewButton: 'Dodaj novo'
-    ChoosePageParentMode: 'Choose where to create this page'
+    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageType: 'Choose page type'
+    ChoosePageParentMode: 'Izberite mesto, kjer želite ustvariti novo stran'
-    Create: Create
+    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'
     EMAIL: E-naslov
-    EditTree: 'Edit Tree'
+    EditTree: 'Uredi drevesno strukturo'
     ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Edit Page'
+    MENUTITLE: 'Uredi stran'
-    NEWPAGE: 'New {pagetype}'
+    NEWPAGE: 'Nov {pagetype}'
     PAGENOTEXISTS: 'Stran na tem naslovu ne obstaja'
-    PAGES: Pages
+    PAGES: Strani
     PAGETYPEANYOPT: Any
-    PAGETYPEOPT: 'Page Type'
+    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.'
-    PUBPAGES: 'Done: Published {count} pages'
+    PUBPAGES: 'Opravljeno: Objavljenih je {count} strani'
-    PageAdded: 'Successfully created page'
+    PageAdded: 'Stran je bila uspešno ustvarjena'
-    REMOVED: 'Vsebina, odstranjena iz objave: ''%s''%s'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
-    REMOVEDPAGE: 'Removed ''{title}'' from the published 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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Preklopljeno na različico #%d. Številka nove različice je #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Shrani
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
-    TabContent: Content
+    TabContent: Vsebina
-    TabHistory: History
+    TabHistory: Zgodovina
-    TabSettings: Settings
+    TabSettings: Nastavitve
     TreeFiltered: 'Filtered tree.'
     TreeFilteredClear: 'Clear filter'
   CMSMain_left.ss:
     'APPLY FILTER': 'Apply Filter'
-    RESET: Reset
+    RESET: Ponastavi
   CMSPageAddController:
-    MENUTITLE: 'Add page'
+    MENUTITLE: 'Dodaj stran'
     ParentMode_child: 'Under another page'
-    ParentMode_top: 'Top level'
+    ParentMode_top: 'Stran na prvem nivoju'
   CMSPageEditController:
-    MENUTITLE: 'Edit Page'
+    MENUTITLE: 'Uredi stran'
   CMSPageHistoryController:
     COMPAREMODE: 'Compare mode (select two)'
-    COMPAREVERSIONS: 'Compare Versions'
+    COMPAREVERSIONS: 'Primerjaj različice'
-    COMPARINGVERSION: 'Comparing versions {version1} and {version2}.'
+    COMPARINGVERSION: 'Primerjava različic {version1} in {version2}.'
-    MENUTITLE: History
+    MENUTITLE: Zgodovina
-    REVERTTOTHISVERSION: 'Revert to this version'
+    REVERTTOTHISVERSION: 'Povrni v to različico'
-    SHOWUNPUBLISHED: 'Show unpublished versions'
+    SHOWUNPUBLISHED: 'Pokaži neobjavljeno različico'
-    SHOWVERSION: 'Show Version'
+    SHOWVERSION: 'Pokaži različico'
     VIEW: view
-    VIEWINGVERSION: 'Currently viewing version {version}.'
+    VIEWINGLATEST: 'Currently viewing the latest version.'
+    VIEWINGVERSION: 'Trenutno prikazana različica {version}.'
   CMSPageHistoryController_versions.ss:
-    AUTHOR: Author
+    AUTHOR: Avtor
-    NOTPUBLISHED: 'Not published'
+    NOTPUBLISHED: 'Ni objavljeno'
     PUBLISHER: Publisher
-    UNKNOWN: Unknown
+    UNKNOWN: Neznano
-    WHEN: When
+    WHEN: Kdaj
   CMSPageSettingsController:
-    MENUTITLE: 'Edit Page'
+    MENUTITLE: 'Uredi stran'
   CMSPagesController:
     GalleryView: 'Gallery View'
-    ListView: 'List View'
+    ListView: Seznam
-    MENUTITLE: Pages
+    MENUTITLE: Strani
-    TreeView: 'Tree View'
+    TreeView: 'Drevesna struktura'
   CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: 'Drag''n''drop'
+    ENABLEDRAGGING: 'Potegni in spusti'
     MULTISELECT: Multi-selection
   CMSPagesController_Tools.ss:
     FILTER: Filter
   CMSSearch:
-    FILTERDATEFROM: From
+    FILTERDATEFROM: Od
-    FILTERDATEHEADING: Date
+    FILTERDATEHEADING: Datum
-    FILTERDATETO: To
+    FILTERDATETO: Do
-    FILTERLABELTEXT: Content
+    FILTERLABELTEXT: Vsebina
   CMSSettingsController:
-    MENUTITLE: Settings
+    MENUTITLE: Nastavitve
   CMSSiteTreeFilter_ChangedPages:
-    Title: 'Changed pages'
+    Title: 'Spremenjene strani'
   CMSSiteTreeFilter_DeletedPages:
-    Title: 'All pages, including deleted'
+    Title: 'Vse strani, tudi izbrisane'
   CMSSiteTreeFilter_Search:
-    Title: 'All pages'
+    Title: 'Vse strani'
   ContentControl:
     NOTEWONTBESHOWN: 'Opomba: neprijavljeni obiskovalci spletnega mesta tega obvestila ne bodo videli.'
   ContentController:
-    ARCHIVEDSITE: 'Preview version'
+    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>'
-    Email: Email
+    Email: E-naslov
-    INSTALL_SUCCESS: 'Installation Successful!'
+    INSTALL_SUCCESS: 'Namestitev je bila uspešna!'
-    InstallFilesDeleted: 'Installation files have been successfully deleted.'
+    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 has been successfully installed!'
+    InstallSuccessCongratulations: 'SilverStripe je bil uspešno nameščen!'
     LOGGEDINAS: 'Prijavljen-a kot'
     LOGIN: Prijava
     LOGOUT: Odjava
     NOTLOGGEDIN: Neprijavljen-a
+    PUBLISHED: Published
     PUBLISHEDSITE: 'Objavljeno spletno mesto'
-    Password: Password
+    Password: Geslo
-    PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.'
+    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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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'
+    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>Sorry, there was a problem with handling your request.</p>'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>Oprostite, pri vaši zahtevi je prišlo do težave.</p>'
-    DEFAULTSERVERERRORPAGETITLE: 'Server error'
+    DEFAULTSERVERERRORPAGETITLE: 'Napaka na strežniku'
-    DESCRIPTION: 'Custom content for different error cases (e.g. "Page not found")'
+    DESCRIPTION: 'Prilagojena vsebina za različne primere napak (npr. "Želene strani nismo uspeli najti.")'
-    ERRORFILEPROBLEM: 'Error opening file "{filename}" for writing. Please check file permissions.'
+    ERRORFILEPROBLEM: 'Napaka pri odpiranju datoteke "{filename}" za pisanje. Prosim, preverite pravice za urejanje datoteke.'
     PLURALNAME: 'Error Pags'
     SINGULARNAME: 'Error Page'
     400: 'Napaka 400'
@@ -218,25 +224,25 @@ sl:
     504: 'Napaka 504: Čas za dostop je potekel'
     505: 'Napaka 505: Strežnik ne podpira HTTP-različice zahtevka'
   Folder:
-    AddFolderButton: 'Add folder'
+    AddFolderButton: 'Dodaj mapo'
     DELETEUNUSEDTHUMBNAILS: 'Izbriši neuporabljene ikone'
     UNUSEDFILESTITLE: 'Neuporabljene datoteke'
     UNUSEDTHUMBNAILSTITLE: 'Neuporabljene ikone (pomanjšane slike)'
-    UploadFilesButton: Upload
+    UploadFilesButton: Naloži
   LeftAndMain:
-    DELETED: Deleted.
+    DELETED: Izbrisano
-    PreviewButton: Preview
+    PreviewButton: Predogled
-    SAVEDUP: Saved.
+    SAVEDUP: Shranjeno.
-    STATUSPUBLISHEDSUCCESS: 'Published ''{title}'' successfully'
+    STATUSPUBLISHEDSUCCESS: '''{title}'' je uspešno objavljen.'
-    SearchResults: 'Search Results'
+    SearchResults: 'Rezultati iskanja'
-    VersionUnknown: Unknown
+    VersionUnknown: Neznano
   Permission:
     CMS_ACCESS_CATEGORY: 'Dostop do CMS-vmesnika'
   Permissions:
     CONTENT_CATEGORY: 'Nastavitve dovoljenj za upravljanje z vsebino'
     PERMISSIONS_CATEGORY: 'Vloge in dovoljenja za dostop'
   RedirectorPage:
-    DESCRIPTION: 'Redirects to a different internal page'
+    DESCRIPTION: 'Preusmeri na drugo notranjo stran'
     HASBEENSETUP: 'Nastavljena preusmeritev še nima določenega cilja.'
     HEADER: 'Ta stran bo preusmerila uporabnike na drugo stran'
     OTHERURL: 'URL druge spletne strani'
@@ -247,10 +253,14 @@ sl:
     SINGULARNAME: 'Redirector Page'
     YOURPAGE: 'Stran na tvojem spletnem mestu'
   ReportAdmin:
-    MENUTITLE: Reports
+    MENUTITLE: Poročila
-    ReportTitle: Title
+    ReportTitle: Naslov
   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
@@ -266,7 +276,9 @@ sl:
     LAST2WEEKS: 'Strani, spremenjene v zadnjih 2 tednih'
     OtherGroupTitle: Drugo
     ParameterLiveCheckbox: 'Preveri na objavljenem spletnem mestu'
-    REPEMPTY: 'The {title} report is empty.'
+    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'
@@ -293,16 +305,18 @@ sl:
     ACCESSHEADER: 'Kdo lahko vidi to stran?'
     ACCESSLOGGEDIN: 'Prijavljeni uporabniki'
     ACCESSONLYTHESE: 'Samo ti uporabniki (izberite jih s seznama)'
-    ADDEDTODRAFTHELP: 'Page has not been published yet'
+    ADDEDTODRAFTHELP: 'Stran še ni bila objavljena'
-    ADDEDTODRAFTSHORT: Draft
+    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'
-    BUTTONSAVEPUBLISH: 'Shrani in objavi'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Umakni iz objave'
     BUTTONUNPUBLISHDESC: 'Umakni to stran iz objave'
-    CREATED: 'Date Created'
+    CREATED: 'Datum nastanka'
     Comments: Komentarji
     Content: Vsebina
     DEFAULTABOUTCONTENT: '<p>Na to stran lahko vnesete svojo vsebino ali pa jo izbrišete in sami ustvarjate strani po svoji meri.<br /></p>'
@@ -311,8 +325,8 @@ sl:
     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: 'Page is no longer published'
+    DELETEDPAGEHELP: 'Stran ni več objavljena'
-    DELETEDPAGESHORT: Deleted
+    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'
@@ -324,20 +338,25 @@ 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'
-    LASTUPDATED: 'Last Updated'
+    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
-    METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
+    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: 'Page has unpublished changes'
+    MODIFIEDONDRAFTHELP: 'Stran vsebuje še neobjavljene spremembe.'
     MODIFIEDONDRAFTSHORT: Modified
-    MetadataToggle: Metadata
+    MetadataToggle: Metapodatki
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose 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: 'Lokacija strani'
     PAGETITLE: 'Ime strani'
     PAGETYPE: 'Tip strani'
@@ -347,17 +366,17 @@ sl:
     PARENTTYPE_SUBPAGE: 'Podstran (izberi spodaj)'
     PERMISSION_GRANTACCESS_DESCRIPTION: 'Upravljaj s pravicami za dostop do vsebine'
     PERMISSION_GRANTACCESS_HELP: 'Dovoli nastavitve pravic za dostop do izbrane strani v sklopu "Strani".'
-    PLURALNAME: Pages
+    PLURALNAME: Strani
-    PageTypNotAllowedOnRoot: 'Page type "{type}" is not allowed on the root level'
+    PageTypNotAllowedOnRoot: 'Tip strani "{type}" ne more biti del osnovne korenske ravni'
-    PageTypeNotAllowed: 'Page type "{type}" not allowed as child of this parent page'
+    PageTypeNotAllowed: 'Tip strani "{type}" ne more biti podrejen tej nadrejeni strani.'
-    REMOVEDFROMDRAFTHELP: 'Page is published, but has been deleted from draft'
+    REMOVEDFROMDRAFTHELP: 'Stran je objavljena, vendar ni bila izbrisana iz osnutkov.'
-    REMOVEDFROMDRAFTSHORT: 'Removed from draft'
+    REMOVEDFROMDRAFTSHORT: 'Odstranjeno iz osnutkov'
-    REMOVE_INSTALL_WARNING: 'Warning: You should remove install.php from this SilverStripe install for security reasons.'
+    REMOVE_INSTALL_WARNING: 'Pozor: Zaradi varnosti priporočamo, da odstranite install.php it te SilverStripe namestitve.'
     REORGANISE_DESCRIPTION: 'Spremeni strukturo spletnega mesta'
     REORGANISE_HELP: 'Razvrsti strani v drevesni strukturi s funkcijo "povleci in izpusti".'
     SHOWINMENUS: 'Pokaži v meniju?'
     SHOWINSEARCH: 'Pokaži v iskalniku?'
-    SINGULARNAME: Page
+    SINGULARNAME: Stran
     TABBEHAVIOUR: Vedenje
     TABCONTENT: Vsebina
     TABDEPENDENT: 'Odvisne strani'
@@ -366,17 +385,18 @@ sl:
     URLSegment: 'URL naslov strani'
     VIEWERGROUPS: 'Skupine obiskovalcev'
     VIEW_ALL_DESCRIPTION: 'Prikaz vse strani'
-    VIEW_ALL_HELP: 'Možnost prikaza katerekoli strani na spletnem mestu, ne glede na nastavitve v sklopu "Dostop". Zahteva dovoljenje za dostop do vsebine spletnega mesta.'
+    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_HELP: 'Ogled osnutka vsebine za uporabnike brez dostopa do vmesnika.'
     Viewers: 'Skupine obiskovalcev (viewers)'
-    Visibility: Visibility
+    Visibility: Vidnost
     has_one_Parent: 'Starševska stran'
     many_many_BackLinkTracking: 'Spremljanje povezav "nazaj"'
     many_many_ImageTracking: 'Spremljanje slik'
     many_many_LinkTracking: 'Spremljanje povezav'
   SiteTreeURLSegmentField:
-    HelpChars: ' Special characters are automatically converted or removed.'
+    EMPTY: 'Please enter a URL Segment or click cancel'
+    HelpChars: 'Posebni znaki so samodejno spremenjeni ali odstranjeni.'
   StaticExporter:
     BASEURL: 'Osnovni URL'
     EXPORTTO: 'Izvozi v to mapo'
@@ -384,27 +404,33 @@ sl:
   TableListField:
     SELECT: 'Izberi:'
   TableListField.ss:
-    NOITEMSFOUND: 'No items found'
+    NOITEMSFOUND: 'Ni najdenih predmetov'
     SORTASC: 'Razvrsti naraščajoče'
     SORTDESC: 'Razvrsti padajoče'
   TableListField_PageControls.ss:
     DISPLAYING: Displaying
-    OF: of
+    OF: od
-    TO: to
+    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:
     CANACCESS: 'Do arhvirane različice spletnega mesta lahko dostopate na naslovu:'
     HAVEASKED: 'Za vpogled v vsebino našega spletnega mesta ste zaprosili'
   VirtualPage:
-    CHOOSE: 'Izberite stran, na katero bo vodila povezava'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'za urejanje vsebine kliknite tukaj'
+    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'

lang/sr.yml

@@ -76,12 +76,15 @@ sr:
     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.'
@@ -96,16 +99,16 @@ sr:
     PUBALLFUN2: 'Притиском на ово дугме постићи ћете исто што и одласком на сваку страну и притискањем дугмета „објави“ . Намењена је за коришћене након великих измена садржаја као када се сајт први пут објављује.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    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: 'Врати се на ову верзију'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Враћено на верзију #%d. Број нове верзије је #%d.'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Сачувај
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ sr:
     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:
     AUTHOR: Autor
@@ -167,6 +171,7 @@ sr:
     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
@@ -178,10 +183,11 @@ sr:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ sr:
     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
@@ -267,6 +277,8 @@ sr:
     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'
@@ -299,7 +311,9 @@ sr:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Откажи промене на нацрту'
     BUTTONCANCELDRAFTDESC: 'Избришите свој нацрт и вратите се на тренутно објављену страну'
-    BUTTONSAVEPUBLISH: 'Сачувај и објави'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Повуци објављивање'
     BUTTONUNPUBLISHDESC: 'Izbriši ovu stranicu sa sajta na kome je objavljena'
     CREATED: 'Datum kreiranja'
@@ -324,9 +338,12 @@ sr:
     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: 'Натпис за навигацију'
@@ -337,7 +354,9 @@ sr:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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: 'Тип стране'
@@ -366,7 +385,7 @@ sr:
     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 Site Content" permission'
+    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'
@@ -376,6 +395,7 @@ sr:
     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'
@@ -397,14 +417,20 @@ sr:
     VIEWPREVIOUS: 'Погледај претходно'
   TreeTools:
     DisplayLabel: 'Display:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'Можете да приступите архивираном садржају на овом линку:'
     HAVEASKED: 'Замољени сте да погледате садржај овог сајта'
   VirtualPage:
-    CHOOSE: 'Izaberite stranicu na koju da se povežete'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Prikazuje sadržaj druge stranice'
-    EDITCONTENT: 'kliknite ovde da promenite sadržaj'
+    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'

lang/sv.yml

@@ -76,12 +76,15 @@ sv:
     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'
     EMAIL: E-post
     EditTree: 'Redigera trädet'
     ListFiltered: 'Filtrerad lista'
@@ -96,16 +99,16 @@ sv:
     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: 'Raderade ''%s''%s från den publicerade sajten'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Tog bort ''{title}'' från den publicerade sajten'
     REMOVEDPAGEFROMDRAFT: 'Raderade ''%s'' från utkast'
-    RESTORE: Återskapa
+    RESTORE: 'Återskapa'
     RESTORED: 'Återskapandet av  ''{title}'' lyckades'
     ROLLBACK: 'Återställ den här versionen'
-    ROLLEDBACKPUB: 'Återskapade publicerad version. Nytt versionsnummer är #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Återskapade version #%d. Nytt versionsnummer är #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Spara
-    SAVEDRAFT: 'Spara utkast'
+    SAVEDRAFT: 'Save draft'
     TabContent: Innehåll
     TabHistory: Historia
     TabSettings: Inställningar
@@ -129,6 +132,7 @@ sv:
     SHOWUNPUBLISHED: 'Visa opublicerade versioner'
     SHOWVERSION: 'Visa version'
     VIEW: 'Titta på'
+    VIEWINGLATEST: 'Nu visas den senaste versionen.'
     VIEWINGVERSION: 'Nu visas version {version}.'
   CMSPageHistoryController_versions.ss:
     AUTHOR: Författare
@@ -167,6 +171,7 @@ sv:
     ARCHIVEDSITE: 'Utkast version'
     ARCHIVEDSITEFROM: 'Arkiverad sajt från'
     CMS: CMS
+    DRAFT: Draft
     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
@@ -178,10 +183,11 @@ sv:
     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: 'Du kan ändra din sajts innehåll genom <a href="{link}">publiceringsverktyget</a>.'
+    StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Lyckades inte radera installationsfilerna. Radera följande filer manuellt.'
     VIEWPAGEIN: 'titta på sidan i:'
   ErrorPage:
@@ -251,6 +257,10 @@ sv:
     ReportTitle: Titel
   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
@@ -267,6 +277,8 @@ sv:
     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'
@@ -299,7 +311,9 @@ 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'
-    BUTTONSAVEPUBLISH: 'Spara och publicera'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Avpublicera
     BUTTONUNPUBLISHDESC: 'Ta bort den här sidan från den publicerade sajten'
     CREATED: Skapad
@@ -324,9 +338,12 @@ sv:
     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'
     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
@@ -337,7 +354,9 @@ sv:
     MODIFIEDONDRAFTHELP: 'Sidan har ej publicerade ändringar'
     MODIFIEDONDRAFTSHORT: Ändrad
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'Denna sida är föråldrad typ {type}. Att spara kommer återställa dess typ och du kan förlora 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: 'Sidans position'
     PAGETITLE: Sidnamn
     PAGETYPE: Sidtyp
@@ -364,18 +383,19 @@ sv:
     TOPLEVEL: 'Sajtinnehåll (toppnivå)'
     TOPLEVELCREATORGROUPS: 'Topp-nivå skapare'
     URLSegment: URL-segment
-    VIEWERGROUPS: Åtkomstgrupper
+    VIEWERGROUPS: 'Åtkomstgrupper'
     VIEW_ALL_DESCRIPTION: 'Visa alla sidor'
-    VIEW_ALL_HELP: 'Möjlighet att se alla sidor på sajten, oavsett inställningarna under Åtkomstfliken. Kräver "Tillgång till webbplatsinnehåll"'
+    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: '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
+    Viewers: 'Åskådargrupper'
     Visibility: Synlighet
     has_one_Parent: 'Överordnad sida'
     many_many_BackLinkTracking: 'Spåra inlänkar'
     many_many_ImageTracking: 'Spåra bild'
     many_many_LinkTracking: 'Spåra länk'
   SiteTreeURLSegmentField:
+    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Specialtecken konverteras eller tas bort'
   StaticExporter:
     BASEURL: Bas-URL
@@ -397,14 +417,20 @@ sv:
     VIEWPREVIOUS: 'Visa föregående'
   TreeTools:
     DisplayLabel: 'Visa:'
+  URLSegmentField:
+    Cancel: Avbryt
+    Edit: Redigera
+    OK: OK
   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: 'Välj en sida att länka till'
+    CHOOSE: 'Länkad sida'
     DESCRIPTION: 'Visar innehåll från en annan sida'
-    EDITCONTENT: 'klicka här för att redigera innehållet'
+    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'

lang/th.yml

@@ -6,7 +6,7 @@ th:
     AppCategoryAudio: ไฟล์เสียง
     AppCategoryDocument: เอกสาร
     AppCategoryFlash: แฟลช
-    AppCategoryImage: รูปภาพ
+    AppCategoryImage: 'รูปภาพ'
     AppCategoryVideo: วีดีโอ
     BackToFolder: ย้อนกลับไปที่โฟลเดอร์
     CREATED: วันที่
@@ -44,7 +44,7 @@ th:
     CheckSiteDropdownPublished: เว็บไซต์ที่เผยแพร่แล้ว
     ColumnDateLastModified: วันที่แก้ไขล่าสุด
     ColumnDateLastPublished: วันที่เผยแพร่ล่าสุด
-    ColumnProblemType: ประเภทปัญหา
+    ColumnProblemType: 'ประเภทปัญหา'
     ColumnURL: URL
     HasBrokenFile: มีไฟล์เสีย
     HasBrokenLink: มีลิงค์เสีย
@@ -76,12 +76,15 @@ th:
     ACCESS_HELP: 'อนุญาตให้เปิดดูส่วนของเซ็กชั่นที่บรรจุรายการหน้าเว็บแบบทรีและเนื้อหาได้ สิทธิ์ในการเปิดดูและแก้ไขสามารถจัดการได้ผ่านทางหน้าเว็บทีระบุอยู่ในเมนูแบบดรอปดาวน์ เช่นเดียวกับ "สิทธิ์อนุญาตของเนื้อหา" ที่แยกออกมาต่างหากด้วยเช่นกัน'
     AddNew: เพิ่มหน้าใหม่
     AddNewButton: เพิ่มใหม่
+    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
     ChoosePageParentMode: เลือกว่าต้องการสร้างหน้าเว็บนี้ไว้ที่ไหน
-    ChoosePageType: เลือกประเภทของหน้าเว็บ
+    ChoosePageType: 'เลือกประเภทของหน้าเว็บ'
     Create: สร้าง
     DELETE: ลบออกจากเว็บไซต์ฉบับร่าง
     DELETEFP: ลบ
     DESCREMOVED: 'และ {count} รายการลูก'
+    DUPLICATED: 'Duplicated ''{title}'' successfully'
+    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: อีเมล
     EditTree: 'แก้ไขรายการแบบ Tree'
     ListFiltered: แสดงรายการตามตัวกรองข้อมูล
@@ -89,23 +92,23 @@ th:
     NEWPAGE: 'ใหม่ {pagetype}'
     PAGENOTEXISTS: ไม่มีหน้านี้อยู่
     PAGES: หน้า
-    PAGETYPEANYOPT: ประเภทใดก็ได้
+    PAGETYPEANYOPT: 'ประเภทใดก็ได้'
-    PAGETYPEOPT: ประเภทหน้าเว็บ
+    PAGETYPEOPT: 'ประเภทหน้าเว็บ'
     PUBALLCONFIRM: 'กรุณาเผยแพร่หน้าเว็บทุกหน้าในเว็บไซต์, คัดลอกเนื้อหาลงไปที่'
     PUBALLFUN: 'ฟังก์ชั่นการทำงาน "เผยแพร่ทั้งหมด"'
     PUBALLFUN2: "การกดปุ่มนี้จะเทียบเท่ากับการไปที่หน้าต่างๆทุกๆหน้าแล้วกด \"เผยแพร่\".  It's\\nปุ่มดังกล่าวมีไว้ด้วยความตั้งใจที่ต้องการให้นำไปใช้กับการแก้ไขเนื้อหาเป็นจำนวนมาก เช่น เมื่อเว็บไซต์\\nถูกสร้างขึ้นเป็นครั้งแรก."
     PUBPAGES: 'เผยแแพร่หน้าเว็บแล้ว {count} หน้า'
     PageAdded: หน้าเว็บที่สร้างเสร็จเรียบร้อยแล้ว
-    REMOVED: 'ลบ ''%s''%s จากเว็บไซต์ที่ออนไลน์สดๆอยู่แล้ว'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'ลบ ''{title}'' ออกจากเว็บไซต์ที่เผยแพร่อยู่แล้ว'
     REMOVEDPAGEFROMDRAFT: 'ลบ ''%s'' ออกจากเว็บไซต์ฉบับร่างแล้ว'
     RESTORE: คืนค่า
     RESTORED: 'เรียกคืนค่า ''{title}'' เสร็จเรียบร้อยแล้ว'
     ROLLBACK: ย้อนกลับไปที่รุ่นนี้
-    ROLLEDBACKPUB: 'ย้อนกลับไปใช้รุ่นที่เผยแพร่อยู่ หมายเลขรุ่นใหม่คือ #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'ย้อนกลับไปเป็นรุ่น #%d แล้ว หมายเลขใหม่ของรุ่นคือ #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: บันทึก
-    SAVEDRAFT: บันทึกเป็นฉบับร่าง
+    SAVEDRAFT: 'Save draft'
     TabContent: เนื้อหา
     TabHistory: ประวัติย้อนหลัง
     TabSettings: ตั้งค่า
@@ -129,6 +132,7 @@ th:
     SHOWUNPUBLISHED: แสดงรุ่นที่ระงับการเผยแพร่ไว้
     SHOWVERSION: แสดงข้อมูลรุ่น
     VIEW: มุมมอง
+    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'ขณะนี้กำลังเปิดดูในรุ่น {version}.'
   CMSPageHistoryController_versions.ss:
     AUTHOR: ผู้แต่ง
@@ -167,6 +171,7 @@ th:
     ARCHIVEDSITE: รุ่นสำหรับดูตัวอย่าง
     ARCHIVEDSITEFROM: เว็บไซต์ที่จัดเก็บไว้ถาวรจาก
     CMS: CMS
+    DRAFT: Draft
     DRAFTSITE: เว็บไซต์ฉบับร่าง
     DRAFT_SITE_ACCESS_RESTRICTION: 'คุณต้องเข้าสู่ระบบด้วยรหัสผ่าน CMS ของคุณ หากต้องการเปิดดูฉบับร่าง หรือเนื้อหาย้อนหลัง.  <a href="%s">คลิกที่นี่เพื่อย้อนกลับไปที่เว็บไซต์ที่เผยแพร่อยู่.</a>'
     Email: อีเมล
@@ -178,10 +183,11 @@ th:
     LOGIN: เข้าสู่ระบบ
     LOGOUT: ออกจากระบบ
     NOTLOGGEDIN: ยังไม่ได้เข้าสู่ระบบ
+    PUBLISHED: Published
     PUBLISHEDSITE: เว็บไซต์ที่เผยแพร่อยู่
     Password: รหัสผ่าน
     PostInstallTutorialIntro: 'เว็บไซต์นี้เป็นรุ่นอย่างง่ายของเว็บไซต์ที่สร้างจากรุ่น SiverStripe 3 หากต้องการขยายขีดความสามารถ กรุณาเข้าไปที่ {link}'
-    StartEditing: 'คุณสามารถเริ่มทำการแก้ไขเนื้อหาในเว็บไซต์ของคุณได้ด้วยการเปิด <a href="{link}"> CMS</a>.'
+    StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'ไม่สามารถลบไฟล์ติดตั้งได้ กรุณาลบไฟล์ดังกล่าวด้านล่างด้วยตนเอง'
     VIEWPAGEIN: 'เปิดดูหน้าเว็บใน:'
   ErrorPage:
@@ -236,7 +242,7 @@ th:
     CONTENT_CATEGORY: สิทธิ์อนุญาตของเนื้อหา
     PERMISSIONS_CATEGORY: บทบาทและสิทธิ์อนุญาตการเข้าถึง
   RedirectorPage:
-    DESCRIPTION: เปลี่ยนเส้นทางไปยังหน้าเว็บภายในอื่นๆ
+    DESCRIPTION: 'เปลี่ยนเส้นทางไปยังหน้าเว็บภายในอื่นๆ'
     HASBEENSETUP: หน้าเว็บที่มีการเปลี่ยนเส้นทางซึ่งได้รับการตั้งค่าโดยปราศจากตำแหน่งปลายทางที่ต้องการเปลี่ยนเส้นทางไป
     HEADER: หน้าเว็บนี้จะเปลี่ยนเส้นทางผู้ใช้งานไปยังหน้าเว็บอื่นๆ
     OTHERURL: 'ที่อยู่ URL ของเว็บไซต์อื่นๆ'
@@ -251,6 +257,10 @@ th:
     ReportTitle: หัวเรื่อง
   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: ค้นหา
@@ -267,6 +277,8 @@ th:
     OtherGroupTitle: อื่นๆ
     ParameterLiveCheckbox: ดูเว็บไซต์แบบสดๆ
     REPEMPTY: 'รายงาน {title} ยังว่างอยู่'
+  SilverStripeNavigator:
+    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'หากต้องการแชร์หน้าเว็บนี้, คัดลอกแล้วนำลิงก์ด้านล่างนี้ไปวาง'
     ShareLink: ลิงก์ที่ต้องการแชร์
@@ -299,7 +311,9 @@ th:
     APPEARSVIRTUALPAGES: 'เนื้อหานี้ปรากฏอยู่ในหน้าเว็บจำลองในส่วนของ {title} ด้วยเช่นกัน'
     BUTTONCANCELDRAFT: ยกเลิกการเปลี่ยนแปลงในฉบับร่าง
     BUTTONCANCELDRAFTDESC: ลบฉบับร่างของคุณแล้วย้อนกลับไปใช้หน้าเว็บที่เผยแพร่อยู่ในขณะนี้
-    BUTTONSAVEPUBLISH: บันทึกและเผยแพร่
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: ยังไม่ได้เผยแพร่
     BUTTONUNPUBLISHDESC: ลบหน้าเว็บนี้ออกจากเว็บไซต์ที่เผยแพร่แล้ว
     CREATED: วันที่สร้าง
@@ -324,9 +338,12 @@ th:
     EDIT_ALL_DESCRIPTION: แก้ไขหน้าเว็บใดก็ได้
     EDIT_ALL_HELP: 'ความสามารถในการแก้ไขหน้าเว็บใดๆในเว็บไซต์, โดยไม่ต้องคำนึงถึงการตั้งค่าที่อยู่ในส่วนของแท็บการเข้าถึง, จำเป็นต้องได้รับสิทธิ์อนุญาติ "เข้าถึงส่วนของ''หน้าเว็บ''"'
     Editors: กลุ่มของบรรณาธิการ
+    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: หน้าเว็บนี้มีลิงค์เสีย
     HTMLEDITORTITLE: เนื้อหา
     INHERIT: สืบทอดค่าจากหน้าเว็บต้นทาง
+    LASTPUBLISHED: 'Last published'
+    LASTSAVED: 'Last saved'
     LASTUPDATED: อัพเดทล่าสุด
     LINKCHANGENOTE: การเปลี่ยนลิงก์ของหน้าเว็บนี้จะส่งผลถึงลิงก์ต่างๆที่อยู่ในหน้าเว็บลูกด้วย
     MENUTITLE: ป้ายบอกทาง
@@ -337,7 +354,9 @@ th:
     MODIFIEDONDRAFTHELP: หน้าเว็บถูกเปลี่ยนค่าเป็นระงับการเผยแพร่แล้ว
     MODIFIEDONDRAFTSHORT: แก้ไขเมื่อ
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'หน้าเว็บนี้เป็นหน้าเว็บประเภทที่เก่าแล้ว {type} การบันทึกข้อมูลจะรีเซ็ตค่าประเภทของหน้าดังกล่าว และอาจทำให้ข้อมูลสูญหายได้'
+    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,16 +385,17 @@ th:
     URLSegment: 'ส่วนการจัดการ URL'
     VIEWERGROUPS: กลุ่มผู้ชม
     VIEW_ALL_DESCRIPTION: เปิดดูหน้าเว็บใดก็ได้
-    VIEW_ALL_HELP: 'สามารถเปิดดูหน้าเว็บใดๆก็ได้ในเว็บไซต์, โดยไม่จำเป็นต้องคำนึงถึงการตั้งในส่วนของแท็บการเข้าถึง จำเป็นต้องได้รับสิทธิ์ "สามารถเข้าถึงเนื้อหาในเว็บไซต์ได้"'
+    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_ImageTracking: 'แกะรอยรูปภาพ'
     many_many_LinkTracking: แกะรอยลิงก์
   SiteTreeURLSegmentField:
+    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: ตัวอักษรพิเศษได้ถูกแปลงค่าหรือลบออกโดยอัตโนมัติแล้ว
   StaticExporter:
     BASEURL: 'URL หลักสำหรับอ้างอิง'
@@ -397,14 +417,20 @@ th:
     VIEWPREVIOUS: เปิดดูก่อนหน้า
   TreeTools:
     DisplayLabel: 'แสดง:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'คุณสามารถเข้าถึงเว็บไซต์รุ่นย้อนหลังได้จากลิงก์นี้:'
     HAVEASKED: คุณได้ร้องขอเพื่อเปิดดูเนื้อหาในเว็บไซต์ของเราเมื่อ
   VirtualPage:
-    CHOOSE: เลือกหน้าเว็บที่ต้องการลิงก์ไป
+    CHOOSE: 'Linked Page'
     DESCRIPTION: แสดงเนื้อหาของหน้าเว็บอื่นๆ
-    EDITCONTENT: คลิกที่นี่เพื่อแก้ไขเนื้อหา
+    EDITCONTENT: 'Edit content on linked page'
+    EditLink: edit
     HEADER: นี่เป็นหน้าเว็บจำลอง
+    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: หน้าเว็บจำลอง
     PageTypNotAllowedOnRoot: 'ชนิดของหน้าเว็บดั้งเดิม "{type}" ไม่ได้รับอนุญาตให้ใช้งานกับหน้าเว็บจำลองที่ตำแหน่ง root'
     SINGULARNAME: หน้าจำลอง

lang/tl.yml

@@ -76,12 +76,15 @@ tl:
     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.'
@@ -96,16 +99,16 @@ tl:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Rolled back to version #%d.  New version number is #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Save
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ tl:
     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
@@ -167,6 +171,7 @@ tl:
     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
@@ -178,10 +183,11 @@ tl:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ tl:
     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
@@ -267,8 +277,10 @@ tl:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -299,7 +311,9 @@ tl:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancel draft changes'
     BUTTONCANCELDRAFTDESC: 'Delete your draft and revert to the currently published page'
-    BUTTONSAVEPUBLISH: 'Save & Publish'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Unpublish
     BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ tl:
     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'
@@ -337,7 +354,9 @@ tl:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ tl:
     URLSegment: 'URL Segment'
     VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'View any page'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to Site Content" permission'
+    VIEW_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'
@@ -376,6 +395,7 @@ tl:
     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'
@@ -397,14 +417,20 @@ tl:
     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: 'Choose a page to link to'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'click here to edit the content'
+    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'

lang/tr.yml

@@ -1,30 +1,30 @@
 tr:
   AssetAdmin:
-    ADDFILES: 'Add Files'
+    ADDFILES: 'Dosya Ekle'
-    ActionAdd: 'Add folder'
+    ActionAdd: 'Klasör ekle'
-    AppCategoryArchive: Archive
+    AppCategoryArchive: Arşiv
-    AppCategoryAudio: Audio
+    AppCategoryAudio: Ses
     AppCategoryDocument: Document
     AppCategoryFlash: Flash
-    AppCategoryImage: Image
+    AppCategoryImage: Görüntü
     AppCategoryVideo: Video
     BackToFolder: 'Back to folder'
-    CREATED: Date
+    CREATED: Tarih
     CurrentFolderOnly: 'Limit to current folder?'
-    DetailsView: Details
+    DetailsView: Ayrıntılar
-    FILES: Files
+    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: 'File type'
+    Filetype: 'Dosya türü'
-    ListView: 'List View'
+    ListView: 'Liste Görünümü'
-    MENUTITLE: Files
+    MENUTITLE: Dosyalar
     NEWFOLDER: YeniKlasör
-    SIZE: Size
+    SIZE: Boyut
     THUMBSDELETED: '{count} unused thumbnails have been deleted'
     TreeView: 'Tree View'
-    Upload: Upload
+    Upload: 'Karşıya yükleme'
   AssetAdmin_DeleteBatchAction:
     TITLE: 'Klasörleri sil'
   AssetAdmin_Tools:
@@ -33,13 +33,13 @@ tr:
     GO: Git
   AssetTableField:
     BACKLINKCOUNT: 'Used on:'
-    PAGES: page(s)
+    PAGES: sayfa(lar)
   BackLink_Button.ss:
-    Back: Back
+    Back: Geri
   BrokenLinksReport:
     Any: Any
     BROKENLINKS: 'Broken links report'
-    CheckSite: 'Check site'
+    CheckSite: 'Siteyi kontrol et'
     CheckSiteDropdownDraft: 'Draft Site'
     CheckSiteDropdownPublished: 'Published Site'
     ColumnDateLastModified: 'Date last modified'
@@ -47,19 +47,19 @@ tr:
     ColumnProblemType: 'Problem type'
     ColumnURL: URL
     HasBrokenFile: 'has broken file'
-    HasBrokenLink: 'has broken link'
+    HasBrokenLink: 'kırık link var'
     HasBrokenLinkAndFile: 'has broken link and file'
-    HoverTitleEditPage: 'Edit page'
+    HoverTitleEditPage: 'Sayfayı düzenle'
-    PageName: 'Page name'
+    PageName: 'Sayfa ismi'
     ReasonDropdown: 'Problem to check'
     ReasonDropdownBROKENFILE: 'Broken file'
-    ReasonDropdownBROKENLINK: 'Broken link'
+    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: 'Add page'
+    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'
@@ -74,52 +74,55 @@ tr:
   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'
+    AddNew: 'Yeni sayfa ekle'
-    AddNewButton: 'Add new'
+    AddNewButton: 'Yeni ekle'
-    ChoosePageParentMode: 'Choose where to create this page'
+    AddPageRestriction: 'Note: Some page types are not allowed for this selection'
-    ChoosePageType: 'Choose page type'
+    ChoosePageParentMode: 'Sayfanın nereye oluşturulacağını seç'
-    Create: Create
+    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'
     EMAIL: Eposta
     EditTree: 'Edit Tree'
     ListFiltered: 'Filtered list.'
-    MENUTITLE: 'Edit Page'
+    MENUTITLE: 'Sayfayı düzenle'
     NEWPAGE: 'New {pagetype}'
     PAGENOTEXISTS: 'Sayfa bulunamadı'
-    PAGES: Pages
+    PAGES: Sayfalar
     PAGETYPEANYOPT: Any
-    PAGETYPEOPT: 'Page Type'
+    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'
-    PageAdded: 'Successfully created page'
+    PageAdded: 'Sayfa başarıyla oluşturuldu'
-    REMOVED: '''%s'' aktif siteden silindi'
+    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'
     ROLLBACK: 'Bu sürüme geri dön'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: '#%d numaralı sürüme geri dönüldü.  Yeni sürüm numarası #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Kaydet
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
-    TabContent: Content
+    TabContent: İçerik
-    TabHistory: History
+    TabHistory: Geçmiş
-    TabSettings: Settings
+    TabSettings: Ayarlar
     TreeFiltered: 'Filtered tree.'
     TreeFilteredClear: 'Clear filter'
   CMSMain_left.ss:
     'APPLY FILTER': 'Filteri Uygula'
     RESET: Sıfırla
   CMSPageAddController:
-    MENUTITLE: 'Add page'
+    MENUTITLE: 'Sayfa ekle'
     ParentMode_child: 'Under another page'
     ParentMode_top: 'Top level'
   CMSPageEditController:
-    MENUTITLE: 'Edit Page'
+    MENUTITLE: 'Sayfayı Düzenle'
   CMSPageHistoryController:
     COMPAREMODE: 'Kıyaslama modu (iki tane seçiniz)'
     COMPAREVERSIONS: 'Versiyonları karşılaştır'
@@ -129,6 +132,7 @@ tr:
     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:
     AUTHOR: Yazar
@@ -144,10 +148,10 @@ tr:
     MENUTITLE: Sayfalar
     TreeView: 'Ağaç Görünümü'
   CMSPagesController_ContentToolbar.ss:
-    ENABLEDRAGGING: 'Drag''n''drop'
+    ENABLEDRAGGING: Sürükle-ve-Bırak
     MULTISELECT: Multi-selection
   CMSPagesController_Tools.ss:
-    FILTER: Filter
+    FILTER: Filtre
   CMSSearch:
     FILTERDATEFROM: Kimden
     FILTERDATEHEADING: Tarih
@@ -156,7 +160,7 @@ tr:
   CMSSettingsController:
     MENUTITLE: Ayarlar
   CMSSiteTreeFilter_ChangedPages:
-    Title: 'Changed pages'
+    Title: 'Değiştirilen sayfalar'
   CMSSiteTreeFilter_DeletedPages:
     Title: 'Silinmişler dahil bütün sayfalar'
   CMSSiteTreeFilter_Search:
@@ -167,21 +171,23 @@ tr:
     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: Email
+    Email: Eposta
-    INSTALL_SUCCESS: 'Installation Successful!'
+    INSTALL_SUCCESS: 'Kurulum Başarılı!'
-    InstallFilesDeleted: 'Installation files have been successfully deleted.'
+    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 has been successfully installed!'
+    InstallSuccessCongratulations: 'SilverStripe başarıyla kuruldu!'
     LOGGEDINAS: 'Logged in as'
     LOGIN: Login
-    LOGOUT: 'Log out'
+    LOGOUT: 'Çıkış Yap'
     NOTLOGGEDIN: 'Not logged in'
+    PUBLISHED: Published
     PUBLISHEDSITE: 'Published Site'
-    Password: Password
+    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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -224,10 +230,10 @@ tr:
     UNUSEDTHUMBNAILSTITLE: 'Kullanılmamış thumbnail ler'
     UploadFilesButton: Yükle
   LeftAndMain:
-    DELETED: Deleted.
+    DELETED: Silindi.
     PreviewButton: Önizleme
-    SAVEDUP: Saved.
+    SAVEDUP: Kaydedildi.
-    STATUSPUBLISHEDSUCCESS: 'Published ''{title}'' successfully'
+    STATUSPUBLISHEDSUCCESS: '''{title}'' başarıyla yayınlandı'
     SearchResults: 'Arama Sonuçları'
     VersionUnknown: Bilinmeyen
   Permission:
@@ -251,41 +257,47 @@ tr:
     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: 'Pages with broken files'
+    BROKENFILES: 'Kırık link bulunan sayfalar'
-    BROKENLINKS: 'Pages with broken links'
+    BROKENLINKS: 'Kırık link bulunan sayfalar'
     BROKENREDIRECTORPAGES: 'RedirectorPages pointing to deleted pages'
     BROKENVIRTUALPAGES: 'VirtualPages pointing to deleted pages'
-    BrokenLinksGroupTitle: 'Broken links reports'
+    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.'
     ShareLink: 'Linki paylaş'
   SilverStripeNavigatorLinkl:
     CloseLink: Kapat
   SiteConfig:
-    DEFAULTTHEME: '(Use default theme)'
+    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: 'Your Site Name'
+    SITENAMEDEFAULT: 'Site Adınız'
     SITETAGLINE: 'Site Tagline/Slogan'
-    SITETITLE: 'Site title'
+    SITETITLE: 'Site başlığı'
-    TABACCESS: Access
+    TABACCESS: Erişim
-    TABMAIN: Main
+    TABMAIN: Ana
     TAGLINEDEFAULT: 'your tagline here'
-    THEME: Theme
+    THEME: Tema
     TOPLEVELCREATE: 'Who can create pages in the root of the site?'
     VIEWHEADER: 'Who can view pages on this site?'
   SiteTree:
@@ -294,12 +306,14 @@ tr:
     ACCESSLOGGEDIN: 'Giriş yapmış kullanıcılar'
     ACCESSONLYTHESE: 'Sadece bu kişiler (listeden seçiniz)'
     ADDEDTODRAFTHELP: 'Page has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
+    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'
-    BUTTONSAVEPUBLISH: 'Kaydet ve Yayınla'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Yayından kaldır'
     BUTTONUNPUBLISHDESC: 'Bu sayfayı yayından kaldır'
     CREATED: 'Oluşturulma Tarihi'
@@ -312,7 +326,7 @@ tr:
     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: Deleted
+    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'
@@ -324,9 +338,12 @@ tr:
     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'
@@ -337,7 +354,9 @@ tr:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Değiştirilmiş
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose 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: 'Sayfa yeri'
     PAGETITLE: 'Sayfa ismi'
     PAGETYPE: 'Sayfa tipi'
@@ -350,8 +369,8 @@ tr:
     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'
+    REMOVEDFROMDRAFTHELP: 'Sayfa yayınlandı ve taslaklardan silindi'
-    REMOVEDFROMDRAFTSHORT: 'Removed from draft'
+    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'
@@ -366,7 +385,7 @@ tr:
     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 Site Content" permission'
+    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ı'
@@ -376,13 +395,14 @@ tr:
     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: 'Select:'
+    SELECT: 'Seç:'
   TableListField.ss:
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Artan olarak sırala'
@@ -397,14 +417,20 @@ tr:
     VIEWPREVIOUS: 'Öncekini görüntüle'
   TreeTools:
     DisplayLabel: 'Display:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   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: 'Bağlantı vermek için bir sayfa seçiniz'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Başka sayfanın içeriğini gösterir'
-    EDITCONTENT: 'içeriği düzenlemek için buraya tıklayın'
+    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'

lang/uk.yml

@@ -2,7 +2,7 @@ uk:
   AssetAdmin:
     ADDFILES: 'Додати файли'
     ActionAdd: 'Додати папку'
-    AppCategoryArchive: Архівувати
+    AppCategoryArchive: 'Архівувати'
     AppCategoryAudio: Аудіо
     AppCategoryDocument: Document
     AppCategoryFlash: Flash
@@ -21,7 +21,7 @@ uk:
     ListView: 'У вигляді списку'
     MENUTITLE: Файли
     NEWFOLDER: 'Нова Тека'
-    SIZE: Розмір
+    SIZE: 'Розмір'
     THUMBSDELETED: '{count} невикористаних ескізів було видалено'
     TreeView: 'У вигляді дерева'
     Upload: Завантажити
@@ -76,12 +76,15 @@ uk:
     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.'
@@ -96,16 +99,16 @@ uk:
     PUBALLFUN2: 'Натиснувши цю кнопку Ви зробите те ж саме, що й перейшовши до кожної сторінки та натиснувши "Публікувати". Це внесено для тих випадків, коли Ви маєте намір маштабно змінити вміст, наприклад, після першого створення сайту.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Сторінка успішно створена'
-    REMOVED: 'Видалено ''%s''%s з публічного сайту'
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: '''{title}'' видалено з публічного сайту'
     REMOVEDPAGEFROMDRAFT: 'Видалено ''%s'' з чорнового сайту'
     RESTORE: Відновити
     RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 'Повернутися до цієї версії'
-    ROLLEDBACKPUB: 'Повернено до опублікованої версії. Нова версія #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Повернено версію #%d. Нова версія - #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Зберегти
-    SAVEDRAFT: 'Зберегти в чорновий'
+    SAVEDRAFT: 'Save draft'
     TabContent: Вміст
     TabHistory: Історія
     TabSettings: Налаштування
@@ -129,6 +132,7 @@ uk:
     SHOWUNPUBLISHED: 'Показати неопубліковані версії'
     SHOWVERSION: 'Показати версію'
     VIEW: вигляд
+    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Переглядається версія {version}.'
   CMSPageHistoryController_versions.ss:
     AUTHOR: Автор
@@ -167,6 +171,7 @@ uk:
     ARCHIVEDSITE: 'Preview version'
     ARCHIVEDSITEFROM: 'Заархівований сайт з'
     CMS: CMS
+    DRAFT: Draft
     DRAFTSITE: 'Чорновий сайт'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Ви повинні увійти у систему для перегляду чернетки даного матеріалу. <a href="%s">Натсиніть для переходу на опублікований матеріал.</a>'
     Email: Е-пошта
@@ -178,10 +183,11 @@ uk:
     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: 'Ви можете почати редагувати вміст сайту перейшовши в <a href="{link}">CMS</a>.'
+    StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Не вдається видалити інсталяційні файли. Будь ласка, видаліть вручну наведені нижче файли'
     VIEWPAGEIN: 'Переглянути сторінку в:'
   ErrorPage:
@@ -251,6 +257,10 @@ uk:
     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: Пошук
@@ -267,6 +277,8 @@ uk:
     OtherGroupTitle: Інше
     ParameterLiveCheckbox: 'Перевірити робочий сайт'
     REPEMPTY: 'The {title} report is empty.'
+  SilverStripeNavigator:
+    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 'Щоб поділитися цією сторінкою, скопіюйте та вставте посилання нижче.'
     ShareLink: 'Поділитися посиланням'
@@ -289,7 +301,7 @@ uk:
     TOPLEVELCREATE: 'Хто може створювати сторінки верхнього рівня на сайті?'
     VIEWHEADER: 'Хто може переглядати сторінки на цьому сайті?'
   SiteTree:
-    ACCESSANYONE: Будь-хто
+    ACCESSANYONE: 'Будь-хто'
     ACCESSHEADER: 'Хто може переглядати цю сторінку?'
     ACCESSLOGGEDIN: 'Тільки ті, що увійшли'
     ACCESSONLYTHESE: 'Тільки ці люди (виберіть зі списку)'
@@ -299,7 +311,9 @@ uk:
     APPEARSVIRTUALPAGES: 'Цей вміст також відображається на віртуальній сторінці в розділі {title}.'
     BUTTONCANCELDRAFT: 'Відмінити зміни чернетки'
     BUTTONCANCELDRAFTDESC: 'Видалити черентку та повернутися до теперішнього опублікованого варіанту'
-    BUTTONSAVEPUBLISH: 'Зберегти та опублікувати'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 'Відміна публікування'
     BUTTONUNPUBLISHDESC: 'Видалити цю сторінку з опублікованого'
     CREATED: 'Дата створення'
@@ -324,9 +338,12 @@ 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: 'Мітка навігації'
@@ -337,7 +354,9 @@ uk:
     MODIFIEDONDRAFTHELP: 'Сторінка має неопубліковані зміни'
     MODIFIEDONDRAFTSHORT: Змінений
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose 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: 'Тип сторінки'
@@ -366,7 +385,7 @@ uk:
     URLSegment: 'URL адреса'
     VIEWERGROUPS: 'Групи глядачів'
     VIEW_ALL_DESCRIPTION: 'Перегляд будь-якої сторінки'
-    VIEW_ALL_HELP: 'Можливість переглядати будь-яку сторінку сайту, незалежно від налаштувань на вкладці Доступ. Потрібен дозвіл "Доступ до розділу "Вміст сайту "'
+    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: 'Групи глядачів'
@@ -376,6 +395,7 @@ uk:
     many_many_ImageTracking: 'Відстеження зображень'
     many_many_LinkTracking: 'Відстеження посилань'
   SiteTreeURLSegmentField:
+    EMPTY: 'Please enter a URL Segment or click cancel'
     HelpChars: 'Спеціальні символи автоматично перетворені або видалені.'
   StaticExporter:
     BASEURL: 'Основний URL'
@@ -397,14 +417,20 @@ uk:
     VIEWPREVIOUS: 'Переглянути попередню'
   TreeTools:
     DisplayLabel: 'Відобразити:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
     CANACCESS: 'Ви можете перейти до архівного сайту за посиланням:'
     HAVEASKED: 'Ви надіслали запит на перегляд вмісту нашої сторінки'
   VirtualPage:
-    CHOOSE: 'Виберіть сторінку на яку посилатися'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Відображення вмісту іншої сторінки'
-    EDITCONTENT: 'натисніть тут для редагування вмісту'
+    EDITCONTENT: 'Edit content on linked page'
+    EditLink: edit
     HEADER: 'Це віртуальна сторінка'
+    HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})'
     PLURALNAME: 'Віртуальні сторінки'
     PageTypNotAllowedOnRoot: 'Тип сторінки "{type}" не допускається на кореневому рівні для цієї віртуальної сторінки'
     SINGULARNAME: 'Віртуальна сторінка'

lang/uz.yml

@@ -76,12 +76,15 @@ uz:
     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.'
@@ -96,16 +99,16 @@ uz:
     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 ''%s''%s from live site'
+    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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Orga versiyaga qaytarildi #%d. Yangi versiya #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Saqlash
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ uz:
     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
@@ -167,6 +171,7 @@ uz:
     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
@@ -178,10 +183,11 @@ uz:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ uz:
     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
@@ -267,8 +277,10 @@ uz:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -299,7 +311,9 @@ uz:
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 'Cancel draft changes'
     BUTTONCANCELDRAFTDESC: 'Delete your draft and revert to the currently published page'
-    BUTTONSAVEPUBLISH: 'Save & Publish'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Unpublish
     BUTTONUNPUBLISHDESC: 'Remove this page from the published site'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ uz:
     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'
@@ -337,7 +354,9 @@ uz:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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'
@@ -366,7 +385,7 @@ uz:
     URLSegment: 'URL Segment'
     VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'View any page'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to Site Content" permission'
+    VIEW_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'
@@ -376,6 +395,7 @@ uz:
     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'
@@ -397,14 +417,20 @@ uz:
     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: 'Choose a page to link to'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'click here to edit the content'
+    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'

lang/vi_VN.yml

@@ -76,12 +76,15 @@ vi_VN:
     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.'
@@ -96,16 +99,16 @@ vi_VN:
     PUBALLFUN2: 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It''s				intended to be used after there have been massive edits of the content, such as when the site was				first built.'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    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'
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 'Trở về phiên bản #%d. Phiên bản mới là  #%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: Lưu
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ vi_VN:
     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
@@ -167,6 +171,7 @@ vi_VN:
     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
@@ -178,10 +183,11 @@ vi_VN:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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:
@@ -251,6 +257,10 @@ vi_VN:
     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
@@ -267,8 +277,10 @@ vi_VN:
     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.'
+    ShareInstructions: 'To share this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close
@@ -299,7 +311,9 @@ vi_VN:
     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'
-    BUTTONSAVEPUBLISH: 'Lưu & Công bố'
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: Ẩn
     BUTTONUNPUBLISHDESC: 'Xóa trang này khỏi trang hoạt động'
     CREATED: 'Date Created'
@@ -324,9 +338,12 @@ vi_VN:
     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
@@ -337,7 +354,9 @@ vi_VN:
     MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
     MODIFIEDONDRAFTSHORT: Modified
     MetadataToggle: Metadata
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    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
@@ -366,7 +385,7 @@ vi_VN:
     URLSegment: 'URL Segment'
     VIEWERGROUPS: 'Viewer Groups'
     VIEW_ALL_DESCRIPTION: 'View any page'
-    VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab.  Requires the "Access to Site Content" permission'
+    VIEW_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'
@@ -376,6 +395,7 @@ vi_VN:
     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'
@@ -397,14 +417,20 @@ vi_VN:
     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: 'Bạn được mời để xem nội dung của web chúng tôi trên'
   VirtualPage:
-    CHOOSE: 'Choose a page to link to'
+    CHOOSE: 'Linked Page'
     DESCRIPTION: 'Displays the content of another page'
-    EDITCONTENT: 'click here to edit the content'
+    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'

lang/zh_CN.yml

@@ -76,12 +76,15 @@ zh_CN:
     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: '从测试网站中删除'
     DELETEFP: Delete
     DESCREMOVED: 'and {count} descendants'
+    DUPLICATED: 'Duplicated ''{title}'' successfully'
+    DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: 电子邮件
     EditTree: 'Edit Tree'
     ListFiltered: 'Filtered list.'
@@ -91,21 +94,21 @@ zh_CN:
     PAGES: Pages
     PAGETYPEANYOPT: Any
     PAGETYPEOPT: 'Page Type'
-    PUBALLCONFIRM: 请发布该站的每一网页，这样，预备发布站上的内容就会复制到正式发布站上
+    PUBALLCONFIRM: '请发布该站的每一网页，这样，预备发布站上的内容就会复制到正式发布站上'
-    PUBALLFUN: “全部发布“功能
+    PUBALLFUN: '“全部发布“功能'
     PUBALLFUN2: 按下这一按键将等同于逐一发布每一网页。此功能适用于被大量编辑过的网页，如在网站被第一次使用时。
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: '已从正式网站删除 ''%s''%s '
+    REMOVED: 'Deleted ''{title}''{description} from live site'
     REMOVEDPAGE: 'Removed ''{title}'' from the published site'
     REMOVEDPAGEFROMDRAFT: '已从测试站点删除 ''%s'''
     RESTORE: Restore
     RESTORED: 'Restored ''{title}'' successfully'
     ROLLBACK: 恢复到这一版本
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: '回复到#%d版本。新的版本号为#%d'
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: 保存
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -129,6 +132,7 @@ zh_CN:
     SHOWUNPUBLISHED: 显示未发布版本
     SHOWVERSION: 显示版本
     VIEW: 视图
+    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Currently viewing version {version}.'
   CMSPageHistoryController_versions.ss:
     AUTHOR: Author
@@ -142,7 +146,7 @@ zh_CN:
     GalleryView: 相册视图
     ListView: 列表视图
     MENUTITLE: 页面
-    TreeView: 树形视图
+    TreeView: '树形视图'
   CMSPagesController_ContentToolbar.ss:
     ENABLEDRAGGING: 'Drag''n''drop'
     MULTISELECT: Multi-selection
@@ -158,7 +162,7 @@ zh_CN:
   CMSSiteTreeFilter_ChangedPages:
     Title: 'Changed pages'
   CMSSiteTreeFilter_DeletedPages:
-    Title: 所有页面(包含已删除)
+    Title: '所有页面(包含已删除)'
   CMSSiteTreeFilter_Search:
     Title: 'All pages'
   ContentControl:
@@ -167,6 +171,7 @@ zh_CN:
     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
@@ -178,14 +183,15 @@ zh_CN:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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>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>'
@@ -218,11 +224,11 @@ zh_CN:
     504: '504 - Gateway Timeout'
     505: '505 - HTTP Version Not Supported'
   Folder:
-    AddFolderButton: 添加文件夹
+    AddFolderButton: '添加文件夹'
-    DELETEUNUSEDTHUMBNAILS: 删除未使用缩略图
+    DELETEUNUSEDTHUMBNAILS: '删除未使用缩略图'
     UNUSEDFILESTITLE: 未使用文件
     UNUSEDTHUMBNAILSTITLE: 未使用缩略图
-    UploadFilesButton: 上传
+    UploadFilesButton: '上传'
   LeftAndMain:
     DELETED: Deleted.
     PreviewButton: 预览
@@ -236,7 +242,7 @@ zh_CN:
     CONTENT_CATEGORY: 'Content permissions'
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   RedirectorPage:
-    DESCRIPTION: 跳转至其他的内部页面
+    DESCRIPTION: '跳转至其他的内部页面'
     HASBEENSETUP: 重导网页被生成，却没有什么地方由它来重导。
     HEADER: 该页会将用户重新导向另一网页
     OTHERURL: 另一网站的URL
@@ -251,6 +257,10 @@ zh_CN:
     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
@@ -263,15 +273,17 @@ zh_CN:
     BrokenLinksGroupTitle: 'Broken links reports'
     ContentGroupTitle: 'Content reports'
     EMPTYPAGES: 空白页
-    LAST2WEEKS: 在过去2周内编辑过的网页
+    LAST2WEEKS: '在过去2周内编辑过的网页'
     OtherGroupTitle: Other
     ParameterLiveCheckbox: 'Check live site'
     REPEMPTY: 'The {title} report is empty.'
+  SilverStripeNavigator:
+    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: 分享此页，请复制粘贴下面的链接
     ShareLink: 分享链接
   SilverStripeNavigatorLinkl:
-    CloseLink: 关闭
+    CloseLink: '关闭'
   SiteConfig:
     DEFAULTTHEME: '(Use default theme)'
     EDITHEADER: 'Who can edit pages on this site?'
@@ -292,21 +304,23 @@ zh_CN:
     ACCESSANYONE: 任何人
     ACCESSHEADER: 在我的网站上，谁可以浏览此页？
     ACCESSLOGGEDIN: 已登录的用户
-    ACCESSONLYTHESE: 只有这些人（请从下列清单中选择）
+    ACCESSONLYTHESE: '只有这些人（请从下列清单中选择）'
     ADDEDTODRAFTHELP: 'Page has not been published yet'
     ADDEDTODRAFTSHORT: Draft
-    ALLOWCOMMENTS: 是否允许对次页进行评论？
+    ALLOWCOMMENTS: '是否允许对次页进行评论？'
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 取消草稿的改动
     BUTTONCANCELDRAFTDESC: 将您的草稿恢复到目前正式发布的版本
-    BUTTONSAVEPUBLISH: 保存并发布
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 撤消发布
-    BUTTONUNPUBLISHDESC: 将此页从正式发布站删除
+    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>'
-    DEFAULTABOUTTITLE: 关于我们
+    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>'
@@ -319,25 +333,30 @@ zh_CN:
     DependtPageColumnURL: URL
     EDITANYONE: 任何可以登录CMS的人
     EDITHEADER: 谁能在CMS中编辑此页？
-    EDITONLYTHESE: 只有这些人（请从下列清单中选择）
+    EDITONLYTHESE: '只有这些人（请从下列清单中选择）'
     EDITORGROUPS: 'Editor Groups'
     EDIT_ALL_DESCRIPTION: 'Edit any page'
     EDIT_ALL_HELP: 'Ability to edit any page on the site, regardless of the settings on the Access tab.  Requires the "Access to ''Pages'' section" permission'
     Editors: 'Editors Groups'
+    GroupPlaceholder: 'Click to select group'
     HASBROKENLINKS: 该页有失效链接。
-    HTMLEDITORTITLE: 内容
+    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.'
-    MENUTITLE: 导航标签
+    MENUTITLE: '导航标签'
-    METADESC: 网页描述标签
+    METADESC: '网页描述标签'
     METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
-    METAEXTRA: 自定义Meta标签
+    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
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose 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: 'Page location'
     PAGETITLE: 网页名称
     PAGETYPE: 网页类型
@@ -356,17 +375,17 @@ zh_CN:
     REORGANISE_DESCRIPTION: 'Change site structure'
     REORGANISE_HELP: 'Rearrange pages in the site tree through drag&drop.'
     SHOWINMENUS: 是否出现在菜单中？
-    SHOWINSEARCH: 是否包括在搜索结果中？
+    SHOWINSEARCH: '是否包括在搜索结果中？'
     SINGULARNAME: Page
     TABBEHAVIOUR: 行为特点
-    TABCONTENT: 内容
+    TABCONTENT: '内容'
     TABDEPENDENT: 'Dependent pages'
-    TOPLEVEL: 网站内容（顶层）
+    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 Site Content" permission'
+    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'
@@ -376,6 +395,7 @@ zh_CN:
     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
@@ -397,14 +417,20 @@ zh_CN:
     VIEWPREVIOUS: 'View previous'
   TreeTools:
     DisplayLabel: 'Display:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
-    CANACCESS: 您可通过这个链接进入已归挡的网页：
+    CANACCESS: '您可通过这个链接进入已归挡的网页：'
     HAVEASKED: '在%s,您要求浏览我们网站'
   VirtualPage:
-    CHOOSE: 选择一个网页进行链接
+    CHOOSE: 'Linked Page'
-    DESCRIPTION: 显示其他页的内容
+    DESCRIPTION: '显示其他页的内容'
-    EDITCONTENT: 点击这里以编辑内容
+    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: 虚拟页面

lang/zh_TW.yml

@@ -76,36 +76,39 @@ zh_TW:
     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: 這頁不存在
+    PAGENOTEXISTS: '這頁不存在'
     PAGES: Pages
     PAGETYPEANYOPT: Any
     PAGETYPEOPT: 'Page Type'
-    PUBALLCONFIRM: 請發布所有網頁
+    PUBALLCONFIRM: '請發布所有網頁'
     PUBALLFUN: '"全部發布" 功能'
-    PUBALLFUN2: 按下這個按鈕就是如同到每頁按「發布」。當有很多內容更變時，這個功能可以省時。
+    PUBALLFUN2: '按下這個按鈕就是如同到每頁按「發布」。當有很多內容更變時，這個功能可以省時。'
     PUBPAGES: 'Done: Published {count} pages'
     PageAdded: 'Successfully created page'
-    REMOVED: 'Deleted ''%s''%s from live site'
+    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: 回複到這個的版本
-    ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}'
+    ROLLEDBACKPUBv2: 'Rolled back to published version.'
-    ROLLEDBACKVERSION: 成功的回複到第%d版。新的版本號是%d。
+    ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
     SAVE: 儲存
-    SAVEDRAFT: 'Save Draft'
+    SAVEDRAFT: 'Save draft'
     TabContent: Content
     TabHistory: History
     TabSettings: Settings
@@ -121,7 +124,7 @@ zh_TW:
   CMSPageEditController:
     MENUTITLE: 'Edit Page'
   CMSPageHistoryController:
-    COMPAREMODE: 比較模式(選擇兩個)
+    COMPAREMODE: '比較模式(選擇兩個)'
     COMPAREVERSIONS: 比較版本
     COMPARINGVERSION: 'Comparing versions {version1} and {version2}.'
     MENUTITLE: 歷史
@@ -129,19 +132,20 @@ zh_TW:
     SHOWUNPUBLISHED: 顯示未出版的版本
     SHOWVERSION: 顯示版本
     VIEW: 瀏覽
+    VIEWINGLATEST: 'Currently viewing the latest version.'
     VIEWINGVERSION: 'Currently viewing version {version}.'
   CMSPageHistoryController_versions.ss:
-    AUTHOR: 作者
+    AUTHOR: '作者'
     NOTPUBLISHED: 未發行的
-    PUBLISHER: 發行者
+    PUBLISHER: '發行者'
     UNKNOWN: 未知的
     WHEN: 何時
   CMSPageSettingsController:
-    MENUTITLE: 編輯網頁
+    MENUTITLE: '編輯網頁'
   CMSPagesController:
     GalleryView: 圖庫瀏覽
-    ListView: 清單瀏覽
+    ListView: '清單瀏覽'
-    MENUTITLE: 網頁
+    MENUTITLE: '網頁'
     TreeView: 樹狀瀏覽
   CMSPagesController_ContentToolbar.ss:
     ENABLEDRAGGING: 'Drag''n''drop'
@@ -160,13 +164,14 @@ zh_TW:
   CMSSiteTreeFilter_DeletedPages:
     Title: '所有網頁, 包括已刪除的'
   CMSSiteTreeFilter_Search:
-    Title: 所有網頁
+    Title: '所有網頁'
   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
@@ -178,16 +183,17 @@ zh_TW:
     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 site\\''s content by opening <a href="{link}">the CMS</a>.'
+    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>抱歉, 看來您正再嘗試存取一個不存在的網頁</p><p>請檢查您正在嘗試存取網址的拼寫並再試一次.</p>'
-    DEFAULTERRORPAGETITLE: 未發現網頁
+    DEFAULTERRORPAGETITLE: '未發現網頁'
     DEFAULTSERVERERRORPAGECONTENT: '<p>抱歉, 處裡您的要求發生一個問題</p>'
     DEFAULTSERVERERRORPAGETITLE: 伺服器錯誤
     DESCRIPTION: 'Custom content for different error cases (e.g. "Page not found")'
@@ -225,7 +231,7 @@ zh_TW:
     UploadFilesButton: 上傳
   LeftAndMain:
     DELETED: Deleted.
-    PreviewButton: 預覽
+    PreviewButton: '預覽'
     SAVEDUP: Saved.
     STATUSPUBLISHEDSUCCESS: 'Published ''{title}'' successfully'
     SearchResults: 搜尋結果
@@ -236,21 +242,25 @@ zh_TW:
     CONTENT_CATEGORY: 'Content permissions'
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   RedirectorPage:
-    DESCRIPTION: 重新導向到一個內部不同的網頁
+    DESCRIPTION: '重新導向到一個內部不同的網頁'
-    HASBEENSETUP: 沒有任何地方被重新導向的一個重新導向網頁已被設定.
+    HASBEENSETUP: '沒有任何地方被重新導向的一個重新導向網頁已被設定.'
-    HEADER: 本網頁將重新導向用戶至別的網頁
+    HEADER: '本網頁將重新導向用戶至別的網頁'
-    OTHERURL: 其他網站網址
+    OTHERURL: '其他網站網址'
     PLURALNAME: 'Redirector Pags'
     REDIRECTTO: 重新導向到
     REDIRECTTOEXTERNAL: 別的網站
-    REDIRECTTOPAGE: 在您網站上的一個網頁
+    REDIRECTTOPAGE: '在您網站上的一個網頁'
     SINGULARNAME: 'Redirector Page'
-    YOURPAGE: 在您網站上的網頁
+    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: 搜尋
@@ -262,11 +272,13 @@ zh_TW:
     BROKENVIRTUALPAGES: 'VirtualPages pointing to deleted pages'
     BrokenLinksGroupTitle: 'Broken links reports'
     ContentGroupTitle: 'Content reports'
-    EMPTYPAGES: 空頁
+    EMPTYPAGES: '空頁'
-    LAST2WEEKS: 網頁在過去兩個禮拜有被更改過
+    LAST2WEEKS: '網頁在過去兩個禮拜有被更改過'
     OtherGroupTitle: Other
     ParameterLiveCheckbox: 'Check live site'
     REPEMPTY: 'The {title} report is empty.'
+  SilverStripeNavigator:
+    ARCHIVED: Archived
   SilverStripeNavigatorLink:
     ShareInstructions: '分享一個由此到此的網頁, 複製與貼上下面的鏈結.'
     ShareLink: 分享鏈結
@@ -290,62 +302,69 @@ zh_TW:
     VIEWHEADER: 'Who can view pages on this site?'
   SiteTree:
     ACCESSANYONE: 所有人
-    ACCESSHEADER: 誰可以瀏覽這頁？
+    ACCESSHEADER: '誰可以瀏覽這頁？'
-    ACCESSLOGGEDIN: 已登入的使用者
+    ACCESSLOGGEDIN: '已登入的使用者'
-    ACCESSONLYTHESE: 只有這些人(從清單選擇)
+    ACCESSONLYTHESE: '只有這些人(從清單選擇)'
     ADDEDTODRAFTHELP: 'Page has not been published yet'
     ADDEDTODRAFTSHORT: Draft
-    ALLOWCOMMENTS: 允許留言嗎？
+    ALLOWCOMMENTS: '允許留言嗎？'
     APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.'
     BUTTONCANCELDRAFT: 取消草稿更變
     BUTTONCANCELDRAFTDESC: 刪除草稿並回複到正式發布的版本
-    BUTTONSAVEPUBLISH: 儲存並發布
+    BUTTONPUBLISHED: Published
+    BUTTONSAVED: Saved
+    BUTTONSAVEPUBLISH: 'Save & publish'
     BUTTONUNPUBLISH: 取消發布
     BUTTONUNPUBLISHDESC: 從正式發布站移除
     CREATED: 建立日期
     Comments: 意見
-    Content: 內容
+    Content: '內容'
     DEFAULTABOUTCONTENT: '<p>您可以用您自己的內容填入本網頁, 或是刪除它並建立您自己的網頁<br /></p>'
     DEFAULTABOUTTITLE: 關於我們
     DEFAULTCONTACTCONTENT: '<p>您可以用您自己的內容填入本網頁, 或是刪除它並建立您自己的網頁<br /></p>'
     DEFAULTCONTACTTITLE: 連絡我們
     DEFAULTHOMECONTENT: '<p>歡迎光臨 SilverStrip! 這是預設的主頁. 您可以開啟<a href="admin/">the CMS</a>來編輯這個網頁. 您現在可存取<a href="http://doc.silverstripe.org">developer documentation</a>, 或是開始<a href="http://doc.silverstripe.org/doku.php?id=tutorials">the tutorials.</a></p>'
-    DEFAULTHOMETITLE: 首頁
+    DEFAULTHOMETITLE: '首頁'
     DELETEDPAGEHELP: 'Page is no longer published'
     DELETEDPAGESHORT: 已刪除
     DEPENDENT_NOTE: '以下的網頁是依附在本網頁的. 這包含了虛擬網頁, 重新導向網頁, 以及有內容鏈結的網頁.'
     DESCRIPTION: 'Generic content page'
     DependtPageColumnLinkType: 鏈結類型
     DependtPageColumnURL: 網址
-    EDITANYONE: 所有可以登入CMS的人
+    EDITANYONE: '所有可以登入CMS的人'
-    EDITHEADER: 誰可以編輯這頁？
+    EDITHEADER: '誰可以編輯這頁？'
-    EDITONLYTHESE: 只有這些人(從清單選擇)
+    EDITONLYTHESE: '只有這些人(從清單選擇)'
-    EDITORGROUPS: 編輯者群組
+    EDITORGROUPS: '編輯者群組'
-    EDIT_ALL_DESCRIPTION: 編輯任何網頁
+    EDIT_ALL_DESCRIPTION: '編輯任何網頁'
     EDIT_ALL_HELP: '不管在存取Tab上的設定值, 在網站上有能力去編輯任何網頁. 需要 "到''網頁''部分的存取"許可'
-    Editors: 編輯者群體
+    Editors: '編輯者群體'
-    HASBROKENLINKS: 網頁含有失效的連結。
+    GroupPlaceholder: 'Click to select group'
-    HTMLEDITORTITLE: 內容
+    HASBROKENLINKS: '網頁含有失效的連結。'
-    INHERIT: 從母頁繼承
+    HTMLEDITORTITLE: '內容'
+    INHERIT: '從母頁繼承'
+    LASTPUBLISHED: 'Last published'
+    LASTSAVED: 'Last saved'
     LASTUPDATED: 最近更新
-    LINKCHANGENOTE: 改變這個網頁鏈結將也會影響所有子網頁的鏈結
+    LINKCHANGENOTE: '改變這個網頁鏈結將也會影響所有子網頁的鏈結'
     MENUTITLE: 捷徑標籤
     METADESC: 敘述
     METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).'
-    METAEXTRA: 自訂元標籤(meta-tags)
+    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
-    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset it''s type and you may lose data'
+    MoreOptions: 'More options'
-    PAGELOCATION: 網頁位置
+    NOTPUBLISHED: 'Not published'
-    PAGETITLE: 網頁名稱
+    OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data'
-    PAGETYPE: 網頁類型
+    PAGELOCATION: '網頁位置'
-    PARENTID: 母頁
+    PAGETITLE: '網頁名稱'
-    PARENTTYPE: 網頁位置
+    PAGETYPE: '網頁類型'
-    PARENTTYPE_ROOT: 頂級網頁
+    PARENTID: '母頁'
-    PARENTTYPE_SUBPAGE: 在母頁下面的次頁
+    PARENTTYPE: '網頁位置'
-    PERMISSION_GRANTACCESS_DESCRIPTION: 管理內容的存取權限
+    PARENTTYPE_ROOT: '頂級網頁'
+    PARENTTYPE_SUBPAGE: '在母頁下面的次頁'
+    PERMISSION_GRANTACCESS_DESCRIPTION: '管理內容的存取權限'
     PERMISSION_GRANTACCESS_HELP: '允許設定在"網頁"部分的網頁-特定存取限制.'
     PLURALNAME: Pages
     PageTypNotAllowedOnRoot: 'Page type "{type}" is not allowed on the root level'
@@ -359,28 +378,29 @@ zh_TW:
     SHOWINSEARCH: 在搜尋結果裡顯示嗎？
     SINGULARNAME: Page
     TABBEHAVIOUR: 作用
-    TABCONTENT: 內容
+    TABCONTENT: '內容'
-    TABDEPENDENT: 依賴網頁
+    TABDEPENDENT: '依賴網頁'
     TOPLEVEL: '網站內容 (高層)'
-    TOPLEVELCREATORGROUPS: 頂級創作者
+    TOPLEVELCREATORGROUPS: '頂級創作者'
     URLSegment: 網址分類
-    VIEWERGROUPS: 瀏覽者群組
+    VIEWERGROUPS: '瀏覽者群組'
-    VIEW_ALL_DESCRIPTION: 瀏覽任何網頁
+    VIEW_ALL_DESCRIPTION: '瀏覽任何網頁'
-    VIEW_ALL_HELP: '不管在存取Tab上的設定值, 在網站上有能力去編輯任何網頁. 需要 "到''網頁''部分的存取"許可'
+    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: '應用於在草稿模式下觀看CMS以外的網頁. 沒有CMS存取權的外部合作者是有用的.'
-    Viewers: 瀏覽者群組
+    Viewers: '瀏覽者群組'
     Visibility: 能見度
-    has_one_Parent: 母頁
+    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: 網站靜態匯出
+    NAME: '網站靜態匯出'
   TableListField:
     SELECT: 'Select:'
   TableListField.ss:
@@ -397,14 +417,20 @@ zh_TW:
     VIEWPREVIOUS: 'View previous'
   TreeTools:
     DisplayLabel: 'Display:'
+  URLSegmentField:
+    Cancel: Cancel
+    Edit: Edit
+    OK: OK
   ViewArchivedEmail.ss:
-    CANACCESS: 您可以利用哲格連結到已歸檔站：
+    CANACCESS: '您可以利用哲格連結到已歸檔站：'
-    HAVEASKED: 您要瀏覽這一天的網站內容：
+    HAVEASKED: '您要瀏覽這一天的網站內容：'
   VirtualPage:
-    CHOOSE: 請選擇一個網頁來連結至
+    CHOOSE: 'Linked Page'
-    DESCRIPTION: 顯示其他網頁的內容
+    DESCRIPTION: '顯示其他網頁的內容'
-    EDITCONTENT: 點擊即可更改內容
+    EDITCONTENT: 'Edit content on linked page'
-    HEADER: 這是一個虛擬網頁
+    EditLink: edit
-    PLURALNAME: 虛擬網頁
+    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: 虛擬網頁
+    SINGULARNAME: '虛擬網頁'

scss/_AssetAdmin.scss

@@ -37,7 +37,7 @@
 		}
 	}
 
-	#Form_EditForm_File {
+	.cms table.ss-gridfield-table {
 		td {
 			// Taken care of by minimum image sizes
 			padding-top: 0;

scss/_CMSMain.scss

@@ -47,7 +47,7 @@
 /** --------------------------------------------
  * Tree View (collapsed for sidebar)
  * -------------------------------------------- */
-#cms-content-treeview {
+#cms-content-treeview, #cms-content-listview {
 	.cms-tree-expand-trigger {
 		display: none; // Don't show trigger in expanded mode
 	}

templates/Includes/CMSMain_ListView.ss

@@ -8,7 +8,7 @@
 
 <div class="cms-panel-content center">
 	<% if TreeIsFiltered %>
-	<div class="cms-tree-filtered">
+	<div class="cms-tree-filtered cms-notice">
 		<strong><% _t('CMSMain.ListFiltered', 'Filtered list.') %></strong>
 		<a href="$LinkPages" class="cms-panel-link">
 			<% _t('CMSMain.TreeFilteredClear', 'Clear filter') %>

templates/Includes/CMSMain_TreeView.ss

@@ -11,7 +11,7 @@ $ExtraTreeTools
 
 <div class="center">
 	<% if TreeIsFiltered %>
-	<div class="cms-tree-filtered">
+	<div class="cms-tree-filtered cms-notice">
 		<strong><% _t('CMSMain.TreeFiltered', 'Filtered tree.') %></strong>
 		<a href="$LinkPages" class="cms-panel-link">
 			<% _t('CMSMain.TreeFilteredClear', 'Clear filter') %>

tests/behat/features/bootstrap/FeatureContext.php

@@ -5,8 +5,10 @@ namespace SilverStripe\Cms\Test\Behaviour;
 use SilverStripe\BehatExtension\Context\SilverStripeContext,
     SilverStripe\BehatExtension\Context\BasicContext,
     SilverStripe\BehatExtension\Context\LoginContext,
+    SilverStripe\BehatExtension\Context\FixtureContext,
     SilverStripe\Framework\Test\Behaviour\CmsFormsContext,
-    SilverStripe\Framework\Test\Behaviour\CmsUiContext;
+    SilverStripe\Framework\Test\Behaviour\CmsUiContext,
+    SilverStripe\Cms\Test\Behaviour;
 
 // PHPUnit
 require_once 'PHPUnit/Autoload.php';
@@ -18,7 +20,7 @@ require_once 'PHPUnit/Framework/Assert/Functions.php';
  * Context automatically loaded by Behat.
  * Uses subcontexts to extend functionality.
  */
-class FeatureContext extends SilverStripeContext
+class FeatureContext extends \SilverStripe\Framework\Test\Behaviour\FeatureContext
 {
     /**
      * Initializes context.
@@ -28,11 +30,23 @@ class FeatureContext extends SilverStripeContext
      */
     public function __construct(array $parameters)
     {
-        $this->useContext('BasicContext', new BasicContext($parameters));
-        $this->useContext('LoginContext', new LoginContext($parameters));
-        $this->useContext('CmsFormsContext', new CmsFormsContext($parameters));
-        $this->useContext('CmsUiContext', new CmsUiContext($parameters));
-
         parent::__construct($parameters);
+
+        // Override existing fixture context with more specific one
+        $fixtureContext = new \SilverStripe\Cms\Test\Behaviour\FixtureContext($parameters);
+        $fixtureContext->setFixtureFactory($this->getFixtureFactory());
+        $this->useContext('FixtureContext', $fixtureContext);
+
+        // Use blueprints which auto-publish all subclasses of SiteTree
+        $factory = $fixtureContext->getFixtureFactory();
+        foreach(\ClassInfo::subclassesFor('SiteTree') as $id => $class) {
+            $blueprint = \Injector::inst()->create('FixtureBlueprint', $class);
+            $blueprint->addCallback('afterCreate', function($obj, $identifier, &$data, &$fixtures) {
+                $obj->publish('Stage', 'Live');
+            });
+            $factory->define($class, $blueprint);
+        } 
+
     }
+
 }

tests/behat/features/bootstrap/SilverStripe/Cms/Test/Behaviour/FixtureContext.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace SilverStripe\Cms\Test\Behaviour;
+
+use Behat\Behat\Context\ClosuredContextInterface,
+    Behat\Behat\Context\TranslatedContextInterface,
+    Behat\Behat\Context\BehatContext,
+    Behat\Behat\Context\Step,
+    Behat\Behat\Event\StepEvent,
+    Behat\Behat\Exception\PendingException,
+    Behat\Mink\Driver\Selenium2Driver,
+    Behat\Gherkin\Node\PyStringNode,
+    Behat\Gherkin\Node\TableNode;
+
+// PHPUnit
+require_once 'PHPUnit/Autoload.php';
+require_once 'PHPUnit/Framework/Assert/Functions.php';
+
+/**
+ * Context used to create fixtures in the SilverStripe ORM.
+ */
+class FixtureContext extends \SilverStripe\BehatExtension\Context\FixtureContext
+{
+
+     /**
+     * Find or create a redirector page and link to another existing page.
+     * Example: Given a "page" "My Redirect" which redirects to a "page" "Page 1" 
+     * 
+     * @Given /^(?:(an|a|the) )"(?<type>[^"]+)" "(?<id>[^"]+)" (:?which )?redirects to (?:(an|a|the) )"(?<targetType>[^"]+)" "(?<targetId>[^"]+)"$/
+     */
+    public function stepCreateRedirectorPage($type, $id, $targetType, $targetId)
+    {
+        $class = 'RedirectorPage';
+        $targetClass = $this->convertTypeToClass($targetType);
+        
+        $targetObj = $this->fixtureFactory->get($targetClass, $targetId);
+        if(!$targetObj) $targetObj = $this->fixtureFactory->get($targetClass, $targetId);
+        
+        $fields = array('LinkToID' => $targetObj->ID);
+        $obj = $this->fixtureFactory->get($class, $id);
+        if($obj) {
+            $obj->update($fields);
+        } else {
+            $obj = $this->fixtureFactory->createObject($class, $id, $fields);
+        }
+        $obj->write();
+        $obj->publish('Stage', 'Live');
+    }
+   
+}

tests/behat/features/create-a-page.feature

@@ -1,15 +1,14 @@
-@database-defaults
 Feature: Create a page
-  As an author
+	As an author
-  I want to create a page in the CMS
+	I want to create a page in the CMS
-  So that I can grow my website
+	So that I can grow my website
 
-  @javascript
+	@javascript
-  Scenario: I can create a page from the pages section
+	Scenario: I can create a page from the pages section
-    Given I am logged in with "ADMIN" permissions
+		Given I am logged in with "ADMIN" permissions
-    And I go to "/admin/pages"
+		And I go to "/admin/pages"
-    And I should see a "Add new" button in CMS Content Toolbar
+		And I should see a "Add new" button in CMS Content Toolbar
-    When I press the "Add new" button
+		When I press the "Add new" button
-    And I check "Page"
+		And I check "Page"
-    And I press the "Create" button
+		And I press the "Create" button
-    Then I should see an edit page form
+		Then I should see an edit page form

tests/behat/features/edit-a-page.feature

@@ -1,29 +1,29 @@
-@database-defaults
 Feature: Edit a page
-  As an author
+	As an author
-  I want to edit a page in the CMS
+	I want to edit a page in the CMS
-  So that I correct errors and provide new information
+	So that I correct errors and provide new information
 
-  Background:
+	Background:
-    Given I am logged in with "ADMIN" permissions
+		Given a "page" "About Us"
-    And I go to "/admin/pages"
+		Given I am logged in with "ADMIN" permissions
-    Then I should see "About Us" in CMS Tree
+		And I go to "/admin/pages"
+		Then I should see "About Us" in CMS Tree
 
-  @javascript
+	@javascript
-  Scenario: I can open a page for editing from the pages tree
+	Scenario: I can open a page for editing from the pages tree
-    When I follow "About Us"
+		When I follow "About Us"
-    Then I should see an edit page form
+		Then I should see an edit page form
 
-  @javascript
+	@javascript
-  Scenario: I can edit title and content and see the changes on draft
+	Scenario: I can edit title and content and see the changes on draft
-    When I follow "About Us"
+		When I follow "About Us"
-    Then I should see an edit page form
+		Then I should see an edit page form
 
-    When I fill in "Title" with "About Us!"
+		When I fill in "Title" with "About Us!"
-    And I fill in the "Content" HTML field with "my new content"
+		And I fill in the "Content" HTML field with "my new content"
-    And I press the "Save Draft" button
+		And I press the "Save draft" button
-    Then I should see a "Saved" button
+		Then I should see "Saved" in the "button#Form_EditForm_action_save" element
 
-    When I follow "About Us"
+		When I follow "About Us"
-    Then the "Title" field should contain "About Us!"
+		Then the "Title" field should contain "About Us!"
-    And the "Content" HTML field should contain "my new content"
+		And the "Content" HTML field should contain "my new content"

tests/behat/features/preview-a-page.feature

@@ -1,42 +1,46 @@
-@database-defaults
 Feature: Preview a page
-  As an author
+	As an author
-  I want to preview the page I'm editing in the CMS
+	I want to preview the page I'm editing in the CMS
-  So that I can see how it would look like to my visitors
+	So that I can see how it would look like to my visitors
 
-  @javascript
+	Background:
-  Scenario: I can show a preview of the current page from the pages section
+		Given a "page" "About Us"
-    Given I am logged in with "ADMIN" permissions
-    And I go to "/admin/pages"
-    Then I should see "About Us" in CMS Tree
 
-    When I follow "About Us"
+	@javascript
-    And I set the CMS mode to "Preview mode"
+	Scenario: I can show a preview of the current page from the pages section
-    Then I can see the preview panel
+		Given I am logged in with "ADMIN" permissions
-    And the preview contains "About Us"
+		And I go to "/admin/pages"
-    Then I set the CMS mode to "Edit mode"
+		Then I should see "About Us" in CMS Tree
 
-  # TODO:
+		When I follow "About Us"
-  # - Only tests correctly on fresh database
+		And I set the CMS mode to "Preview mode"
-  # - We should continue testing against it after we have fixtures ready
+		Then I can see the preview panel
-  @javascript
+		And the preview contains "About Us"
-  Scenario: I can see an updated preview when editing content
+		Then I set the CMS mode to "Edit mode"
-    Given I am logged in with "ADMIN" permissions
-    And I go to "/admin/pages"
-    Then I should see "About Us" in CMS Tree
 
-    When I follow "About Us"
+	# TODO:
-    And I fill in the "Content" HTML field with "my new content"
+	# - Only tests correctly on fresh database
-    And I press the "Save Draft" button
+	# - We should continue testing against it after we have fixtures ready
-    And I set the CMS mode to "Preview mode"
+	@javascript
+	Scenario: I can see an updated preview when editing content
+		Given I am logged in with "ADMIN" permissions
+		And I go to "/admin/pages"
+		Then I should see "About Us" in CMS Tree
 
-    When I switch the preview to "Published"
+		When I follow "About Us"
-    Then the preview does not contain "my new content"
+		And I fill in the "Content" HTML field with "first content"
-    And the preview contains "You can fill"
+		And I press the "Publish" button
+		And I fill in the "Content" HTML field with "my new content"
+		And I press the "Save draft" button
+		And I set the CMS mode to "Preview mode"
 
-    When I switch the preview to "Draft"
+		When I switch the preview to "Published"
-    Then the preview does not contain "You can fill"
+		Then the preview does not contain "my new content"
-    And the preview contains "my new content"
+		And the preview contains "first content"
 
-    And I set the CMS mode to "Edit mode"
+		When I switch the preview to "Draft"
-    Then I should see an edit page form
+		Then the preview does not contain "first content"
+		And the preview contains "my new content"
+
+		And I set the CMS mode to "Edit mode"
+		Then I should see an edit page form

tests/behat/features/publish-a-page.feature

@@ -1,4 +1,95 @@
-Feature: Create a page
+Feature: Publish a page
-  As a site owner
+As a site owner
-  I want content to go to a draft site before being published
+I want content to go to a draft site before being published
-  So that only high quality changes are seen by our visitors
+So that only high quality changes are seen by our visitors
+
+	Background:
+		Given a "page" "My Page" with "URLSegment"="my-page" and "Content"="initial content"
+		And the "page" "My Page" is not published
+
+	@javascript
+	Scenario: I can have a unpublished version of a page that is not publicly available
+		Given I go to "/my-page"
+		Then I should see "Page not found"
+
+	@javascript
+	Scenario: I can publish a previously never published page
+		Given I am logged in with "ADMIN" permissions
+		And I go to "/admin/pages"
+		And I should see "My Page" in CMS Tree
+		And I follow "My Page"
+		And I press the "Publish" button
+
+		Then I press the "Log out" button
+		And I go to "/my-page"
+
+		Then I should see "initial content"
+
+	@javascript
+	Scenario: I will get different options depending on the current publish state of the page
+		Given I am logged in with "ADMIN" permissions
+		And I go to "/admin/pages"
+		And I should see "My Page" in CMS Tree
+		And I follow "My Page"
+
+		When I click "More options" in the "#ActionMenus" element
+		Then I should not see "Unpublish" in the "#ActionMenus_MoreOptions" element
+		And I should see "Not published" in the "#ActionMenus_MoreOptions" element
+		And I should see "Delete draft" in the "#ActionMenus_MoreOptions" element
+		And I should see a "Save & publish" button
+		And I should see a "Saved" button
+
+		When I fill in the "Content" HTML field with "my new content"
+		And I click "More options" in the "#ActionMenus" element
+		Then I should not see "Unpublish" in the "#ActionMenus_MoreOptions" element
+		And I should see a "Save & publish" button
+		And I should see a "Save draft" button
+
+		When I press the "Publish" button
+		And I click "More options" in the "#ActionMenus" element
+		Then I should see "Unpublish" in the "#ActionMenus_MoreOptions" element
+		And I should see "Delete draft" in the "#ActionMenus_MoreOptions" element
+		And I should see a "Published" button
+		And I should see a "Saved" button
+
+	@javascript
+	Scenario: I can unpublish a page
+		Given a "page" "Hello" with "URLSegment"="hello" and "Content"="hello world"
+		And I go to "/hello"
+		Then I should see "hello world"
+
+		Given I am logged in with "ADMIN" permissions
+		And I go to "/admin/pages"
+		And I should see "Hello" in CMS Tree
+		And I follow "Hello"
+
+		When I click "More options" in the "#ActionMenus" element
+		And I press the "Unpublish" button
+
+		Then I press the "Log out" button
+		And I go to "/hello"
+		Then I should see "Page not found"
+
+	@javascript
+	Scenario: I can delete a page from live and draft stage to completely remove it
+		Given I am logged in with "ADMIN" permissions
+		And I go to "/admin/pages"
+		And I should see "My Page" in CMS Tree
+		When I follow "My Page"
+		And I press the "Publish" button
+		And I click "More options" in the "#ActionMenus" element
+		Then I should see "Unpublish" in the "#ActionMenus_MoreOptions" element
+
+		When I press the "Unpublish" button
+		And I click "More options" in the "#ActionMenus" element
+		Then I should see "Delete draft" in the "#ActionMenus_MoreOptions" element
+
+		When I press the "Delete draft" button
+		Then I should see a "Restore" button
+		And I should not see a "Published" button
+		And I should not see a "Save & publish" button
+		And I should not see a "Saved" button
+		And I should not see a "Save draft" button
+
+		When I press the "Restore" button
+		Then I should see a "Save & publish" button

tests/behat/features/search-for-a-page.feature

@@ -1,18 +1,21 @@
-@database-defaults
 Feature: Search for a page
-  As an author
+	As an author
-  I want to search for a page in the CMS
+	I want to search for a page in the CMS
-  So that I can efficiently navigate nested content structures
+	So that I can efficiently navigate nested content structures
 
-  @javascript
+	Background:
-  Scenario: I can search for a page by its title
+		Given a "page" "About Us"
-    Given I am logged in with "ADMIN" permissions
+		And a "page" "Contact Us"
-    And I go to "/admin/pages"
-    Then I should see "About Us" in CMS Tree
-    And I should see "Contact Us" in CMS Tree
 
-    When I expand the "Filter" CMS Panel
+	@javascript
-    And I fill in "Content" with "About Us"
+	Scenario: I can search for a page by its title
-    And I press the "Apply Filter" button
+		Given I am logged in with "ADMIN" permissions
-    Then I should see "About Us" in CMS Tree
+		And I go to "/admin/pages"
-    But I should not see "Contact Us" in CMS Tree
+		Then I should see "About Us" in CMS Tree
+		And I should see "Contact Us" in CMS Tree
+
+		When I expand the "Filter" CMS Panel
+		And I fill in "Content" with "About Us"
+		And I press the "Apply Filter" button
+		Then I should see "About Us" in CMS Tree
+		But I should not see "Contact Us" in CMS Tree

tests/behat/features/settings-main.feature

@@ -0,0 +1,26 @@
+Feature: Edit site wide title and tagline
+	As a site administrator
+	I want to configure the sites title and tagline
+	So that I dont have to change any templates
+
+	Background:
+		Given a "page" "home"
+
+	@javascript
+	Scenario: I can edit my Site title and Tagline
+		Given I am logged in with "ADMIN" permissions
+		And I go to "/admin/settings"
+		Then I should see an edit page form
+		And I should see "Site title"
+		And I should see "Tagline"
+		And I should see "Theme"
+
+		When I fill in "Site title" with "Test Site"
+		And I fill in "Tagline" with "Site is under construction"
+		And I press the "Save" button
+		And I reload the page
+		Then I should see "Test Site" in the ".cms-logo" element
+
+		When I go to "/home"
+		Then I should see "Test Site"
+		And I should see "Site is under construction"

tests/model/SiteTreeTest.php

@@ -890,6 +890,37 @@ class SiteTreeTest extends SapphireTest {
 		$this->assertEquals(null, $page->getField('MenuTitle'));
 	}
 
+	public function testMetaTagGeneratorDisabling() {
+		$generator = Config::inst()->get('SiteTree', 'meta_generator');
+
+		$page = new SiteTreeTest_PageNode();
+
+		$meta = $page->MetaTags();
+		$this->assertEquals(
+			1,
+			preg_match('/.*meta name="generator" content="SilverStripe - http:\/\/silverstripe.org".*/', $meta),
+			'test default functionality - uses value from Config');
+
+		// test proper escaping of quotes in attribute value
+		Config::inst()->update('SiteTree', 'meta_generator', 'Generator with "quotes" in it');
+		$meta = $page->MetaTags();
+		$this->assertEquals(
+			1,
+			preg_match('/.*meta name="generator" content="Generator with "quotes" in it".*/', $meta),
+			'test proper escaping of values from Config');
+
+		// test empty generator - no tag should appear at all
+		Config::inst()->update('SiteTree', 'meta_generator', '');
+		$meta = $page->MetaTags();
+		$this->assertEquals(
+			0,
+			preg_match('/.*meta name=.generator..*/', $meta),
+			'test blank value means no tag generated');
+
+		// reset original value
+		Config::inst()->update('SiteTree', 'meta_generator', $generator);
+	}
+	
 }
 
 /**#@+