Merge branch '1' into 2.1

silverstripe · Feb 9, 2024 · cbcbe1b · cbcbe1b
2 parents 6efe0bb + 5dccce4
commit cbcbe1b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/lang/da.yml b/lang/da.yml
@@ -4,9 +4,6 @@ da:
     ITEMS_CHANGES:
       one: '{total} (1 ændring)'
       other: '{total} ({count} ændringer)'
-    ITEMS_TOTAL:
-      one: '1 total'
-      other: '{count} total'
     NAME: Navn
     PLURALNAME: Kampagner
     PLURALS:
@@ -25,12 +22,6 @@ da:
     db_Name: Navn
     db_PublishDate: 'Udgivelses dato'
     db_State: Tilstand
-  SilverStripe\Versioned\ChangeSetItem:
-    PLURALNAME: 'Change Set Items'
-    PLURALS:
-      one: 'A Change Set Item'
-      other: '{count} Change Set Items'
-    SINGULARNAME: 'Change Set Item'
   SilverStripe\Versioned\GridFieldArchiveAction:
     Archive: Arkiver
   SilverStripe\Versioned\RecursivePublishable:

diff --git a/lang/de.yml b/lang/de.yml
@@ -7,7 +7,6 @@ de:
     ITEMS_TOTAL:
       one: '1 insgesamt'
       other: '{count} insgesamt'
-    NAME: Name
     PLURALNAME: Kampagnen
     PLURALS:
       one: 'Eine Kampagne'
@@ -22,7 +21,6 @@ de:
     STATE_OPEN: Aktiv
     STATE_PUBLISHED: Veröffentlicht
     STATE_REVERTED: 'Rückgängig gemacht'
-    db_Name: Name
     db_PublishDate: Veröffentlichungsdatum
     db_State: Bundesland
   SilverStripe\Versioned\ChangeSetItem:

diff --git a/lang/en.yml b/lang/en.yml
@@ -77,9 +77,9 @@ en:
     DRAFT: Draft
     MODIFIED: Modified
     MoreOptions: 'More options'
+    PUBLISHEDTOASTMESSAGE: 'Published {type} "{title}"'
     Published: 'Published {name} {link}'
     Unpublished: 'Unpublished {name} "{title}"'
-    PUBLISHEDTOASTMESSAGE: 'Published {type} "{title}"'
   SilverStripe\Versioned\VersionedGridFieldState\VersionedGridFieldState:
     ADDEDTODRAFTHELP: 'Item has not been published yet'
     ADDEDTODRAFTSHORT: Draft

diff --git a/lang/fr.yml b/lang/fr.yml
@@ -22,14 +22,12 @@ fr:
     PUBLISH_DATE: 'Date de publication'
     SINGULARNAME: Campagne
     STATE: Statut
-    STATE_OPEN: Active
     STATE_PUBLISHED: Publié
     STATE_REVERTED: Revenu
     db_Name: Nom
     db_PublishDate: 'Date de publication'
     db_State: Statut
   SilverStripe\Versioned\GridFieldArchiveAction:
-    Archive: Archive
     Delete: Effacer
   SilverStripe\Versioned\GridFieldRestoreAction:
     RESTORE: 'Rétablir le brouillon'
@@ -41,8 +39,6 @@ fr:
     RESTORE_DESC: 'Rétablir la version archivée en tant que brouillon'
     RESTORE_SUCCESS: 'Le {model} "{id}" a été rétabli avec succès.'
     RESTORE_TO_ROOT: 'Rétablir le brouillon à la racine'
-  SilverStripe\Versioned\Versioned:
-    has_many_Versions: Versions
   SilverStripe\Versioned\VersionedGridFieldItemRequest:
     Archived: '{name} {title} archivé'
     BUTTONAPPLYCHANGES: 'Appliquer les modifications'

diff --git a/lang/sl.yml b/lang/sl.yml
@@ -28,9 +28,15 @@ sl:
     STATE_OPEN: Aktivno
     STATE_PUBLISHED: Objavljeno
     STATE_REVERTED: Povrnjeno
+    db_Description: Opis
+    db_IsInferred: Izpeljan
+    db_LastSynced: 'Nazadnje posodobljeno'
     db_Name: Naziv
     db_PublishDate: 'Datum objave'
     db_State: Stanje
+    has_many_Changes: Spremembe
+    has_one_Owner: Lastnik
+    has_one_Publisher: Objavitelj
   SilverStripe\Versioned\ChangeSetItem:
     PLURALNAME: 'Nizi sprememb'
     PLURALS:
@@ -39,6 +45,13 @@ sl:
       other: '{count} nizov sprememb'
       two: '{count} niza sprememb'
     SINGULARNAME: 'Preoblikuj niz sprememb'
+    belongs_many_many_References: Navedbe
+    db_Added: Dodano
+    db_VersionAfter: 'Naslednja različica'
+    db_VersionBefore: 'Predhodnja različica'
+    has_one_ChangeSet: 'Niz sprememb'
+    has_one_Object: Objekt
+    many_many_ReferencedBy: 'Referenca za'
   SilverStripe\Versioned\GridFieldArchiveAction:
     Archive: Arhiviraj
     ArchivePermissionsFailure: 'Nimate pravic za arhiviranje'
@@ -58,6 +71,7 @@ sl:
     RESTORE_TO_ROOT: 'Obnovi v osnutek na prvem nivoju'
     RESTORE_TO_ROOT_DESC: 'Obnovi arhivirano različico v obliki osnutka na prvem nivoju'
   SilverStripe\Versioned\Versioned:
+    db_Version: Različica
     has_many_Versions: Različice
   SilverStripe\Versioned\VersionedGridFieldItemRequest:
     Archived: 'Arhivirano {name} {title}'