Merge branch '2.1' into 2

silverstripe · Nov 13, 2023 · 3f10244 · 3f10244
2 parents 79c3cd4 + 4f9678e
commit 3f10244
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lang/en.yml b/lang/en.yml
@@ -19,7 +19,7 @@ en:
     CODE_415: '415 - Unsupported Media Type'
     CODE_416: '416 - Request Range Not Satisfiable'
     CODE_417: '417 - Expectation Failed'
-    CODE_418: "418 - I'm a teapot"
+    CODE_418: '418 - I''m a teapot'
     CODE_421: '421 - Misdirected Request'
     CODE_422: '422 - Unprocessable Entity'
     CODE_423: '423 - Locked'
@@ -41,7 +41,7 @@ en:
     CODE_508: '508 - Loop Detected'
     CODE_510: '510 - Not Extended'
     CODE_511: '511 - Network Authentication Required'
-    DEFAULTERRORPAGECONTENT: "<p>Sorry, it seems you were trying to access a page that doesn't exist.</p><p>Please check the spelling of the URL you were trying to access and try again.</p>"
+    DEFAULTERRORPAGECONTENT: '<p>Sorry, it seems you were trying to access a page that doesn''t exist.</p><p>Please check the spelling of the URL you were trying to access and try again.</p>'
     DEFAULTERRORPAGETITLE: 'Page not found'
     DEFAULTSERVERERRORPAGECONTENT: '<p>Sorry, there was a problem with handling your request.</p>'
     DEFAULTSERVERERRORPAGETITLE: 'Server error'

diff --git a/lang/eo.yml b/lang/eo.yml
@@ -33,7 +33,7 @@ eo:
     DEFAULTSERVERERRORPAGECONTENT: '<p>Bedaŭrinde okazis problemo pri la traktado de via peto.</p>'
     DEFAULTSERVERERRORPAGETITLE: 'Servila eraro'
     DESCRIPTION: 'Propra enhavo por diversaj prieraraj okazoj (ekz-e "Ne trovis la paĝon")'
-    PLURALNAME: 'Bazaj paĝoj'
+    PLURALNAME: 'Eraraj paĝoj'
     PLURALS:
       one: '1 baza paĝo'
       other: '{count} bazaj paĝoj'

diff --git a/lang/it.yml b/lang/it.yml
@@ -33,7 +33,7 @@ it:
     DEFAULTSERVERERRORPAGECONTENT: '<p>Spiacente, c''è stato un problema nella gestione della richiesta.</p>'
     DEFAULTSERVERERRORPAGETITLE: 'Errore server'
     DESCRIPTION: 'Contenuto personalizzato per i differenti casi di errore (per esempio "Pagina non trovata")'
-    PLURALNAME: 'Pagine Base'
+    PLURALNAME: 'Pagine di Errore'
     PLURALS:
       many: '{count} Pagine Errore'
       one: 'Una Pagina Errore'

diff --git a/lang/pl.yml b/lang/pl.yml
@@ -33,7 +33,7 @@ pl:
     DEFAULTSERVERERRORPAGECONTENT: '<p>Wystąpił problem z obsługą Twojego żądania.</p>'
     DEFAULTSERVERERRORPAGETITLE: 'Błąd serwera'
     DESCRIPTION: 'Niestandardowa treść dla różnych przypadków błędu (np. "Nie znaleziono strony")'
-    PLURALNAME: Strony
+    PLURALNAME: 'Strony błędów'
     PLURALS:
       few: 'Stron błędów {count}'
       many: 'Stron błędów {count}'