Merge branch '2.1' into 2

silverstripe · Feb 9, 2024 · 961f5b9 · 961f5b9
2 parents e96efb7 + 1994a22
commit 961f5b9
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/lang/da.yml b/lang/da.yml
@@ -4,7 +4,6 @@ da:
     COLUMN_DATEARCHIVED: 'Arkiveret d.'
     COLUMN_ORIGIN: Oprindelse
     COLUMN_TITLE: Titel
-    COLUMN_TYPE: Type
     MENUTITLE: Arkiv
     SELECT_EMPTY: Vælg...
     SELECT_TYPE: 'Vælg en indholdstype'
@@ -13,7 +12,6 @@ da:
     MENUTITLE: 'Rediger side'
   SilverStripe\VersionedAdmin\Controllers\HistoryViewerController:
     ErrorItemViewPermissionDenied: 'Du har ikke de nødvendige rettigheder for at se {ObjectTitle}'
-    MENUTITLE: SilverStripe\VersionedAdmin\Controllers\HistoryViewerController
   SilverStripe\VersionedAdmin\Forms\DiffField:
     NO_DIFF_AVAILABLE: 'Ingen diff tilgængelig'
   SilverStripe\VersionedAdmin\Navigator\SilverStripeNavigatorItem_LiveLink:

diff --git a/lang/eo.yml b/lang/eo.yml
@@ -15,7 +15,6 @@ eo:
     MENUTITLE: 'Redakti paĝon'
   SilverStripe\VersionedAdmin\Controllers\HistoryViewerController:
     ErrorItemViewPermissionDenied: 'Vi ne havas la necesajn permesojn por vidigi je {ObjectTitle}'
-    MENUTITLE: SilverStripe\VersionedAdmin\Controllers\HistoryViewerController
   SilverStripe\VersionedAdmin\Forms\DiffField:
     NO_DIFF_AVAILABLE: 'Mankas diff'
   SilverStripe\VersionedAdmin\Navigator\SilverStripeNavigatorItem_ArchiveLink:

diff --git a/lang/fr.yml b/lang/fr.yml
@@ -4,8 +4,6 @@ fr:
     COLUMN_DATEARCHIVED: 'Archivé le'
     COLUMN_ORIGIN: Origine
     COLUMN_TITLE: Titre
-    COLUMN_TYPE: Type
-    MENUTITLE: Archive
     SELECT_EMPTY: Sélectionner…
     SELECT_TYPE: 'Sélectionner un type de contenu'
     TAB_OTHERS: Autre

diff --git a/lang/it.yml b/lang/it.yml
@@ -13,7 +13,6 @@ it:
     MENUTITLE: 'Modifica Pagina'
   SilverStripe\VersionedAdmin\Controllers\HistoryViewerController:
     ErrorItemViewPermissionDenied: 'Non hai i necessari permessi per vedere {ObjectTitle}'
-    MENUTITLE: SilverStripe\VersionedAdmin\Controllers\HistoryViewerController
   SilverStripe\VersionedAdmin\Forms\DiffField:
     NO_DIFF_AVAILABLE: 'Diff non disponibile'
   SilverStripe\VersionedAdmin\Navigator\SilverStripeNavigatorItem_LiveLink:

diff --git a/lang/nl.yml b/lang/nl.yml
@@ -4,7 +4,6 @@ nl:
     COLUMN_DATEARCHIVED: Archiefdatum
     COLUMN_ORIGIN: Oorsprong
     COLUMN_TITLE: Titel
-    COLUMN_TYPE: Type
     MENUTITLE: Archief
     SELECT_EMPTY: Selecteer...
     SELECT_TYPE: 'Selecteer type'

diff --git a/lang/sl.yml b/lang/sl.yml
@@ -1,4 +1,6 @@
 sl:
+  SilverStripe\Admin\Navigator\SilverStripeNavigatorItem:
+    WONT_BE_SHOWN: 'Tega sporočila obiskovalcem ne bomo prikazali'
   SilverStripe\VersionedAdmin\ArchiveAdmin:
     COLUMN_ARCHIVEDBY: Arhiviral
     COLUMN_DATEARCHIVED: 'Datum arhiviranja'
@@ -13,8 +15,20 @@ sl:
     MENUTITLE: 'Uredi stran'
   SilverStripe\VersionedAdmin\Controllers\HistoryViewerController:
     ErrorItemViewPermissionDenied: 'Nimate pravic za ogled {ObjectTitle}'
-    MENUTITLE: SilverStripe\VersionedAdmin\Controllers\HistoryViewerController
   SilverStripe\VersionedAdmin\Forms\DiffField:
     NO_DIFF_AVAILABLE: 'Spremembe niso na voljo'
+  SilverStripe\VersionedAdmin\Navigator\SilverStripeNavigatorItem_ArchiveLink:
+    ARCHIVED_FROM: 'Arhivsko spletišče z dne {date}'
+    PREVIEW: Predogled
+    TITLE: Arhivirana
   SilverStripe\VersionedAdmin\Navigator\SilverStripeNavigatorItem_LiveLink:
+    PUBLISHED_SITE: 'Objavljeno spletišče'
     TITLE: Objavljeno
+  SilverStripe\VersionedAdmin\Navigator\SilverStripeNavigatorItem_StageLink:
+    DRAFT_SITE: 'Osnutek spletišča'
+    TITLE: Osnutek
+  SilverStripe\Versioned\RestoreAction:
+    RESTORE: 'Povrni v osnutek'
+    RESTORE_DESC: 'Arhivirano različico povrni v osnutek'
+    RESTORE_TO_ROOT: 'Povrni v osnutek na vrhnjem nivoju'
+    RESTORE_TO_ROOT_DESC: 'Arhivirano različico povrni v osnutek na vrhnjem nivoju'