Merge 3.5 into 3

silverstripe · Dec 22, 2016 · 838c2e9 · 838c2e9
2 parents 0695648 + 875c18c
commit 838c2e9
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 15 deletions.
diff --git a/lang/en.yml b/lang/en.yml
@@ -4,27 +4,27 @@ en:
   SilverStripeNavigator:
     Edit: Edit
   SilverStripe\SiteConfig\SiteConfig:
-    PLURALNAME: "Site Configs"
-    SINGULARNAME: "Site Config"
+    PLURALNAME: 'Site Configs'
+    SINGULARNAME: 'Site Config'
   SilverStripe\SiteConfig\SiteConfigLeftAndMain:
     MENUTITLE: Settings
   SiteConfig:
-    DEFAULTTHEME: "(Use default theme)"
-    EDITHEADER: "Who can edit pages on this site?"
-    EDIT_PERMISSION: "Manage site configuration"
-    EDIT_PERMISSION_HELP: "Ability to edit global access settings/top-level page permissions."
-    PLURALNAME: "Site Configs"
-    SINGULARNAME: "Site Config"
-    SITENAMEDEFAULT: "Your Site Name"
-    SITETAGLINE: "Site Tagline/Slogan"
-    SITETITLE: "Site title"
+    DEFAULTTHEME: '(Use default theme)'
+    EDITHEADER: 'Who can edit pages on this site?'
+    EDIT_PERMISSION: 'Manage site configuration'
+    EDIT_PERMISSION_HELP: 'Ability to edit global access settings/top-level page permissions.'
+    PLURALNAME: 'Site Configs'
+    SINGULARNAME: 'Site Config'
+    SITENAMEDEFAULT: 'Your Site Name'
+    SITETAGLINE: 'Site Tagline/Slogan'
+    SITETITLE: 'Site title'
     TABACCESS: Access
     TABMAIN: Main
-    TAGLINEDEFAULT: "your tagline here"
+    TAGLINEDEFAULT: 'your tagline here'
     THEME: Theme
-    TOPLEVELCREATE: "Who can create pages in the root of the site?"
-    VIEWHEADER: "Who can view pages on this site?"
+    TOPLEVELCREATE: 'Who can create pages in the root of the site?'
+    VIEWHEADER: 'Who can view pages on this site?'
   SiteConfigLeftAndMain:
     MENUTITLE: Settings
   SiteTree:
-    TOPLEVELCREATORGROUPS: "Top level creators"
+    TOPLEVELCREATORGROUPS: 'Top level creators'
diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml
@@ -1,6 +1,13 @@
 fa_IR:
   CMSSettingsController:
     MENUTITLE: تنظیمات
+  SilverStripeNavigator:
+    Edit: ویرایش
+  SilverStripe\SiteConfig\SiteConfig:
+    PLURALNAME: "تنظیمات سایت"
+    SINGULARNAME: "تنظیم سایت"
+  SilverStripe\SiteConfig\SiteConfigLeftAndMain:
+    MENUTITLE: تنظیمات
   SiteConfig:
     DEFAULTTHEME: "(استفاده از پوسته پیشفرض)"
     EDITHEADER: "چه کسی میتواند صفحات را در این سایت ویرایش کند؟"

diff --git a/lang/fi.yml b/lang/fi.yml
@@ -1,6 +1,13 @@
 fi:
   CMSSettingsController:
     MENUTITLE: Asetukset
+  SilverStripeNavigator:
+    Edit: Muokkaa
+  SilverStripe\SiteConfig\SiteConfig:
+    PLURALNAME: "Sivuston asetukset"
+    SINGULARNAME: "Sivuston asetukset"
+  SilverStripe\SiteConfig\SiteConfigLeftAndMain:
+    MENUTITLE: Asetukset
   SiteConfig:
     DEFAULTTHEME: "(Käytä oletusteemaa)"
     EDITHEADER: "Kuka voi muokata sivuja tällä sivustolla?"