Merge branch '4.2' into 4

This commit is contained in:
Daniel Hensby 2018-07-30 17:10:37 +01:00
commit f99d0d7990
No known key found for this signature in database
GPG Key ID: D8DEBC4C8E7BC8B9

View File

@ -271,9 +271,13 @@ en:
TITLE_TYPE: Type
TITLE_USED_ON: 'Used on'
SilverStripe\CMS\Model\SiteTreeFileFormFactoryExtension:
BACKLINKCOUNT: 'Used on:'
PAGES: page(s)
USAGE: Usage
SilverStripe\CMS\Model\SiteTreeLink:
PLURALNAME: 'Site Tree Links'
PLURALS:
one: 'A Site Tree Link'
other: '{count} Site Tree Links'
SINGULARNAME: 'Site Tree Link'
SilverStripe\CMS\Model\VirtualPage:
CHOOSE: 'Linked Page'
DESCRIPTION: 'Displays the content of another page'