Merge branch '2.8' into 2

lang/sk.yml

@@ -1,14 +1,37 @@
 sk:
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: Podstránky
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    has_one_Subsite: Podstránka
+  SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
+    SubsiteFieldLabel: Podstránka
+  SilverStripe\Subsites\Extensions\GroupSubsites:
+    SECURITYTABTITLE: Podstránky
+    db_AccessAllSubsites: 'Prístup na všetky podstránky'
+    many_many_Subsites: Podstránky
+  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
+    has_one_Subsite: Podstránka
+  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
+    has_one_Subsite: Podstránka
+    many_many_CrossSubsiteLinkTracking: 'Sledovanie odkazov naprieč podstránkami'
   SilverStripe\Subsites\Model\Subsite:
     ConfigurationTab: Konfigurácia
     CustomExtraMeta: 'Vlastné Meta Tagy'
     CustomMetaDescription: Popis
     CustomMetaTitle: Názov
+    PLURALNAME: Podstránky
+    SINGULARNAME: Podstránka
     SiteConfigTitle: 'Názov vášho webu'
     belongs_many_many_Groups: Skupiny
     db_Language: Jazyk
     db_Theme: Téma
     db_Title: Názov
+  SilverStripe\Subsites\Model\SubsiteDomain:
+    has_one_Subsite: Podstránka
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
+    SubsiteField: Podstránka
+  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
+    ReportDropdownSubsite: Podstránka
   Subsites:
     LanguageFieldLabel: Jazyk
     ThemeFieldLabel: Téma

lang/sl.yml

@@ -0,0 +1,35 @@
+sl:
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: Podspletišča
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    has_one_Subsite: Podspletišče
+  SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
+    SubsiteFieldLabel: Podspletišče
+  SilverStripe\Subsites\Extensions\GroupSubsites:
+    SECURITYTABTITLE: Podspletišča
+    db_AccessAllSubsites: 'Dostop do vseh podspletišč'
+    many_many_Subsites: Podspletišča
+  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
+    has_one_Subsite: Podspletišče
+  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
+    has_one_Subsite: Podspletišče
+    many_many_CrossSubsiteLinkTracking: 'Spremljanje povezav med podspletišči'
+  SilverStripe\Subsites\Model\Subsite:
+    ConfigurationTab: Nastavitve
+    CustomExtraMeta: 'Meta tagi po meri'
+    CustomMetaDescription: Opis
+    CustomMetaTitle: Naziv
+    PLURALNAME: Podspletišča
+    SINGULARNAME: Podspletišče
+    SiteConfigTitle: 'Naziv vašega spletnega mesta'
+    belongs_many_many_Groups: Skupine
+    db_Theme: Tema
+    db_Title: Naziv
+  SilverStripe\Subsites\Model\SubsiteDomain:
+    has_one_Subsite: Podspletišče
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
+    SubsiteField: Podspletišče
+  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
+    ReportDropdownSubsite: Podspletišče
+  Subsites:
+    ThemeFieldLabel: Tema