diff --git a/lang/ar.yml b/lang/ar.yml
index b0f35f0..7a638b4 100644
--- a/lang/ar.yml
+++ b/lang/ar.yml
@@ -1,22 +1,10 @@
 ar:
-  Subsite:
-    COPYSTRUCTURE: 'نسخ الهيكل من:'
-    NOTEMPLATE: 'بدون قالب'
-  Subsites:
-    DefaultSiteFieldLabel: 'الموقع الافتراضي'
-    DomainFieldLabel: النطاق
-    IsPublicFieldLabel: 'تفعيل نفاذ العامّة'
-    LanguageFieldLabel: اللغة
-    MainSiteTitle: 'الموقع الرئيسي'
-    PageTypeBlacklistFieldLabel: 'نوع الصفحة قائمة سوداء'
-    PrimaryDomainFieldLabel: 'النطاق الأساسي'
-    RedirectURLFieldLabel: 'إعادة توجيه عنوان موقع الويب'
-    ThemeFieldLabel: المحور
-    TitleFieldLabel: 'اسم الموقع الفرعي'
   SilverStripe\CMS\Model\VirtualPage:
     EDITCONTENT: 'انقر هنا لتحرير المحتوى'
   SilverStripe\Subsites\Admin\SubsiteAdmin:
     MENUTITLE: 'المواقع الفرعية'
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    has_one_Subsite: 'الموقع الفرعي'
   SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
     AllSitesDropdownOpt: 'كافة المواقع'
     SUBSITENOTICE: 'يمكن الوصول إلى المجلدات والملفات التي تم إنشاؤها في الموقع الرئيسي من طرف كل المواقع الفرعية.'
@@ -32,6 +20,8 @@ ar:
     many_many_Subsites: 'المواقع الفرعية'
   SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     Saved: 'تمّ الحفظ، يرجى تحديث الصفحات ذات الصلة.'
+  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
+    has_one_Subsite: 'الموقع الفرعي'
   SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: نسخ
     CopyToSubsite: 'نسخ الصفحة في موقع فرعي'
@@ -70,7 +60,17 @@ ar:
   SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: المواقع
     ReportDropdownSubsite: 'الموقع الفرعي'
-  SilverStripe\Subsites\Extensions\FileSubsites:
-    has_one_Subsite: 'الموقع الفرعي'
-  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
-    has_one_Subsite: 'الموقع الفرعي'
+  Subsite:
+    COPYSTRUCTURE: 'نسخ الهيكل من:'
+    NOTEMPLATE: 'بدون قالب'
+  Subsites:
+    DefaultSiteFieldLabel: 'الموقع الافتراضي'
+    DomainFieldLabel: النطاق
+    IsPublicFieldLabel: 'تفعيل نفاذ العامّة'
+    LanguageFieldLabel: اللغة
+    MainSiteTitle: 'الموقع الرئيسي'
+    PageTypeBlacklistFieldLabel: 'نوع الصفحة قائمة سوداء'
+    PrimaryDomainFieldLabel: 'النطاق الأساسي'
+    RedirectURLFieldLabel: 'إعادة توجيه عنوان موقع الويب'
+    ThemeFieldLabel: المحور
+    TitleFieldLabel: 'اسم الموقع الفرعي'
diff --git a/lang/cs.yml b/lang/cs.yml
index 47b4980..e37750f 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -2,36 +2,6 @@ cs:
   LeftAndMain_Menu:
     Hello: Ahoj
     LOGOUT: 'Odhlásit se'
-  SiteTreeSubsites:
-    CopyAction: Kopírovat
-  Subsite:
-    CustomExtraMeta: 'Vlastní meta tagy'
-    CustomMetaDescription: Popis
-    CustomMetaKeywords: 'Klíčová slova'
-    CustomMetaTitle: Název
-    DOMAINSAVEFIRST: 'Domény můžete přidávat až po uložení'
-    DomainsHeadline: 'Domény pro tento web'
-    DomainsListTitle: Domény
-    SiteConfigSubtitle: 'Slogan Vašeho webu'
-    SiteConfigTitle: 'Název Vašeho webu'
-    TabTitleConfig: Konfigurace
-    ValidateTitle: 'Prosím vložte "Název"'
-  SubsiteAdmin:
-    MENUTITLE: Subsites
-  SubsiteDomain:
-    DOMAIN: Doména
-    PLURALNAME: 'Domény webů'
-    SINGULARNAME: 'Doména webu'
-  SubsiteReportWrapper:
-    ReportDropdown: Weby
-  Subsites:
-    DefaultSiteFieldLabel: 'Výchozí web'
-    DomainFieldLabel: Doména
-    LanguageFieldLabel: Jazyk
-    ThemeFieldLabel: Téma
-    TitleFieldLabel: 'Název subsite'
-  SubsitesVirtualPage:
-    PLURALNAME: 'Základní stránky'
   SilverStripe\Subsites\Admin\SubsiteAdmin:
     MENUTITLE: Subsites
   SilverStripe\Subsites\Extensions\GroupSubsites:
@@ -62,3 +32,33 @@ cs:
     db_Domain: Doména
   SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: Weby
+  SiteTreeSubsites:
+    CopyAction: Kopírovat
+  Subsite:
+    CustomExtraMeta: 'Vlastní meta tagy'
+    CustomMetaDescription: Popis
+    CustomMetaKeywords: 'Klíčová slova'
+    CustomMetaTitle: Název
+    DOMAINSAVEFIRST: 'Domény můžete přidávat až po uložení'
+    DomainsHeadline: 'Domény pro tento web'
+    DomainsListTitle: Domény
+    SiteConfigSubtitle: 'Slogan Vašeho webu'
+    SiteConfigTitle: 'Název Vašeho webu'
+    TabTitleConfig: Konfigurace
+    ValidateTitle: 'Prosím vložte "Název"'
+  SubsiteAdmin:
+    MENUTITLE: Subsites
+  SubsiteDomain:
+    DOMAIN: Doména
+    PLURALNAME: 'Domény webů'
+    SINGULARNAME: 'Doména webu'
+  SubsiteReportWrapper:
+    ReportDropdown: Weby
+  Subsites:
+    DefaultSiteFieldLabel: 'Výchozí web'
+    DomainFieldLabel: Doména
+    LanguageFieldLabel: Jazyk
+    ThemeFieldLabel: Téma
+    TitleFieldLabel: 'Název subsite'
+  SubsitesVirtualPage:
+    PLURALNAME: 'Základní stránky'
diff --git a/lang/de.yml b/lang/de.yml
index d454101..a9382f4 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -5,6 +5,8 @@ de:
     EDITCONTENT: 'Klicken Sie hier, um den Inhalt zu bearbeiten'
   SilverStripe\Subsites\Admin\SubsiteAdmin:
     MENUTITLE: Subsites
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    has_one_Subsite: Subseite
   SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
     AllSitesDropdownOpt: 'Alle Seiten'
     SUBSITENOTICE: 'Auf Ordner und Dateien der Hauptseite kann von allen Subsites zugegriffen werden.'
@@ -21,6 +23,8 @@ de:
   SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     SITECONTENTLEFT: 'Seiten Inhalt'
     Saved: 'Gespeichert, bitte aktualisieren Sie verknüpfte Seiten'
+  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
+    has_one_Subsite: Subseite
   SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: Kopieren
     CopyToSubsite: 'Seite auf Subseite Kopieren'
@@ -94,7 +98,3 @@ de:
     RedirectURLFieldLabel: Weierleitungs-URL
     ThemeFieldLabel: Theme
     TitleFieldLabel: 'Name der Subsite'
-  SilverStripe\Subsites\Extensions\FileSubsites:
-    has_one_Subsite: Subseite
-  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
-    has_one_Subsite: Subseite
diff --git a/lang/en.yml b/lang/en.yml
index 83e86a1..6ab761a 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -7,6 +7,8 @@ en:
     MENUTITLE: Subsites
   SilverStripe\Subsites\Controller\SubsiteXHRController:
     MENUTITLE: SilverStripe\Subsites\Controller\SubsiteXHRController
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    has_one_Subsite: Subsite
   SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
     AllSitesDropdownOpt: 'All sites'
     SUBSITENOTICE: 'Folders and files created in the main site are accessible by all subsites.'
@@ -24,6 +26,8 @@ en:
   SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     SITECONTENTLEFT: 'Site Content'
     Saved: 'Saved, please update related pages.'
+  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
+    has_one_Subsite: Subsite
   SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: Copy
     CopyToSubsite: 'Copy page to subsite'
@@ -107,7 +111,3 @@ en:
     RedirectURLFieldLabel: 'Redirect URL'
     ThemeFieldLabel: Theme
     TitleFieldLabel: 'Subsite Name'
-  SilverStripe\Subsites\Extensions\FileSubsites:
-    has_one_Subsite: Subsite
-  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
-    has_one_Subsite: Subsite
diff --git a/lang/eo.yml b/lang/eo.yml
index 63b22ca..4dd3bc7 100644
--- a/lang/eo.yml
+++ b/lang/eo.yml
@@ -7,6 +7,8 @@ eo:
     MENUTITLE: Subretejoj
   SilverStripe\Subsites\Controller\SubsiteXHRController:
     MENUTITLE: SilverStripe\Subretejoj\Reganto\SubretejaXHRReganto
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    has_one_Subsite: Subretejo
   SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
     AllSitesDropdownOpt: 'Ĉiuj retejoj'
     SUBSITENOTICE: 'Dosierujoj kaj dosieroj kreitaj en la ĉefa retejo estas alireblaj de ĉiuj retejoj'
@@ -19,16 +21,20 @@ eo:
     MANAGE_SUBSITES: 'Administri subretejojn por grupoj'
     MANAGE_SUBSITES_HELP: 'Eblo limigi la permesojn por grupo al unu aŭ pluaj subretejoj.'
     SECURITYTABTITLE: Subretejoj
+    db_AccessAllSubsites: 'Aliri ĉiujn subretejojn'
     many_many_Subsites: Subretejoj
   SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     SITECONTENTLEFT: 'Enhavo de retejo'
     Saved: 'Konservita, bonvole ĝisdatigi rilatajn paĝojn.'
+  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
+    has_one_Subsite: Subretejo
   SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: Kopio
     CopyToSubsite: 'Kopii paĝon al subretejo'
     CopyToSubsiteWithChildren: 'Ĉu inkluzivi  paĝidojn?'
     SubsiteOperations: 'Subretejaj operacioj'
     has_one_Subsite: Subretejo
+    many_many_CrossSubsiteLinkTracking: 'Trans-subreteja ligspurado'
   SilverStripe\Subsites\Model\Subsite:
     ConfigurationTab: Agordaro
     CopyMessage: 'Kreis kopion de {title}'
@@ -48,7 +54,9 @@ eo:
     ValidateTitle: 'Bonvole aldoni "Titolon"'
     belongs_many_many_Groups: Grupoj
     db_DefaultSite: 'Apriora retejo'
+    db_IsPublic: 'Estas publika'
     db_Language: Lingvo
+    db_PageTypeBlacklist: 'Paĝtipa nigra listo'
     db_RedirectURL: 'Redirekti je URL'
     db_Theme: Etoso
     db_Title: Titolo
@@ -56,6 +64,7 @@ eo:
   SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: Domajno
     DOMAIN_DESCRIPTION: 'Gastiga nomo de ĉi tiu subretejo (ellasu protokolon). Permesas ĵokerojn (*).'
+    ISPRIMARY_DESCRIPTION: 'Marki ĉi tion kiel la aprioran domajnon por ĉi tiu subretejo'
     IS_PRIMARY: 'Ĉu unuaranga domajno?'
     PLURALNAME: 'Subretejaj domajnoj'
     PLURALS:
@@ -67,8 +76,8 @@ eo:
     PROTOCOL_HTTPS: 'https://'
     Protocol: Protokolo
     SINGULARNAME: 'Subreteja domajno'
-    ISPRIMARY_DESCRIPTION: 'Marki ĉi tion kiel la aprioran domajnon por ĉi tiu subretejo'
     db_Domain: Domajno
+    db_IsPrimary: 'Estas unuaranga'
     db_Protocol: Protokolo
     has_one_Subsite: Subretejo
   SilverStripe\Subsites\Pages\SubsitesVirtualPage:
@@ -80,8 +89,13 @@ eo:
       other: '{count} virtualaj paĝoj de subretejoj'
     SINGULARNAME: 'Virtuala paĝo de subretejoj'
     SubsiteField: Subretejo
+    db_CustomExtraMeta: 'Propra kroma meta'
+    db_CustomMetaDescription: 'Propra metapriskribo'
+    db_CustomMetaKeywords: 'Propraj meta-ŝlosilvortoj '
+    db_CustomMetaTitle: 'Propraj meta-titolo'
   SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: Retejoj
+    ReportDropdownAll: Ĉiuj
     ReportDropdownSubsite: Subretejo
   Subsite:
     COPYSTRUCTURE: 'Kopii strukturon de:'
@@ -97,7 +111,3 @@ eo:
     RedirectURLFieldLabel: 'Redirekti je URL'
     ThemeFieldLabel: Etoso
     TitleFieldLabel: 'Nomo de subretejo'
-  SilverStripe\Subsites\Extensions\FileSubsites:
-    has_one_Subsite: Subretejo
-  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
-    has_one_Subsite: Subretejo
diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml
index 581d71e..c4e0e03 100644
--- a/lang/fa_IR.yml
+++ b/lang/fa_IR.yml
@@ -1,19 +1,12 @@
 fa_IR:
   DomainNameField:
     INVALID_DOMAIN: 'نام دامنه نامعتبر'
-  Subsite:
-    NOTEMPLATE: 'بدون قالب'
-  Subsites:
-    DefaultSiteFieldLabel: 'سایت پیش فرض'
-    DomainFieldLabel: دامنه
-    LanguageFieldLabel: زبان
-    PrimaryDomainFieldLabel: 'دامنه اولیه'
-    ThemeFieldLabel: پوسته
-    TitleFieldLabel: 'نام زیر سایت'
   SilverStripe\CMS\Model\VirtualPage:
     EDITCONTENT: 'برای ویرایش محتوا اینجا را کلیک کنید'
   SilverStripe\Subsites\Admin\SubsiteAdmin:
     MENUTITLE: 'زیر سایت ها'
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    has_one_Subsite: 'زیر سایت'
   SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
     AllSitesDropdownOpt: 'تمامی سایت ها'
     SubsiteFieldLabel: 'زیر سایت'
@@ -22,6 +15,10 @@ fa_IR:
     ACCESSONLY: 'فقط این زیر سایت ها'
     SECURITYTABTITLE: 'زیر سایت ها'
     many_many_Subsites: 'زیر سایت ها'
+  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
+    has_one_Subsite: 'زیر سایت'
+  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
+    has_one_Subsite: 'زیر سایت'
   SilverStripe\Subsites\Model\Subsite:
     ConfigurationTab: پیکربندی
     CustomExtraMeta: 'متا تگ‌های اختصاصی'
@@ -51,9 +48,12 @@ fa_IR:
   SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: 'سایت ها'
     ReportDropdownSubsite: 'زیر سایت'
-  SilverStripe\Subsites\Extensions\FileSubsites:
-    has_one_Subsite: 'زیر سایت'
-  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
-    has_one_Subsite: 'زیر سایت'
-  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
-    has_one_Subsite: 'زیر سایت'
+  Subsite:
+    NOTEMPLATE: 'بدون قالب'
+  Subsites:
+    DefaultSiteFieldLabel: 'سایت پیش فرض'
+    DomainFieldLabel: دامنه
+    LanguageFieldLabel: زبان
+    PrimaryDomainFieldLabel: 'دامنه اولیه'
+    ThemeFieldLabel: پوسته
+    TitleFieldLabel: 'نام زیر سایت'
diff --git a/lang/fi.yml b/lang/fi.yml
index faffe02..174d63f 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -5,30 +5,36 @@ fi:
     EDITCONTENT: 'Napsauta tässä muokataksesi sisältöä'
   SilverStripe\Subsites\Admin\SubsiteAdmin:
     MENUTITLE: Alasivustot
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    has_one_Subsite: Alasivusto
   SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
     AllSitesDropdownOpt: 'Kaikki sivustot'
-    SubsiteFieldLabel: Alasivusto
     SUBSITENOTICE: 'Kansiot ja tiedostot, jotka on luotu pääsivustolla, ovat käytettävissä kaikissa alisivustoissa.'
+    SubsiteFieldLabel: Alasivusto
   SilverStripe\Subsites\Extensions\GroupSubsites:
     ACCESSALL: 'Kaikki alasivustot'
     ACCESSONLY: 'Vain nämä alasivustot'
     ACCESSRADIOTITLE: 'Anna ryhmän oikeudet »'
     GlobalGroup: Globaaliryhmä
     MANAGE_SUBSITES: 'Hallinnoi ryhmien alasivustoja'
-    SECURITYTABTITLE: Alasivustot
     MANAGE_SUBSITES_HELP: 'Mahdollisuus rajoittaa ryhmän oikeuksia yhdelle tai useammalle alisivustolle.'
+    SECURITYTABTITLE: Alasivustot
     many_many_Subsites: Alasivut
   SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     SITECONTENTLEFT: 'Sivuston sisältö'
     Saved: 'Tallennettu, ole hyvä ja päivitä liittyvät sivut.'
+  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
+    has_one_Subsite: Alasivusto
   SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: Kopioi
     CopyToSubsite: 'Kopioi sivu alasivustolle'
-    SubsiteOperations: 'Alasivuston toiminnot'
     CopyToSubsiteWithChildren: 'Sisällytä alasivut?'
+    SubsiteOperations: 'Alasivuston toiminnot'
     has_one_Subsite: Alasivusto
   SilverStripe\Subsites\Model\Subsite:
     ConfigurationTab: Asetukset
+    CopyMessage: 'Luotiin kopio lähteestä {title}'
+    CustomExtraMeta: 'Omat meta-tagit'
     CustomMetaDescription: Kuvaus
     CustomMetaKeywords: Avainsanat
     CustomMetaTitle: Otsikko
@@ -36,12 +42,10 @@ fi:
     PLURALS:
       one: Alasivu
       other: '{count} alasivua'
-    SiteConfigSubtitle: 'Tähän sloganisi'
-    SiteConfigTitle: 'Sivuston nimi'
-    CopyMessage: 'Luotiin kopio lähteestä {title}'
-    CustomExtraMeta: 'Omat meta-tagit'
     PageTypeBlacklistField: 'Kiellä sivutyyppien käyttö?'
     SINGULARNAME: Alasivusto
+    SiteConfigSubtitle: 'Tähän sloganisi'
+    SiteConfigTitle: 'Sivuston nimi'
     ValidateTitle: 'Lisää "Otsikko"'
     belongs_many_many_Groups: Ryhmät
     db_DefaultSite: Oletussivusto
@@ -52,23 +56,23 @@ fi:
     has_many_Domains: Domainit
   SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: Verkkotunnus
-    PROTOCOL_HTTP: 'http://'
-    PROTOCOL_HTTPS: 'https://'
-    Protocol: Protokolla
     DOMAIN_DESCRIPTION: 'Tämä alisivuston isäntänimi (ilman protokollaa). Sallii wildcard-merkit (*).'
     ISPRIMARY_DESCRIPTION: 'Merkitse tämä oletusdomainiksi tälle alisivustolle'
     IS_PRIMARY: 'On päädomain?'
     PLURALNAME: 'Alisivuston domain-osoitteet'
     PROTOCOL_AUTOMATIC: Automaattinen
+    PROTOCOL_HTTP: 'http://'
+    PROTOCOL_HTTPS: 'https://'
+    Protocol: Protokolla
     SINGULARNAME: 'Alisivuston domain-osoite'
     db_Domain: Verkkotunnus
     db_Protocol: Protokolla
     has_one_Subsite: Alasivusto
   SilverStripe\Subsites\Pages\SubsitesVirtualPage:
-    SubsiteField: Alasivusto
     DESCRIPTION: 'Näyttää sisällön toisen alisivuston sivulta'
     PLURALNAME: 'Alisivustojen virtuaaliset sivut'
     SINGULARNAME: 'Alisivuston Virtuaalisivu'
+    SubsiteField: Alasivusto
   SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: Sivustot
     ReportDropdownSubsite: Alasivusto
@@ -86,7 +90,3 @@ fi:
     RedirectURLFieldLabel: 'Edelleenohjaus URL'
     ThemeFieldLabel: Teema
     TitleFieldLabel: 'Alisivuston nimi'
-  SilverStripe\Subsites\Extensions\FileSubsites:
-    has_one_Subsite: Alasivusto
-  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
-    has_one_Subsite: Alasivusto
diff --git a/lang/hr.yml b/lang/hr.yml
index 2077c53..2341d8b 100644
--- a/lang/hr.yml
+++ b/lang/hr.yml
@@ -1,24 +1,12 @@
 hr:
   DomainNameField:
     INVALID_DOMAIN: 'Netočan naziv domene'
-  Subsite:
-    COPYSTRUCTURE: 'Kopiraj strukturu od:'
-    NOTEMPLATE: 'Nema predloška'
-  Subsites:
-    DefaultSiteFieldLabel: 'Zadani sajt'
-    DomainFieldLabel: Domena
-    IsPublicFieldLabel: 'Omogućni javni pristup'
-    LanguageFieldLabel: Jezik
-    MainSiteTitle: 'Glavni sajt'
-    PageTypeBlacklistFieldLabel: 'Crna lista tipova stranica'
-    PrimaryDomainFieldLabel: 'Glavna domena'
-    RedirectURLFieldLabel: 'Link preusmjeravanja'
-    ThemeFieldLabel: Tema
-    TitleFieldLabel: 'Naziv podsajta'
   SilverStripe\CMS\Model\VirtualPage:
     EDITCONTENT: 'Klikni ovdje za uređivanje sadržaja'
   SilverStripe\Subsites\Admin\SubsiteAdmin:
     MENUTITLE: Podsajtovi
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    has_one_Subsite: Podsajt
   SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
     AllSitesDropdownOpt: 'Svi sajtovi'
     SUBSITENOTICE: 'Direktoriji i datoteke kreirane u glavnom sajtu su dostupne svim podsajtovima.'
@@ -34,6 +22,8 @@ hr:
     many_many_Subsites: Podsajtovi
   SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     Saved: 'Spremljeno, molimo osvježite povezane stranice.'
+  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
+    has_one_Subsite: Podsajt
   SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: Kopiraj
     CopyToSubsite: 'Kopiraj stranicu u podsajt'
@@ -81,7 +71,17 @@ hr:
   SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: Sajtovi
     ReportDropdownSubsite: Podsajt
-  SilverStripe\Subsites\Extensions\FileSubsites:
-    has_one_Subsite: Podsajt
-  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
-    has_one_Subsite: Podsajt
+  Subsite:
+    COPYSTRUCTURE: 'Kopiraj strukturu od:'
+    NOTEMPLATE: 'Nema predloška'
+  Subsites:
+    DefaultSiteFieldLabel: 'Zadani sajt'
+    DomainFieldLabel: Domena
+    IsPublicFieldLabel: 'Omogućni javni pristup'
+    LanguageFieldLabel: Jezik
+    MainSiteTitle: 'Glavni sajt'
+    PageTypeBlacklistFieldLabel: 'Crna lista tipova stranica'
+    PrimaryDomainFieldLabel: 'Glavna domena'
+    RedirectURLFieldLabel: 'Link preusmjeravanja'
+    ThemeFieldLabel: Tema
+    TitleFieldLabel: 'Naziv podsajta'
diff --git a/lang/id.yml b/lang/id.yml
index 6e86d6f..48eac68 100644
--- a/lang/id.yml
+++ b/lang/id.yml
@@ -3,6 +3,38 @@ id:
     SubsiteFieldLabel: Subsitus
   GroupSubsites:
     SECURITYTABTITLE: Subsitus
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: Subsitus
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    has_one_Subsite: Subsitus
+  SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
+    SubsiteFieldLabel: Subsitus
+  SilverStripe\Subsites\Extensions\GroupSubsites:
+    SECURITYTABTITLE: Subsitus
+    many_many_Subsites: Subsitus
+  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
+    has_one_Subsite: Subsitus
+  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
+    has_one_Subsite: Subsitus
+  SilverStripe\Subsites\Model\Subsite:
+    CustomExtraMeta: 'Penanda Meta'
+    CustomMetaDescription: Deskripsi
+    CustomMetaKeywords: 'Kata kunci'
+    CustomMetaTitle: Judul
+    PLURALNAME: Subsitus
+    SINGULARNAME: Subsitus
+    SiteConfigTitle: 'Nama Situs'
+    belongs_many_many_Groups: Kelompok
+    db_Language: Bahasa
+    db_Theme: Tema
+    db_Title: Judul
+  SilverStripe\Subsites\Model\SubsiteDomain:
+    has_one_Subsite: Subsitus
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
+    SubsiteField: Subsitus
+  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
+    ReportDropdown: Situs
+    ReportDropdownSubsite: Subsitus
   Subsite:
     CustomMetaDescription: Deskripsi
     CustomMetaKeywords: 'Kata kunci'
@@ -18,35 +50,3 @@ id:
     ThemeFieldLabel: Tema
   SubsitesVirtualPage:
     SubsiteField: Subsitus
-  SilverStripe\Subsites\Admin\SubsiteAdmin:
-    MENUTITLE: Subsitus
-  SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
-    SubsiteFieldLabel: Subsitus
-  SilverStripe\Subsites\Extensions\GroupSubsites:
-    SECURITYTABTITLE: Subsitus
-    many_many_Subsites: Subsitus
-  SilverStripe\Subsites\Model\Subsite:
-    CustomExtraMeta: 'Penanda Meta'
-    CustomMetaDescription: Deskripsi
-    CustomMetaKeywords: 'Kata kunci'
-    CustomMetaTitle: Judul
-    PLURALNAME: Subsitus
-    SINGULARNAME: Subsitus
-    SiteConfigTitle: 'Nama Situs'
-    belongs_many_many_Groups: Kelompok
-    db_Language: Bahasa
-    db_Theme: Tema
-    db_Title: Judul
-  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
-    SubsiteField: Subsitus
-  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
-    ReportDropdown: Situs
-    ReportDropdownSubsite: Subsitus
-  SilverStripe\Subsites\Extensions\FileSubsites:
-    has_one_Subsite: Subsitus
-  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
-    has_one_Subsite: Subsitus
-  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
-    has_one_Subsite: Subsitus
-  SilverStripe\Subsites\Model\SubsiteDomain:
-    has_one_Subsite: Subsitus
diff --git a/lang/it.yml b/lang/it.yml
index 50c7a18..4f15ee3 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -1,24 +1,12 @@
 it:
   DomainNameField:
     INVALID_DOMAIN: 'Nome a dominio non valido'
-  Subsite:
-    COPYSTRUCTURE: 'Copia struttura da:'
-    NOTEMPLATE: 'Nessuno schema'
-  Subsites:
-    DefaultSiteFieldLabel: 'Sito di default'
-    DomainFieldLabel: Dominio
-    IsPublicFieldLabel: 'Permetti accesso pubblico'
-    LanguageFieldLabel: Lingua
-    MainSiteTitle: 'Sito principale'
-    PageTypeBlacklistFieldLabel: 'Blacklist dei tipi di pagina'
-    PrimaryDomainFieldLabel: 'Dominio primario'
-    RedirectURLFieldLabel: 'URL di reindirizzamento'
-    ThemeFieldLabel: Tema
-    TitleFieldLabel: 'Nome sottosito'
   SilverStripe\CMS\Model\VirtualPage:
     EDITCONTENT: 'Clicca qui per editare il contenuto'
   SilverStripe\Subsites\Admin\SubsiteAdmin:
     MENUTITLE: Sottositi
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    has_one_Subsite: Sottosito
   SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
     AllSitesDropdownOpt: 'Tutti i siti'
     SUBSITENOTICE: 'Le cartelle e i files creati nel sito principale sono accessibili da tutti i sottositi.'
@@ -34,6 +22,8 @@ it:
     many_many_Subsites: Sottositi
   SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     Saved: 'Salvato, si prega di aggiornare le pagine relative.'
+  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
+    has_one_Subsite: Sottosito
   SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: Copia
     CopyToSubsite: 'Copia pagina in sottosito'
@@ -81,7 +71,17 @@ it:
   SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: Siti
     ReportDropdownSubsite: Sottosito
-  SilverStripe\Subsites\Extensions\FileSubsites:
-    has_one_Subsite: Sottosito
-  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
-    has_one_Subsite: Sottosito
+  Subsite:
+    COPYSTRUCTURE: 'Copia struttura da:'
+    NOTEMPLATE: 'Nessuno schema'
+  Subsites:
+    DefaultSiteFieldLabel: 'Sito di default'
+    DomainFieldLabel: Dominio
+    IsPublicFieldLabel: 'Permetti accesso pubblico'
+    LanguageFieldLabel: Lingua
+    MainSiteTitle: 'Sito principale'
+    PageTypeBlacklistFieldLabel: 'Blacklist dei tipi di pagina'
+    PrimaryDomainFieldLabel: 'Dominio primario'
+    RedirectURLFieldLabel: 'URL di reindirizzamento'
+    ThemeFieldLabel: Tema
+    TitleFieldLabel: 'Nome sottosito'
diff --git a/lang/ja.yml b/lang/ja.yml
index b896460..93868e9 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -6,18 +6,12 @@ ja:
     ACCESSONLY: これらのサブサイトのみ
     ACCESSRADIOTITLE: このグループに選択先へのアクセス権を与える
     SECURITYTABTITLE: サブサイト
-  SubsiteAdmin:
-    MENUTITLE: サブサイト
-  SubsiteDomain:
-    DOMAIN: ドメイン
-    PLURALNAME: サブサイトのドメイン
-    SINGULARNAME: サブサイトのドメイン
-  SubsitesVirtualPage:
-    SINGULARNAME: サブサイトの仮想ページ
   SilverStripe\CMS\Model\VirtualPage:
     EDITCONTENT: ここをクリックしてコンテンツを編集
   SilverStripe\Subsites\Admin\SubsiteAdmin:
     MENUTITLE: サブサイト
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    has_one_Subsite: サブサイト
   SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
     SubsiteFieldLabel: サブサイト
   SilverStripe\Subsites\Extensions\GroupSubsites:
@@ -26,6 +20,10 @@ ja:
     ACCESSRADIOTITLE: このグループに選択先へのアクセス権を与える
     SECURITYTABTITLE: サブサイト
     many_many_Subsites: サブサイト
+  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
+    has_one_Subsite: サブサイト
+  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
+    has_one_Subsite: サブサイト
   SilverStripe\Subsites\Model\Subsite:
     CustomExtraMeta: メタタグをカスタム
     CustomMetaDescription: 説明文
@@ -46,15 +44,17 @@ ja:
   SilverStripe\Subsites\Pages\SubsitesVirtualPage:
     SINGULARNAME: サブサイトの仮想ページ
     SubsiteField: サブサイト
+  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
+    ReportDropdownSubsite: サブサイト
+  SubsiteAdmin:
+    MENUTITLE: サブサイト
+  SubsiteDomain:
+    DOMAIN: ドメイン
+    PLURALNAME: サブサイトのドメイン
+    SINGULARNAME: サブサイトのドメイン
   Subsites:
     DomainFieldLabel: ドメイン
     LanguageFieldLabel: 言語
     ThemeFieldLabel: テーマ
-  SilverStripe\Subsites\Extensions\FileSubsites:
-    has_one_Subsite: サブサイト
-  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
-    has_one_Subsite: サブサイト
-  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
-    has_one_Subsite: サブサイト
-  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
-    ReportDropdownSubsite: サブサイト
+  SubsitesVirtualPage:
+    SINGULARNAME: サブサイトの仮想ページ
diff --git a/lang/lt.yml b/lang/lt.yml
index 4b64d00..6f6d043 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -1,16 +1,4 @@
 lt:
-  Subsite:
-    COPYSTRUCTURE: 'Kopijuoti struktūrą iš:'
-    NOTEMPLATE: 'Nėra šablono'
-  Subsites:
-    DefaultSiteFieldLabel: 'Pagrindinė svetainė'
-    DomainFieldLabel: Domenas
-    IsPublicFieldLabel: 'Leisti pasiekti visiems'
-    LanguageFieldLabel: Kalba
-    MainSiteTitle: 'Pagrindinis puslapis'
-    PrimaryDomainFieldLabel: 'Pagrindinis domenas'
-    RedirectURLFieldLabel: 'Nukreipimo nuoroda'
-    ThemeFieldLabel: Tema
   SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
     AllSitesDropdownOpt: 'Visos svetainės'
   SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
@@ -41,3 +29,15 @@ lt:
     db_Domain: Domenas
   SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: Svetainės
+  Subsite:
+    COPYSTRUCTURE: 'Kopijuoti struktūrą iš:'
+    NOTEMPLATE: 'Nėra šablono'
+  Subsites:
+    DefaultSiteFieldLabel: 'Pagrindinė svetainė'
+    DomainFieldLabel: Domenas
+    IsPublicFieldLabel: 'Leisti pasiekti visiems'
+    LanguageFieldLabel: Kalba
+    MainSiteTitle: 'Pagrindinis puslapis'
+    PrimaryDomainFieldLabel: 'Pagrindinis domenas'
+    RedirectURLFieldLabel: 'Nukreipimo nuoroda'
+    ThemeFieldLabel: Tema
diff --git a/lang/mi.yml b/lang/mi.yml
index ecb7433..c5cbfc0 100644
--- a/lang/mi.yml
+++ b/lang/mi.yml
@@ -1,22 +1,10 @@
 mi:
-  Subsite:
-    COPYSTRUCTURE: 'Tāurutia te hanganga mai i:'
-    NOTEMPLATE: 'Kāore he tātauira'
-  Subsites:
-    DefaultSiteFieldLabel: 'Pae taunoa'
-    DomainFieldLabel: Rohe
-    IsPublicFieldLabel: 'Whakahohe urunga tūmatatanui'
-    LanguageFieldLabel: Reo
-    MainSiteTitle: 'Pae matua'
-    PageTypeBlacklistFieldLabel: 'Rārangirāhui Momo Whārangi'
-    PrimaryDomainFieldLabel: 'Rohe Matua'
-    RedirectURLFieldLabel: 'Tukua anō te URL'
-    ThemeFieldLabel: Kaupapa
-    TitleFieldLabel: 'Ingoa Pae Iti'
   SilverStripe\CMS\Model\VirtualPage:
     EDITCONTENT: 'Pāwhiri ki konei hei whakatika i ngā ihirangi'
   SilverStripe\Subsites\Admin\SubsiteAdmin:
     MENUTITLE: 'Ngā pae iti'
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    has_one_Subsite: 'Pae iti'
   SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
     AllSitesDropdownOpt: 'Ngā pae katoa'
     SUBSITENOTICE: 'Ka taea ngā kōpaki me ngā kōnae kua hangaia i te pae matua te uru mā ngā pae iti katoa.'
@@ -32,6 +20,8 @@ mi:
     many_many_Subsites: 'Ngā pae iti'
   SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     Saved: 'Kua tiakina, whakahoutia ngā whārangi pāhono.'
+  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
+    has_one_Subsite: 'Pae iti'
   SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: Tārua
     CopyToSubsite: 'Tāruatia te whārangi ki te pae iti'
@@ -70,7 +60,17 @@ mi:
   SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: 'Ngā Pae'
     ReportDropdownSubsite: 'Pae iti'
-  SilverStripe\Subsites\Extensions\FileSubsites:
-    has_one_Subsite: 'Pae iti'
-  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
-    has_one_Subsite: 'Pae iti'
+  Subsite:
+    COPYSTRUCTURE: 'Tāurutia te hanganga mai i:'
+    NOTEMPLATE: 'Kāore he tātauira'
+  Subsites:
+    DefaultSiteFieldLabel: 'Pae taunoa'
+    DomainFieldLabel: Rohe
+    IsPublicFieldLabel: 'Whakahohe urunga tūmatatanui'
+    LanguageFieldLabel: Reo
+    MainSiteTitle: 'Pae matua'
+    PageTypeBlacklistFieldLabel: 'Rārangirāhui Momo Whārangi'
+    PrimaryDomainFieldLabel: 'Rohe Matua'
+    RedirectURLFieldLabel: 'Tukua anō te URL'
+    ThemeFieldLabel: Kaupapa
+    TitleFieldLabel: 'Ingoa Pae Iti'
diff --git a/lang/nb_NO.yml b/lang/nb_NO.yml
index 4815956..2a5f08f 100644
--- a/lang/nb_NO.yml
+++ b/lang/nb_NO.yml
@@ -6,18 +6,12 @@ nb_NO:
     ACCESSONLY: 'Only these subsites'
     ACCESSRADIOTITLE: 'Give this group access to'
     SECURITYTABTITLE: subdomener
-  SubsiteAdmin:
-    MENUTITLE: Underdomener
-  SubsiteDomain:
-    DOMAIN: Domain
-    PLURALNAME: 'Subsite Domains'
-    SINGULARNAME: 'Subsite Domain'
-  SubsitesVirtualPage:
-    SINGULARNAME: 'Subdomeners Virtuelle Side'
   SilverStripe\CMS\Model\VirtualPage:
     EDITCONTENT: 'klikk her for å endre dette innholdet'
   SilverStripe\Subsites\Admin\SubsiteAdmin:
     MENUTITLE: subdomener
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    has_one_Subsite: Subdomene
   SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
     SubsiteFieldLabel: Subdomene
   SilverStripe\Subsites\Extensions\GroupSubsites:
@@ -26,6 +20,10 @@ nb_NO:
     ACCESSRADIOTITLE: 'Give this group access to'
     SECURITYTABTITLE: subdomener
     many_many_Subsites: subdomener
+  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
+    has_one_Subsite: Subdomene
+  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
+    has_one_Subsite: Subdomene
   SilverStripe\Subsites\Model\Subsite:
     ConfigurationTab: Konfigurasjon
     PLURALNAME: subdomener
@@ -39,13 +37,15 @@ nb_NO:
   SilverStripe\Subsites\Pages\SubsitesVirtualPage:
     SINGULARNAME: 'Subdomeners Virtuelle Side'
     SubsiteField: Subdomene
-  Subsites:
-    DomainFieldLabel: Domain
-  SilverStripe\Subsites\Extensions\FileSubsites:
-    has_one_Subsite: Subdomene
-  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
-    has_one_Subsite: Subdomene
-  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
-    has_one_Subsite: Subdomene
   SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdownSubsite: Subdomene
+  SubsiteAdmin:
+    MENUTITLE: Underdomener
+  SubsiteDomain:
+    DOMAIN: Domain
+    PLURALNAME: 'Subsite Domains'
+    SINGULARNAME: 'Subsite Domain'
+  Subsites:
+    DomainFieldLabel: Domain
+  SubsitesVirtualPage:
+    SINGULARNAME: 'Subdomeners Virtuelle Side'
diff --git a/lang/nl.yml b/lang/nl.yml
index 0d6a90e..03eda2c 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -7,6 +7,8 @@ nl:
     MENUTITLE: Subsites
   SilverStripe\Subsites\Controller\SubsiteXHRController:
     MENUTITLE: Subsites
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    has_one_Subsite: Subsite
   SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
     AllSitesDropdownOpt: 'Alle sites'
     SUBSITENOTICE: 'Mappen en bestanden van de Hoofdsite zijn toegankelijk voor alle subsites.'
@@ -23,6 +25,8 @@ nl:
   SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     SITECONTENTLEFT: 'Site inhoud'
     Saved: 'Opgeslagen, pas onderliggende pagina''s aan.'
+  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
+    has_one_Subsite: Subsite
   SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: Kopieer
     CopyToSubsite: 'Kopieer pagina''s naar subsite'
@@ -55,6 +59,7 @@ nl:
   SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: Domein
     DOMAIN_DESCRIPTION: 'Domeinnaam van deze subsite (zonder http), wildcards zijn toegestaan (*).'
+    ISPRIMARY_DESCRIPTION: 'Dit is de standaard domeinnaam voor deze subsite'
     IS_PRIMARY: 'Is Primaire domein'
     PLURALNAME: 'Subsite Domeinen'
     PLURALS:
@@ -66,7 +71,6 @@ nl:
     PROTOCOL_HTTPS: 'https://'
     Protocol: Protocol
     SINGULARNAME: 'Subsite Domein'
-    ISPRIMARY_DESCRIPTION: 'Dit is de standaard domeinnaam voor deze subsite'
     db_Domain: Domein
     db_Protocol: Protocol
     has_one_Subsite: Subsite
@@ -96,7 +100,3 @@ nl:
     RedirectURLFieldLabel: 'Redirect URL'
     ThemeFieldLabel: Thema
     TitleFieldLabel: 'Subsite naam'
-  SilverStripe\Subsites\Extensions\FileSubsites:
-    has_one_Subsite: Subsite
-  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
-    has_one_Subsite: Subsite
diff --git a/lang/pl_PL.yml b/lang/pl_PL.yml
index 61edc71..92a4518 100644
--- a/lang/pl_PL.yml
+++ b/lang/pl_PL.yml
@@ -6,18 +6,12 @@ pl_PL:
     ACCESSONLY: 'Tylko te podwitryny'
     ACCESSRADIOTITLE: 'Daj tej grupie dostęp do'
     SECURITYTABTITLE: Podwitryny
-  SubsiteAdmin:
-    MENUTITLE: Podwitryny
-  SubsiteDomain:
-    DOMAIN: Domena
-    PLURALNAME: 'Domeny podwitryny'
-    SINGULARNAME: 'Domena podwitryny'
-  SubsitesVirtualPage:
-    SINGULARNAME: 'Wirtualna strona dla podwitryn'
   SilverStripe\CMS\Model\VirtualPage:
     EDITCONTENT: 'Kliknij tutaj aby edytować zawartość'
   SilverStripe\Subsites\Admin\SubsiteAdmin:
     MENUTITLE: Podwitryny
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    has_one_Subsite: Podwitryna
   SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
     SubsiteFieldLabel: Podwitryna
   SilverStripe\Subsites\Extensions\GroupSubsites:
@@ -26,6 +20,10 @@ pl_PL:
     ACCESSRADIOTITLE: 'Daj tej grupie dostęp do'
     SECURITYTABTITLE: Podwitryny
     many_many_Subsites: Podwitryny
+  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
+    has_one_Subsite: Podwitryna
+  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
+    has_one_Subsite: Podwitryna
   SilverStripe\Subsites\Model\Subsite:
     ConfigurationTab: Konfiguracja
     CustomExtraMeta: 'Własne meta tagi'
@@ -43,14 +41,16 @@ pl_PL:
   SilverStripe\Subsites\Pages\SubsitesVirtualPage:
     SINGULARNAME: 'Wirtualna strona dla podwitryn'
     SubsiteField: Podwitryna
+  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
+    ReportDropdownSubsite: Podwitryna
+  SubsiteAdmin:
+    MENUTITLE: Podwitryny
+  SubsiteDomain:
+    DOMAIN: Domena
+    PLURALNAME: 'Domeny podwitryny'
+    SINGULARNAME: 'Domena podwitryny'
   Subsites:
     DomainFieldLabel: Domena
     LanguageFieldLabel: Język
-  SilverStripe\Subsites\Extensions\FileSubsites:
-    has_one_Subsite: Podwitryna
-  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
-    has_one_Subsite: Podwitryna
-  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
-    has_one_Subsite: Podwitryna
-  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
-    ReportDropdownSubsite: Podwitryna
+  SubsitesVirtualPage:
+    SINGULARNAME: 'Wirtualna strona dla podwitryn'
diff --git a/lang/ru.yml b/lang/ru.yml
index fab30d3..b8b801d 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -1,24 +1,12 @@
 ru:
   DomainNameField:
     INVALID_DOMAIN: 'Неверный домен'
-  Subsite:
-    COPYSTRUCTURE: 'Скопировать структуры из:'
-    NOTEMPLATE: 'Нет шаблона'
-  Subsites:
-    DefaultSiteFieldLabel: 'Основной сайт'
-    DomainFieldLabel: Домен
-    IsPublicFieldLabel: 'Разрешить публичный доступ'
-    LanguageFieldLabel: Язык
-    MainSiteTitle: 'Основной Сайт'
-    PageTypeBlacklistFieldLabel: 'Запрещённые типы страниц'
-    PrimaryDomainFieldLabel: 'Основной Домен'
-    RedirectURLFieldLabel: 'Ссылка для перенаправления'
-    ThemeFieldLabel: Оформление
-    TitleFieldLabel: 'Название Подсайта'
   SilverStripe\CMS\Model\VirtualPage:
     EDITCONTENT: 'Нажмите для изменения содержимого'
   SilverStripe\Subsites\Admin\SubsiteAdmin:
     MENUTITLE: Подсайты
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    has_one_Subsite: Подсайт
   SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
     AllSitesDropdownOpt: 'Все сайты'
     SUBSITENOTICE: 'Папки и файлы созданные на основном сайте так же доступны для под-сайтов.'
@@ -34,6 +22,8 @@ ru:
     many_many_Subsites: Подсайты
   SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     Saved: 'Сохранено, пожалуйста обновите связанные группы'
+  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
+    has_one_Subsite: Подсайт
   SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: Копировать
     CopyToSubsite: 'Копировать страницу на подсайт'
@@ -81,7 +71,17 @@ ru:
   SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: Сайты
     ReportDropdownSubsite: Подсайт
-  SilverStripe\Subsites\Extensions\FileSubsites:
-    has_one_Subsite: Подсайт
-  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
-    has_one_Subsite: Подсайт
+  Subsite:
+    COPYSTRUCTURE: 'Скопировать структуры из:'
+    NOTEMPLATE: 'Нет шаблона'
+  Subsites:
+    DefaultSiteFieldLabel: 'Основной сайт'
+    DomainFieldLabel: Домен
+    IsPublicFieldLabel: 'Разрешить публичный доступ'
+    LanguageFieldLabel: Язык
+    MainSiteTitle: 'Основной Сайт'
+    PageTypeBlacklistFieldLabel: 'Запрещённые типы страниц'
+    PrimaryDomainFieldLabel: 'Основной Домен'
+    RedirectURLFieldLabel: 'Ссылка для перенаправления'
+    ThemeFieldLabel: Оформление
+    TitleFieldLabel: 'Название Подсайта'
diff --git a/lang/tr_TR.yml b/lang/tr_TR.yml
index 34baf85..7466ef3 100644
--- a/lang/tr_TR.yml
+++ b/lang/tr_TR.yml
@@ -6,18 +6,12 @@ tr_TR:
     ACCESSONLY: 'Only these subsites'
     ACCESSRADIOTITLE: 'Give this group access to'
     SECURITYTABTITLE: 'Alt Siteler'
-  SubsiteAdmin:
-    MENUTITLE: 'Alt Siteler'
-  SubsiteDomain:
-    DOMAIN: Domain
-    PLURALNAME: 'Subsite Domains'
-    SINGULARNAME: 'Subsite Domain'
-  SubsitesVirtualPage:
-    SINGULARNAME: 'Alt Site Sanal Sayfa'
   SilverStripe\CMS\Model\VirtualPage:
     EDITCONTENT: 'İçeriği düzenlemek için tıklayınız'
   SilverStripe\Subsites\Admin\SubsiteAdmin:
     MENUTITLE: 'Alt Siteler'
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    has_one_Subsite: 'Alt Site'
   SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
     SubsiteFieldLabel: 'Alt Site'
   SilverStripe\Subsites\Extensions\GroupSubsites:
@@ -26,6 +20,10 @@ tr_TR:
     ACCESSRADIOTITLE: 'Give this group access to'
     SECURITYTABTITLE: 'Alt Siteler'
     many_many_Subsites: 'Alt Siteler'
+  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
+    has_one_Subsite: 'Alt Site'
+  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
+    has_one_Subsite: 'Alt Site'
   SilverStripe\Subsites\Model\Subsite:
     PLURALNAME: 'Alt Siteler'
     SINGULARNAME: 'Alt Site'
@@ -38,13 +36,15 @@ tr_TR:
   SilverStripe\Subsites\Pages\SubsitesVirtualPage:
     SINGULARNAME: 'Alt Site Sanal Sayfa'
     SubsiteField: 'Alt Site'
-  Subsites:
-    DomainFieldLabel: Domain
-  SilverStripe\Subsites\Extensions\FileSubsites:
-    has_one_Subsite: 'Alt Site'
-  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
-    has_one_Subsite: 'Alt Site'
-  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
-    has_one_Subsite: 'Alt Site'
   SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdownSubsite: 'Alt Site'
+  SubsiteAdmin:
+    MENUTITLE: 'Alt Siteler'
+  SubsiteDomain:
+    DOMAIN: Domain
+    PLURALNAME: 'Subsite Domains'
+    SINGULARNAME: 'Subsite Domain'
+  Subsites:
+    DomainFieldLabel: Domain
+  SubsitesVirtualPage:
+    SINGULARNAME: 'Alt Site Sanal Sayfa'
diff --git a/lang/zh.yml b/lang/zh.yml
index 996d22e..7c056da 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -1,22 +1,10 @@
 zh:
-  Subsite:
-    COPYSTRUCTURE: 复制结构来自：
-    NOTEMPLATE: 没有模板
-  Subsites:
-    DefaultSiteFieldLabel: 默认网站
-    DomainFieldLabel: 域名
-    IsPublicFieldLabel: 启用公共访问权
-    LanguageFieldLabel: 语言
-    MainSiteTitle: 主网站
-    PageTypeBlacklistFieldLabel: 页面类型黑名单
-    PrimaryDomainFieldLabel: 主域名
-    RedirectURLFieldLabel: '重定向 URL'
-    ThemeFieldLabel: 主题
-    TitleFieldLabel: 子网站名称
   SilverStripe\CMS\Model\VirtualPage:
     EDITCONTENT: 点击这里来编辑内容
   SilverStripe\Subsites\Admin\SubsiteAdmin:
     MENUTITLE: 多个子网站
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    has_one_Subsite: 子网站
   SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
     AllSitesDropdownOpt: 所有网站
     SUBSITENOTICE: 主网站上创建的文件夹和文件可以被所有子网站访问。
@@ -32,6 +20,8 @@ zh:
     many_many_Subsites: 多个子网站
   SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     Saved: 已保存，请更新相关的页面。
+  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
+    has_one_Subsite: 子网站
   SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: 复制
     CopyToSubsite: 将页面复制到子网站
@@ -70,7 +60,17 @@ zh:
   SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: 网站
     ReportDropdownSubsite: 子网站
-  SilverStripe\Subsites\Extensions\FileSubsites:
-    has_one_Subsite: 子网站
-  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
-    has_one_Subsite: 子网站
+  Subsite:
+    COPYSTRUCTURE: 复制结构来自：
+    NOTEMPLATE: 没有模板
+  Subsites:
+    DefaultSiteFieldLabel: 默认网站
+    DomainFieldLabel: 域名
+    IsPublicFieldLabel: 启用公共访问权
+    LanguageFieldLabel: 语言
+    MainSiteTitle: 主网站
+    PageTypeBlacklistFieldLabel: 页面类型黑名单
+    PrimaryDomainFieldLabel: 主域名
+    RedirectURLFieldLabel: '重定向 URL'
+    ThemeFieldLabel: 主题
+    TitleFieldLabel: 子网站名称