Commit ca8af7b2 authored by Damian Mooyman's avatar Damian Mooyman

Merge branch '1.5'

parents b70f71b4 86212dc9
{
"name": "cwp/cwp-core",
"description": "CWP basic compatibility module. Use for migrations.",
"type": "silverstripe-module",
"keywords": ["silverstripe", "cwp"],
"require": {
"composer/installers": "*",
"silverstripe/cms": "~3.1",
"silverstripe/framework": "~3.1",
"silverstripe/hybridsessions": "~1.1",
"silverstripe/environmentcheck": "~1.2",
"silverstripe/auditor": "~1.0"
},
"extra": {
"branch-alias": {
"dev-master": "1.5.x-dev"
}
}
}
"name": "cwp/cwp-core",
"description": "CWP basic compatibility module. Use for migrations.",
"type": "silverstripe-module",
"keywords": [
"silverstripe",
"cwp"
],
"require": {
"composer/installers": "*",
"silverstripe/cms": "~3.1",
"silverstripe/framework": "~3.1",
"silverstripe/hybridsessions": "~1.1",
"silverstripe/environmentcheck": "~1.2",
"silverstripe/auditor": "~1.0"
},
"extra": []
}
\ No newline at end of file
......@@ -2,7 +2,7 @@ de:
Cwp:
LoginPrompt: 'Bitte melden Sie sich mit Ihren CMS-Anmeldedaten an'
CwpStatsReport:
FileCount: 'Dateianzahl'
FileCount: Dateianzahl
Name: Name
PagesForMainSite: '- auf der Hauptseite'
PagesForSubsite: '- auf der Unterseite ''{SubsiteTitle}'''
......
......@@ -9,7 +9,7 @@ fi:
Name: Nimi
PagesForMainSite: '- pääsivustolla'
PagesForSubsite: '- alasivustolla ''{SubsiteTitle}'''
Title: 'Yhteenvetotilasto'
Title: Yhteenvetotilasto
TotalPageCount: 'Julkaistujen sivujen määrä, kaikki käännetyt ja alasivut huomioiden'
RichLinks:
OpenLinkTitle: 'Avaa ulkoinen linkki'
......@@ -3,4 +3,4 @@ zh:
LoginPrompt: '轻使用您的 CMS 证书登录'
UatServerPermission: '允许用户使用它们的帐户访问 UAT 服务器'
RichLinks:
OpenLinkTitle: '打开外部链接'
OpenLinkTitle: 打开外部链接
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment