Merge branch '3.10' into 3

silverstripe · Aug 28, 2023 · 277f843 · 277f843
2 parents 7e202de + ca59344
commit 277f843
Show file tree

Hide file tree

Showing 18 changed files with 109 additions and 109 deletions.
diff --git a/lang/de.yml b/lang/de.yml
@@ -46,9 +46,15 @@ de:
     COMMENTAPPROVED: 'Kommentar genehmigt.'
     COMMENTMARKEDSPAM: 'Commentar als Spam markiert.'
     SPAM: Spam
+  SilverStripe\Comments\Admin\CommentsGridFieldApproveAction:
+    APPROVE: Genehmigen
+    COMMENTAPPROVED: 'Kommentar genehmigt.'
   SilverStripe\Comments\Admin\CommentsGridFieldConfig:
     APPROVE: Genehmigen
     SPAM: Spam
+  SilverStripe\Comments\Admin\CommentsGridFieldSpamAction:
+    COMMENTMARKEDSPAM: 'Commentar als Spam markiert.'
+    SPAM: Spam
   SilverStripe\Comments\Controllers\CommentingController:
     COMMENTS: Kommentare
     EMAILADDRESS: 'E-Mail Adresse (wird nicht angezeigt)'
@@ -80,9 +86,3 @@ de:
     ParentComment_Title: 'Dieser Kommentar ist eine Antwort auf'
     SINGULARNAME: Kommentar
     URL: URL
-  SilverStripe\Comments\Admin\CommentsGridFieldApproveAction:
-    APPROVE: Genehmigen
-    COMMENTAPPROVED: 'Kommentar genehmigt.'
-  SilverStripe\Comments\Admin\CommentsGridFieldSpamAction:
-    COMMENTMARKEDSPAM: 'Commentar als Spam markiert.'
-    SPAM: Spam
diff --git a/lang/es.yml b/lang/es.yml
@@ -32,18 +32,18 @@ es:
     EMAILADDRESS: 'Su dirección de correo (no se publicará)'
     PERMISSIONFAILURE: 'Ud no puede publicar comentarios en esta página. Por favor asegúrese que haya iniciado sesión y que tenga el adecuado nivel de permisos.'
     WEBSITEURL: 'URL de su sitio Web'
+  SilverStripe\Comments\Extensions\CommentsExtension:
+    COMMENTOPTIONS: Comentarios
+    COMMENTSTABSET: Comentarios
   SilverStripe\Comments\Model\Comment:
     COMMENT: Comentario
     COMMENTBY: 'Comentario por %s'
     CREATED: 'Fecha de publicación'
     EMAIL: Email
     ISSPAM: '¿Spam?'
     MODERATED: '¿Moderado?'
+    'ON': en
     PARENTTITLE: Padre
     PLURALNAME: Comentarios
     SINGULARNAME: Comentario
     URL: URL
-    'ON': en
-  SilverStripe\Comments\Extensions\CommentsExtension:
-    COMMENTOPTIONS: Comentarios
-    COMMENTSTABSET: Comentarios
diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml
@@ -46,9 +46,15 @@ fa_IR:
     COMMENTAPPROVED: 'دیدگاه تایید شد.'
     COMMENTMARKEDSPAM: 'دیدگاه به عنوان هرزنوشت علامت‌گذاری شد.'
     SPAM: هرزنوشت
+  SilverStripe\Comments\Admin\CommentsGridFieldApproveAction:
+    APPROVE: تایید
+    COMMENTAPPROVED: 'دیدگاه تایید شد.'
   SilverStripe\Comments\Admin\CommentsGridFieldConfig:
     APPROVE: تایید
     SPAM: هرزنوشت
+  SilverStripe\Comments\Admin\CommentsGridFieldSpamAction:
+    COMMENTMARKEDSPAM: 'دیدگاه به عنوان هرزنوشت علامت‌گذاری شد.'
+    SPAM: هرزنوشت
   SilverStripe\Comments\Controllers\CommentingController:
     COMMENTS: دیدگاه‌ها
     EMAILADDRESS: 'ایمیل شما (منتشر نخواهد شد)'
@@ -57,10 +63,10 @@ fa_IR:
     WEBSITEURL: 'نشانی وب‌سایت شما'
   SilverStripe\Comments\Extensions\CommentsExtension:
     COMMENTOPTIONS: دیدگاه‌ها
+    COMMENTSTABSET: دیدگاه‌ها
     MODERATIONREQUIRED_NONE: 'نیاز به مدیریت ندارد'
     MODERATIONREQUIRED_NONMEMBERSONLY: 'تنها مدیریت کاربران غیر عضو'
     MODERATIONREQUIRED_REQUIRED: 'مدیریت تمامی دیدگاه‌ها'
-    COMMENTSTABSET: دیدگاه‌ها
   SilverStripe\Comments\Model\Comment:
     COMMENT: دیدگاه
     COMMENTBY: 'دیدگاه توسط %s'
@@ -76,9 +82,3 @@ fa_IR:
     ParentComment_Title: 'این دیدگاه پاسخی است به زیر'
     SINGULARNAME: دیدگاه
     URL: 'نشانی اینترنتی'
-  SilverStripe\Comments\Admin\CommentsGridFieldApproveAction:
-    APPROVE: تایید
-    COMMENTAPPROVED: 'دیدگاه تایید شد.'
-  SilverStripe\Comments\Admin\CommentsGridFieldSpamAction:
-    COMMENTMARKEDSPAM: 'دیدگاه به عنوان هرزنوشت علامت‌گذاری شد.'
-    SPAM: هرزنوشت
diff --git a/lang/fi.yml b/lang/fi.yml
@@ -46,9 +46,15 @@ fi:
     COMMENTAPPROVED: 'Kommentti hyväksytty'
     COMMENTMARKEDSPAM: 'Kommentti merkitty spämmiksi.'
     SPAM: Spämmiä
+  SilverStripe\Comments\Admin\CommentsGridFieldApproveAction:
+    APPROVE: Hyväksy
+    COMMENTAPPROVED: 'Kommentti hyväksytty'
   SilverStripe\Comments\Admin\CommentsGridFieldConfig:
     APPROVE: Hyväksy
     SPAM: Spämmiä
+  SilverStripe\Comments\Admin\CommentsGridFieldSpamAction:
+    COMMENTMARKEDSPAM: 'Kommentti merkitty spämmiksi.'
+    SPAM: Spämmiä
   SilverStripe\Comments\Controllers\CommentingController:
     COMMENTS: Kommentit
     EMAILADDRESS: 'Sähköpostiosoitteesi (ei julkaista)'
@@ -76,9 +82,3 @@ fi:
     ParentComment_Title: 'Tämä kommentti on vastaus alla olevaan'
     SINGULARNAME: Kommentti
     URL: URL-osoite
-  SilverStripe\Comments\Admin\CommentsGridFieldApproveAction:
-    APPROVE: Hyväksy
-    COMMENTAPPROVED: 'Kommentti hyväksytty'
-  SilverStripe\Comments\Admin\CommentsGridFieldSpamAction:
-    COMMENTMARKEDSPAM: 'Kommentti merkitty spämmiksi.'
-    SPAM: Spämmiä
diff --git a/lang/fr.yml b/lang/fr.yml
@@ -18,14 +18,14 @@ fr:
     COMMENTPOSTLOGIN: 'Se connecter'
     COMMENTS: Commentaires
     COMMENTSDISABLED: 'La publication de commentaires est désactivée'
+    DELETEALLCOMMENTS: 'Supprimer tout les commentaires de cette page'
     LOGINTOPOSTCOMMENT: 'Connectez vous pour poster un commentaire'
     NEXT: suivant
     NOCOMMENTSYET: 'Il n''y a pas encore de commentaire.'
     POSTCOM: 'Publiez votre commentaire'
     PREV: précédent
     RSSFEEDALLCOMMENTS: 'Flux RSS de tous les commentaires'
     RSSFEEDCOMMENTS: 'Flux RSS de commentaires de cette page'
-    DELETEALLCOMMENTS: 'Supprimer tout les commentaires de cette page'
   SilverStripe\Comments\Admin\CommentAdmin:
     MENUTITLE: Commentaires
   SilverStripe\Comments\Controllers\CommentingController:
@@ -44,8 +44,8 @@ fr:
     EMAIL: Email
     ISSPAM: 'Spam?'
     MODERATED: 'Modéré?'
+    'ON': sur
     PARENTTITLE: Parent
     PLURALNAME: Commentaires
     SINGULARNAME: Commentaire
     URL: URL
-    'ON': sur
diff --git a/lang/hr.yml b/lang/hr.yml
@@ -46,9 +46,15 @@ hr:
     COMMENTAPPROVED: 'Komentar odobren.'
     COMMENTMARKEDSPAM: 'Komentar označen kao spam.'
     SPAM: SPam
+  SilverStripe\Comments\Admin\CommentsGridFieldApproveAction:
+    APPROVE: Odobri
+    COMMENTAPPROVED: 'Komentar odobren.'
   SilverStripe\Comments\Admin\CommentsGridFieldConfig:
     APPROVE: Odobri
     SPAM: Spam
+  SilverStripe\Comments\Admin\CommentsGridFieldSpamAction:
+    COMMENTMARKEDSPAM: 'Komentar označen kao spam.'
+    SPAM: Spam
   SilverStripe\Comments\Controllers\CommentingController:
     COMMENTS: Komentari
     EMAILADDRESS: 'Vaša email adresa (neće biti objavljena)'
@@ -57,10 +63,10 @@ hr:
     WEBSITEURL: 'Vaša web adresa'
   SilverStripe\Comments\Extensions\CommentsExtension:
     COMMENTOPTIONS: Komentari
+    COMMENTSTABSET: Komentari
     MODERATIONREQUIRED_NONE: 'Nije potrebna moderacija'
     MODERATIONREQUIRED_NONMEMBERSONLY: 'Samo moderiraj goste'
     MODERATIONREQUIRED_REQUIRED: 'Moderiraj sve komentare'
-    COMMENTSTABSET: Komentari
   SilverStripe\Comments\Model\Comment:
     COMMENT: Komentar
     COMMENTBY: 'Komentar od %s'
@@ -76,9 +82,3 @@ hr:
     ParentComment_Title: 'Ovaj komentar je odgovor na dolje'
     SINGULARNAME: Komentar
     URL: Link
-  SilverStripe\Comments\Admin\CommentsGridFieldApproveAction:
-    APPROVE: Odobri
-    COMMENTAPPROVED: 'Komentar odobren.'
-  SilverStripe\Comments\Admin\CommentsGridFieldSpamAction:
-    COMMENTMARKEDSPAM: 'Komentar označen kao spam.'
-    SPAM: Spam
diff --git a/lang/hu.yml b/lang/hu.yml
@@ -18,14 +18,14 @@ hu:
     COMMENTPOSTLOGIN: Bejelentkezés
     COMMENTS: Hozzászólások
     COMMENTSDISABLED: 'A hozzászólások le vannak tiltva '
+    DELETEALLCOMMENTS: 'Oldal összes hozzászólásának törlése'
     LOGINTOPOSTCOMMENT: 'A hozzászóláshoz jelentkezzen be '
     NEXT: következő
     NOCOMMENTSYET: 'Nem érkeztek hozzászólások'
     POSTCOM: 'Küldjön egy hozzászólást'
     PREV: előző
     RSSFEEDALLCOMMENTS: 'Összes hozzászólás RSS-ben'
     RSSFEEDCOMMENTS: 'Oldal hozzászólásai RSS-ben'
-    DELETEALLCOMMENTS: 'Oldal összes hozzászólásának törlése'
   SilverStripe\Comments\Admin\CommentAdmin:
     ADMIN_PERMISSION: '''Hozzászólások'' mező elérése'
     MENUTITLE: Hozzászólások
@@ -35,6 +35,9 @@ hu:
     PERMISSIONFAILURE: 'Ön csak a bejelentkezést követően, és a megfelelő jogosultság birtokában hozhat létre hozzászólást.'
     RSSTITLE: 'Hozzászólások RSS-ben'
     WEBSITEURL: 'Az Ön webcíme'
+  SilverStripe\Comments\Extensions\CommentsExtension:
+    COMMENTOPTIONS: Hozzászólások
+    COMMENTSTABSET: Hozzászólások
   SilverStripe\Comments\Model\Comment:
     COMMENT: Hozzászólás
     COMMENTBY: 'Létrehozta %s'
@@ -46,6 +49,3 @@ hu:
     PLURALNAME: Hozzászólások
     SINGULARNAME: Hozzászólás
     URL: Link
-  SilverStripe\Comments\Extensions\CommentsExtension:
-    COMMENTOPTIONS: Hozzászólások
-    COMMENTSTABSET: Hozzászólások
diff --git a/lang/id.yml b/lang/id.yml
@@ -18,14 +18,14 @@ id:
     COMMENTPOSTLOGIN: 'Login di Sini'
     COMMENTS: Komentar
     COMMENTSDISABLED: 'Komentar sedang dinonaktifkan'
+    DELETEALLCOMMENTS: 'Hapus semua komentar di laman ini'
     LOGINTOPOSTCOMMENT: 'Login untuk berkomentar'
     NEXT: selanjutnya
     NOCOMMENTSYET: 'Belum ada yang berkomentar.'
     POSTCOM: 'Kirim komentar Anda'
     PREV: sebelumnya
     RSSFEEDALLCOMMENTS: 'Sindikasi RSS untuk semua komentar'
     RSSFEEDCOMMENTS: 'Sindikasi RSS untuk komentar di laman ini'
-    DELETEALLCOMMENTS: 'Hapus semua komentar di laman ini'
   SilverStripe\Comments\Admin\CommentAdmin:
     MENUTITLE: Komentar
   SilverStripe\Comments\Controllers\CommentingController:
@@ -34,6 +34,9 @@ id:
     PERMISSIONFAILURE: 'Anda tidak dapat mengomentari laman ini. Mohon pastikan Anda sudah login dan mendapatkan hak akses yang sesuai.'
     RSSTITLE: 'Sindikasi RSS Komentar'
     WEBSITEURL: 'URL situs Anda'
+  SilverStripe\Comments\Extensions\CommentsExtension:
+    COMMENTOPTIONS: Komentar
+    COMMENTSTABSET: Komentar
   SilverStripe\Comments\Model\Comment:
     COMMENT: Komentar
     COMMENTBY: 'Komentar oleh %s'
@@ -45,6 +48,3 @@ id:
     PLURALNAME: Komentar
     SINGULARNAME: Komentar
     URL: URL
-  SilverStripe\Comments\Extensions\CommentsExtension:
-    COMMENTOPTIONS: Komentar
-    COMMENTSTABSET: Komentar
diff --git a/lang/lt.yml b/lang/lt.yml
@@ -39,6 +39,12 @@ lt:
     MENUTITLE: Komentarai
     NewComments: Nauji
     SpamComments: Šlamštas
+  SilverStripe\Comments\Admin\CommentsGridFieldAction:
+    SPAM: Šlamštas
+  SilverStripe\Comments\Admin\CommentsGridFieldConfig:
+    SPAM: Šlamštas
+  SilverStripe\Comments\Admin\CommentsGridFieldSpamAction:
+    SPAM: Šlamštas
   SilverStripe\Comments\Controllers\CommentingController:
     COMMENTS: Komentarai
     EMAILADDRESS: 'Jūsų el.pašto adresas (nebus skelbiamas)'
@@ -47,10 +53,10 @@ lt:
     WEBSITEURL: 'Jūsų svetainės nuoroda'
   SilverStripe\Comments\Extensions\CommentsExtension:
     COMMENTOPTIONS: Komentarai
+    COMMENTSTABSET: Komentarai
     MODERATIONREQUIRED_NONE: 'Nereikalauja patvirtinimo'
     MODERATIONREQUIRED_NONMEMBERSONLY: 'Tvirtinti tik neregistruotų vartotojų'
     MODERATIONREQUIRED_REQUIRED: 'Tvirtinti visus komentarus'
-    COMMENTSTABSET: Komentarai
   SilverStripe\Comments\Model\Comment:
     COMMENT: Komentaras
     COMMENTBY: 'Komentarą parašė ''%s'''
@@ -65,9 +71,3 @@ lt:
     ParentComment_Title: 'Šis komentaras yra atsakymas į žemiau esantį'
     SINGULARNAME: Komentaras
     URL: 'URL adresas'
-  SilverStripe\Comments\Admin\CommentsGridFieldAction:
-    SPAM: Šlamštas
-  SilverStripe\Comments\Admin\CommentsGridFieldConfig:
-    SPAM: Šlamštas
-  SilverStripe\Comments\Admin\CommentsGridFieldSpamAction:
-    SPAM: Šlamštas
diff --git a/lang/nb.yml b/lang/nb.yml
@@ -1,27 +1,27 @@
 nb:
   CommentInterface:
-    POST: 'Legg ut'
-    YOURNAME: Navn
     EMAILADDRESS_MESSAGE_REQUIRED: 'Vennligst fyll inn din e-postadresse'
+    POST: 'Legg ut'
     PREVIEW: Forhåndsvisning
     PREVIEWLABEL: Forhåndsvisning
+    YOURNAME: Navn
   CommentsInterface_pendingcomment_ss:
     AWAITINGMODERATION: 'Kommentaren din har blitt lagret og er lagt i kø for moderering.'
   CommentsInterface_ss:
+    AWAITINGMODERATION: 'Kommentaren din har blitt lagret og er lagt i kø for moderering.'
     COMMENTLOGINERROR: 'Du kan ikke skrive kommentarer før du har logget inn'
     COMMENTPERMISSIONERROR: 'og at du har et passende tilgangsnivå'
     COMMENTPOSTLOGIN: 'Logg inn her'
     COMMENTS: Kommentarer
     COMMENTSDISABLED: 'Kommentarskriving har blitt slått av'
+    DELETEALLCOMMENTS: 'Fjern alle kommentarer på denne siden'
     LOGINTOPOSTCOMMENT: 'Logg inn for å skrive en kommentar'
     NEXT: neste
     NOCOMMENTSYET: 'Ingen har skrevet en kommentar ennå.'
     POSTCOM: 'Skriv kommentar'
     PREV: forrige
     RSSFEEDALLCOMMENTS: 'RSS-feed for alle kommentarer'
     RSSFEEDCOMMENTS: 'RSS-feed for kommentarer på denne siden'
-    AWAITINGMODERATION: 'Kommentaren din har blitt lagret og er lagt i kø for moderering.'
-    DELETEALLCOMMENTS: 'Fjern alle kommentarer på denne siden'
   SilverStripe\Comments\Admin\CommentAdmin:
     MENUTITLE: Kommentarer
   SilverStripe\Comments\Controllers\CommentingController:
@@ -30,14 +30,14 @@ nb:
     PERMISSIONFAILURE: 'Du kan ikke kommentere på denne siden. Vennligst sjekk at du er innlogget og har et passende tilgangsnivå.'
     RSSTITLE: 'RSS-feed for kommentarer'
     WEBSITEURL: Hjemmeside
+  SilverStripe\Comments\Extensions\CommentsExtension:
+    COMMENTOPTIONS: Kommentarer
+    COMMENTSTABSET: Kommentarer
   SilverStripe\Comments\Model\Comment:
     COMMENT: Kommentar
+    EMAIL: Epost
     ISSPAM: 'Spam?'
     MODERATED: 'Moderert?'
     PLURALNAME: Kommentarer
     SINGULARNAME: Kommentar
-    EMAIL: Epost
     URL: Nettadresse
-  SilverStripe\Comments\Extensions\CommentsExtension:
-    COMMENTOPTIONS: Kommentarer
-    COMMENTSTABSET: Kommentarer
diff --git a/lang/nl.yml b/lang/nl.yml
@@ -18,6 +18,7 @@ nl:
   CommentsInterface_pendingcomment_ss:
     AWAITINGMODERATION: 'Je reactie is verstuurd en is in afwachting van moderatie.'
   CommentsInterface_ss:
+    AWAITINGMODERATION: 'Je reactie is verstuurd en is in afwachting van moderatie.'
     COMMENTLOGINERROR: 'Je moet ingelogd zijn om reacties te kunnen plaatsen'
     COMMENTPERMISSIONERROR: 'en controleer je gebruikersrechten'
     COMMENTPOSTLOGIN: Inloggen
@@ -31,12 +32,17 @@ nl:
     PREV: vorige
     RSSFEEDALLCOMMENTS: 'RSS feed voor alle reacties'
     RSSFEEDCOMMENTS: 'RSS feed voor reacties op deze pagina'
-    AWAITINGMODERATION: 'Je reactie is verstuurd en is in afwachting van moderatie.'
   SilverStripe\Comments\Admin\CommentAdmin:
-    MENUTITLE: Reacties
     Comments: Goedgekeurd
+    MENUTITLE: Reacties
     NewComments: Nieuw
     SpamComments: Spam
+  SilverStripe\Comments\Admin\CommentsGridFieldAction:
+    SPAM: Spam
+  SilverStripe\Comments\Admin\CommentsGridFieldConfig:
+    SPAM: Spam
+  SilverStripe\Comments\Admin\CommentsGridFieldSpamAction:
+    SPAM: Spam
   SilverStripe\Comments\Controllers\CommentingController:
     COMMENTS: Reacties
     EMAILADDRESS: 'E-mail adres (wordt niet gepubliceerd)'
@@ -48,17 +54,11 @@ nl:
     COMMENTSTABSET: Reacties
   SilverStripe\Comments\Model\Comment:
     COMMENT: Reactie
+    EMAIL: E-mail
     ISSPAM: 'Spam?'
     MODERATED: 'Gemodereerd?'
     'ON': op
+    OPTIONS: Instellingen
     PLURALNAME: Reacties
     SINGULARNAME: Reactie
-    EMAIL: E-mail
-    OPTIONS: Instellingen
     URL: URL
-  SilverStripe\Comments\Admin\CommentsGridFieldAction:
-    SPAM: Spam
-  SilverStripe\Comments\Admin\CommentsGridFieldConfig:
-    SPAM: Spam
-  SilverStripe\Comments\Admin\CommentsGridFieldSpamAction:
-    SPAM: Spam