Merge branch '3' into 4

2024-10-22 11:05:55 +02:00 · 2024-05-08 11:31:15 +00:00 · 2024-05-08 11:31:15 +00:00 · 3517ae544a
commit 3517ae544a
parent 320c3cde35 d5259e44ac
11 changed files with 4 additions and 78 deletions
--- a/lang/cs.yml
+++ b/lang/cs.yml
@ -2,11 +2,6 @@ cs:
  LeftAndMain_Menu:
    Hello: Ahoj
    LOGOUT: 'Odhlásit se'
-  SilverStripe\Subsites\Admin\SubsiteAdmin:
-    MENUTITLE: Subsites
-  SilverStripe\Subsites\Extensions\GroupSubsites:
-    SECURITYTABTITLE: Subsites
-    many_many_Subsites: Subsites
  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
    CopyAction: Kopírovat
  SilverStripe\Subsites\Model\Subsite:
@ -15,7 +10,6 @@ cs:
    CustomMetaDescription: Popis
    CustomMetaKeywords: 'Klíčová slova'
    CustomMetaTitle: Název
-    PLURALNAME: Subsites
    SiteConfigSubtitle: 'Slogan Vašeho webu'
    SiteConfigTitle: 'Název Vašeho webu'
    ValidateTitle: 'Prosím vložte "Název"'
--- a/lang/de.yml
+++ b/lang/de.yml
@ -3,8 +3,6 @@ de:
    INVALID_DOMAIN: 'Ungültige Domain'
  SilverStripe\CMS\Model\VirtualPage:
    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:
@ -18,8 +16,6 @@ de:
    GlobalGroup: 'globale Gruppe'
    MANAGE_SUBSITES: 'Subseiten für jede Gruppe bearbeiten'
    MANAGE_SUBSITES_HELP: 'Möglichkeit, die Berechtigungen einer Gruppe auf bestimmte Subsites zu beschränken.'
-    SECURITYTABTITLE: Subsites
-    many_many_Subsites: Subsites
  SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
    SITECONTENTLEFT: 'Seiten Inhalt'
    Saved: 'Gespeichert, bitte aktualisieren Sie verknüpfte Seiten'
@ -38,7 +34,6 @@ de:
    CustomMetaDescription: Beschreibung
    CustomMetaKeywords: Schlüsselwörter
    CustomMetaTitle: Titel
-    PLURALNAME: Subsites
    PLURALS:
      one: 'Eine Subseite'
      other: '{count} Subsites'
@ -46,15 +41,12 @@ de:
    SINGULARNAME: Subseite
    SiteConfigSubtitle: 'Ihr Websiteslogan'
    SiteConfigTitle: 'Name Ihrer Website'
-    ThemeFieldEmptyString: '-'
    ValidateTitle: 'Bitte geben Sie einen Titel an'
    belongs_many_many_Groups: Gruppe
    db_DefaultSite: 'Standard Seite'
    db_Language: Sprache
    db_RedirectURL: Weierleitungs-URL
-    db_Theme: Theme
    db_Title: Titel
-    has_many_Domains: Domains
  SilverStripe\Subsites\Model\SubsiteDomain:
    DOMAIN: Domäne
    DOMAIN_DESCRIPTION: 'Hostname dieser Subsite (ohne Protokol). Joker (*) ist erlaubt.'
@ -65,8 +57,6 @@ de:
      other: '{count} Domainen der Subseite'
    PROTOCOL_AUTOMATIC: Automatisch
    PROTOCOL_DESCRIPTION: 'DIes ist die Standarddomäne für diese Subseite'
-    PROTOCOL_HTTP: 'http://'
-    PROTOCOL_HTTPS: 'https://'
    Protocol: Protokoll
    SINGULARNAME: 'Domäne der Subseite'
    db_Domain: Domäne
@ -96,5 +86,4 @@ de:
    PageTypeBlacklistFieldLabel: 'Ausgeschlossene Seitentypen'
    PrimaryDomainFieldLabel: 'Primäre Domain'
    RedirectURLFieldLabel: Weierleitungs-URL
-    ThemeFieldLabel: Theme
    TitleFieldLabel: 'Name der Subsite'
--- a/lang/eo.yml
+++ b/lang/eo.yml
@ -50,7 +50,6 @@ eo:
    SINGULARNAME: Subretejo
    SiteConfigSubtitle: 'Jen via slogano'
    SiteConfigTitle: 'Nomo de via retejo'
-    ThemeFieldEmptyString: '-'
    ValidateTitle: 'Bonvole aldoni "Titolon"'
    belongs_many_many_Groups: Grupoj
    db_DefaultSite: 'Apriora retejo'
@ -72,8 +71,6 @@ eo:
      other: '{count} subretejaj domajnoj'
    PROTOCOL_AUTOMATIC: Aŭtomata
    PROTOCOL_DESCRIPTION: 'Kiam generante ligilojn al ĉi tiu subretejo, uzu la elektitan protokolon.'
-    PROTOCOL_HTTP: 'http://'
-    PROTOCOL_HTTPS: 'https://'
    Protocol: Protokolo
    SINGULARNAME: 'Subreteja domajno'
    db_Domain: Domajno
--- a/lang/fi.yml
+++ b/lang/fi.yml
@ -61,8 +61,6 @@ fi:
    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
@ -81,7 +79,6 @@ fi:
    NOTEMPLATE: 'Ei sivupohjaa'
  Subsites:
    DefaultSiteFieldLabel: Oletussivusto
-    DomainFieldLabel: Domain
    IsPublicFieldLabel: 'Aktivoi julkinen pääsy'
    LanguageFieldLabel: Kieli
    MainSiteTitle: Pääsivusto
--- a/lang/fr.yml
+++ b/lang/fr.yml
@ -1,8 +1,6 @@
 fr:
  SilverStripe\Subsites\Model\Subsite:
-    ConfigurationTab: Configuration
    CustomExtraMeta: 'Balises Méta personnalisées'
-    CustomMetaDescription: Description
    CustomMetaTitle: Titre
    SiteConfigTitle: 'Nom du site'
    belongs_many_many_Groups: Groupes
--- a/lang/hr.yml
+++ b/lang/hr.yml
@ -57,8 +57,6 @@ hr:
    IS_PRIMARY: 'Da li je glavna domena?'
    PLURALNAME: 'Domene podsajtova'
    PROTOCOL_AUTOMATIC: Automatsko
-    PROTOCOL_HTTP: 'http://'
-    PROTOCOL_HTTPS: 'https://'
    Protocol: Protokol
    SINGULARNAME: 'Domena podsajta'
    db_Domain: Domena
--- a/lang/it.yml
+++ b/lang/it.yml
@ -35,7 +35,6 @@ it:
    CopyMessage: 'Creata una copia di {title}'
    CustomExtraMeta: 'Meta Tags personalizzati'
    CustomMetaDescription: Descrizione
-    CustomMetaKeywords: Keywords
    CustomMetaTitle: Titolo
    PLURALNAME: Sottositi
    PageTypeBlacklistField: 'Disabilita tipi di pagina?'
@ -57,8 +56,6 @@ it:
    IS_PRIMARY: 'È il dominio primario?'
    PLURALNAME: 'Domini del sottosito'
    PROTOCOL_AUTOMATIC: Automatico
-    PROTOCOL_HTTP: 'http://'
-    PROTOCOL_HTTPS: 'https://'
    Protocol: Protocollo
    SINGULARNAME: 'Dominio del sottosito'
    db_Domain: Dominio
--- a/lang/nb_NO.yml
+++ b/lang/nb_NO.yml
@ -15,9 +15,6 @@ nb_NO:
  SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
    SubsiteFieldLabel: Subdomene
  SilverStripe\Subsites\Extensions\GroupSubsites:
-    ACCESSALL: 'All subsites'
-    ACCESSONLY: 'Only these subsites'
-    ACCESSRADIOTITLE: 'Give this group access to'
    SECURITYTABTITLE: subdomener
    many_many_Subsites: subdomener
  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
@ -29,10 +26,6 @@ nb_NO:
    PLURALNAME: subdomener
    SINGULARNAME: Subdomene
  SilverStripe\Subsites\Model\SubsiteDomain:
-    DOMAIN: Domain
-    PLURALNAME: 'Subsite Domains'
-    SINGULARNAME: 'Subsite Domain'
-    db_Domain: Domain
    has_one_Subsite: Subdomene
  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
    SINGULARNAME: 'Subdomeners Virtuelle Side'
@ -45,7 +38,5 @@ nb_NO:
    DOMAIN: Domain
    PLURALNAME: 'Subsite Domains'
    SINGULARNAME: 'Subsite Domain'
-  Subsites:
-    DomainFieldLabel: Domain
  SubsitesVirtualPage:
    SINGULARNAME: 'Subdomeners Virtuelle Side'
--- a/lang/nl.yml
+++ b/lang/nl.yml
@ -3,16 +3,11 @@ nl:
    INVALID_DOMAIN: 'Ongeldige domein naam'
  SilverStripe\CMS\Model\VirtualPage:
    EDITCONTENT: 'Klik hier om inhoud aan te passen'
-  SilverStripe\Subsites\Admin\SubsiteAdmin:
-    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.'
-    SubsiteFieldLabel: Subsite
  SilverStripe\Subsites\Extensions\GroupSubsites:
    ACCESSALL: 'Alle subsites'
    ACCESSONLY: 'Alleen deze subsites'
@ -20,20 +15,15 @@ nl:
    GlobalGroup: 'globale groep'
    MANAGE_SUBSITES: 'Beheer subsites voor groepen'
    MANAGE_SUBSITES_HELP: 'Bepaal de toegangsrechten voor groepen per subsite'
-    SECURITYTABTITLE: Subsites
    db_AccessAllSubsites: 'Toegang tot alle subsites'
-    many_many_Subsites: Subsites
  SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
    SITECONTENTLEFT: 'Site inhoud'
-    Saved: 'Opgeslagen, pas onderliggende pagina''s aan.'
-  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
-    has_one_Subsite: Subsite
+    Saved: "Opgeslagen, pas onderliggende pagina's aan."
  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
    CopyAction: Kopieer
-    CopyToSubsite: 'Kopieer pagina''s naar subsite'
-    CopyToSubsiteWithChildren: 'Inclusief onderliggende pagina''s?'
+    CopyToSubsite: "Kopieer pagina's naar subsite"
+    CopyToSubsiteWithChildren: "Inclusief onderliggende pagina's?"
    SubsiteOperations: 'Subsite Acties'
-    has_one_Subsite: Subsite
  SilverStripe\Subsites\Model\Subsite:
    ConfigurationTab: Configuratie
    CopyMessage: 'Kopie gemaakt van {title}'
@ -41,20 +31,16 @@ nl:
    CustomMetaDescription: Omschrijving
    CustomMetaKeywords: Sleutelwoorden
    CustomMetaTitle: Titel
-    PLURALNAME: Subsites
    PLURALS:
      one: 'Een Subsite'
      other: '{count} Subsites'
    PageTypeBlacklistField: 'Niet toegestane paginatypes?'
-    SINGULARNAME: Subsite
    SiteConfigSubtitle: 'Jouw slagzin hier'
    SiteConfigTitle: 'Jouw Site Naam'
-    ThemeFieldEmptyString: '-'
    ValidateTitle: 'Voeg een "Titel" toe'
    belongs_many_many_Groups: Groepen
    db_DefaultSite: 'Standaard Site'
    db_Language: Taal
-    db_RedirectURL: 'Redirect URL'
    db_Theme: Thema
    db_Title: Titel
  SilverStripe\Subsites\Model\SubsiteDomain:
@ -67,14 +53,9 @@ nl:
      one: 'Een subsite domein'
      other: '{count} subsite domeinen'
    PROTOCOL_AUTOMATIC: Automatisch
-    PROTOCOL_DESCRIPTION: 'Wordt gebruikt bij het genereren van links naar deze subsite. <br />''Automatisch'' houdt in dat het huidige protocol gebruikt zal worden.'
-    PROTOCOL_HTTP: 'http://'
-    PROTOCOL_HTTPS: 'https://'
-    Protocol: Protocol
+    PROTOCOL_DESCRIPTION: "Wordt gebruikt bij het genereren van links naar deze subsite. <br />'Automatisch' houdt in dat het huidige protocol gebruikt zal worden."
    SINGULARNAME: 'Subsite Domein'
    db_Domain: Domein
-    db_Protocol: Protocol
-    has_one_Subsite: Subsite
  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
    DESCRIPTION: 'Toon de inhoud van een pagina op een andere subsite'
    OverrideNote: 'Overschrijft de overgenomen tekst van de gelinkte pagina'
@ -83,10 +64,6 @@ nl:
      one: 'Subsites Virtuele pagina'
      other: '{count} Subsites Virtuele paginas'
    SINGULARNAME: 'Subsites Virtuele pagina'
-    SubsiteField: Subsite
-  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
-    ReportDropdown: Sites
-    ReportDropdownSubsite: Subsite
  Subsite:
    COPYSTRUCTURE: 'Kopieer structuur vanaf:'
    NOTEMPLATE: 'Geen template'
@ -98,6 +75,5 @@ nl:
    MainSiteTitle: 'Hoofd site'
    PageTypeBlacklistFieldLabel: 'Paginatypes blacklist'
    PrimaryDomainFieldLabel: 'Primaire domein'
-    RedirectURLFieldLabel: 'Redirect URL'
    ThemeFieldLabel: Thema
    TitleFieldLabel: 'Subsite naam'
--- a/lang/ru.yml
+++ b/lang/ru.yml
@ -57,8 +57,6 @@ ru:
    IS_PRIMARY: 'Это основной домен?'
    PLURALNAME: 'Домены подсайтов'
    PROTOCOL_AUTOMATIC: Автоматически
-    PROTOCOL_HTTP: 'http://'
-    PROTOCOL_HTTPS: 'https://'
    Protocol: Протокол
    SINGULARNAME: 'Домен подсайта'
    db_Domain: Домен
--- a/lang/tr_TR.yml
+++ b/lang/tr_TR.yml
@ -15,9 +15,6 @@ tr_TR:
  SilverStripe\Subsites\Extensions\FolderFormFactoryExtension:
    SubsiteFieldLabel: 'Alt Site'
  SilverStripe\Subsites\Extensions\GroupSubsites:
-    ACCESSALL: 'All subsites'
-    ACCESSONLY: 'Only these subsites'
-    ACCESSRADIOTITLE: 'Give this group access to'
    SECURITYTABTITLE: 'Alt Siteler'
    many_many_Subsites: 'Alt Siteler'
  SilverStripe\Subsites\Extensions\SiteConfigSubsites:
@ -28,10 +25,6 @@ tr_TR:
    PLURALNAME: 'Alt Siteler'
    SINGULARNAME: 'Alt Site'
  SilverStripe\Subsites\Model\SubsiteDomain:
-    DOMAIN: Domain
-    PLURALNAME: 'Subsite Domains'
-    SINGULARNAME: 'Subsite Domain'
-    db_Domain: Domain
    has_one_Subsite: 'Alt Site'
  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
    SINGULARNAME: 'Alt Site Sanal Sayfa'
@ -44,7 +37,5 @@ tr_TR:
    DOMAIN: Domain
    PLURALNAME: 'Subsite Domains'
    SINGULARNAME: 'Subsite Domain'
-  Subsites:
-    DomainFieldLabel: Domain
  SubsitesVirtualPage:
    SINGULARNAME: 'Alt Site Sanal Sayfa'