diff --git a/code/model/SiteTree.php b/code/model/SiteTree.php index 2d5308ca..0b2bd652 100755 --- a/code/model/SiteTree.php +++ b/code/model/SiteTree.php @@ -2020,7 +2020,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid $actions->push(new FormAction('revert',_t('CMSMain.RESTORE','Restore'))); if($this->canDelete() && $this->canDeleteFromLive()) { // "delete from live" - $actions->push($deleteFromLiveAction = new FormAction('deletefromlive',_t('CMSMain.DELETEFP','Delete from the published site'))); + $actions->push($deleteFromLiveAction = new FormAction('deletefromlive',_t('CMSMain.DELETEFP','Delete'))); $deleteFromLiveAction->addExtraClass('ss-ui-action-destructive'); } } else { @@ -2030,20 +2030,20 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid } else { if($this->canDelete()) { // "delete" - $actions->push($deleteAction = new FormAction('delete',_t('CMSMain.DELETE','Delete from the draft site'))); + $actions->push($deleteAction = new FormAction('delete',_t('CMSMain.DELETE','Delete draft'))); $deleteAction->addExtraClass('delete'); $deleteAction->addExtraClass('ss-ui-action-destructive'); } // "save" - $actions->push($saveDraftAction = new FormAction('save',_t('CMSMain.SAVE','Save Draft'))); + $actions->push($saveDraftAction = new FormAction('save',_t('CMSMain.SAVEDRAFT','Save Draft'))); $saveDraftAction->addExtraClass('save-draft'); } } if($this->canPublish() && !$this->IsDeletedFromStage) { // "publish" - $actions->push($publishAction = new FormAction('publish', _t('SiteTree.BUTTONSAVEPUBLISH', 'Save and Publish'))); + $actions->push($publishAction = new FormAction('publish', _t('SiteTree.BUTTONSAVEPUBLISH', 'Save & Publish'))); $publishAction->addExtraClass('ss-ui-action-constructive'); } diff --git a/lang/en_US.php b/lang/en_US.php index 1504b5bf..93fb6720 100755 --- a/lang/en_US.php +++ b/lang/en_US.php @@ -82,10 +82,10 @@ $lang['en_US']['BrokenLinksReport']['RedirectorNonExistent'] = 'redirector page $lang['en_US']['BrokenLinksReport']['VirtualPageNonExistent'] = 'virtual page pointing to non-existent page'; $lang['en_US']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = 'Deleted %d pages from the draft site, %d failures'; $lang['en_US']['CMSBatchActions']['DELETED_PAGES'] = 'Deleted %d pages from the published site, %d failures'; -$lang['en_US']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Delete from draft site'; -$lang['en_US']['CMSBatchActions']['DELETE_PAGES'] = 'Delete from published site'; +$lang['en_US']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Delete draft'; +$lang['en_US']['CMSBatchActions']['DELETE_PAGES'] = 'Delete'; $lang['en_US']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = 'Deleted %d pages from the draft site'; -$lang['en_US']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Delete from draft site'; +$lang['en_US']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Delete draft'; $lang['en_US']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Published %d pages, %d failures'; $lang['en_US']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publish'; $lang['en_US']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'Un-published %d pages'; @@ -100,7 +100,7 @@ $lang['en_US']['CMSMain']['ACCESSALLINTERFACES'] = 'Access to all CMS sections'; $lang['en_US']['CMSMain']['BTNCOMPAREVERSIONS'] = 'Compare Versions'; $lang['en_US']['CMSMain']['BTNREFRESH'] = 'Refresh'; $lang['en_US']['CMSMain']['COMPARINGV'] = 'Comparing versions %s and %s'; -$lang['en_US']['CMSMain']['DELETE'] = 'Delete from the draft site'; +$lang['en_US']['CMSMain']['DELETE'] = 'Delete draft'; $lang['en_US']['CMSMain']['DESCREMOVED'] = 'and %s descendants'; $lang['en_US']['CMSMain']['EMAIL'] = 'Email'; $lang['en_US']['CMSMain']['GO'] = 'Go'; @@ -140,6 +140,7 @@ $lang['en_US']['CMSMain']['ROLLBACK'] = 'Roll back to this version'; $lang['en_US']['CMSMain']['ROLLEDBACKPUB'] = 'Rolled back to published version. New version number is #%d'; $lang['en_US']['CMSMain']['ROLLEDBACKVERSION'] = 'Rolled back to version #%d. New version number is #%d'; $lang['en_US']['CMSMain']['SAVE'] = 'Save'; +$lang['en_US']['CMSMain']['SAVEDRAFT'] = 'Save draft'; $lang['en_US']['CMSMain']['STATUSOPT'] = 'Status'; $lang['en_US']['CMSMain']['SearchTreeFormPagesDropdown'] = 'Pages'; $lang['en_US']['CMSMain']['TITLEOPT'] = 'Title';