Merge branch '4.13' into 4

2023-08-25 11:04:27 +00:00 · 2023-08-25 11:04:27 +00:00 · 030c56777c
parent 2c3f2ca64d 03869a7535
commit 030c56777c
2 changed files with 8 additions and 4 deletions
--- a/lang/en.yml
+++ b/lang/en.yml
@ -1,11 +1,11 @@
 en:
+  SilverStripe\CMS\Controllers\CMSPageHistoryController:
+    PREVIEW: 'Website preview'
+  SilverStripe\Forms\GridField\GridField:
+    Filter: Filter
  SilverStripe\Reports\ReportAdmin:
    MENUTITLE: Reports
    ReportTitle: Title
  SilverStripe\Reports\SideReport:
    OtherGroupTitle: Other
    REPEMPTY: 'The {title} report is empty.'
-  SilverStripe\CMS\Controllers\CMSPageHistoryController:
-    PREVIEW: 'Website preview'
-  SilverStripe\Forms\GridField\GridField:
-    Filter: Filter
--- a/lang/eo.yml
+++ b/lang/eo.yml
@ -1,4 +1,8 @@
 eo:
+  SilverStripe\CMS\Controllers\CMSPageHistoryController:
+    PREVIEW: 'Retejon antaŭvidi'
+  SilverStripe\Forms\GridField\GridField:
+    Filter: Filtrilo
  SilverStripe\Reports\ReportAdmin:
    MENUTITLE: Raportoj
    ReportTitle: Titoloj