From 2713f1444704da9a5dd3fcb4ac809aed31c827fa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2026 10:12:30 +0200 Subject: [PATCH 01/34] New Crowdin Translations (automated) (#39259) Co-authored-by: GitHub Actions --- app/javascript/mastodon/locales/af.json | 1 - app/javascript/mastodon/locales/an.json | 1 - app/javascript/mastodon/locales/ar.json | 1 - app/javascript/mastodon/locales/az.json | 1 - app/javascript/mastodon/locales/be.json | 2 +- app/javascript/mastodon/locales/bg.json | 1 - app/javascript/mastodon/locales/br.json | 1 - app/javascript/mastodon/locales/ca.json | 1 - app/javascript/mastodon/locales/ckb.json | 1 - app/javascript/mastodon/locales/cs.json | 1 - app/javascript/mastodon/locales/cy.json | 1 - app/javascript/mastodon/locales/da.json | 2 +- app/javascript/mastodon/locales/de.json | 2 +- app/javascript/mastodon/locales/el.json | 6 +++--- app/javascript/mastodon/locales/en-GB.json | 1 - app/javascript/mastodon/locales/eo.json | 1 - app/javascript/mastodon/locales/es-AR.json | 2 +- app/javascript/mastodon/locales/es-MX.json | 2 +- app/javascript/mastodon/locales/es.json | 2 +- app/javascript/mastodon/locales/et.json | 2 +- app/javascript/mastodon/locales/eu.json | 1 - app/javascript/mastodon/locales/fa.json | 1 - app/javascript/mastodon/locales/fo.json | 1 - app/javascript/mastodon/locales/fr-CA.json | 2 +- app/javascript/mastodon/locales/fr.json | 2 +- app/javascript/mastodon/locales/fy.json | 1 - app/javascript/mastodon/locales/ga.json | 2 +- app/javascript/mastodon/locales/gd.json | 1 - app/javascript/mastodon/locales/gl.json | 2 +- app/javascript/mastodon/locales/he.json | 2 +- app/javascript/mastodon/locales/hi.json | 1 - app/javascript/mastodon/locales/hu.json | 2 +- app/javascript/mastodon/locales/ia.json | 1 - app/javascript/mastodon/locales/id.json | 1 - app/javascript/mastodon/locales/ie.json | 1 - app/javascript/mastodon/locales/io.json | 1 - app/javascript/mastodon/locales/is.json | 2 +- app/javascript/mastodon/locales/it.json | 2 +- app/javascript/mastodon/locales/ja.json | 1 - app/javascript/mastodon/locales/ko.json | 1 - app/javascript/mastodon/locales/ku.json | 1 - app/javascript/mastodon/locales/lad.json | 1 - app/javascript/mastodon/locales/lt.json | 1 - app/javascript/mastodon/locales/lv.json | 1 - app/javascript/mastodon/locales/mr.json | 1 - app/javascript/mastodon/locales/ms.json | 1 - app/javascript/mastodon/locales/my.json | 1 - app/javascript/mastodon/locales/nan-TW.json | 1 - app/javascript/mastodon/locales/nl.json | 2 +- app/javascript/mastodon/locales/nn.json | 1 - app/javascript/mastodon/locales/no.json | 1 - app/javascript/mastodon/locales/oc.json | 1 - app/javascript/mastodon/locales/pl.json | 1 - app/javascript/mastodon/locales/pt-BR.json | 2 +- app/javascript/mastodon/locales/pt-PT.json | 1 - app/javascript/mastodon/locales/ro.json | 1 - app/javascript/mastodon/locales/ru.json | 1 - app/javascript/mastodon/locales/sa.json | 1 - app/javascript/mastodon/locales/sc.json | 1 - app/javascript/mastodon/locales/sco.json | 1 - app/javascript/mastodon/locales/si.json | 1 - app/javascript/mastodon/locales/sk.json | 1 - app/javascript/mastodon/locales/sl.json | 1 - app/javascript/mastodon/locales/sq.json | 2 +- app/javascript/mastodon/locales/sr-Latn.json | 1 - app/javascript/mastodon/locales/sr.json | 1 - app/javascript/mastodon/locales/sv.json | 1 - app/javascript/mastodon/locales/th.json | 1 - app/javascript/mastodon/locales/tr.json | 2 +- app/javascript/mastodon/locales/tt.json | 1 - app/javascript/mastodon/locales/uk.json | 1 - app/javascript/mastodon/locales/vi.json | 1 - app/javascript/mastodon/locales/zh-CN.json | 2 +- app/javascript/mastodon/locales/zh-HK.json | 1 - app/javascript/mastodon/locales/zh-TW.json | 2 +- config/locales/de.yml | 2 ++ config/locales/es-MX.yml | 4 ++-- config/locales/et.yml | 4 ++++ config/locales/ga.yml | 4 ++++ config/locales/he.yml | 2 ++ config/locales/zh-CN.yml | 2 ++ 81 files changed, 40 insertions(+), 79 deletions(-) diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json index daa78a0cd4..ac05096895 100644 --- a/app/javascript/mastodon/locales/af.json +++ b/app/javascript/mastodon/locales/af.json @@ -200,7 +200,6 @@ "lightbox.next": "Volgende", "lightbox.previous": "Vorige", "limited_account_hint.action": "Vertoon profiel in elk geval", - "limited_account_hint.title": "Hierdie profiel is deur moderators van {domain} versteek.", "link_preview.author": "Deur {name}", "lists.delete": "Verwyder lys", "lists.edit": "Redigeer lys", diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json index b5d282f1a4..469403241b 100644 --- a/app/javascript/mastodon/locales/an.json +++ b/app/javascript/mastodon/locales/an.json @@ -264,7 +264,6 @@ "lightbox.next": "Siguient", "lightbox.previous": "Anterior", "limited_account_hint.action": "Amostrar perfil de totz modos", - "limited_account_hint.title": "Este perfil ha estau amagau per los moderadors de {domain}.", "lists.delete": "Borrar lista", "lists.edit": "Editar lista", "lists.replies_policy.followed": "Qualsequier usuario seguiu", diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json index cfd6160b92..2148b1053b 100644 --- a/app/javascript/mastodon/locales/ar.json +++ b/app/javascript/mastodon/locales/ar.json @@ -773,7 +773,6 @@ "lightbox.zoom_in": "التكبير إلى الحجم الفعلي", "lightbox.zoom_out": "التكبير ليناسب الحجم", "limited_account_hint.action": "إظهار الملف التعريفي على أي حال", - "limited_account_hint.title": "تم إخفاء هذا الملف الشخصي من قبل مشرفي {domain}.", "link_preview.author": "مِن {name}", "link_preview.more_from_author": "المزيد من {name}", "link_preview.shares": "{count, plural, zero {{counter} منشور}one {{counter} منشور} two {{counter} منشور} few {{counter} منشور} many {{counter} منشور} other {{counter} منشور}}", diff --git a/app/javascript/mastodon/locales/az.json b/app/javascript/mastodon/locales/az.json index 6710075ad7..fb1969bbcd 100644 --- a/app/javascript/mastodon/locales/az.json +++ b/app/javascript/mastodon/locales/az.json @@ -505,7 +505,6 @@ "lightbox.zoom_in": "Həqiqi ölçüyə qayıt", "lightbox.zoom_out": "Sığacaq şəkildə yaxınlaşdır", "limited_account_hint.action": "Yenə də profili göstər", - "limited_account_hint.title": "Bu profil, {domain} moderatorları tərəfindən gizlədildi.", "link_preview.author": "Müəllif: {name}", "link_preview.more_from_author": "{name} - daha çox", "link_preview.shares": "{count, plural, one {{counter} göndəriş} other {{counter} göndəriş}}", diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json index 2a7c4dd41c..f0fd8edfbf 100644 --- a/app/javascript/mastodon/locales/be.json +++ b/app/javascript/mastodon/locales/be.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "Маштабаваць да фактычнага памеру", "lightbox.zoom_out": "Дапасаваць усё змесціва пад памеры экрана", "limited_account_hint.action": "Усе роўна паказваць профіль", - "limited_account_hint.title": "Гэты профіль быў схаваны мадэратарамі {domain}.", + "limited_account_hint.title": "Гэты профіль або сервер быў схаваны мадэратарамі {domain}.", "link_preview.author": "Ад {name}", "link_preview.more_from_author": "Больш ад {name}", "link_preview.shares": "{count, plural, one {{counter} допіс} few {{counter} допісы} many {{counter} допісаў} other {{counter} допісу}}", diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json index 58106c55a8..de7d0ab623 100644 --- a/app/javascript/mastodon/locales/bg.json +++ b/app/javascript/mastodon/locales/bg.json @@ -464,7 +464,6 @@ "lightbox.zoom_in": "Увеличение до действителната големина", "lightbox.zoom_out": "Увеличение до побиране", "limited_account_hint.action": "Показване на профила въпреки това", - "limited_account_hint.title": "Този профил е бил скрит от модераторите на {domain}.", "link_preview.author": "От {name}", "link_preview.more_from_author": "Още от {name}", "link_preview.shares": "{count, plural, one {{counter} публикация} other {{counter} публикации}}", diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json index 9ec1ff452d..bdeba762fe 100644 --- a/app/javascript/mastodon/locales/br.json +++ b/app/javascript/mastodon/locales/br.json @@ -442,7 +442,6 @@ "lightbox.next": "Da-heul", "lightbox.previous": "A-raok", "limited_account_hint.action": "Diskouez ar profil memes tra", - "limited_account_hint.title": "Kuzhet eo bet ar profil-mañ gant an evezhierien eus {domain}.", "link_preview.author": "Gant {name}", "link_preview.more_from_author": "Muioc'h gant {name}", "link_preview.shares": "{count, plural, one {{counter} embannadur} two {{counter} embannadur} few {{counter} embannadur} many {{counter} embannadur} other {{counter} embannadur}}", diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index 7b72137111..767f4e5c43 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -559,7 +559,6 @@ "lightbox.zoom_in": "Amplia fins a la mida real", "lightbox.zoom_out": "Amplia fins a encabir", "limited_account_hint.action": "Mostra el perfil de totes maneres", - "limited_account_hint.title": "Aquest perfil l'han amagat els moderadors de {domain}.", "link_preview.author": "Per {name}", "link_preview.more_from_author": "Més de {name}", "link_preview.shares": "{count, plural, one {{counter} publicació} other {{counter} publicacions}}", diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json index 8a7ff76c6f..564e1d159b 100644 --- a/app/javascript/mastodon/locales/ckb.json +++ b/app/javascript/mastodon/locales/ckb.json @@ -306,7 +306,6 @@ "lightbox.next": "داهاتوو", "lightbox.previous": "پێشوو", "limited_account_hint.action": "بەهەر حاڵ پڕۆفایلی پیشان بدە", - "limited_account_hint.title": "ئەم پرۆفایلە لەلایەن بەڕێوەبەرانی {domain} شاراوەتەوە.", "lists.delete": "سڕینەوەی لیست", "lists.edit": "دەستکاری لیست", "lists.replies_policy.followed": "هەر بەکارهێنەرێکی بەدواکەوتوو", diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json index 9b11c74664..271329ce0a 100644 --- a/app/javascript/mastodon/locales/cs.json +++ b/app/javascript/mastodon/locales/cs.json @@ -619,7 +619,6 @@ "lightbox.zoom_in": "Přiblížit na skutečnou velikost", "lightbox.zoom_out": "Přizpůsobit velikost", "limited_account_hint.action": "Přesto profil zobrazit", - "limited_account_hint.title": "Tento profil byl skryt moderátory {domain}.", "link_preview.author": "Od {name}", "link_preview.more_from_author": "Více od {name}", "link_preview.shares": "{count, plural, one {{counter} příspěvek} few {{counter} příspěvky} many {{counter} příspěvků} other {{counter} příspěvků}}", diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json index e577fbc44a..f717a74a82 100644 --- a/app/javascript/mastodon/locales/cy.json +++ b/app/javascript/mastodon/locales/cy.json @@ -840,7 +840,6 @@ "lightbox.zoom_in": "Chwyddo i faint gwirioneddol", "lightbox.zoom_out": "Chwyddo i ffitio", "limited_account_hint.action": "Dangos y proffil beth bynnag", - "limited_account_hint.title": "Mae'r proffil hwn wedi cael ei guddio gan gymedrolwyr {domain}.", "link_preview.author": "Gan {name}", "link_preview.more_from_author": "Mwy gan {name}", "link_preview.shares": "{count, plural, one {{counter} postiad } two {{counter} bostiad } few {{counter} postiad} many {{counter} postiad} other {{counter} postiad}}", diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json index 2451e0f4e6..a7cc1c9631 100644 --- a/app/javascript/mastodon/locales/da.json +++ b/app/javascript/mastodon/locales/da.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "Zoom til faktisk størrelse", "lightbox.zoom_out": "Zoom for at tilpasse", "limited_account_hint.action": "Vis profil alligevel", - "limited_account_hint.title": "Denne profil er blevet skjult af {domain}-moderatorerne.", + "limited_account_hint.title": "Denne profil eller server er blevet skjult af moderatorerne på {domain}.", "link_preview.author": "Af {name}", "link_preview.more_from_author": "Mere fra {name}", "link_preview.shares": "{count, plural, one {{counter} indlæg} other {{counter} indlæg}}", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index fe79bd772f..0e07f296d1 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "In Originalgröße anzeigen", "lightbox.zoom_out": "In angepasster Größe anzeigen", "limited_account_hint.action": "Profil trotzdem anzeigen", - "limited_account_hint.title": "Dieses Profil wurde von den Moderator*innen von {domain} ausgeblendet.", + "limited_account_hint.title": "Dieses Profil oder dieser Server wurde von den Moderator*innen von {domain} ausgeblendet.", "link_preview.author": "Von {name}", "link_preview.more_from_author": "Mehr von {name}", "link_preview.shares": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}}", diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json index 4b3286832c..160315510a 100644 --- a/app/javascript/mastodon/locales/el.json +++ b/app/javascript/mastodon/locales/el.json @@ -760,10 +760,10 @@ "hashtag.counter_by_uses": "{count, plural, one {{counter} ανάρτηση} other {{counter} αναρτήσεις}}", "hashtag.counter_by_uses_today": "{count, plural, one {{counter} ανάρτηση} other {{counter} αναρτήσεις}} σήμερα", "hashtag.feature": "Ανάδειξη στο προφίλ", - "hashtag.follow": "Παρακολούθηση ετικέτας", + "hashtag.follow": "Ακολούθηση ετικέτας", "hashtag.mute": "Σίγαση #{hashtag}", "hashtag.unfeature": "Να μην αναδεικνύεται στο προφίλ", - "hashtag.unfollow": "Διακοπή παρακολούθησης ετικέτας", + "hashtag.unfollow": "Άρση ακολούθησης ετικέτας", "hashtags.and_other": "…και {count, plural, other {# ακόμα}}", "hints.profiles.followers_may_be_missing": "Μπορεί να λείπουν ακόλουθοι για αυτό το προφίλ.", "hints.profiles.follows_may_be_missing": "Άτομα που ακολουθούνται μπορεί να λείπουν απ' αυτό το προφίλ.", @@ -850,7 +850,7 @@ "lightbox.zoom_in": "Εστίαση στο πραγματικό μέγεθος", "lightbox.zoom_out": "Εστίαση για προσαρμογή", "limited_account_hint.action": "Εμφάνιση προφίλ ούτως ή άλλως", - "limited_account_hint.title": "Αυτό το προφίλ έχει αποκρυφτεί από τους διαχειριστές του διακομιστή {domain}.", + "limited_account_hint.title": "Αυτό το προφίλ ή διακομιστής έχει κρυφτεί από τους διαχειριστές του {domain}.", "link_preview.author": "Από {name}", "link_preview.more_from_author": "Περισσότερα από {name}", "link_preview.shares": "{count, plural, one {{counter} ανάρτηση} other {{counter} αναρτήσεις}}", diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json index be685559ac..fb95859d3a 100644 --- a/app/javascript/mastodon/locales/en-GB.json +++ b/app/javascript/mastodon/locales/en-GB.json @@ -833,7 +833,6 @@ "lightbox.zoom_in": "Zoom to actual size", "lightbox.zoom_out": "Zoom to fit", "limited_account_hint.action": "Show profile anyway", - "limited_account_hint.title": "This profile or server has been hidden by the moderators of {domain}.", "link_preview.author": "By {name}", "link_preview.more_from_author": "More from {name}", "link_preview.shares": "{count, plural, one {{counter} post} other {{counter} posts}}", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index 4dabacba5d..904a5a6a60 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -478,7 +478,6 @@ "lightbox.zoom_in": "Zomi al reala grandeco", "lightbox.zoom_out": "Zomi por konveni", "limited_account_hint.action": "Montru profilon ĉiukaze", - "limited_account_hint.title": "La profilo estas kaŝita de la moderigantoj de {domain}.", "link_preview.author": "De {name}", "link_preview.more_from_author": "Pli de {name}", "link_preview.shares": "{count, plural, one {{counter} afiŝo} other {{counter} afiŝoj}}", diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json index 865212b6e1..dcaa4ccc64 100644 --- a/app/javascript/mastodon/locales/es-AR.json +++ b/app/javascript/mastodon/locales/es-AR.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "Ampliar al tamaño real", "lightbox.zoom_out": "Ampliar hasta ajustar", "limited_account_hint.action": "Mostrar perfil de todos modos", - "limited_account_hint.title": "Este perfil fue ocultado por los moderadores de {domain}.", + "limited_account_hint.title": "Este perfil del servidor fue ocultado por los moderadores de {domain}.", "link_preview.author": "Por {name}", "link_preview.more_from_author": "Más de {name}", "link_preview.shares": "{count, plural, one {{counter} mensaje} other {{counter} mensajes}}", diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json index a6589a751b..38bec75472 100644 --- a/app/javascript/mastodon/locales/es-MX.json +++ b/app/javascript/mastodon/locales/es-MX.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "Ampliar al tamaño real", "lightbox.zoom_out": "Ampliar para ajustar", "limited_account_hint.action": "Mostrar perfil de todos modos", - "limited_account_hint.title": "Este perfil ha sido ocultado por los moderadores de {domain}.", + "limited_account_hint.title": "Este perfil o servidor ha sido ocultado por los moderadores de {domain}.", "link_preview.author": "Por {name}", "link_preview.more_from_author": "Más de {name}", "link_preview.shares": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}}", diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index df1fc28843..c5c68be3db 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "Ampliar al tamaño real", "lightbox.zoom_out": "Ampliar para ajustar", "limited_account_hint.action": "Mostrar perfil de todos modos", - "limited_account_hint.title": "Este perfil ha sido ocultado por los moderadores de {domain}.", + "limited_account_hint.title": "Los moderadores de {domain} han ocultado este perfil o servidor.", "link_preview.author": "Por {name}", "link_preview.more_from_author": "Más de {name}", "link_preview.shares": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}}", diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json index a7c5fe1f9f..2ca57023b4 100644 --- a/app/javascript/mastodon/locales/et.json +++ b/app/javascript/mastodon/locales/et.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "Näita algsuuruses", "lightbox.zoom_out": "Näita kõik", "limited_account_hint.action": "Näita profilli sellegipoolest", - "limited_account_hint.title": "See profiil on peidetud {domain} moderaatorite poolt.", + "limited_account_hint.title": "See profiil või server on {domain}-i moderaatorite poolt peidetud.", "link_preview.author": "{name} poolt", "link_preview.more_from_author": "Veel kasutajalt {name}", "link_preview.shares": "{count, plural, one {{counter} postitus} other {{counter} postitust}}", diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json index 422d37763e..eeec939a33 100644 --- a/app/javascript/mastodon/locales/eu.json +++ b/app/javascript/mastodon/locales/eu.json @@ -527,7 +527,6 @@ "lightbox.zoom_in": "Zooma egungo tamainara", "lightbox.zoom_out": "Zooma egokitzeko", "limited_account_hint.action": "Erakutsi profila hala ere", - "limited_account_hint.title": "Profil hau ezkutatu egin dute {domain} zerbitzariko moderatzaileek.", "link_preview.author": "Egilea: {name}", "link_preview.more_from_author": "{name} erabiltzaileaz gehiago jakin", "link_preview.shares": "{count, plural, one {{counter} bidalketa} other {{counter} bidalketa}}", diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index 483844e4bb..a5e9b2b097 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -833,7 +833,6 @@ "lightbox.zoom_in": "بزرگ‌نمایی به اندازهٔ اصلی", "lightbox.zoom_out": "بزرگ نمایی برای برازش", "limited_account_hint.action": "به هر روی نمایه نشان داده شود", - "limited_account_hint.title": "این نمایه از سوی ناظم‌های {domain} پنهان شده.", "link_preview.author": "از {name}", "link_preview.more_from_author": "بیش‌تر از {name}", "link_preview.shares": "{count, plural, one {{counter} فرسته} other {{counter} فرسته}}", diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json index 8268e44354..a8651ba586 100644 --- a/app/javascript/mastodon/locales/fo.json +++ b/app/javascript/mastodon/locales/fo.json @@ -662,7 +662,6 @@ "lightbox.zoom_in": "Suma til veruliga stødd", "lightbox.zoom_out": "Suma, so tað passar", "limited_account_hint.action": "Vís vangamynd kortini", - "limited_account_hint.title": "Hesin vangin er fjaldur av kjakleiðarunum á {domain}.", "link_preview.author": "Av {name}", "link_preview.more_from_author": "Meira frá {name}", "link_preview.shares": "{count, plural, one {{counter} postur} other {{counter} postar}}", diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json index 1bfdf758df..52482f5c93 100644 --- a/app/javascript/mastodon/locales/fr-CA.json +++ b/app/javascript/mastodon/locales/fr-CA.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "Zoomer sur la taille réelle", "lightbox.zoom_out": "Zoomer pour adapter", "limited_account_hint.action": "Afficher le profil quand même", - "limited_account_hint.title": "Ce profil a été masqué par la modération de {domain}.", + "limited_account_hint.title": "Ce profil ou serveur a été masqué par l'équipe de modération de {domain}.", "link_preview.author": "Par {name}", "link_preview.more_from_author": "Voir plus de {name}", "link_preview.shares": "{count, plural, one {{counter} message} other {{counter} messages}}", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index 129c4f778a..0ccc72f517 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "Zoomer sur la taille réelle", "lightbox.zoom_out": "Zoomer pour adapter", "limited_account_hint.action": "Afficher le profil quand même", - "limited_account_hint.title": "Ce profil a été masqué par la modération de {domain}.", + "limited_account_hint.title": "Ce profil ou serveur a été masqué par l'équipe de modération de {domain}.", "link_preview.author": "Par {name}", "link_preview.more_from_author": "Voir plus de {name}", "link_preview.shares": "{count, plural, one {{counter} message} other {{counter} messages}}", diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json index 507983097d..63d4dce56c 100644 --- a/app/javascript/mastodon/locales/fy.json +++ b/app/javascript/mastodon/locales/fy.json @@ -443,7 +443,6 @@ "lightbox.zoom_in": "Oarspronklike grutte toane", "lightbox.zoom_out": "Passend toane", "limited_account_hint.action": "Profyl dochs besjen", - "limited_account_hint.title": "Dit profyl is troch de behearders fan {domain} ferstoppe.", "link_preview.author": "Troch {name}", "link_preview.more_from_author": "Mear fan {name}", "link_preview.shares": "{count, plural, one {{counter} berjocht} other {{counter} berjochten}}", diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json index b356ce6617..cd9a83745a 100644 --- a/app/javascript/mastodon/locales/ga.json +++ b/app/javascript/mastodon/locales/ga.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "Súmáil chuig an méid iarbhír", "lightbox.zoom_out": "Súmáil a d'oirfeadh", "limited_account_hint.action": "Taispeáin an phróifíl ar aon nós", - "limited_account_hint.title": "Tá an phróifíl seo curtha i bhfolach ag na modhnóra {domain}.", + "limited_account_hint.title": "Tá an phróifíl nó an freastalaí seo i bhfolach ag modhnóirí {domain}.", "link_preview.author": "Le {name}", "link_preview.more_from_author": "Tuilleadh ó {name}", "link_preview.shares": "{count, plural, one {{counter} post} other {{counter} poist}}", diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json index e5bb99c9d9..9c6ecb5533 100644 --- a/app/javascript/mastodon/locales/gd.json +++ b/app/javascript/mastodon/locales/gd.json @@ -824,7 +824,6 @@ "lightbox.zoom_in": "Sùm dhan fhìor-mheud", "lightbox.zoom_out": "Sùm fèin-obrachail", "limited_account_hint.action": "Seall a’ phròifil co-dhiù", - "limited_account_hint.title": "Chaidh a’ phròifil seo fhalach le maoir {domain}.", "link_preview.author": "Le {name}", "link_preview.more_from_author": "Barrachd le {name}", "link_preview.shares": "{count, plural, one {{counter} phost} two {{counter} phost} few {{counter} postaichean} other {{counter} post}}", diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json index 2a6e86c145..45b7d7af9d 100644 --- a/app/javascript/mastodon/locales/gl.json +++ b/app/javascript/mastodon/locales/gl.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "Ver tamaño real", "lightbox.zoom_out": "Ver tamaño axustado", "limited_account_hint.action": "Mostrar perfil igualmente", - "limited_account_hint.title": "Este perfil foi agochado pola moderación de {domain}.", + "limited_account_hint.title": "A moderación de {domain} ocultou este perfil ou servidor.", "link_preview.author": "Por {name}", "link_preview.more_from_author": "Máis de {name}", "link_preview.shares": "{count, plural, one {{counter} publicación} other {{counter} publicacións}}", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index e6bb2d7333..dc9382e7f9 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "הגדלה לגודל מלא", "lightbox.zoom_out": "התאמה לגודל המסך", "limited_account_hint.action": "הצג חשבון בכל זאת", - "limited_account_hint.title": "פרופיל המשתמש הזה הוסתר על ידי מנחי הדיון של {domain}.", + "limited_account_hint.title": "פרופיל המשתמש או השרת כולו הוסתר על ידי מנחי הדיון של {domain}.", "link_preview.author": "מאת {name}", "link_preview.more_from_author": "עוד מאת {name}", "link_preview.shares": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{counter} הודעות} other {{counter} הודעות}}", diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json index 5db28962ca..a6215bc6b1 100644 --- a/app/javascript/mastodon/locales/hi.json +++ b/app/javascript/mastodon/locales/hi.json @@ -326,7 +326,6 @@ "lightbox.next": "अगला", "lightbox.previous": "पिछला", "limited_account_hint.action": "फिर भी प्रोफाइल दिखाओ", - "limited_account_hint.title": "यह प्रोफ़ाइल {domain} के मॉडरेटर द्वारा छिपाई गई है.", "lists.delete": "सूची हटाएँ", "lists.edit": "सूची संपादित करें", "lists.replies_policy.followed": "अन्य फोल्लोवेद यूजर", diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index 4360b3b10b..4af2e3d474 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "Nagyítás a tényleges méretre", "lightbox.zoom_out": "Méretre igazítás", "limited_account_hint.action": "Profil megjelenítése mindenképpen", - "limited_account_hint.title": "Ezt a profilt {domain} moderátorai elrejtették.", + "limited_account_hint.title": "Ezt a profilt vagy kiszolgálót a(z) {domain} moderátorai elrejtették.", "link_preview.author": "{name} szerint", "link_preview.more_from_author": "Több tőle: {name}", "link_preview.shares": "{count, plural, one {{counter} bejegyzés} other {{counter} bejegyzés}}", diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json index 181b9cbb64..fb1ec026a8 100644 --- a/app/javascript/mastodon/locales/ia.json +++ b/app/javascript/mastodon/locales/ia.json @@ -483,7 +483,6 @@ "lightbox.zoom_in": "Aggrandir al dimension real", "lightbox.zoom_out": "Diminuer pro adaptar", "limited_account_hint.action": "Monstrar profilo in omne caso", - "limited_account_hint.title": "Iste profilo ha essite celate per le moderatores de {domain}.", "link_preview.author": "Per {name}", "link_preview.more_from_author": "Plus de {name}", "link_preview.shares": "{count, plural, one {{counter} message} other {{counter} messages}}", diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json index ae36afb463..63bd8f231e 100644 --- a/app/javascript/mastodon/locales/id.json +++ b/app/javascript/mastodon/locales/id.json @@ -347,7 +347,6 @@ "lightbox.next": "Selanjutnya", "lightbox.previous": "Sebelumnya", "limited_account_hint.action": "Tetap tampilkan profil", - "limited_account_hint.title": "Profil ini telah disembunyikan oleh moderator {domain}.", "link_preview.author": "Oleh {name}", "lists.delete": "Hapus daftar", "lists.edit": "Sunting daftar", diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json index 0238f4567a..42f8bad5bf 100644 --- a/app/javascript/mastodon/locales/ie.json +++ b/app/javascript/mastodon/locales/ie.json @@ -342,7 +342,6 @@ "lightbox.next": "Sequent", "lightbox.previous": "Precedent", "limited_account_hint.action": "Monstrar profil totvez", - "limited_account_hint.title": "Ti-ci profil ha esset celat del moderatores de {domain}.", "link_preview.author": "De {name}", "lists.delete": "Deleter liste", "lists.edit": "Redacter liste", diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json index 5c318f09b4..bbba5af9a3 100644 --- a/app/javascript/mastodon/locales/io.json +++ b/app/javascript/mastodon/locales/io.json @@ -524,7 +524,6 @@ "lightbox.zoom_in": "Grandigez a reala grandeso", "lightbox.zoom_out": "Grandigez por fitigar", "limited_account_hint.action": "Jus montrez profilo", - "limited_account_hint.title": "Ca profilo celesas dal jereri di {domain}.", "link_preview.author": "Da {name}", "link_preview.more_from_author": "Plua de {name}", "link_preview.shares": "{count, plural,one {{counter} posto} other {{counter} posti}}", diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json index bf2ee7416d..56f1ca4358 100644 --- a/app/javascript/mastodon/locales/is.json +++ b/app/javascript/mastodon/locales/is.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "Renna að raunstærð", "lightbox.zoom_out": "Renna að svo passi", "limited_account_hint.action": "Birta notandasniðið samt", - "limited_account_hint.title": "Þetta notandasnið hefur verið falið af umsjónarmönnum {domain}.", + "limited_account_hint.title": "Þetta notandasnið eða netþjónn var falið af stjórnendum {domain}.", "link_preview.author": "Frá {name}", "link_preview.more_from_author": "Meira frá {name}", "link_preview.shares": "{count, plural, one {{counter} færsla} other {{counter} færslur}}", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index ca9790020d..5b0e89a0bf 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "Ingrandisci alla dimensione attuale", "lightbox.zoom_out": "Ingrandisci per adattarsi", "limited_account_hint.action": "Mostra comunque il profilo", - "limited_account_hint.title": "Questo profilo è stato nascosto dai moderatori di {domain}.", + "limited_account_hint.title": "Questo profilo o server è stato nascosto dai moderatori di {domain}.", "link_preview.author": "Di {name}", "link_preview.more_from_author": "Altro da {name}", "link_preview.shares": "{count, plural, one {{counter} post} other {{counter} post}}", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index f8d67407b2..f864cb0b77 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -545,7 +545,6 @@ "lightbox.zoom_in": "実際のサイズにする", "lightbox.zoom_out": "表示範囲に合わせる", "limited_account_hint.action": "構わず表示する", - "limited_account_hint.title": "このプロフィールは{domain}のモデレーターによって非表示にされています。", "link_preview.author": "{name}", "link_preview.more_from_author": "{name}さんの投稿をもっと読む", "link_preview.shares": "{count, plural, other {{counter}件の投稿}}", diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index c388d53d52..507c2d0312 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -568,7 +568,6 @@ "lightbox.zoom_in": "실제 크기에 맞춰 보기", "lightbox.zoom_out": "화면 크기에 맞춰 보기", "limited_account_hint.action": "그래도 프로필 보기", - "limited_account_hint.title": "이 프로필은 {domain}의 중재자에 의해 숨겨진 상태입니다.", "link_preview.author": "{name}", "link_preview.more_from_author": "{name} 프로필 보기", "link_preview.shares": "{count, plural, other {{counter} 개의 게시물}}", diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json index 34fa3086b2..202a15d2ac 100644 --- a/app/javascript/mastodon/locales/ku.json +++ b/app/javascript/mastodon/locales/ku.json @@ -324,7 +324,6 @@ "lightbox.next": "Pêş", "lightbox.previous": "Paş", "limited_account_hint.action": "Bi heman awayî profîlê nîşan bide", - "limited_account_hint.title": "Profîl ji aliyê rêveberên {domain}ê ve hatiye veşartin.", "lists.delete": "Lîsteyê jê bibe", "lists.edit": "Lîsteyê serrast bike", "lists.replies_policy.followed": "Bikarhênereke şopandî", diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json index ae72cace9e..e22aa33ab6 100644 --- a/app/javascript/mastodon/locales/lad.json +++ b/app/javascript/mastodon/locales/lad.json @@ -488,7 +488,6 @@ "lightbox.next": "Sigiente", "lightbox.previous": "Anterior", "limited_account_hint.action": "Amostra el profil entanto", - "limited_account_hint.title": "Este profil fue eskondido por los moderadores de {domain}.", "link_preview.author": "Publikasyon de {name}", "link_preview.more_from_author": "Mas de {name}", "link_preview.shares": "{count, plural, one {{counter} publikasyon} other {{counter} publikasyones}}", diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json index 517a9d6265..61525d0ec7 100644 --- a/app/javascript/mastodon/locales/lt.json +++ b/app/javascript/mastodon/locales/lt.json @@ -520,7 +520,6 @@ "lightbox.zoom_in": "Padidink iki tikrojo dydžio", "lightbox.zoom_out": "Padidink, kad tilptų", "limited_account_hint.action": "Vis tiek rodyti profilį", - "limited_account_hint.title": "Šį profilį paslėpė {domain} prižiūrėtojai.", "link_preview.author": "Sukūrė {name}", "link_preview.more_from_author": "Daugiau iš {name}", "link_preview.shares": "{count, plural, one {{counter} įrašas} few {{counter} įrašai} many {{counter} įrašo} other {{counter} įrašų}}", diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json index 5323bab63c..0ac38ecd00 100644 --- a/app/javascript/mastodon/locales/lv.json +++ b/app/javascript/mastodon/locales/lv.json @@ -526,7 +526,6 @@ "lightbox.zoom_in": "Tālummainīt līdz patiesajam izmēram", "lightbox.zoom_out": "Tālummainīt, lai ietilpinātu", "limited_account_hint.action": "Tik un tā rādīt profilu", - "limited_account_hint.title": "{domain} moderatori ir paslēpuši šo profilu.", "link_preview.author": "No {name}", "link_preview.more_from_author": "Vairāk no {name}", "lists.add_member": "Pievienot", diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json index 3eda891333..ca6b67046a 100644 --- a/app/javascript/mastodon/locales/mr.json +++ b/app/javascript/mastodon/locales/mr.json @@ -153,7 +153,6 @@ "lightbox.next": "पुढे", "lightbox.previous": "मागील", "limited_account_hint.action": "तरीही प्रोफाइल दाखवा", - "limited_account_hint.title": "हे प्रोफाइल {domain} च्या नियंत्रकांनी लपवले आहे.", "lists.delete": "सूची हटवा", "lists.edit": "सूची संपादित करा", "lists.replies_policy.followed": "कोणताही फॉलो केलेला वापरकर्ता", diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json index 3c28a1e275..2024174bf6 100644 --- a/app/javascript/mastodon/locales/ms.json +++ b/app/javascript/mastodon/locales/ms.json @@ -381,7 +381,6 @@ "lightbox.next": "Seterusnya", "lightbox.previous": "Sebelumnya", "limited_account_hint.action": "Paparkan profil", - "limited_account_hint.title": "Profil ini telah disembunyikan oleh moderator {domain}.", "link_preview.author": "Dengan {name}", "lists.delete": "Padam senarai", "lists.edit": "Sunting senarai", diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json index c45ee000a9..a08722a66e 100644 --- a/app/javascript/mastodon/locales/my.json +++ b/app/javascript/mastodon/locales/my.json @@ -304,7 +304,6 @@ "lightbox.next": "ရှေ့သို့", "lightbox.previous": "ရှေ့သို့", "limited_account_hint.action": "ဘာပဲဖြစ်ဖြစ် ပရိုဖိုင်ကို ပြပါ", - "limited_account_hint.title": "ဤပရိုဖိုင်ကို {domain} ၏ စိစစ်သူများမှ ဖျောက်ထားသည်။", "link_preview.author": "{name} ဖြင့်", "lists.delete": "စာရင်းကိုဖျက်ပါ", "lists.edit": "စာရင်းကိုပြင်ဆင်ပါ", diff --git a/app/javascript/mastodon/locales/nan-TW.json b/app/javascript/mastodon/locales/nan-TW.json index 1a8d26108d..393351265c 100644 --- a/app/javascript/mastodon/locales/nan-TW.json +++ b/app/javascript/mastodon/locales/nan-TW.json @@ -850,7 +850,6 @@ "lightbox.zoom_in": "Tshūn-kiu kàu實際ê sài-suh", "lightbox.zoom_out": "Tshūn-kiu kàu適當ê sài-suh", "limited_account_hint.action": "一直顯示個人資料", - "limited_account_hint.title": "Tsit ê 個人資料予 {domain} ê管理員tshàng起來ah。", "link_preview.author": "Tuì {name}", "link_preview.more_from_author": "看 {name} ê其他內容", "link_preview.shares": "{count, plural, one {{counter} 篇} other {{counter} 篇}}PO文", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index 9dba7c6103..89e98a4553 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "Oorspronkelijke grootte weergeven", "lightbox.zoom_out": "Passend weergeven", "limited_account_hint.action": "Alsnog het profiel tonen", - "limited_account_hint.title": "Dit profiel is door de moderatoren van {domain} verborgen.", + "limited_account_hint.title": "Dit profiel of deze server is door de moderatoren van {domain} verborgen.", "link_preview.author": "Door {name}", "link_preview.more_from_author": "Meer van {name}", "link_preview.shares": "{count, plural, one {{counter} bericht} other {{counter} berichten}}", diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json index c995f4aa8b..f95af7bb5d 100644 --- a/app/javascript/mastodon/locales/nn.json +++ b/app/javascript/mastodon/locales/nn.json @@ -790,7 +790,6 @@ "lightbox.zoom_in": "Zoom til faktisk storleik", "lightbox.zoom_out": "Vis heile", "limited_account_hint.action": "Vis profilen likevel", - "limited_account_hint.title": "Denne profilen er skjult av moderatorane på {domain}.", "link_preview.author": "Av {name}", "link_preview.more_from_author": "Meir frå {name}", "link_preview.shares": "{count, plural,one {{counter} innlegg} other {{counter} innlegg}}", diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json index d8851a95bf..afb565e3c4 100644 --- a/app/javascript/mastodon/locales/no.json +++ b/app/javascript/mastodon/locales/no.json @@ -528,7 +528,6 @@ "lightbox.zoom_in": "Zoom til original størrelse", "lightbox.zoom_out": "Vis hele", "limited_account_hint.action": "Vis profil likevel", - "limited_account_hint.title": "Denne profilen har blitt skjult av moderatorene til {domain}.", "link_preview.author": "Av {name}", "link_preview.more_from_author": "Mer fra {name}", "link_preview.shares": "{count, plural, one {{counter} innlegg} other {{counter} innlegg}}", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index a001cc8ec0..400f14ba0c 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -347,7 +347,6 @@ "lightbox.next": "Seguent", "lightbox.previous": "Precedent", "limited_account_hint.action": "Afichar lo perfil de tota manièra", - "limited_account_hint.title": "Aqueste perfil foguèt rescondut per la moderacion de {domain}.", "link_preview.author": "Per {name}", "link_preview.more_from_author": "Mai de {name}", "lists.delete": "Suprimir la lista", diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index 0615f5c914..4756b753eb 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -602,7 +602,6 @@ "lightbox.zoom_in": "Powiększ do rzeczywistego rozmiaru", "lightbox.zoom_out": "Powiększ, aby dopasować", "limited_account_hint.action": "Pokaż profil mimo to", - "limited_account_hint.title": "Ten profil został ukryty przez moderatorów {domain}.", "link_preview.author": "{name}", "link_preview.more_from_author": "Więcej od {name}", "link_preview.shares": "{count, plural, one {{counter} wpis} few {{counter} wpisy} many {{counter} wpisów} other {{counter} wpisów}}", diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index ae9a2fb528..c8b24dcd1b 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "Retornar ao tamanho real", "lightbox.zoom_out": "Ampliar para ajustar", "limited_account_hint.action": "Exibir perfil mesmo assim", - "limited_account_hint.title": "Este perfil foi ocultado pelos moderadores de {domain}.", + "limited_account_hint.title": "Este perfil ou servidor foi ocultado pelos moderadores de {domain}.", "link_preview.author": "Por {name}", "link_preview.more_from_author": "Mais de {name}", "link_preview.shares": "{count, plural, one {{counter} publicação} other {{counter} publicações}}", diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json index 7cb6db1ab2..3a93b7273b 100644 --- a/app/javascript/mastodon/locales/pt-PT.json +++ b/app/javascript/mastodon/locales/pt-PT.json @@ -800,7 +800,6 @@ "lightbox.zoom_in": "Ampliar para o tamanho real", "lightbox.zoom_out": "Ajustar para caber", "limited_account_hint.action": "Mostrar perfil mesmo assim", - "limited_account_hint.title": "Este perfil foi ocultado pelos moderadores de {domain}.", "link_preview.author": "Por {name}", "link_preview.more_from_author": "Mais de {name}", "link_preview.shares": "{count, plural, one {{counter} publicação} other {{counter} publicações}}", diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json index 32990569c1..07da3389c3 100644 --- a/app/javascript/mastodon/locales/ro.json +++ b/app/javascript/mastodon/locales/ro.json @@ -325,7 +325,6 @@ "lightbox.next": "Înainte", "lightbox.previous": "Înapoi", "limited_account_hint.action": "Afișează profilul oricum", - "limited_account_hint.title": "Acest profil a fost ascuns de moderatorii domeniului {domain}.", "link_preview.author": "De {name}", "lists.delete": "Șterge lista", "lists.edit": "Modifică lista", diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json index c999bb6f44..56a4e98fe1 100644 --- a/app/javascript/mastodon/locales/ru.json +++ b/app/javascript/mastodon/locales/ru.json @@ -769,7 +769,6 @@ "lightbox.zoom_in": "Масштаб до фактического размера", "lightbox.zoom_out": "Масштаб по размеру экрана", "limited_account_hint.action": "Всё равно показать", - "limited_account_hint.title": "Этот профиль был скрыт модераторами сервера {domain}.", "link_preview.author": "Автор: {name}", "link_preview.more_from_author": "Автор: {name}", "link_preview.shares": "{count, plural, one {{counter} пост} few {{counter} поста} other {{counter} постов}}", diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json index 4f660c8d1f..d536301f60 100644 --- a/app/javascript/mastodon/locales/sa.json +++ b/app/javascript/mastodon/locales/sa.json @@ -273,7 +273,6 @@ "lightbox.next": "परः", "lightbox.previous": "पूर्वः", "limited_account_hint.action": "प्रोफैलं दर्शय कथञ्चित्", - "limited_account_hint.title": "{domain} इत्यस्य प्रशासकैरयं प्रोफैल्प्रच्छन्नः।", "lists.delete": "सूचिं मार्जय", "lists.edit": "सूचिं सम्पादय", "lists.replies_policy.followed": "कोऽप्यनुसारितोपभोक्ता", diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json index 39baa3f00a..bb377da384 100644 --- a/app/javascript/mastodon/locales/sc.json +++ b/app/javascript/mastodon/locales/sc.json @@ -385,7 +385,6 @@ "lightbox.next": "Imbeniente", "lightbox.previous": "Pretzedente", "lightbox.zoom_in": "Ismànnia finas a sa mannària atuale", - "limited_account_hint.title": "Custu profilu est istadu cuadu dae sa moderatzione de {domain}.", "link_preview.author": "Dae {name}", "link_preview.shares": "{count, plural, one {{counter} publicatzione} other {{counter} publicatziones}}", "lists.delete": "Cantzella sa lista", diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json index 746b737302..59680e7c79 100644 --- a/app/javascript/mastodon/locales/sco.json +++ b/app/javascript/mastodon/locales/sco.json @@ -266,7 +266,6 @@ "lightbox.next": "Neist", "lightbox.previous": "Last ane", "limited_account_hint.action": "Shaw profile onieweys", - "limited_account_hint.title": "This profile haes been planked bi the moderators o {domain}.", "lists.delete": "Delete list", "lists.edit": "Edit list", "lists.replies_policy.followed": "Onie follaed uiser", diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json index 1bec768e05..7506b04958 100644 --- a/app/javascript/mastodon/locales/si.json +++ b/app/javascript/mastodon/locales/si.json @@ -431,7 +431,6 @@ "lightbox.zoom_in": "සැබෑ ප්‍රමාණයට විශාලනය කරන්න", "lightbox.zoom_out": "ගැළපීමට විශාලනය කරන්න", "limited_account_hint.action": "කෙසේ හෝ පැතිකඩ පෙන්වන්න", - "limited_account_hint.title": "මෙම පැතිකඩ {domain}හි මධ්‍යස්ථකරුවන් විසින් සඟවා ඇත.", "link_preview.author": "{name}විසිනි", "link_preview.more_from_author": "{name}වෙතින් තවත්", "link_preview.shares": "{count, plural, one {{counter} සටහන} other {{counter} සටහන්}}", diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index 3b50a77caf..381e194817 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -458,7 +458,6 @@ "lightbox.previous": "Späť", "lightbox.zoom_out": "Priblížiť na mieru", "limited_account_hint.action": "Aj tak zobraziť profil", - "limited_account_hint.title": "Tento profil bol skrytý správcami servera {domain}.", "link_preview.author": "Autor: {name}", "link_preview.more_from_author": "Viac od {name}", "link_preview.shares": "{count, plural, one {{counter} príspevok} other {{counter} príspevkov}}", diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json index 5f4f42cbec..43e01d231c 100644 --- a/app/javascript/mastodon/locales/sl.json +++ b/app/javascript/mastodon/locales/sl.json @@ -489,7 +489,6 @@ "lightbox.zoom_in": "Približaj na dejansko velikost", "lightbox.zoom_out": "Čez cel prikaz", "limited_account_hint.action": "Vseeno pokaži profil", - "limited_account_hint.title": "Profil so moderatorji strežnika {domain} skrili.", "link_preview.author": "Avtor/ica {name}", "link_preview.more_from_author": "Več od {name}", "link_preview.shares": "{count, plural, one {{counter} objava} two {{counter} objavi} few {{counter} objave} other {{counter} objav}}", diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json index fb2d1c6f9c..2456186445 100644 --- a/app/javascript/mastodon/locales/sq.json +++ b/app/javascript/mastodon/locales/sq.json @@ -845,7 +845,7 @@ "lightbox.zoom_in": "Ktheje në madhësinë origjinale", "lightbox.zoom_out": "Zmadhoje të përshtatet", "limited_account_hint.action": "Shfaqe profilin sido qoftë", - "limited_account_hint.title": "Ky profil është fshehur nga moderatorët e {domain}.", + "limited_account_hint.title": "Ky profil, ose shërbyes është fshehur nga moderatorër e {domain}.", "link_preview.author": "Nga {name}", "link_preview.more_from_author": "Më tepër nga {name}", "link_preview.shares": "{count, plural, one {{counter} post} other {{counter} postime}}", diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json index 5d7760a0d4..841c8e5473 100644 --- a/app/javascript/mastodon/locales/sr-Latn.json +++ b/app/javascript/mastodon/locales/sr-Latn.json @@ -368,7 +368,6 @@ "lightbox.next": "Sledeće", "lightbox.previous": "Prethodno", "limited_account_hint.action": "Ipak prikaži profil", - "limited_account_hint.title": "Ovaj profil su sakrili moderatori {domain}.", "link_preview.author": "Po {name}", "link_preview.more_from_author": "Više od {name}", "link_preview.shares": "{count, plural, one {{counter} objava} few {{counter} objave} other {{counter} objava}}", diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json index 57e5d93011..93731afcfd 100644 --- a/app/javascript/mastodon/locales/sr.json +++ b/app/javascript/mastodon/locales/sr.json @@ -345,7 +345,6 @@ "lightbox.next": "Следеће", "lightbox.previous": "Претходно", "limited_account_hint.action": "Ипак прикажи профил", - "limited_account_hint.title": "Овај профил су сакрили модератори {domain}.", "link_preview.author": "По {name}", "link_preview.more_from_author": "Више од {name}", "link_preview.shares": "{count, plural, one {{counter} објава} few {{counter} објаве} other {{counter} објава}}", diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json index 11b664d680..a5cda9c93f 100644 --- a/app/javascript/mastodon/locales/sv.json +++ b/app/javascript/mastodon/locales/sv.json @@ -850,7 +850,6 @@ "lightbox.zoom_in": "Zooma till faktisk storlek", "lightbox.zoom_out": "Zooma för att passa", "limited_account_hint.action": "Visa profil ändå", - "limited_account_hint.title": "Denna profil har dolts av {domain}s moderatorer.", "link_preview.author": "Av {name}", "link_preview.more_from_author": "Mer från {name}", "link_preview.shares": "{count, plural, one {{counter} inlägg} other {{counter} inlägg}}", diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json index 2f9bc2ad4c..64df55cd2c 100644 --- a/app/javascript/mastodon/locales/th.json +++ b/app/javascript/mastodon/locales/th.json @@ -475,7 +475,6 @@ "lightbox.zoom_in": "ซูมเป็นขนาดจริง", "lightbox.zoom_out": "ซูมให้พอดี", "limited_account_hint.action": "แสดงโปรไฟล์ต่อไป", - "limited_account_hint.title": "มีการซ่อนโปรไฟล์นี้โดยผู้กลั่นกรองของ {domain}", "link_preview.author": "โดย {name}", "link_preview.more_from_author": "เพิ่มเติมจาก {name}", "link_preview.shares": "{count, plural, other {{counter} โพสต์}}", diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json index fe86644071..e1306a87fc 100644 --- a/app/javascript/mastodon/locales/tr.json +++ b/app/javascript/mastodon/locales/tr.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "Özgün boyuta dön", "lightbox.zoom_out": "Sığacak şekilde boyutla", "limited_account_hint.action": "Yine de profili göster", - "limited_account_hint.title": "Bu profil {domain} moderatörleri tarafından gizlendi.", + "limited_account_hint.title": "Bu profil veya sunucu, {domain} moderatörleri tarafından gizlendi.", "link_preview.author": "Yazar: {name}", "link_preview.more_from_author": "{name} kişisinden daha fazlası", "link_preview.shares": "{count, plural, one {{counter} gönderi} other {{counter} gönderi}}", diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json index e09cfa8daf..9dabb0d256 100644 --- a/app/javascript/mastodon/locales/tt.json +++ b/app/javascript/mastodon/locales/tt.json @@ -274,7 +274,6 @@ "lightbox.next": "Киләсе", "lightbox.previous": "Алдагы", "limited_account_hint.action": "Барыбер профильне күрсәтергә", - "limited_account_hint.title": "Бу профильне модераторлар яшергән {domain}.", "lists.delete": "Исемлекне бетерегез", "lists.edit": "Исемлекне үзгәртү", "lists.replies_policy.list": "Исемлек әгъзалары", diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json index a514e36990..54917fab1d 100644 --- a/app/javascript/mastodon/locales/uk.json +++ b/app/javascript/mastodon/locales/uk.json @@ -517,7 +517,6 @@ "lightbox.zoom_in": "Масштаб за реальним розміром", "lightbox.zoom_out": "Збільшити відповідно до розміру", "limited_account_hint.action": "Усе одно показати профіль", - "limited_account_hint.title": "Цей профіль сховали модератори {domain}.", "link_preview.author": "Від {name}", "link_preview.more_from_author": "Більше від {name}", "link_preview.shares": "{count, plural, one {{counter} допис} few {{counter} дописи} many {{counter} дописів} other {{counter} допис}}", diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json index 3e14da491c..973ecf626e 100644 --- a/app/javascript/mastodon/locales/vi.json +++ b/app/javascript/mastodon/locales/vi.json @@ -850,7 +850,6 @@ "lightbox.zoom_in": "Kích cỡ gốc", "lightbox.zoom_out": "Vừa màn hình", "limited_account_hint.action": "Vẫn cứ xem", - "limited_account_hint.title": "Tài khoản này đã bị ẩn bởi quản trị viên {domain}.", "link_preview.author": "Bởi {name}", "link_preview.more_from_author": "Viết bởi {name}", "link_preview.shares": "{count, plural, other {{counter} lượt chia sẻ}}", diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index 13410edba6..7312742aa2 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "缩放为实际大小", "lightbox.zoom_out": "缩放到适合窗口大小", "limited_account_hint.action": "仍要显示个人资料", - "limited_account_hint.title": "此账号资料已被 {domain} 管理员隐藏。", + "limited_account_hint.title": "此账号资料或服务器已被 {domain} 管理员隐藏。", "link_preview.author": "由 {name}", "link_preview.more_from_author": "查看 {name} 的更多内容", "link_preview.shares": "{count, plural, other {{counter} 条嘟文}}", diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json index 837ae22f90..a64c3ada6e 100644 --- a/app/javascript/mastodon/locales/zh-HK.json +++ b/app/javascript/mastodon/locales/zh-HK.json @@ -464,7 +464,6 @@ "lightbox.next": "下一頁", "lightbox.previous": "上一頁", "limited_account_hint.action": "一律顯示個人檔案", - "limited_account_hint.title": "此個人檔案已被 {domain} 的管理員隱藏。", "link_preview.author": "由 {name} 提供", "lists.add_member": "新增", "lists.create": "建立", diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json index d7a303721f..724ff38ce1 100644 --- a/app/javascript/mastodon/locales/zh-TW.json +++ b/app/javascript/mastodon/locales/zh-TW.json @@ -850,7 +850,7 @@ "lightbox.zoom_in": "縮放至實際大小", "lightbox.zoom_out": "縮放至合適大小", "limited_account_hint.action": "一律顯示個人檔案", - "limited_account_hint.title": "此個人檔案已被 {domain} 之管理員隱藏。", + "limited_account_hint.title": "此個人檔案或伺服器已被 {domain} 之管理員隱藏。", "link_preview.author": "來自 {name}", "link_preview.more_from_author": "來自 {name} 之更多內容", "link_preview.shares": "{count, plural, other {{counter} 則嘟文}}", diff --git a/config/locales/de.yml b/config/locales/de.yml index aaa00f6485..27a49b4d79 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -746,6 +746,7 @@ de: action_log: Protokoll action_taken_by: Maßnahme ergriffen von actions: + delete_description_html: Die gemeldeten Beiträge/Sammlungen werden gelöscht und die ergriffene Maßnahme wird aufgezeichnet, um dir bei zukünftigen Verstößen des gleichen Kontos zu helfen. mark_as_sensitive_description_html: Die Medien in den gemeldeten Beiträgen werden mit einer Inhaltswarnung versehen und der Vorfall wird vermerkt, um bei zukünftigen Verstößen desselben Kontos besser reagieren zu können. other_description_html: Weitere Optionen zur Steuerung des Kontoverhaltens und zur Anpassung der Kommunikation mit dem gemeldeten Konto. resolve_description_html: Es wird keine Maßnahme gegen das gemeldete Konto ergriffen und der Vorgang wird nicht aufgezeichnet – die Meldung wird hiermit geschlossen. @@ -772,6 +773,7 @@ de: confirm: Bestätigen confirm_action: Maßnahme gegen @%{acct} bestätigen created_at: Gemeldet am + delete_and_resolve: Inhalt löschen forwarded: Weitergeleitet forwarded_replies_explanation: Diese Meldung stammt von einem externen Profil und betrifft einen externen Inhalt. Der Inhalt wurde an dich weitergeleitet, weil er eine Antwort auf ein bei dir registriertes Profil ist. forwarded_to: Weitergeleitet an %{domain} diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml index 958492bae9..746f64655b 100644 --- a/config/locales/es-MX.yml +++ b/config/locales/es-MX.yml @@ -746,7 +746,7 @@ es-MX: action_log: Registro de auditoría action_taken_by: Acción tomada por actions: - delete_description_html: Las publicaciones y/o colecciones informadas se borrarán, y se aplicará una amonestación para ayudarte a escalar futuras acciones sobre la misma cuenta. + delete_description_html: Las publicaciones y/o colecciones denunciadas serán eliminadas y se registrará una advertencia para ayudarte a tomar medidas más estrictas en caso de futuras infracciones por parte de la misma cuenta. mark_as_sensitive_description_html: Los archivos multimedia en las publicaciones reportadas se marcarán como sensibles y se aplicará una amonestación para ayudarte a escalar las futuras infracciones de la misma cuenta. other_description_html: Ver más opciones para controlar el comportamiento de la cuenta y personalizar la comunicación de la cuenta reportada. resolve_description_html: No se tomarán medidas contra la cuenta denunciada, no se registrará la amonestación, y se cerrará el informe. @@ -773,7 +773,7 @@ es-MX: confirm: Confirmar confirm_action: Confirmar acción de moderación contra @%{acct} created_at: Denunciado - delete_and_resolve: Borrar contenido + delete_and_resolve: Eliminar contenido forwarded: Reenviado forwarded_replies_explanation: Este reporte es de un usuario remoto y sobre contenido remoto. Se le ha enviado porque el contenido reportado es en respuesta a uno de sus usuarios. forwarded_to: Reenviado a %{domain} diff --git a/config/locales/et.yml b/config/locales/et.yml index 866c764f7e..1c41ade363 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -746,6 +746,7 @@ et: action_log: Auditilogi action_taken_by: Meetmeid kasutanud actions: + delete_description_html: Teatatud postitused ja/või kogumikud kustutatakse ning registreeritakse hoiatus, mis aitab sul sama konto tulevaste rikkumiste korral asja edasi suunata. mark_as_sensitive_description_html: Raporteeritud meedia märgitakse kui tundlik sisu ja juhtum talletatakse hoiatusena tulevaste eksimuste ärahoidmiseks. other_description_html: On rohkem valikuid konto käitumise juhtimiseks ja suhtluse kohandamiseks raporteeritud kontoga. resolve_description_html: Raporteeritud konto suhtes ei võeta midagi ette, juhtumit ei registreerita ja raport suletakse. @@ -772,6 +773,7 @@ et: confirm: Kinnita confirm_action: Kinnita @%{acct} modereering created_at: Teavitatud + delete_and_resolve: Kustuta sisu forwarded: Edastatud forwarded_replies_explanation: See aruanne pärineb kaugkasutajalt ja käsitleb kaugsisu. See on edastatud sulle, sest raporteeritud sisu on vastus ühele sinu kasutajale. forwarded_to: Edastatud %{domain} domeeni @@ -1567,7 +1569,9 @@ et: blocks: Sa blokeerid bookmarks: Järjehoidjad csv: CSV + custom_filters: Filtrid domain_blocks: Domeeni blokeeringud + json: JSON lists: Loetelud mutes: Oled summutanud storage: Meedia hoidla diff --git a/config/locales/ga.yml b/config/locales/ga.yml index d4fba106d2..437fcd3d94 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -788,6 +788,7 @@ ga: action_log: Loga iniúchta action_taken_by: Gníomh arna ghlacadh ag actions: + delete_description_html: Scriosfar na poist agus/nó na bailiúcháin a tuairiscíodh agus taifeadfar stailc chun cabhrú leat sárú dlí amach anseo ag an gcuntas céanna a chur chun cinn. mark_as_sensitive_description_html: Déanfar na meáin sna poist tuairiscithe a mharcáil mar íogair agus déanfar stailc a thaifeadadh chun cabhrú leat sárú a dhéanamh ar sháruithe sa todhchaí tríd an gcuntas céanna. other_description_html: Féach ar a thuilleadh roghanna chun iompar an chuntais a rialú agus cumarsáid a shaincheapadh chuig an gcuntas tuairiscithe. resolve_description_html: Ní dhéanfar aon ghníomhaíocht i gcoinne an chuntais thuairiscithe, ní dhéanfar aon stailc a thaifeadadh, agus dúnfar an tuarascáil. @@ -814,6 +815,7 @@ ga: confirm: Deimhnigh confirm_action: Deimhnigh gníomh modhnóireachta i gcoinne @%{acct} created_at: Tuairiscithe + delete_and_resolve: Scrios ábhar forwarded: Ar aghaidh forwarded_replies_explanation: Is ó chianúsáideoir an tuairisc seo agus faoi chianábhar. Tá sé curtha ar aghaidh chugat toisc go bhfuil an t-ábhar tuairiscithe mar fhreagra ar cheann de na húsáideoirí atá agat. forwarded_to: Ar aghaidh chuig %{domain} @@ -1635,7 +1637,9 @@ ga: blocks: Bac leat bookmarks: Leabharmharcanna csv: CSV + custom_filters: Scagairí domain_blocks: Bloic fearainn + json: JSON lists: Liostaí mutes: Balbhaíonn tú storage: Stóráil meáin diff --git a/config/locales/he.yml b/config/locales/he.yml index f160d6f2cb..c754a48df6 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -774,6 +774,7 @@ he: action_log: ביקורת יומן action_taken_by: פעולה בוצעה ע"י actions: + delete_description_html: ההודעות המדווחות ו/או אוספים יימחקו ותרשם עבירה על מנת להקל בהעלאה של דיווחים עתידיים על אותו החשבון. mark_as_sensitive_description_html: המדיה בהודעות מדווחות תסומן כרגישה ועבירה תרשם כדי לעזור לך להסלים באינטראקציות עתידיות עם אותו החשבון. other_description_html: ראו אפשרויות נוספות לשליטה בהתנהגות החשבון וכדי לבצע התאמות בתקשורת עם החשבון המדווח. resolve_description_html: אף פעולה לא תבוצע נגד החשבון עליו דווח, לא תירשם עבירה, והדיווח ייסגר. @@ -800,6 +801,7 @@ he: confirm: אישור confirm_action: נא לאשר פעולת משמעת לגבי חשבון %{acct} created_at: מדווח + delete_and_resolve: מחק תוכן forwarded: קודם forwarded_replies_explanation: דווח זה הגיע מחשבון משתמש חיצוני על תוכן חיצוני. הוא הועבר אליך כיוון שהתוכן שדווח הוא בתשובה למשתמש.ת שלך. forwarded_to: קודם ל-%{domain} diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 379b941c7c..d8255d01a1 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -732,6 +732,7 @@ zh-CN: action_log: 审计日志 action_taken_by: 操作执行者 actions: + delete_description_html: 被举报的嘟文和收藏列表将被删除，同时该账号将被标记一次处罚，以供未来同一账号再次违规时参考。 mark_as_sensitive_description_html: 被举报的嘟文将被标记为敏感，同时该账号将被标记一次处罚，以供未来同一账号再次违规时参考。 other_description_html: 查看更多控制该账号行为的选项，并自定义编写与被举报账号的通信。 resolve_description_html: 不会对被举报账号采取任何动作，举报将被关闭，也不会留下处罚记录。 @@ -758,6 +759,7 @@ zh-CN: confirm: 确认 confirm_action: 确认对 @%{acct} 的管理操作 created_at: 举报时间 + delete_and_resolve: 删除内容 forwarded: 已转发 forwarded_replies_explanation: 该举报来自外站用户，涉及外站内容。之所以转发给你，是因为被举报的内容是对你站点一位用户的回复。 forwarded_to: 转发举报到 %{domain} From a6ec5ce508eae1dcd37eec05ae25a3622e86ceb7 Mon Sep 17 00:00:00 2001 From: diondiondion Date: Thu, 4 Jun 2026 10:20:46 +0200 Subject: [PATCH 02/34] Remove resize handles from inputs in Firefox (#39274) --- app/javascript/styles/mastodon/forms.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss index 27b2a46223..d3fdf2fb21 100644 --- a/app/javascript/styles/mastodon/forms.scss +++ b/app/javascript/styles/mastodon/forms.scss @@ -557,7 +557,6 @@ code { display: block; width: 100%; font-family: inherit; - resize: vertical; background: var(--color-bg-secondary); border: 1px solid var(--color-border-primary); border-radius: 4px; @@ -584,6 +583,10 @@ code { } } + textarea { + resize: vertical; + } + input[type='text'], input[type='number'], input[type='email'], From 8d9a7aa50b5f4b1132ddc489cb1a28654ec47cea Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Thu, 4 Jun 2026 04:38:33 -0400 Subject: [PATCH 03/34] Exercise more of `tags/show.rss` view (#39269) --- spec/requests/tags_spec.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spec/requests/tags_spec.rb b/spec/requests/tags_spec.rb index f04d1bc2d3..bacd85ca6f 100644 --- a/spec/requests/tags_spec.rb +++ b/spec/requests/tags_spec.rb @@ -6,6 +6,9 @@ RSpec.describe 'Tags' do describe 'GET /tags/:id' do context 'when tag exists' do let(:tag) { Fabricate :tag } + let(:status) { Fabricate :status } + + before { status.tags << tag } context 'with HTML format' do before { get tag_path(tag) } @@ -51,6 +54,8 @@ RSpec.describe 'Tags' do .and have_cacheable_headers.with_vary('Accept, Accept-Language, Cookie') expect(response.content_type) .to start_with('application/rss+xml') + expect(response.body) + .to include(status.text) end end end From a849a2d824fa2c19056b3fcccba7bf396b41a0a5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2026 11:27:15 +0200 Subject: [PATCH 04/34] Update dependency js-yaml to v4.2.0 (#39241) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index c27f3c70bd..d5a210c45c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9304,13 +9304,13 @@ __metadata: linkType: hard "js-yaml@npm:^4.1.0": - version: 4.1.1 - resolution: "js-yaml@npm:4.1.1" + version: 4.2.0 + resolution: "js-yaml@npm:4.2.0" dependencies: argparse: "npm:^2.0.1" bin: js-yaml: bin/js-yaml.js - checksum: 10c0/561c7d7088c40a9bb53cc75becbfb1df6ae49b34b5e6e5a81744b14ae8667ec564ad2527709d1a6e7d5e5fa6d483aa0f373a50ad98d42fde368ec4a190d4fae7 + checksum: 10c0/1916456c118746603b067d74bbcbb0445d9a1d5e474ad4ae775e7b20525bed902e01d9d97dd0c81fcd8d4f596162309d0eb057f4aa38f3e9647f14075e9dea45 languageName: node linkType: hard From 0eed603a361ddb64669e2daf73a3493793edf32c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2026 09:27:52 +0000 Subject: [PATCH 05/34] Update dependency aws-sdk-core to v3.251.0 (#39257) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a8f4d4fc88..6df2d6e0fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,8 +99,8 @@ GEM ast (2.4.3) attr_required (1.0.2) aws-eventstream (1.4.0) - aws-partitions (1.1255.0) - aws-sdk-core (3.250.0) + aws-partitions (1.1256.0) + aws-sdk-core (3.251.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) From 6bdecf2e4f118d147d69943504c43d553f8c04e2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2026 09:27:54 +0000 Subject: [PATCH 06/34] Update dependency aws-sdk-s3 to v1.225.0 (#39258) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6df2d6e0fb..4630d77e23 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -108,10 +108,10 @@ GEM bigdecimal jmespath (~> 1, >= 1.6.1) logger - aws-sdk-kms (1.128.0) + aws-sdk-kms (1.129.0) aws-sdk-core (~> 3, >= 3.248.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.224.0) + aws-sdk-s3 (1.225.0) aws-sdk-core (~> 3, >= 3.248.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) From df27144803bce46d9ff6d9f0c972f99a72f45c2f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2026 11:34:49 +0200 Subject: [PATCH 07/34] Update dependency vite to v8.0.16 (#39245) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 157 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 82 insertions(+), 75 deletions(-) diff --git a/yarn.lock b/yarn.lock index d5a210c45c..847501e2f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3361,7 +3361,14 @@ __metadata: languageName: node linkType: hard -"@oxc-project/types@npm:=0.132.0, @oxc-project/types@npm:^0.132.0": +"@oxc-project/types@npm:=0.133.0": + version: 0.133.0 + resolution: "@oxc-project/types@npm:0.133.0" + checksum: 10c0/70c57ba58644f7ec217b670c301801f4d06995f4ccdba6b2bd106ea3e5ee49d616573e6ef8d55530b87571a960696543687f3850e87ad173d3f88965c30cdd63 + languageName: node + linkType: hard + +"@oxc-project/types@npm:^0.132.0": version: 0.132.0 resolution: "@oxc-project/types@npm:0.132.0" checksum: 10c0/d0ca5e98be0b873d69e4f0f743eb35026833603dac11db9d55f2b5438251b381b886dc556fe3175a17b673f8e2073c49bde88d7e6e702aa09298c22b8b5504e1 @@ -3772,93 +3779,93 @@ __metadata: languageName: node linkType: hard -"@rolldown/binding-android-arm64@npm:1.0.2": - version: 1.0.2 - resolution: "@rolldown/binding-android-arm64@npm:1.0.2" +"@rolldown/binding-android-arm64@npm:1.0.3": + version: 1.0.3 + resolution: "@rolldown/binding-android-arm64@npm:1.0.3" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@rolldown/binding-darwin-arm64@npm:1.0.2": - version: 1.0.2 - resolution: "@rolldown/binding-darwin-arm64@npm:1.0.2" +"@rolldown/binding-darwin-arm64@npm:1.0.3": + version: 1.0.3 + resolution: "@rolldown/binding-darwin-arm64@npm:1.0.3" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@rolldown/binding-darwin-x64@npm:1.0.2": - version: 1.0.2 - resolution: "@rolldown/binding-darwin-x64@npm:1.0.2" +"@rolldown/binding-darwin-x64@npm:1.0.3": + version: 1.0.3 + resolution: "@rolldown/binding-darwin-x64@npm:1.0.3" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@rolldown/binding-freebsd-x64@npm:1.0.2": - version: 1.0.2 - resolution: "@rolldown/binding-freebsd-x64@npm:1.0.2" +"@rolldown/binding-freebsd-x64@npm:1.0.3": + version: 1.0.3 + resolution: "@rolldown/binding-freebsd-x64@npm:1.0.3" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@rolldown/binding-linux-arm-gnueabihf@npm:1.0.2": - version: 1.0.2 - resolution: "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.2" +"@rolldown/binding-linux-arm-gnueabihf@npm:1.0.3": + version: 1.0.3 + resolution: "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.3" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@rolldown/binding-linux-arm64-gnu@npm:1.0.2": - version: 1.0.2 - resolution: "@rolldown/binding-linux-arm64-gnu@npm:1.0.2" +"@rolldown/binding-linux-arm64-gnu@npm:1.0.3": + version: 1.0.3 + resolution: "@rolldown/binding-linux-arm64-gnu@npm:1.0.3" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@rolldown/binding-linux-arm64-musl@npm:1.0.2": - version: 1.0.2 - resolution: "@rolldown/binding-linux-arm64-musl@npm:1.0.2" +"@rolldown/binding-linux-arm64-musl@npm:1.0.3": + version: 1.0.3 + resolution: "@rolldown/binding-linux-arm64-musl@npm:1.0.3" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@rolldown/binding-linux-ppc64-gnu@npm:1.0.2": - version: 1.0.2 - resolution: "@rolldown/binding-linux-ppc64-gnu@npm:1.0.2" +"@rolldown/binding-linux-ppc64-gnu@npm:1.0.3": + version: 1.0.3 + resolution: "@rolldown/binding-linux-ppc64-gnu@npm:1.0.3" conditions: os=linux & cpu=ppc64 & libc=glibc languageName: node linkType: hard -"@rolldown/binding-linux-s390x-gnu@npm:1.0.2": - version: 1.0.2 - resolution: "@rolldown/binding-linux-s390x-gnu@npm:1.0.2" +"@rolldown/binding-linux-s390x-gnu@npm:1.0.3": + version: 1.0.3 + resolution: "@rolldown/binding-linux-s390x-gnu@npm:1.0.3" conditions: os=linux & cpu=s390x & libc=glibc languageName: node linkType: hard -"@rolldown/binding-linux-x64-gnu@npm:1.0.2": - version: 1.0.2 - resolution: "@rolldown/binding-linux-x64-gnu@npm:1.0.2" +"@rolldown/binding-linux-x64-gnu@npm:1.0.3": + version: 1.0.3 + resolution: "@rolldown/binding-linux-x64-gnu@npm:1.0.3" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@rolldown/binding-linux-x64-musl@npm:1.0.2": - version: 1.0.2 - resolution: "@rolldown/binding-linux-x64-musl@npm:1.0.2" +"@rolldown/binding-linux-x64-musl@npm:1.0.3": + version: 1.0.3 + resolution: "@rolldown/binding-linux-x64-musl@npm:1.0.3" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@rolldown/binding-openharmony-arm64@npm:1.0.2": - version: 1.0.2 - resolution: "@rolldown/binding-openharmony-arm64@npm:1.0.2" +"@rolldown/binding-openharmony-arm64@npm:1.0.3": + version: 1.0.3 + resolution: "@rolldown/binding-openharmony-arm64@npm:1.0.3" conditions: os=openharmony & cpu=arm64 languageName: node linkType: hard -"@rolldown/binding-wasm32-wasi@npm:1.0.2": - version: 1.0.2 - resolution: "@rolldown/binding-wasm32-wasi@npm:1.0.2" +"@rolldown/binding-wasm32-wasi@npm:1.0.3": + version: 1.0.3 + resolution: "@rolldown/binding-wasm32-wasi@npm:1.0.3" dependencies: "@emnapi/core": "npm:1.10.0" "@emnapi/runtime": "npm:1.10.0" @@ -3867,16 +3874,16 @@ __metadata: languageName: node linkType: hard -"@rolldown/binding-win32-arm64-msvc@npm:1.0.2": - version: 1.0.2 - resolution: "@rolldown/binding-win32-arm64-msvc@npm:1.0.2" +"@rolldown/binding-win32-arm64-msvc@npm:1.0.3": + version: 1.0.3 + resolution: "@rolldown/binding-win32-arm64-msvc@npm:1.0.3" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@rolldown/binding-win32-x64-msvc@npm:1.0.2": - version: 1.0.2 - resolution: "@rolldown/binding-win32-x64-msvc@npm:1.0.2" +"@rolldown/binding-win32-x64-msvc@npm:1.0.3": + version: 1.0.3 + resolution: "@rolldown/binding-win32-x64-msvc@npm:1.0.3" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -12517,26 +12524,26 @@ __metadata: languageName: node linkType: hard -"rolldown@npm:1.0.2": - version: 1.0.2 - resolution: "rolldown@npm:1.0.2" +"rolldown@npm:1.0.3": + version: 1.0.3 + resolution: "rolldown@npm:1.0.3" dependencies: - "@oxc-project/types": "npm:=0.132.0" - "@rolldown/binding-android-arm64": "npm:1.0.2" - "@rolldown/binding-darwin-arm64": "npm:1.0.2" - "@rolldown/binding-darwin-x64": "npm:1.0.2" - "@rolldown/binding-freebsd-x64": "npm:1.0.2" - "@rolldown/binding-linux-arm-gnueabihf": "npm:1.0.2" - "@rolldown/binding-linux-arm64-gnu": "npm:1.0.2" - "@rolldown/binding-linux-arm64-musl": "npm:1.0.2" - "@rolldown/binding-linux-ppc64-gnu": "npm:1.0.2" - "@rolldown/binding-linux-s390x-gnu": "npm:1.0.2" - "@rolldown/binding-linux-x64-gnu": "npm:1.0.2" - "@rolldown/binding-linux-x64-musl": "npm:1.0.2" - "@rolldown/binding-openharmony-arm64": "npm:1.0.2" - "@rolldown/binding-wasm32-wasi": "npm:1.0.2" - "@rolldown/binding-win32-arm64-msvc": "npm:1.0.2" - "@rolldown/binding-win32-x64-msvc": "npm:1.0.2" + "@oxc-project/types": "npm:=0.133.0" + "@rolldown/binding-android-arm64": "npm:1.0.3" + "@rolldown/binding-darwin-arm64": "npm:1.0.3" + "@rolldown/binding-darwin-x64": "npm:1.0.3" + "@rolldown/binding-freebsd-x64": "npm:1.0.3" + "@rolldown/binding-linux-arm-gnueabihf": "npm:1.0.3" + "@rolldown/binding-linux-arm64-gnu": "npm:1.0.3" + "@rolldown/binding-linux-arm64-musl": "npm:1.0.3" + "@rolldown/binding-linux-ppc64-gnu": "npm:1.0.3" + "@rolldown/binding-linux-s390x-gnu": "npm:1.0.3" + "@rolldown/binding-linux-x64-gnu": "npm:1.0.3" + "@rolldown/binding-linux-x64-musl": "npm:1.0.3" + "@rolldown/binding-openharmony-arm64": "npm:1.0.3" + "@rolldown/binding-wasm32-wasi": "npm:1.0.3" + "@rolldown/binding-win32-arm64-msvc": "npm:1.0.3" + "@rolldown/binding-win32-x64-msvc": "npm:1.0.3" "@rolldown/pluginutils": "npm:^1.0.0" dependenciesMeta: "@rolldown/binding-android-arm64": @@ -12571,7 +12578,7 @@ __metadata: optional: true bin: rolldown: ./bin/cli.mjs - checksum: 10c0/628327a6e3122c0b62880f1c87d54095394e5138a6af2e6e7b2f67ef4c4b11f1421db68c9a5bb4e1be161465a863ab4f68f15076ce895cd4bb3d0ba18a3b20b1 + checksum: 10c0/5f9dd47b7abf203b16bc600db68542f245e974c800e59ff50b76157d1dada1403657690435b036fabca88e93d13a67c31abe5cfaa6f61ce33717f61720204cdf languageName: node linkType: hard @@ -13795,13 +13802,13 @@ __metadata: languageName: node linkType: hard -"tinyglobby@npm:^0.2.12, tinyglobby@npm:^0.2.14, tinyglobby@npm:^0.2.15, tinyglobby@npm:^0.2.16": - version: 0.2.16 - resolution: "tinyglobby@npm:0.2.16" +"tinyglobby@npm:^0.2.12, tinyglobby@npm:^0.2.14, tinyglobby@npm:^0.2.15, tinyglobby@npm:^0.2.17": + version: 0.2.17 + resolution: "tinyglobby@npm:0.2.17" dependencies: fdir: "npm:^6.5.0" picomatch: "npm:^4.0.4" - checksum: 10c0/f2e09fd93dd95c41e522113b686ff6f7c13020962f8698a864a257f3d7737599afc47722b7ab726e12f8a813f779906187911ff8ee6701ede65072671a7e934b + checksum: 10c0/7f7bb0f197c88bc4b20c231e0deca4240ca3bf313a88f5a7fee93a872b84966a4d50220947c0455ad07a60b3b360961c5b7fd979222aeb716a9f99b412002e4c languageName: node linkType: hard @@ -14532,15 +14539,15 @@ __metadata: linkType: hard "vite@npm:^6.0.0 || ^7.0.0 || ^8.0.0, vite@npm:^8.0.0": - version: 8.0.14 - resolution: "vite@npm:8.0.14" + version: 8.0.16 + resolution: "vite@npm:8.0.16" dependencies: fsevents: "npm:~2.3.3" lightningcss: "npm:^1.32.0" picomatch: "npm:^4.0.4" postcss: "npm:^8.5.15" - rolldown: "npm:1.0.2" - tinyglobby: "npm:^0.2.16" + rolldown: "npm:1.0.3" + tinyglobby: "npm:^0.2.17" peerDependencies: "@types/node": ^20.19.0 || >=22.12.0 "@vitejs/devtools": ^0.1.18 @@ -14584,7 +14591,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 10c0/1ff99b4daadc64aed5f9e40387ecf39fd3bca45c1a5c4fa4aa82197de901930f0507af8d75c54715e2744c99575913947efb625653a78ef6df3997c5613970bd + checksum: 10c0/d75be3fbe2f63e6a8145325970338afaf0dd4d96ba9175c13f9a286fd5f95afc489401b693e4fa6c0899a4dd0e137be91cdf9401a40a635563911ad5036e3467 languageName: node linkType: hard From ecc823fc2e71b7baf8d7f2a5fce254284f581b59 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2026 11:45:58 +0200 Subject: [PATCH 08/34] Update yarn monorepo to v4.16.0 (#39247) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- streaming/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index af9928e6c4..98c0ffbd3b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@mastodon/mastodon", "license": "AGPL-3.0-or-later", - "packageManager": "yarn@4.15.0", + "packageManager": "yarn@4.16.0", "engines": { "node": ">=22" }, diff --git a/streaming/package.json b/streaming/package.json index 0581cd75ad..bd23541208 100644 --- a/streaming/package.json +++ b/streaming/package.json @@ -1,7 +1,7 @@ { "name": "@mastodon/streaming", "license": "AGPL-3.0-or-later", - "packageManager": "yarn@4.15.0", + "packageManager": "yarn@4.16.0", "engines": { "node": ">=22" }, From e00d16474e51111f0a89c81ae976d08a2082d6ec Mon Sep 17 00:00:00 2001 From: diondiondion Date: Thu, 4 Jun 2026 14:08:26 +0200 Subject: [PATCH 09/34] Prevent logged out users from accessing collection & list creation routes (#39282) --- .../features/account_featured/index.tsx | 2 +- .../features/collection_adder/index.tsx | 2 +- .../features/collections/editor/index.tsx | 19 +++--- .../mastodon/features/collections/index.tsx | 6 +- ...ated_by_you.tsx => created_by_account.tsx} | 59 ++++++++++++------- .../collections/overview/featuring_you.tsx | 2 +- .../mastodon/features/lists/index.tsx | 37 ++++++++---- .../mastodon/features/lists/new.tsx | 15 ++++- app/javascript/mastodon/locales/en.json | 1 + 9 files changed, 93 insertions(+), 50 deletions(-) rename app/javascript/mastodon/features/collections/overview/{created_by_you.tsx => created_by_account.tsx} (71%) diff --git a/app/javascript/mastodon/features/account_featured/index.tsx b/app/javascript/mastodon/features/account_featured/index.tsx index b743a7302e..cddfb96c22 100644 --- a/app/javascript/mastodon/features/account_featured/index.tsx +++ b/app/javascript/mastodon/features/account_featured/index.tsx @@ -29,7 +29,7 @@ import { useAppDispatch, useAppSelector } from '@/mastodon/store'; import AddIcon from '@/material-icons/400-24px/add.svg?react'; import { CollectionListItem } from '../collections/components/collection_list_item'; -import { useCollectionsCreatedBy } from '../collections/overview/created_by_you'; +import { useCollectionsCreatedBy } from '../collections/overview/created_by_account'; import { EmptyMessage } from './components/empty_message'; import { Subheading, SubheadingLink } from './components/subheading'; diff --git a/app/javascript/mastodon/features/collection_adder/index.tsx b/app/javascript/mastodon/features/collection_adder/index.tsx index 48a0e68f48..75aae8f3f8 100644 --- a/app/javascript/mastodon/features/collection_adder/index.tsx +++ b/app/javascript/mastodon/features/collection_adder/index.tsx @@ -15,7 +15,7 @@ import { IconButton } from 'mastodon/components/icon_button'; import { useAppDispatch, useAppSelector } from 'mastodon/store'; import { MAX_COLLECTION_ACCOUNT_COUNT } from '../collections/editor/accounts'; -import { useCollectionsCreatedBy } from '../collections/overview/created_by_you'; +import { useCollectionsCreatedBy } from '../collections/overview/created_by_account'; import { CollectionToggle } from './collection_toggle'; diff --git a/app/javascript/mastodon/features/collections/editor/index.tsx b/app/javascript/mastodon/features/collections/editor/index.tsx index 935e230e4a..06109916a3 100644 --- a/app/javascript/mastodon/features/collections/editor/index.tsx +++ b/app/javascript/mastodon/features/collections/editor/index.tsx @@ -13,20 +13,21 @@ import { import { Helmet } from '@unhead/react/helmet'; -import { Callout } from '@/mastodon/components/callout'; -import { useCurrentAccountId } from '@/mastodon/hooks/useAccountId'; -import { initialState } from '@/mastodon/initial_state'; import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react'; +import { Callout } from 'mastodon/components/callout'; import { Column } from 'mastodon/components/column'; import { ColumnHeader } from 'mastodon/components/column_header'; import { LoadingIndicator } from 'mastodon/components/loading_indicator'; +import { NotSignedInIndicator } from 'mastodon/components/not_signed_in_indicator'; +import { useIdentity } from 'mastodon/identity_context'; +import { initialState } from 'mastodon/initial_state'; import { collectionEditorActions, fetchCollection, } from 'mastodon/reducers/slices/collections'; import { useAppDispatch, useAppSelector } from 'mastodon/store'; -import { useCollectionsCreatedBy } from '../overview/created_by_you'; +import { useCollectionsCreatedBy } from '../overview/created_by_account'; import { CollectionAccounts } from './accounts'; import { CollectionDetails } from './details'; @@ -75,7 +76,7 @@ export const CollectionEditorPage: React.FC<{ }> = ({ multiColumn }) => { const intl = useIntl(); const dispatch = useAppDispatch(); - const accountId = useCurrentAccountId(); + const { accountId, signedIn } = useIdentity(); const { id = null } = useParams<{ id?: string }>(); const { path } = useRouteMatch(); const collection = useAppSelector((state) => @@ -94,13 +95,13 @@ export const CollectionEditorPage: React.FC<{ (!isEditMode && collectionListStatus === 'loading'); const canCreateMoreCollections = - isEditMode || collectionList.length < userCollectionLimit; + signedIn && (isEditMode || collectionList.length < userCollectionLimit); useEffect(() => { - if (id) { + if (id && signedIn) { void dispatch(fetchCollection({ collectionId: id })); } - }, [dispatch, id]); + }, [dispatch, id, signedIn]); useEffect(() => { if (id !== editorStateId) { @@ -129,6 +130,8 @@ export const CollectionEditorPage: React.FC<{
{isLoading ? ( + ) : !signedIn ? ( + ) : canCreateMoreCollections ? ( - + { +export const CollectionsCreatedByAccount: React.FC = () => { const me = useCurrentAccountId(); const accountId = useAccountId(); + const account = useAccount(accountId); const { collections, status } = useCollectionsCreatedBy(accountId); @@ -78,24 +81,40 @@ export const CollectionsCreatedByYou: React.FC = () => { } if (collections.length === 0) { - return ( - - } - message={ - - } - > - - - ); + if (isOwnCollectionPage) { + return ( + + } + message={ + + } + > + + + ); + } else { + return ( + , + }} + /> + } + /> + ); + } } return ( @@ -113,7 +132,7 @@ export const CollectionsCreatedByYou: React.FC = () => { {showCreateButton && }
- {!canCreateMoreCollections && ( + {isOwnCollectionPage && !canCreateMoreCollections && ( )} {collections.map((item, index) => ( diff --git a/app/javascript/mastodon/features/collections/overview/featuring_you.tsx b/app/javascript/mastodon/features/collections/overview/featuring_you.tsx index 4d6cd30b9f..2f5c7628d2 100644 --- a/app/javascript/mastodon/features/collections/overview/featuring_you.tsx +++ b/app/javascript/mastodon/features/collections/overview/featuring_you.tsx @@ -16,7 +16,7 @@ import { useAppSelector, useAppDispatch } from 'mastodon/store'; import { CollectionListItem } from '../components/collection_list_item'; import classes from '../styles.module.scss'; -import { CollectionListError } from './created_by_you'; +import { CollectionListError } from './created_by_account'; function useCollectionsFeaturing(accountId: string | null | undefined) { const dispatch = useAppDispatch(); diff --git a/app/javascript/mastodon/features/lists/index.tsx b/app/javascript/mastodon/features/lists/index.tsx index 6aa27d5c57..12b96ea336 100644 --- a/app/javascript/mastodon/features/lists/index.tsx +++ b/app/javascript/mastodon/features/lists/index.tsx @@ -6,6 +6,8 @@ import { Link } from 'react-router-dom'; import { Helmet } from '@unhead/react/helmet'; +import { NotSignedInIndicator } from '@/mastodon/components/not_signed_in_indicator'; +import { useIdentity } from '@/mastodon/identity_context'; import AddIcon from '@/material-icons/400-24px/add.svg?react'; import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react'; import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react'; @@ -78,10 +80,13 @@ const Lists: React.FC<{ const dispatch = useAppDispatch(); const intl = useIntl(); const lists = useAppSelector((state) => getOrderedLists(state)); + const { signedIn } = useIdentity(); useEffect(() => { - void dispatch(fetchLists()); - }, [dispatch]); + if (signedIn) { + void dispatch(fetchLists()); + } + }, [signedIn, dispatch]); const emptyMessage = ( <> @@ -112,14 +117,16 @@ const Lists: React.FC<{ iconComponent={ListAltIcon} multiColumn={multiColumn} extraButton={ - - - + signedIn && ( + + + + ) } /> @@ -128,9 +135,13 @@ const Lists: React.FC<{ emptyMessage={emptyMessage} bindToDocument={!multiColumn} > - {lists.map((list) => ( - - ))} + {signedIn ? ( + lists.map((list) => ( + + )) + ) : ( + + )} diff --git a/app/javascript/mastodon/features/lists/new.tsx b/app/javascript/mastodon/features/lists/new.tsx index e8f6343278..c95eb333f1 100644 --- a/app/javascript/mastodon/features/lists/new.tsx +++ b/app/javascript/mastodon/features/lists/new.tsx @@ -8,6 +8,8 @@ import { isFulfilled } from '@reduxjs/toolkit'; import { Helmet } from '@unhead/react/helmet'; +import { NotSignedInIndicator } from '@/mastodon/components/not_signed_in_indicator'; +import { useIdentity } from '@/mastodon/identity_context'; import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react'; import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react'; import { fetchList } from 'mastodon/actions/lists'; @@ -250,16 +252,17 @@ const NewListWrapper: React.FC<{ }> = ({ multiColumn }) => { const intl = useIntl(); const dispatch = useAppDispatch(); + const { signedIn } = useIdentity(); const { id } = useParams<{ id?: string }>(); const list = useAppSelector((state) => id ? state.lists.get(id) : undefined, ); useEffect(() => { - if (id) { + if (signedIn && id) { dispatch(fetchList(id)); } - }, [dispatch, id]); + }, [dispatch, signedIn, id]); const isLoading = id && !list; @@ -277,7 +280,13 @@ const NewListWrapper: React.FC<{ />
- {isLoading ? : } + {!signedIn ? ( + + ) : isLoading ? ( + + ) : ( + + )}
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 44e2c9aa17..d051fecf8a 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -646,6 +646,7 @@ "empty_column.account_unavailable": "Profile unavailable", "empty_column.blocks": "You haven't blocked any users yet.", "empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.", + "empty_column.collections": "{acct} has not created any collections yet.", "empty_column.collections.featured_in": "You have not been added to any collections yet.", "empty_column.collections.featured_in_undiscoverable": "In order for people to add you to collections, you need to allow featuring in discovery experiences from Preferences > Privacy and reach", "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!", From a19dd606e89dcd760f5e23ade29dd555269f5f44 Mon Sep 17 00:00:00 2001 From: Claire Date: Thu, 4 Jun 2026 15:10:06 +0200 Subject: [PATCH 10/34] Fix link to profile API documentation in CHANGELOG (#39276) --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a024029283..4fd104d6d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ All notable changes to this project will be documented in this file. - Add export for custom filters (#39085 by @arte7) - Add ability to search email blocks by domain in admin UI (#38923 by @arte7) - Add new endpoints for profile editing in REST API (#37912, #37934, #37932, #38221, and #38339 by @ClearlyClaire) - - Add `GET /api/v1/profile` and `PATCH /api/v1/profile` to replace the existing `update_credentials` endpoint. See [the documentation](https://www.notion.so/joinmastodon/Mastodon-v4-6-0-beta1-changelog-3656208ac91b8088a745d15a9e81f727) for more information. + - Add `GET /api/v1/profile` and `PATCH /api/v1/profile` to replace the existing `update_credentials` endpoint. See [the documentation](https://docs.joinmastodon.org/methods/profile/) for more information. - Add `missing_attribution` boolean to preview cards in REST API (#38043 by @ClearlyClaire) - Documentation: https://docs.joinmastodon.org/entities/PreviewCard/#missing_attribution - Add `exclude_direct` flag to `/api/v1/accounts/:id/statuses` to exclude direct messages (#37763 by @ClearlyClaire) From 2b6b2fcb6ff7f0c066260c0aa3f14f34e4bc3588 Mon Sep 17 00:00:00 2001 From: diondiondion Date: Thu, 4 Jun 2026 15:18:53 +0200 Subject: [PATCH 11/34] Fix ValidationError when loading many collections at once (#39286) --- .../mastodon/reducers/slices/collections.ts | 13 +++++++++---- app/javascript/mastodon/utils/batch_array.ts | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 app/javascript/mastodon/utils/batch_array.ts diff --git a/app/javascript/mastodon/reducers/slices/collections.ts b/app/javascript/mastodon/reducers/slices/collections.ts index ec2143351a..56cf907f78 100644 --- a/app/javascript/mastodon/reducers/slices/collections.ts +++ b/app/javascript/mastodon/reducers/slices/collections.ts @@ -27,6 +27,7 @@ import { createAppSelector, createDataLoadingThunk, } from '@/mastodon/store/typed_functions'; +import { batchArray } from '@/mastodon/utils/batch_array'; import { inputToHashtag } from '@/mastodon/utils/hashtags'; type QueryStatus = 'idle' | 'loading' | 'error'; @@ -337,10 +338,14 @@ async function importAccountsForPreviewCard( ) .filter((id): id is string => !!id); - await dispatch( - fetchAccounts({ - accountIds: previewAccountIds, - }), + // fetchAccounts can only process up to 40 item ids, so we'll + // batch the list of ids + const batchedAccountIdLists = batchArray(previewAccountIds, 40); + + await Promise.allSettled( + batchedAccountIdLists.map((accountIds) => + dispatch(fetchAccounts({ accountIds })), + ), ); } diff --git a/app/javascript/mastodon/utils/batch_array.ts b/app/javascript/mastodon/utils/batch_array.ts new file mode 100644 index 0000000000..9e54895d33 --- /dev/null +++ b/app/javascript/mastodon/utils/batch_array.ts @@ -0,0 +1,15 @@ +/** + * Splits a long array so that the resulting nested arrays + * never exceed the `maxLength` provided. + * Useful when dealing with endpoints that accept a limited number + * of parameters + */ +export function batchArray(array: T[], maxLength: number) { + const result: T[][] = []; + + for (let i = 0; i < array.length; i += maxLength) { + result.push(array.slice(i, i + maxLength)); + } + + return result; +} From 085c91bf126a1df95e19198d62b315482ab3ecca Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Thu, 4 Jun 2026 09:55:21 -0400 Subject: [PATCH 12/34] Reduce timeout minutes for actions (#39205) --- .github/workflows/bundler-audit.yml | 1 + .github/workflows/check-i18n.yml | 1 + .github/workflows/chromatic.yml | 2 ++ .github/workflows/codeql.yml | 1 + .github/workflows/format-check.yml | 1 + .github/workflows/lint-css.yml | 1 + .github/workflows/lint-haml.yml | 1 + .github/workflows/lint-js.yml | 1 + .github/workflows/lint-ruby.yml | 1 + .github/workflows/test-js.yml | 1 + .github/workflows/test-migrations.yml | 1 + .github/workflows/test-ruby.yml | 4 ++++ 12 files changed, 16 insertions(+) diff --git a/.github/workflows/bundler-audit.yml b/.github/workflows/bundler-audit.yml index b58fe60056..dc79d87264 100644 --- a/.github/workflows/bundler-audit.yml +++ b/.github/workflows/bundler-audit.yml @@ -22,6 +22,7 @@ on: jobs: security: runs-on: ubuntu-latest + timeout-minutes: 15 env: BUNDLE_ONLY: development diff --git a/.github/workflows/check-i18n.yml b/.github/workflows/check-i18n.yml index 4906ab6cf4..3a0c5dc36a 100644 --- a/.github/workflows/check-i18n.yml +++ b/.github/workflows/check-i18n.yml @@ -19,6 +19,7 @@ permissions: jobs: check-i18n: runs-on: ubuntu-latest + timeout-minutes: 15 steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index 9ead1916dd..05f88df81c 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -12,6 +12,7 @@ jobs: pathcheck: name: Check for relevant changes runs-on: ubuntu-latest + timeout-minutes: 15 outputs: changed: ${{ steps.filter.outputs.src }} steps: @@ -38,6 +39,7 @@ jobs: chromatic: name: Run Chromatic runs-on: ubuntu-latest + timeout-minutes: 15 needs: pathcheck if: github.repository == 'mastodon/mastodon' && needs.pathcheck.outputs.changed == 'true' steps: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index afb7066956..bc796d828c 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -17,6 +17,7 @@ jobs: analyze: name: Analyze runs-on: ubuntu-latest + timeout-minutes: 15 permissions: actions: read contents: read diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml index 9a200504ef..cca26ed5b0 100644 --- a/.github/workflows/format-check.yml +++ b/.github/workflows/format-check.yml @@ -10,6 +10,7 @@ on: jobs: lint: runs-on: ubuntu-latest + timeout-minutes: 15 steps: - name: Clone repository diff --git a/.github/workflows/lint-css.yml b/.github/workflows/lint-css.yml index d0c9802367..59c69f836c 100644 --- a/.github/workflows/lint-css.yml +++ b/.github/workflows/lint-css.yml @@ -27,6 +27,7 @@ on: jobs: lint: runs-on: ubuntu-latest + timeout-minutes: 15 steps: - name: Clone repository diff --git a/.github/workflows/lint-haml.yml b/.github/workflows/lint-haml.yml index ff18689c05..9534eb2254 100644 --- a/.github/workflows/lint-haml.yml +++ b/.github/workflows/lint-haml.yml @@ -25,6 +25,7 @@ on: jobs: lint: runs-on: ubuntu-latest + timeout-minutes: 15 env: BUNDLE_ONLY: development diff --git a/.github/workflows/lint-js.yml b/.github/workflows/lint-js.yml index f16e01d4d2..4fa0828368 100644 --- a/.github/workflows/lint-js.yml +++ b/.github/workflows/lint-js.yml @@ -33,6 +33,7 @@ on: jobs: lint: runs-on: ubuntu-latest + timeout-minutes: 15 steps: - name: Clone repository diff --git a/.github/workflows/lint-ruby.yml b/.github/workflows/lint-ruby.yml index 8095c40724..ffecf17a76 100644 --- a/.github/workflows/lint-ruby.yml +++ b/.github/workflows/lint-ruby.yml @@ -27,6 +27,7 @@ on: jobs: lint: runs-on: ubuntu-latest + timeout-minutes: 15 env: BUNDLE_ONLY: development diff --git a/.github/workflows/test-js.yml b/.github/workflows/test-js.yml index d1b55a5e0b..f9ba34e32b 100644 --- a/.github/workflows/test-js.yml +++ b/.github/workflows/test-js.yml @@ -31,6 +31,7 @@ on: jobs: test: runs-on: ubuntu-latest + timeout-minutes: 15 steps: - name: Clone repository diff --git a/.github/workflows/test-migrations.yml b/.github/workflows/test-migrations.yml index f33bf981cc..52fefbe053 100644 --- a/.github/workflows/test-migrations.yml +++ b/.github/workflows/test-migrations.yml @@ -25,6 +25,7 @@ on: jobs: test: runs-on: ubuntu-latest + timeout-minutes: 15 strategy: fail-fast: false diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml index ac95c708dd..e4c6c1aa91 100644 --- a/.github/workflows/test-ruby.yml +++ b/.github/workflows/test-ruby.yml @@ -19,6 +19,7 @@ concurrency: jobs: build: runs-on: ubuntu-latest + timeout-minutes: 15 strategy: fail-fast: true @@ -75,6 +76,7 @@ jobs: test: runs-on: ubuntu-latest + timeout-minutes: 30 needs: - build @@ -176,6 +178,7 @@ jobs: test-e2e: name: End to End testing runs-on: ubuntu-latest + timeout-minutes: 15 needs: - build @@ -279,6 +282,7 @@ jobs: test-search: name: Elastic Search integration testing runs-on: ubuntu-latest + timeout-minutes: 15 needs: - build From fe4613ba325f0dd07176b6a7519a4e36d0f59a54 Mon Sep 17 00:00:00 2001 From: diondiondion Date: Thu, 4 Jun 2026 16:28:51 +0200 Subject: [PATCH 13/34] Display collection in search results when searched by URL (#39289) --- app/javascript/mastodon/actions/search.ts | 19 +++++++++-- .../mastodon/features/search/index.tsx | 32 ++++++++++++++++++- app/javascript/mastodon/locales/en.json | 1 + app/javascript/mastodon/models/search.ts | 7 ++-- app/javascript/mastodon/reducers/search.ts | 3 ++ .../mastodon/reducers/slices/collections.ts | 13 +++++++- 6 files changed, 69 insertions(+), 6 deletions(-) diff --git a/app/javascript/mastodon/actions/search.ts b/app/javascript/mastodon/actions/search.ts index 4f21a53b4d..4b97682a74 100644 --- a/app/javascript/mastodon/actions/search.ts +++ b/app/javascript/mastodon/actions/search.ts @@ -12,6 +12,11 @@ import { createAppAsyncThunk, } from 'mastodon/store/typed_functions'; +import { + importAccountsForPreviewCard, + importFetchedCollections, +} from '../reducers/slices/collections'; + import { fetchRelationships } from './accounts'; import { importFetchedAccounts, importFetchedStatuses } from './importer'; @@ -29,7 +34,7 @@ export const submitSearch = createDataLoadingThunk( limit: 11, }); }, - (data, { dispatch }) => { + async (data, { dispatch }) => { if (data.accounts.length > 0) { dispatch(importFetchedAccounts(data.accounts)); dispatch(fetchRelationships(data.accounts.map((account) => account.id))); @@ -39,6 +44,11 @@ export const submitSearch = createDataLoadingThunk( dispatch(importFetchedStatuses(data.statuses)); } + if (data.collections.length > 0) { + dispatch(importFetchedCollections(data.collections)); + await importAccountsForPreviewCard(data.collections, dispatch); + } + return data; }, { @@ -60,7 +70,7 @@ export const expandSearch = createDataLoadingThunk( offset, }); }, - (data, { dispatch }) => { + async (data, { dispatch }) => { if (data.accounts.length > 0) { dispatch(importFetchedAccounts(data.accounts)); dispatch(fetchRelationships(data.accounts.map((account) => account.id))); @@ -70,6 +80,11 @@ export const expandSearch = createDataLoadingThunk( dispatch(importFetchedStatuses(data.statuses)); } + if (data.collections.length > 0) { + dispatch(importFetchedCollections(data.collections)); + await importAccountsForPreviewCard(data.collections, dispatch); + } + return data; }, { diff --git a/app/javascript/mastodon/features/search/index.tsx b/app/javascript/mastodon/features/search/index.tsx index 724d9c16d6..8ff5c9016a 100644 --- a/app/javascript/mastodon/features/search/index.tsx +++ b/app/javascript/mastodon/features/search/index.tsx @@ -4,6 +4,7 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl'; import { Helmet } from '@unhead/react/helmet'; +import CollectionsIcon from '@/material-icons/400-24px/category.svg?react'; import FindInPageIcon from '@/material-icons/400-24px/find_in_page.svg?react'; import PeopleIcon from '@/material-icons/400-24px/group.svg?react'; import SearchIcon from '@/material-icons/400-24px/search.svg?react'; @@ -23,6 +24,8 @@ import { useSearchParam } from 'mastodon/hooks/useSearchParam'; import type { Hashtag as HashtagType } from 'mastodon/models/tags'; import { useAppDispatch, useAppSelector } from 'mastodon/store'; +import { CollectionListItem } from '../collections/components/collection_list_item'; + import { SearchSection } from './components/search_section'; const messages = defineMessages({ @@ -131,7 +134,8 @@ export const SearchResults: React.FC<{ multiColumn: boolean }> = ({ filteredResults = results.accounts.length + results.hashtags.length + - results.statuses.length > + results.statuses.length + + results.collections.length > 0 ? ( <> {results.accounts.length > 0 && ( @@ -154,6 +158,32 @@ export const SearchResults: React.FC<{ multiColumn: boolean }> = ({ )} + {results.collections.length > 0 && ( + + + + + } + > + {results.collections + .slice(0, INITIAL_DISPLAY) + .map((collection, index, array) => ( + + ))} + + )} + {results.hashtags.length > 0 && ( ({ accounts: serverJSON.accounts.map((account) => account.id), statuses: serverJSON.statuses.map((status) => status.id), hashtags: serverJSON.hashtags, + collections: serverJSON.collections, }); diff --git a/app/javascript/mastodon/reducers/search.ts b/app/javascript/mastodon/reducers/search.ts index c822990244..7b9e1f6fcf 100644 --- a/app/javascript/mastodon/reducers/search.ts +++ b/app/javascript/mastodon/reducers/search.ts @@ -49,6 +49,9 @@ export const searchReducer = createReducer(initialState, (builder) => { hashtags: state.results ? [...state.results.hashtags, ...results.hashtags] : results.hashtags, + collections: state.results + ? [...state.results.collections, ...results.collections] + : results.collections, }; state.loading = false; }); diff --git a/app/javascript/mastodon/reducers/slices/collections.ts b/app/javascript/mastodon/reducers/slices/collections.ts index 56cf907f78..41bda5aa95 100644 --- a/app/javascript/mastodon/reducers/slices/collections.ts +++ b/app/javascript/mastodon/reducers/slices/collections.ts @@ -121,6 +121,15 @@ const collectionSlice = createSlice({ const { field, value } = action.payload; state.editor[field] = value; }, + importFetchedCollections( + state, + action: PayloadAction, + ) { + const collections = action.payload; + collections.forEach((collection) => { + state.collections[collection.id] = collection; + }); + }, }, extraReducers(builder) { /** @@ -328,7 +337,7 @@ const collectionSlice = createSlice({ /** * Prefetch accounts whose avatars will be displayed in the collection list */ -async function importAccountsForPreviewCard( +export async function importAccountsForPreviewCard( collections: ApiCollectionJSON[], dispatch: AppDispatch, ) { @@ -419,6 +428,8 @@ export const collections = collectionSlice.reducer; export const collectionEditorActions = collectionSlice.actions; export const updateCollectionEditorField = collectionSlice.actions.updateEditorField; +export const importFetchedCollections = + collectionSlice.actions.importFetchedCollections; /** * Selectors From 3ccda276ac64353c741833e564012da2b548b573 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Thu, 4 Jun 2026 10:44:06 -0400 Subject: [PATCH 14/34] Update openid_connect to version 2.5.0 (#39288) --- Gemfile.lock | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4630d77e23..4a05001044 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -224,8 +224,6 @@ GEM elasticsearch-api (8.19.3) multi_json elasticsearch-dsl (0.1.10) - email_validator (2.2.4) - activemodel erb (6.0.4) erubi (1.13.1) et-orbi (1.4.0) @@ -491,10 +489,9 @@ GEM omniauth_openid_connect (0.8.0) omniauth (>= 1.9, < 3) openid_connect (~> 2.2) - openid_connect (2.3.1) + openid_connect (2.5.0) activemodel attr_required (>= 1.0.0) - email_validator faraday (~> 2.0) faraday-follow_redirects json-jwt (>= 1.16) From ada6e1339d0de19682ac25559c0eeab1754df6fd Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Thu, 4 Jun 2026 10:45:14 -0400 Subject: [PATCH 15/34] Exercise more of `disputes/strikes/_card` partial (#39265) --- spec/system/disputes/strikes_spec.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/spec/system/disputes/strikes_spec.rb b/spec/system/disputes/strikes_spec.rb index 5d026a6164..6118d98379 100644 --- a/spec/system/disputes/strikes_spec.rb +++ b/spec/system/disputes/strikes_spec.rb @@ -6,8 +6,11 @@ RSpec.describe 'Disputes Strikes' do before { sign_in(current_user) } describe 'viewing strike disputes' do + let!(:strike) { Fabricate(:account_warning, target_account: current_user.account, report:, status_ids: [status.id]) } let(:current_user) { Fabricate(:user) } - let!(:strike) { Fabricate(:account_warning, target_account: current_user.account) } + let(:report) { Fabricate :report, category: :violation, rule_ids: rules.map(&:id), target_account: current_user.account } + let(:rules) { Fabricate.times 2, :rule } + let(:status) { Fabricate :status, account: current_user.account, text: 'Offensive text' } it 'shows a list of strikes and details for each' do visit disputes_strikes_path @@ -18,6 +21,8 @@ RSpec.describe 'Disputes Strikes' do expect(page) .to have_title(strike_page_title) .and have_text(strike.text) + .and have_text(rules.last.text) + .and have_text(status.text) end def strike_page_title From daae64afabdcbd638381f65cdd0f0ff5b135dd86 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2026 17:27:32 +0200 Subject: [PATCH 16/34] Update dependency chewy to v8.3.0 (#39201) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4a05001044..7e42276621 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -159,7 +159,7 @@ GEM cbor (0.5.10.2) cgi (0.5.1) charlock_holmes (0.7.9) - chewy (8.0.1) + chewy (8.3.0) activesupport (>= 7.2) elasticsearch (>= 8.14, < 9.0) elasticsearch-dsl @@ -214,7 +214,7 @@ GEM dotenv (3.2.0) drb (2.2.3) dry-cli (1.4.1) - elastic-transport (8.5.1) + elastic-transport (8.5.2) faraday (< 3) multi_json elasticsearch (8.19.3) @@ -241,7 +241,7 @@ GEM faraday (>= 1, < 3) faraday-httpclient (2.0.2) httpclient (>= 2.2) - faraday-net_http (3.4.3) + faraday-net_http (3.4.4) net-http (~> 0.5) fast_blank (1.0.1) fastimage (2.4.1) @@ -352,7 +352,7 @@ GEM azure-blob (~> 0.5.2) hashie (~> 5.0) jmespath (1.6.2) - json (2.19.7) + json (2.19.8) json-canonicalization (1.0.0) json-jwt (1.17.0) activesupport (>= 4.2) @@ -451,7 +451,7 @@ GEM drb (~> 2.0) prism (~> 1.5) msgpack (1.8.0) - multi_json (1.20.1) + multi_json (1.21.1) mutex_m (0.3.0) net-http (0.9.1) uri (>= 0.11.1) From 4957a4fb5034e8360441d7d86d5c18de8b2c93ff Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 5 Jun 2026 03:54:34 -0400 Subject: [PATCH 17/34] Exercise ip block comment path in admin area (#39292) --- spec/system/admin/ip_blocks_spec.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spec/system/admin/ip_blocks_spec.rb b/spec/system/admin/ip_blocks_spec.rb index 3f99ec0050..34dfff7c52 100644 --- a/spec/system/admin/ip_blocks_spec.rb +++ b/spec/system/admin/ip_blocks_spec.rb @@ -26,10 +26,12 @@ RSpec.describe 'Admin::IpBlocks' do # Valid with IP fill_in 'ip_block_ip', with: '192.168.1.1' + fill_in 'ip_block_comment', with: 'Block explanation' expect { submit_form } .to change(IpBlock, :count).by(1) expect(page) .to have_text(I18n.t('admin.ip_blocks.created_msg')) + .and have_text('Block explanation') end def submit_form From 62bcdc41fc113af0111307b0a232789748c839fa Mon Sep 17 00:00:00 2001 From: Claire Date: Fri, 5 Jun 2026 09:54:55 +0200 Subject: [PATCH 18/34] Allow `authorized_interactions` endpoint to handle Collections (#39287) --- app/controllers/authorize_interactions_controller.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/authorize_interactions_controller.rb b/app/controllers/authorize_interactions_controller.rb index 03cad3e317..a1adf0e493 100644 --- a/app/controllers/authorize_interactions_controller.rb +++ b/app/controllers/authorize_interactions_controller.rb @@ -7,10 +7,13 @@ class AuthorizeInteractionsController < ApplicationController before_action :set_resource def show - if @resource.is_a?(Account) + case @resource + when Account redirect_to web_url("@#{@resource.pretty_acct}") - elsif @resource.is_a?(Status) + when Status redirect_to web_url("@#{@resource.account.pretty_acct}/#{@resource.id}") + when Collection + redirect_to web_url("collections/#{resource.id}") else not_found end From 8c80fc612a7a9c2385fae4a83f1085f713e003a8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 Jun 2026 10:29:12 +0200 Subject: [PATCH 19/34] New Crowdin Translations (automated) (#39295) Co-authored-by: GitHub Actions --- app/javascript/mastodon/locales/af.json | 1 - app/javascript/mastodon/locales/an.json | 1 - app/javascript/mastodon/locales/ar.json | 1 - app/javascript/mastodon/locales/ast.json | 1 - app/javascript/mastodon/locales/az.json | 43 ++++++- app/javascript/mastodon/locales/be.json | 10 +- app/javascript/mastodon/locales/bg.json | 1 - app/javascript/mastodon/locales/bn.json | 1 - app/javascript/mastodon/locales/br.json | 1 - app/javascript/mastodon/locales/ca.json | 1 - app/javascript/mastodon/locales/ckb.json | 1 - app/javascript/mastodon/locales/cs.json | 1 - app/javascript/mastodon/locales/cy.json | 1 - app/javascript/mastodon/locales/da.json | 10 +- app/javascript/mastodon/locales/de.json | 10 +- app/javascript/mastodon/locales/el.json | 10 +- app/javascript/mastodon/locales/en-GB.json | 1 - app/javascript/mastodon/locales/eo.json | 1 - app/javascript/mastodon/locales/es-AR.json | 10 +- app/javascript/mastodon/locales/es-MX.json | 10 +- app/javascript/mastodon/locales/es.json | 10 +- app/javascript/mastodon/locales/et.json | 1 - app/javascript/mastodon/locales/eu.json | 1 - app/javascript/mastodon/locales/fa.json | 1 - app/javascript/mastodon/locales/fi.json | 10 +- app/javascript/mastodon/locales/fil.json | 1 - app/javascript/mastodon/locales/fo.json | 1 - app/javascript/mastodon/locales/fr-CA.json | 20 +++- app/javascript/mastodon/locales/fr.json | 20 +++- app/javascript/mastodon/locales/fy.json | 1 - app/javascript/mastodon/locales/ga.json | 10 +- app/javascript/mastodon/locales/gd.json | 1 - app/javascript/mastodon/locales/gl.json | 10 +- app/javascript/mastodon/locales/he.json | 1 - app/javascript/mastodon/locales/hi.json | 1 - app/javascript/mastodon/locales/hr.json | 1 - app/javascript/mastodon/locales/hu.json | 1 - app/javascript/mastodon/locales/hy.json | 1 - app/javascript/mastodon/locales/ia.json | 1 - app/javascript/mastodon/locales/id.json | 1 - app/javascript/mastodon/locales/ie.json | 1 - app/javascript/mastodon/locales/io.json | 1 - app/javascript/mastodon/locales/is.json | 2 +- app/javascript/mastodon/locales/it.json | 2 +- app/javascript/mastodon/locales/ja.json | 1 - app/javascript/mastodon/locales/kab.json | 1 - app/javascript/mastodon/locales/kk.json | 1 - app/javascript/mastodon/locales/kn.json | 1 - app/javascript/mastodon/locales/ko.json | 1 - app/javascript/mastodon/locales/ku.json | 1 - app/javascript/mastodon/locales/la.json | 1 - app/javascript/mastodon/locales/lad.json | 1 - app/javascript/mastodon/locales/lt.json | 1 - app/javascript/mastodon/locales/lv.json | 1 - app/javascript/mastodon/locales/mk.json | 1 - app/javascript/mastodon/locales/mr.json | 1 - app/javascript/mastodon/locales/ms.json | 1 - app/javascript/mastodon/locales/my.json | 1 - app/javascript/mastodon/locales/nan-TW.json | 1 - app/javascript/mastodon/locales/ne.json | 1 - app/javascript/mastodon/locales/nl.json | 10 +- app/javascript/mastodon/locales/nn.json | 70 +++++++++++- app/javascript/mastodon/locales/no.json | 1 - app/javascript/mastodon/locales/oc.json | 1 - app/javascript/mastodon/locales/pa.json | 1 - app/javascript/mastodon/locales/pl.json | 26 ++++- app/javascript/mastodon/locales/pt-BR.json | 112 ++++++++++--------- app/javascript/mastodon/locales/pt-PT.json | 1 - app/javascript/mastodon/locales/ro.json | 1 - app/javascript/mastodon/locales/ru.json | 1 - app/javascript/mastodon/locales/ry.json | 1 - app/javascript/mastodon/locales/sa.json | 1 - app/javascript/mastodon/locales/sc.json | 1 - app/javascript/mastodon/locales/sco.json | 1 - app/javascript/mastodon/locales/si.json | 1 - app/javascript/mastodon/locales/sk.json | 1 - app/javascript/mastodon/locales/sl.json | 1 - app/javascript/mastodon/locales/sq.json | 10 +- app/javascript/mastodon/locales/sr-Latn.json | 1 - app/javascript/mastodon/locales/sr.json | 1 - app/javascript/mastodon/locales/sv.json | 2 +- app/javascript/mastodon/locales/szl.json | 1 - app/javascript/mastodon/locales/ta.json | 1 - app/javascript/mastodon/locales/tai.json | 1 - app/javascript/mastodon/locales/th.json | 1 - app/javascript/mastodon/locales/tok.json | 1 - app/javascript/mastodon/locales/tr.json | 2 +- app/javascript/mastodon/locales/tt.json | 1 - app/javascript/mastodon/locales/ug.json | 1 - app/javascript/mastodon/locales/uk.json | 1 - app/javascript/mastodon/locales/ur.json | 1 - app/javascript/mastodon/locales/uz.json | 1 - app/javascript/mastodon/locales/vi.json | 13 ++- app/javascript/mastodon/locales/zh-CN.json | 14 ++- app/javascript/mastodon/locales/zh-HK.json | 1 - app/javascript/mastodon/locales/zh-TW.json | 10 +- config/locales/doorkeeper.pl.yml | 2 + config/locales/nn.yml | 77 +++++++++++++ config/locales/pl.yml | 18 ++- config/locales/simple_form.pl.yml | 5 + config/locales/simple_form.zh-CN.yml | 2 +- config/locales/zh-CN.yml | 10 +- config/locales/zh-TW.yml | 6 +- 103 files changed, 475 insertions(+), 172 deletions(-) diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json index ac05096895..a9c7c23377 100644 --- a/app/javascript/mastodon/locales/af.json +++ b/app/javascript/mastodon/locales/af.json @@ -2,7 +2,6 @@ "about.blocks": "Gemodereerde bedieners", "about.contact": "Kontak:", "about.default_locale": "Verstek", - "about.disclaimer": "Mastodon is gratis oopbronsagteware en ’n handelsmerk van Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Rede nie beskikbaar nie", "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.", "about.domain_blocks.silenced.title": "Beperk", diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json index 469403241b..9cb076e2d9 100644 --- a/app/javascript/mastodon/locales/an.json +++ b/app/javascript/mastodon/locales/an.json @@ -1,7 +1,6 @@ { "about.blocks": "Servidors moderaus", "about.contact": "Contacto:", - "about.disclaimer": "Mastodon ye software de codigo ubierto, y una marca comercial de Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Razón no disponible", "about.domain_blocks.preamble": "Mastodon normalment te permite veyer lo conteniu y interactuar con os usuarios de qualsequier atro servidor en o fediverso. Estas son las excepcions que s'han feito en este servidor en particular.", "about.domain_blocks.silenced.explanation": "Normalment no veyerás perfils y conteniu d'este servidor, de no estar que lo busques explicitament u sigas bella cuenta.", diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json index 2148b1053b..839ab07a37 100644 --- a/app/javascript/mastodon/locales/ar.json +++ b/app/javascript/mastodon/locales/ar.json @@ -2,7 +2,6 @@ "about.blocks": "خوادم تحت الإشراف", "about.contact": "للاتصال:", "about.default_locale": "افتراضي", - "about.disclaimer": "ماستدون برنامج حر ومفتوح المصدر وعلامة تجارية لـ Mastodon GmbH.", "about.domain_blocks.no_reason_available": "السبب غير متوفر", "about.domain_blocks.preamble": "يتيح مَستُدون عمومًا لمستخدميه مطالعة المحتوى من المستخدمين من الخواديم الأخرى في الفدرالية والتفاعل معهم. وهذه هي الاستثناءات التي وضعت على هذا الخادوم.", "about.domain_blocks.silenced.explanation": "لن تظهر لك ملفات التعريف الشخصية والمحتوى من هذا الخادوم، إلا إن بحثت عنه عمدًا أو تابعته.", diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json index 8ec910816f..877617ca8a 100644 --- a/app/javascript/mastodon/locales/ast.json +++ b/app/javascript/mastodon/locales/ast.json @@ -1,7 +1,6 @@ { "about.blocks": "Sirvidores moderaos", "about.contact": "Contautu:", - "about.disclaimer": "Mastodon ye software gratuito y de códigu llibre, y una marca rexistrada de Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "El motivu nun ta disponible", "about.domain_blocks.preamble": "Polo xeneral, Mastodon permítete ver el conteníu ya interactuar colos perfiles d'otros sirvidores nel fediversu. Estes son les esceiciones que se ficieron nesti sirvidor.", "about.domain_blocks.silenced.explanation": "Polo xeneral, nun ves los perfiles y el conteníu d'esti sirvidor sacante que los busques o decidas siguilos.", diff --git a/app/javascript/mastodon/locales/az.json b/app/javascript/mastodon/locales/az.json index fb1969bbcd..4be0facc60 100644 --- a/app/javascript/mastodon/locales/az.json +++ b/app/javascript/mastodon/locales/az.json @@ -2,7 +2,7 @@ "about.blocks": "Moderasiya edilmiş serverlər", "about.contact": "Əlaqə:", "about.default_locale": "İlkin", - "about.disclaimer": "Mastodon ödənişsiz, açıq-mənbəli yazılımdır və Mastodon gGmbH-nin əmtəə nişanıdır.", + "about.disclaimer": "Mastodon ödənişsiz, açıq-mənbəli yazılımdır və Mastodon GmbH-nin əmtəə nişanıdır.", "about.domain_blocks.no_reason_available": "Səbəb mövcud deyil", "about.domain_blocks.preamble": "Mastodon, adətən fediverse-dəki hər hansısa bir serverdən məzmuna baxmağınıza və istifadəçilərlə qarşılıqlı əlaqədə olmağınıza imkanı verir. Bunlar, bu serverdə edilmiş istisnalardır.", "about.domain_blocks.silenced.explanation": "Siz bu serverdəki profilləri və məzmunu xüsusi olaraq axtarmasanız və ya izləməsəniz ümumiyyətlə görməyəcəksiniz.", @@ -86,6 +86,7 @@ "account.locked_info": "Bu hesabın məxfilik statusu kilidlənib. Sahibi, onu kimin izləyə biləcəyini manual olaraq incələyir.", "account.media": "Media", "account.mention": "@{name} istifadəçisini teq et", + "account.menu.add_to_collection": "Kolleksiyaya əlavə et…", "account.menu.add_to_list": "Siyahıya əlavə et…", "account.menu.block": "Hesabı əngəllə", "account.menu.block_domain": "{domain} - əngəllə", @@ -102,14 +103,26 @@ "account.menu.share": "Paylaş…", "account.menu.show_reblogs": "Zaman xəttində təkrar paylaşmaları göstər", "account.menu.unblock": "Hesabın əngəlini götür", + "account.menu.unblock_domain": "{domain} - əngəli götür", + "account.menu.unmute": "Hesabın səsini aç", "account.moved_to": "{name} onun yeni hesabının artıq bu olduğunu bildirdi:", "account.mute": "@{name} istifadəçisini susdur", "account.mute_notifications_short": "Bildirişləri səssizləşdir", "account.mute_short": "Səssizləşdir", "account.muted": "Səssizləşdirilib", "account.mutual": "Bir-birinizi izləyirsiniz", + "account.name.help.domain": "{domain}, istifadəçinin profil və göndərişlərinin yerləşdiyi serverdir.", + "account.name.help.domain_self": "{domain}, profil və göndərişlərinizin yerləşdiyi serverdir.", + "account.name.help.footer": "Necə ki, fərqli e-poçt provayderlərini istifadə edən insanlara e-poçt göndərə bilirsiniz, eynilə digər Mastodon serverlərindəki insanlarla və digər Fediverse tətbiqlərindəki hər kəslə qarşılıqlı əlaqə qura bilərsiniz.", + "account.name.help.username": "{username} bu hesabın öz serverindəki istifadəçi adıdır. Başqa bir serverdəki başqa biri də eyni istifadəçi adına sahib ola bilər.", + "account.name.help.username_self": "{username} sizin bu serverdəki istifadəçi adınızdır. Başqa bir serverdəki başqa biri də eyni istifadəçi adına sahib ola bilər.", + "account.name_info": "Bu nə deməkdir?", "account.no_bio": "Təsvir göstərilməyib.", + "account.node_modal.error_unknown": "Not saxlanıla bilmədi", + "account.node_modal.save": "Saxla", + "account.note.edit_button": "Düzəliş", "account.open_original_page": "Orijinal səhifəni aç", + "account.pending": "Gözləmədə", "account.posts": "Paylaşım", "account.remove_from_followers": "{name} - izləyicilərdən çıxart", "account.report": "@{name} istifadəçisini şikayət et", @@ -117,6 +130,8 @@ "account.share": "@{name} profilini paylaş", "account.show_reblogs": "@{name} - təkrar paylaşımlarını göstər", "account.statuses_counter": "{count, plural, one {{counter} paylaşım} other {{counter} paylaşım}}", + "account.timeline.pinned": "Sancıldı", + "account.timeline.pinned.view_all": "Bütün sancılmış göndərişlərə bax", "account.unblock": "@{name} blokunu aç", "account.unblock_domain": "{domain} domeninin blokunu aç", "account.unblock_domain_short": "Əngəldən çıxart", @@ -126,7 +141,33 @@ "account.unmute": "@{name} səssizləşdirmədən çıxart", "account.unmute_notifications_short": "Bildirişlərin səsini aç", "account.unmute_short": "Səssizləşdirmədən çıxart", + "account_edit.advanced_settings.bot_label": "Avtomatlaşdırılmış hesab", "account_edit.advanced_settings.title": "Qabaqcıl ayarlar", + "account_edit.bio.add_label": "Bio əlavə et", + "account_edit.bio.edit_label": "Bioya düzəliş", + "account_edit.bio.placeholder": "Başqalarının sizi tanımasına kömək edəcək qısa bir açıqlama əlavə edin.", + "account_edit.bio.title": "Bio", + "account_edit.bio_modal.add_title": "Bio əlavə et", + "account_edit.bio_modal.edit_title": "Bioya düzəliş", + "account_edit.column_button": "Hazırdır", + "account_edit.column_title": "Profilə düzəliş", + "account_edit.custom_fields.add_label": "Xana əlavə et", + "account_edit.custom_fields.edit_label": "Xanaya düzəliş", + "account_edit.custom_fields.placeholder": "Müraciət formalarını, xarici keçidləri və ya paylaşmaq istədiyiniz digər məlumatları əlavə edin.", + "account_edit.custom_fields.reorder_button": "Xanaları təkrar sırala", + "account_edit.custom_fields.tip_content": "Sahibi olduğunuz veb saytlara keçidləri doğrulayaraq Mastodon hesabınıza asanlıqla etibarlılıq qazandıra bilərsiniz.", + "account_edit.custom_fields.tip_title": "İpucu: Doğrulanmış keçidləri əlavə etmə", + "account_edit.custom_fields.title": "Özəl xanalar", + "account_edit.custom_fields.verified_hint": "Doğrulanmış keçid necə əlavə olunur?", + "account_edit.display_name.add_label": "Ekran adı əlavə et", + "account_edit.display_name.edit_label": "Ekran adına düzəliş", + "account_edit.display_name.placeholder": "Ekran adınız, profilinizdə və zaman xəttində adınızın görünmə formasıdır.", + "account_edit.display_name.title": "Ekran adı", + "account_edit.featured_hashtags.edit_label": "Mövzu etiketi əlavə et", + "account_edit.featured_hashtags.placeholder": "Başqalarının sevimli mövzularınızı tanımasına və onlara cəld erişməsinə kömək edin.", + "account_edit.featured_hashtags.title": "Seçilmiş mövzu etiketləri", + "account_edit.field_actions.delete": "Xananı sil", + "account_edit.field_actions.edit": "Xanaya düzəliş", "account_edit.field_delete_modal.title": "Özəl xananı sil?", "account_edit.field_edit_modal.add_title": "Özəl xana əlavə et", "account_edit.field_edit_modal.discard_confirm": "İmtina", diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json index f0fd8edfbf..06c7f961ae 100644 --- a/app/javascript/mastodon/locales/be.json +++ b/app/javascript/mastodon/locales/be.json @@ -2,7 +2,7 @@ "about.blocks": "Мадэраваныя серверы", "about.contact": "Кантакт:", "about.default_locale": "Прадвызначаная", - "about.disclaimer": "Mastodon - свабоднае праграмнае забеспячэнне, з адкрытым зыходным кодам, і гандлёвай маркай Mastodon gGmbH.", + "about.disclaimer": "Mastodon - свабоднае праграмнае забеспячэнне, з адкрытым зыходным кодам, і гандлёвай маркай Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Прычына недаступная", "about.domain_blocks.preamble": "Mastodon, у асноўным, дазваляе вам праглядаць кантэнт і ўзаемадзейнічаць з карыстальнікамі з іншых сервераў у федэсвету. Гэтыя выключэнні былі зроблены дакладна на гэтым серверы.", "about.domain_blocks.silenced.explanation": "Вы не будзеце бачыць профілі і змесціва гэтага серверу, калі не шукаеце іх мэтанакіравана ці не падпісаны на карыстальнікаў адтуль.", @@ -646,6 +646,7 @@ "empty_column.account_unavailable": "Профіль недаступны", "empty_column.blocks": "Вы яшчэ нікога не заблакіравалі.", "empty_column.bookmarked_statuses": "У Вашых закладках яшчэ няма допісаў. Калі Вы дадасце закладку, яна з’явіцца тут.", + "empty_column.collections": "{acct} пакуль не стварыў(-ла) аніводнай калекцыі.", "empty_column.collections.featured_in": "Вас пакуль не дадалі ў ніякія калекцыі.", "empty_column.collections.featured_in_undiscoverable": "Каб людзі маглі дадаваць Вас у калекцыі, Вам трэба даць ім дазвол знаходзіць Вас у Налады > Прыватнасць і пошук", "empty_column.community": "Мясцовая стужка пустая. Напішыце нешта публічнае, каб разварушыць справу!", @@ -819,6 +820,12 @@ "keyboard_shortcuts.heading": "Спалучэнні клавіш", "keyboard_shortcuts.home": "Адкрыць хатнюю храналагічную стужку", "keyboard_shortcuts.hotkey": "Спалучэнне клавіш", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "Backspace", + "keyboard_shortcuts.keys.enter": "Enter", + "keyboard_shortcuts.keys.esc": "Esc", + "keyboard_shortcuts.keys.page_down": "Page Down", + "keyboard_shortcuts.keys.page_up": "Page Up", "keyboard_shortcuts.legend": "Паказаць легенду", "keyboard_shortcuts.load_more": "Навесці на кнопку \"Загрузіць болей\"", "keyboard_shortcuts.local": "Адкрыць хатнюю храналагічную стужку", @@ -1192,6 +1199,7 @@ "search_popout.user": "карыстальнік", "search_results.accounts": "Профілі", "search_results.all": "Усё", + "search_results.collections": "Калекцыі", "search_results.hashtags": "Хэштэгі", "search_results.no_results": "Няма вынікаў.", "search_results.no_search_yet": "Паспрабуйце пашукаць допісы, профілі або хэштэгі.", diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json index de7d0ab623..d7e48086bc 100644 --- a/app/javascript/mastodon/locales/bg.json +++ b/app/javascript/mastodon/locales/bg.json @@ -2,7 +2,6 @@ "about.blocks": "Модерирани сървъри", "about.contact": "За контакти:", "about.default_locale": "По подразбиране", - "about.disclaimer": "Mastodon е безплатен софтуер с отворен изходен код и търговска марка на Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Няма налична причина", "about.domain_blocks.preamble": "Mastodon обикновено позволява да разглеждате съдържание и да взаимодействате с други потребители от всякакви сървъри във Федивселената. Има изключения, направени конкретно за този сървър.", "about.domain_blocks.silenced.explanation": "Обикновено няма да виждате профили и съдържание, освен ако изрично не го потърсите или се включете в него, следвайки го.", diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json index f9cbc3f1ca..0222f9cf16 100644 --- a/app/javascript/mastodon/locales/bn.json +++ b/app/javascript/mastodon/locales/bn.json @@ -1,7 +1,6 @@ { "about.blocks": "অনুপলব্ধ সার্ভার", "about.contact": "যোগাযোগ:", - "about.disclaimer": "ম্যাস্টোডন একটি ফ্রি, ওপেন সোর্স সফটওয়্যার এবং ম্যাস্টোডন জিজিএমবিএইচ এর একটি ট্রেডমার্ক।", "about.domain_blocks.no_reason_available": "কারণ দর্শানো যাচ্ছে না", "about.domain_blocks.preamble": "ম্যাস্টোডন সাধারণত আপনাকে ফেদিভার্স এ অন্য কোনও সার্ভারের ব্যবহারকারীদের থেকে সামগ্রী দেখতে এবং তাদের সাথে আলাপচারিতা করার সুযোগ দেয়। এই ব্যতিক্রম যে এই বিশেষ সার্ভারে তৈরি করা হয়েছে।", "about.domain_blocks.silenced.explanation": "আপনি সাধারণত এই সার্ভার থেকে প্রোফাইল এবং বিষয়বস্তু দেখতে পারবেন না, যদি না আপনি নিজে থেকেই এটাকে ফলো না করেন.", diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json index bdeba762fe..a852e98cea 100644 --- a/app/javascript/mastodon/locales/br.json +++ b/app/javascript/mastodon/locales/br.json @@ -2,7 +2,6 @@ "about.blocks": "Servijerioù evezhiet", "about.contact": "Darempred :", "about.default_locale": "Dre ziouer", - "about.disclaimer": "Mastodon zo ur meziant frank, open-source hag ur merk marilhet eus Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Abeg dihegerz", "about.domain_blocks.preamble": "Gant Mastodon e c'hellit gwelet danvez hag eskemm gant implijerien·ezed eus forzh peseurt servijer er fedibed peurliesañ. Setu an nemedennoù a zo bet graet evit ar servijer-mañ e-unan.", "about.domain_blocks.silenced.explanation": "Ne vo ket gwelet profiloù eus ar servijer-mañ ganeoc'h peurliesañ, nemet ma vefec'h o klask war o lec'h pe choazfec'h o heuliañ.", diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index 767f4e5c43..f8a00143b4 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -2,7 +2,6 @@ "about.blocks": "Servidors moderats", "about.contact": "Contacte:", "about.default_locale": "Per defecte", - "about.disclaimer": "Mastodon és programari lliure de codi obert i una marca comercial de Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "No es disposa del motiu", "about.domain_blocks.preamble": "En general, Mastodon permet de veure el contingut i interaccionar amb els usuaris de qualsevol altre servidor del fedivers. Aquestes són les excepcions d'aquest servidor en particular.", "about.domain_blocks.silenced.explanation": "Generalment no veuràs perfils ni contingut d'aquest servidor, a menys que el cerquis explícitament o optis per seguir-lo.", diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json index 564e1d159b..6dca6917b2 100644 --- a/app/javascript/mastodon/locales/ckb.json +++ b/app/javascript/mastodon/locales/ckb.json @@ -1,7 +1,6 @@ { "about.blocks": "ڕاژە سەرپەرشتیکراو", "about.contact": "پەیوەندی کردن:", - "about.disclaimer": "ماستودۆن بە خۆڕایە، پرۆگرامێکی سەرچاوە کراوەیە، وە نیشانە بازرگانیەکەی ماستودۆن (gGmbH)ە", "about.domain_blocks.no_reason_available": "هۆکار بەردەست نیە", "about.domain_blocks.preamble": "ماستۆدۆن بە گشتی ڕێگەت پێدەدات بە پیشاندانی ناوەڕۆکەکان و کارلێک کردن لەگەڵ بەکارهێنەران لە هەر ڕاژەیەکی تر بە گشتی. ئەمانە ئەو بەدەرکردنانەن کە کراون لەسەر ئەم ڕاژە تایبەتە.", "about.domain_blocks.silenced.explanation": "بە گشتی ناتوانی زانیاریە تایبەتەکان و ناوەڕۆکی ئەم ڕاژەیە ببینی، مەگەر بە ڕوونی بەدوایدا بگەڕێیت یان هەڵیبژێریت بۆ شوێنکەوتنی.", diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json index 271329ce0a..c2515f037b 100644 --- a/app/javascript/mastodon/locales/cs.json +++ b/app/javascript/mastodon/locales/cs.json @@ -2,7 +2,6 @@ "about.blocks": "Moderované servery", "about.contact": "Kontakt:", "about.default_locale": "Výchozí", - "about.disclaimer": "Mastodon je svobodný software s otevřeným zdrojovým kódem a ochranná známka společnosti Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Důvod není k dispozici", "about.domain_blocks.preamble": "Mastodon umožňuje prohlížet obsah a komunikovat s uživateli jakéhokoliv serveru ve fediversu. Pro tento konkrétní server se vztahují následující výjimky.", "about.domain_blocks.silenced.explanation": "Uživatele a obsah tohoto serveru neuvidíte, pokud je nebudete výslovně hledat nebo je nezačnete sledovat.", diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json index f717a74a82..fdd35c3a95 100644 --- a/app/javascript/mastodon/locales/cy.json +++ b/app/javascript/mastodon/locales/cy.json @@ -2,7 +2,6 @@ "about.blocks": "Gweinyddion wedi'u cymedroli", "about.contact": "Cysylltiad:", "about.default_locale": "Rhagosodedig", - "about.disclaimer": "Mae Mastodon yn feddalwedd cod agored rhydd ac o dan hawlfraint Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Dyw'r rheswm ddim ar gael", "about.domain_blocks.preamble": "Fel rheol, mae Mastodon yn caniatáu i chi weld cynnwys gan unrhyw weinyddwr arall yn y ffedysawd a rhyngweithio â hi. Dyma'r eithriadau a wnaed ar y gweinydd penodol hwn.", "about.domain_blocks.silenced.explanation": "Fel rheol, fyddwch chi ddim yn gweld proffiliau a chynnwys o'r gweinydd hwn, oni bai eich bod yn chwilio'n benodol amdano neu yn ymuno drwy ei ddilyn.", diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json index a7cc1c9631..96e2fcb5df 100644 --- a/app/javascript/mastodon/locales/da.json +++ b/app/javascript/mastodon/locales/da.json @@ -2,7 +2,7 @@ "about.blocks": "Modererede servere", "about.contact": "Kontakt:", "about.default_locale": "Standard", - "about.disclaimer": "Mastodon er gratis, open-source software og et varemærke tilhørende Mastodon gGmbH.", + "about.disclaimer": "Mastodon er gratis, open-source software og et varemærke tilhørende Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Begrundelse ikke tilgængelig", "about.domain_blocks.preamble": "Mastodon tillader generelt, at du ser indhold og interagere med brugere fra enhver anden server i fediverset. Disse er undtagelserne, som er implementeret på netop denne server.", "about.domain_blocks.silenced.explanation": "Du vil generelt ikke se profiler og indhold fra denne server, medmindre du udtrykkeligt slår den op eller vælger den ved at følge.", @@ -646,6 +646,7 @@ "empty_column.account_unavailable": "Profil utilgængelig", "empty_column.blocks": "Du har ikke blokeret nogle brugere endnu.", "empty_column.bookmarked_statuses": "Du har ingen bogmærkede indlæg endnu. Når du bogmærker ét, vil det dukke op hér.", + "empty_column.collections": "{acct} har endnu ikke oprettet nogen samlinger.", "empty_column.collections.featured_in": "Du er ikke blevet tilføjet til nogen samlinger endnu.", "empty_column.collections.featured_in_undiscoverable": "For at andre kan føje dig til samlinger, skal du give tilladelse til at blive vist i opdagelsesfunktioner under Præferencer > Fortrolighed og rækkevidde", "empty_column.community": "Den lokale tidslinje er tom. Skriv noget offentligt for at sætte tingene i gang!", @@ -819,6 +820,12 @@ "keyboard_shortcuts.heading": "Tastaturgenveje", "keyboard_shortcuts.home": "Åbn hjem-tidslinje", "keyboard_shortcuts.hotkey": "Hurtigtast", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "Backspace", + "keyboard_shortcuts.keys.enter": "Enter", + "keyboard_shortcuts.keys.esc": "Esc", + "keyboard_shortcuts.keys.page_down": "Side ned", + "keyboard_shortcuts.keys.page_up": "Side op", "keyboard_shortcuts.legend": "Vis dette symbol", "keyboard_shortcuts.load_more": "Fokusér knappen \"Indlæs flere\"", "keyboard_shortcuts.local": "Åbn lokal tidslinje", @@ -1192,6 +1199,7 @@ "search_popout.user": "bruger", "search_results.accounts": "Profiler", "search_results.all": "Alle", + "search_results.collections": "Samlinger", "search_results.hashtags": "Hashtags", "search_results.no_results": "Ingen resultater.", "search_results.no_search_yet": "Prøv at søge efter indlæg, profiler eller hashtags.", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index 0e07f296d1..214f34ffa6 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -2,7 +2,7 @@ "about.blocks": "Eingeschränkte Server", "about.contact": "Kontakt:", "about.default_locale": "Standard", - "about.disclaimer": "Mastodon ist eine freie, quelloffene Software und eine Marke der Mastodon gGmbH.", + "about.disclaimer": "Mastodon ist eine freie, quelloffene Software und eine Marke der Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Keinen Grund angegeben", "about.domain_blocks.preamble": "Mastodon erlaubt es dir grundsätzlich, alle Inhalte von allen Nutzer*innen auf allen Servern im Fediverse zu sehen und mit ihnen zu interagieren. Für diesen Server gibt es aber ein paar Ausnahmen.", "about.domain_blocks.silenced.explanation": "Standardmäßig werden von diesem Server keine Inhalte oder Profile angezeigt. Du kannst die Profile und Inhalte aber dennoch sehen, wenn du explizit nach diesen suchst oder diesen folgst.", @@ -646,6 +646,7 @@ "empty_column.account_unavailable": "Profil nicht verfügbar", "empty_column.blocks": "Du hast bisher keine Profile blockiert.", "empty_column.bookmarked_statuses": "Du hast bisher keine Beiträge als Lesezeichen abgelegt. Sobald du einen Beitrag als Lesezeichen speicherst, wird er hier erscheinen.", + "empty_column.collections": "{acct} hat noch keine Sammlungen erstellt.", "empty_column.collections.featured_in": "Du wurdest noch keiner Sammlung hinzugefügt.", "empty_column.collections.featured_in_undiscoverable": "Damit du zu Sammlungen hinzugefügt werden kannst, muss „Mich beim Entdecken berücksichtigen“ unter Einstellungen > Datenschutz und Reichweite aktiviert werden", "empty_column.community": "Die lokale Timeline ist leer. Schreibe einen öffentlichen Beitrag, um den Stein ins Rollen zu bringen!", @@ -819,6 +820,12 @@ "keyboard_shortcuts.heading": "Tastenkürzel", "keyboard_shortcuts.home": "Startseite öffnen", "keyboard_shortcuts.hotkey": "Tastenkürzel", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "Backspace", + "keyboard_shortcuts.keys.enter": "Eingabetaste", + "keyboard_shortcuts.keys.esc": "Esc", + "keyboard_shortcuts.keys.page_down": "Bild ab", + "keyboard_shortcuts.keys.page_up": "Bild auf", "keyboard_shortcuts.legend": "Tastenkürzel anzeigen (diese Seite)", "keyboard_shortcuts.load_more": "Schaltfläche „Mehr laden“ fokussieren", "keyboard_shortcuts.local": "Lokale Timeline öffnen", @@ -1192,6 +1199,7 @@ "search_popout.user": "Profil", "search_results.accounts": "Profile", "search_results.all": "Alles", + "search_results.collections": "Sammlungen", "search_results.hashtags": "Hashtags", "search_results.no_results": "Keine Ergebnisse.", "search_results.no_search_yet": "Suche nach Beiträgen, Profilen oder Hashtags.", diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json index 160315510a..76ad93350f 100644 --- a/app/javascript/mastodon/locales/el.json +++ b/app/javascript/mastodon/locales/el.json @@ -2,7 +2,7 @@ "about.blocks": "Συντονιζόμενοι διακομιστές", "about.contact": "Επικοινωνία:", "about.default_locale": "Προεπιλογή", - "about.disclaimer": "Το Mastodon είναι ελεύθερο λογισμικό ανοιχτού κώδικα και εμπορικό σήμα της Mastodon gGmbH.", + "about.disclaimer": "Το Mastodon είναι ελεύθερο λογισμικό ανοιχτού κώδικα και εμπορικό σήμα της Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Αιτιολογία μη διαθέσιμη", "about.domain_blocks.preamble": "Σε γενικές γραμμές το Mastodon σου επιτρέπει να βλέπεις περιεχόμενο και να αλληλεπιδράς με χρήστες από οποιονδήποτε άλλο διακομιστή σε ένα διασυνδεδεμένο σύμπαν διακομιστών (fediverse). Ακολουθούν οι εξαιρέσεις που ισχύουν για τον συγκεκριμένο διακομιστή.", "about.domain_blocks.silenced.explanation": "Συνήθως δε θα βλέπεις προφίλ και περιεχόμενο απ' αυτόν τον διακομιστή, εκτός αν κάνεις συγκεκριμένη αναζήτηση ή επιλέξεις να τον ακολουθήσεις.", @@ -646,6 +646,7 @@ "empty_column.account_unavailable": "Μη διαθέσιμο προφίλ", "empty_column.blocks": "Δεν έχεις αποκλείσει κανέναν χρήστη ακόμη.", "empty_column.bookmarked_statuses": "Δεν έχεις καμία ανάρτηση με σελιδοδείκτη ακόμη. Μόλις βάλεις κάποιον, θα εμφανιστεί εδώ.", + "empty_column.collections": "Ο χρήστης {acct} δεν έχει δημιουργήσει ακόμη καμία συλλογή.", "empty_column.collections.featured_in": "Δεν έχετε προστεθεί ακόμη σε καμία συλλογή.", "empty_column.collections.featured_in_undiscoverable": "Προκειμένου ο κόσμος να σας προσθέσει σε συλλογές, πρέπει να επιτρέψετε την ανάδειξή σας σε εμπειρίες ανακάλυψης από τις Προτιμήσεις > Ιδιωτικότητα και προσιτότητα", "empty_column.community": "Η τοπική ροή είναι κενή. Γράψε κάτι δημόσια για να αρχίσει να κυλά η μπάλα!", @@ -819,6 +820,12 @@ "keyboard_shortcuts.heading": "Συντομεύσεις πληκτρολογίου", "keyboard_shortcuts.home": "Άνοιγμα ροής αρχικής σελίδας", "keyboard_shortcuts.hotkey": "Συντόμευση", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "Backspace", + "keyboard_shortcuts.keys.enter": "Enter", + "keyboard_shortcuts.keys.esc": "Esc", + "keyboard_shortcuts.keys.page_down": "Page Down", + "keyboard_shortcuts.keys.page_up": "Page Up", "keyboard_shortcuts.legend": "Εμφάνιση αυτού του οδηγού", "keyboard_shortcuts.load_more": "Εστίαση στο κουμπί \"Φόρτωση περισσότερων\"", "keyboard_shortcuts.local": "Άνοιγμα τοπικής ροής", @@ -1192,6 +1199,7 @@ "search_popout.user": "χρήστης", "search_results.accounts": "Προφίλ", "search_results.all": "Όλα", + "search_results.collections": "Συλλογές", "search_results.hashtags": "Ετικέτες", "search_results.no_results": "Κανένα αποτέλεσμα.", "search_results.no_search_yet": "Δοκίμασε να ψάξεις για αναρτήσεις, προφίλ ή ετικέτες.", diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json index fb95859d3a..e8cb9675f3 100644 --- a/app/javascript/mastodon/locales/en-GB.json +++ b/app/javascript/mastodon/locales/en-GB.json @@ -2,7 +2,6 @@ "about.blocks": "Moderated servers", "about.contact": "Contact:", "about.default_locale": "Default", - "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Reason not available", "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the Fediverse. These are the exceptions that have been made on this particular server.", "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index 904a5a6a60..fa90d2d54c 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -2,7 +2,6 @@ "about.blocks": "Reguligitaj serviloj", "about.contact": "Kontakto:", "about.default_locale": "Defaŭlta", - "about.disclaimer": "Mastodon estas libera, malfermitkoda programo kaj varmarko de la firmao Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Kialo ne disponeblas", "about.domain_blocks.preamble": "Mastodon ĝenerale rajtigas vidi la enhavojn de uzantoj el aliaj serviloj en la fediverso, kaj komuniki kun ili. Jen la limigoj deciditaj de tiu ĉi servilo mem.", "about.domain_blocks.silenced.explanation": "Vi ne ĝenerale vidos profilojn kaj enhavojn de ĉi tiu servilo, krom se vi eksplice trovas aŭ estas permesita de via sekvato.", diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json index dcaa4ccc64..c4ac658b68 100644 --- a/app/javascript/mastodon/locales/es-AR.json +++ b/app/javascript/mastodon/locales/es-AR.json @@ -2,7 +2,7 @@ "about.blocks": "Servidores moderados", "about.contact": "Contacto:", "about.default_locale": "Predeterminado", - "about.disclaimer": "Mastodon es software libre y de código abierto y una marca comercial de Mastodon gGmbH.", + "about.disclaimer": "Mastodon es software libre y de código abierto, y una marca comercial de Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Motivo no disponible", "about.domain_blocks.preamble": "Mastodon normalmente te permite ver el contenido e interactuar con los usuarios de cualquier otro servidor en el fediverso. Estas son las excepciones que se han hecho en este servidor en particular.", "about.domain_blocks.silenced.explanation": "Normalmente no verás perfiles y contenido de este servidor, a menos que lo busqués explícitamente o sigás alguna cuenta.", @@ -646,6 +646,7 @@ "empty_column.account_unavailable": "Perfil no disponible", "empty_column.blocks": "Todavía no bloqueaste a ningún usuario.", "empty_column.bookmarked_statuses": "Todavía no tenés mensajes guardados en \"Marcadores\". Cuando guardés uno en \"Marcadores\", se mostrará acá.", + "empty_column.collections": "{acct} todavía no creó ninguna colección.", "empty_column.collections.featured_in": "Todavía no te agregaron a ninguna colección.", "empty_column.collections.featured_in_undiscoverable": "Para que la gente pueda agregarte a colecciones, tenés que permitir que te destacen en las experiencias de descubrimiento en Configuración > Privacidad y alcance", "empty_column.community": "La línea temporal local está vacía. ¡Escribí algo en modo público para que se empiece a correr la bola!", @@ -819,6 +820,12 @@ "keyboard_shortcuts.heading": "Atajos de teclado", "keyboard_shortcuts.home": "Abrir línea temporal principal", "keyboard_shortcuts.hotkey": "Atajo", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "⌫ Retroceso", + "keyboard_shortcuts.keys.enter": "↳ Intro", + "keyboard_shortcuts.keys.esc": "Escape", + "keyboard_shortcuts.keys.page_down": "Re Pág", + "keyboard_shortcuts.keys.page_up": "Av Pág", "keyboard_shortcuts.legend": "Mostrar este texto", "keyboard_shortcuts.load_more": "Focalizar el botón «Cargar más»", "keyboard_shortcuts.local": "Abrirlínea temporal local", @@ -1192,6 +1199,7 @@ "search_popout.user": "usuario", "search_results.accounts": "Perfiles", "search_results.all": "Todos", + "search_results.collections": "Colecciones", "search_results.hashtags": "Etiquetas", "search_results.no_results": "Sin resultados.", "search_results.no_search_yet": "Intentá buscar publicaciones, perfiles o etiquetas.", diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json index 38bec75472..eacd2dce51 100644 --- a/app/javascript/mastodon/locales/es-MX.json +++ b/app/javascript/mastodon/locales/es-MX.json @@ -2,7 +2,7 @@ "about.blocks": "Servidores moderados", "about.contact": "Contacto:", "about.default_locale": "Por defecto", - "about.disclaimer": "Mastodon es software libre de código abierto, y una marca comercial de Mastodon gGmbH.", + "about.disclaimer": "Mastodon es un software libre, de código abierto, y una marca comercial de Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Motivo no disponible", "about.domain_blocks.preamble": "Mastodon generalmente te permite ver contenido e interactuar con usuarios de cualquier otro servidor del fediverso. Estas son las excepciones que se han hecho en este servidor en particular.", "about.domain_blocks.silenced.explanation": "Por lo general, no verás perfiles ni contenidos de este servidor, a menos que los busques explícitamente o que optes por seguirlo.", @@ -646,6 +646,7 @@ "empty_column.account_unavailable": "Perfil no disponible", "empty_column.blocks": "Aún no has bloqueado a ningún usuario.", "empty_column.bookmarked_statuses": "Aún no tienes ninguna publicación guardada como marcador. Cuando guardes una, se mostrará aquí.", + "empty_column.collections": "{acct} aún no ha creado ninguna colección.", "empty_column.collections.featured_in": "Aún no te han añadido a ninguna colección.", "empty_column.collections.featured_in_undiscoverable": "Para que los usuarios puedan añadirte a sus colecciones, debes habilitar la opción de aparecer en las experiencias de descubrimiento desde Preferencias > Privacidad y alcance", "empty_column.community": "La cronología local está vacía. ¡Escribe algo públicamente para ponerla en marcha!", @@ -819,6 +820,12 @@ "keyboard_shortcuts.heading": "Atajos de teclado", "keyboard_shortcuts.home": "Abrir cronología principal", "keyboard_shortcuts.hotkey": "Tecla de acceso rápido", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "Retroceso", + "keyboard_shortcuts.keys.enter": "Enter", + "keyboard_shortcuts.keys.esc": "Escape", + "keyboard_shortcuts.keys.page_down": "Re Pág", + "keyboard_shortcuts.keys.page_up": "Av Pág", "keyboard_shortcuts.legend": "Mostrar esta leyenda", "keyboard_shortcuts.load_more": "Enfoque en el botón \"Cargar más\"", "keyboard_shortcuts.local": "Abrir cronología local", @@ -1192,6 +1199,7 @@ "search_popout.user": "usuario", "search_results.accounts": "Perfiles", "search_results.all": "Todos", + "search_results.collections": "Colecciones", "search_results.hashtags": "Etiquetas", "search_results.no_results": "No hay resultados.", "search_results.no_search_yet": "Intenta buscar publicaciones, perfiles o etiquetas.", diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index c5c68be3db..f00bf98832 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -2,7 +2,7 @@ "about.blocks": "Servidores moderados", "about.contact": "Contacto:", "about.default_locale": "Por defecto", - "about.disclaimer": "Mastodon es software libre, de código abierto, y una marca comercial de Mastodon gGmbH.", + "about.disclaimer": "Mastodon es un software libre, de código abierto, y una marca comercial de Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Razón no disponible", "about.domain_blocks.preamble": "Mastodon normalmente te permite ver el contenido e interactuar con los usuarios de cualquier otro servidor en el fediverso. Estas son las excepciones que se han hecho en este servidor en particular.", "about.domain_blocks.silenced.explanation": "Normalmente no verás perfiles y contenido de este servidor, a menos que lo busques explícitamente o sigas alguna cuenta.", @@ -646,6 +646,7 @@ "empty_column.account_unavailable": "Perfil no disponible", "empty_column.blocks": "Aún no has bloqueado a ningún usuario.", "empty_column.bookmarked_statuses": "Aún no tienes ninguna publicación guardada como marcador. Cuando guardes una, se mostrará aquí.", + "empty_column.collections": "{acct} aún no ha creado ninguna colección.", "empty_column.collections.featured_in": "Aún no te han añadido a ninguna colección.", "empty_column.collections.featured_in_undiscoverable": "Para que la gente pueda añadirte a colecciones, debes permitir ser destacado en algoritmos de descubrimiento desde Preferencias > Privacidad y alcance", "empty_column.community": "La línea de tiempo local está vacía. ¡Escribe algo para empezar la fiesta!", @@ -819,6 +820,12 @@ "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "Abrir cronología principal", "keyboard_shortcuts.hotkey": "Tecla rápida", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "Retroceso", + "keyboard_shortcuts.keys.enter": "Enter", + "keyboard_shortcuts.keys.esc": "Escape", + "keyboard_shortcuts.keys.page_down": "Re Pág", + "keyboard_shortcuts.keys.page_up": "Av Pág", "keyboard_shortcuts.legend": "Mostrar esta leyenda", "keyboard_shortcuts.load_more": "Poner el foco en el botón \"Cargar más\"", "keyboard_shortcuts.local": "Abrir cronología local", @@ -1192,6 +1199,7 @@ "search_popout.user": "usuario", "search_results.accounts": "Perfiles", "search_results.all": "Todos", + "search_results.collections": "Colecciones", "search_results.hashtags": "Etiquetas", "search_results.no_results": "Sin resultados.", "search_results.no_search_yet": "Intenta buscar publicaciones, perfiles o etiquetas.", diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json index 2ca57023b4..f8eabe8f6f 100644 --- a/app/javascript/mastodon/locales/et.json +++ b/app/javascript/mastodon/locales/et.json @@ -2,7 +2,6 @@ "about.blocks": "Modereeritavad serverid", "about.contact": "Kontakt:", "about.default_locale": "Vaikimisi", - "about.disclaimer": "Mastodon on vaba, tasuta ja avatud lähtekoodiga tarkvara ning Mastodon gGmbH kaubamärk.", "about.domain_blocks.no_reason_available": "Põhjus on teadmata", "about.domain_blocks.preamble": "Mastodon lubab üldiselt vaadata sisu ning suhelda kasutajatega ükskõik millisest teisest födiversumi serverist. Need on erandid, mis kehtivad selles kindlas serveris.", "about.domain_blocks.silenced.explanation": "Sa üldjuhul ei näe profiile ja sisu sellest serverist, kui sa just tahtlikult neid ei otsi või jälgimise moel nõusolekut ei anna.", diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json index eeec939a33..11f140560c 100644 --- a/app/javascript/mastodon/locales/eu.json +++ b/app/javascript/mastodon/locales/eu.json @@ -2,7 +2,6 @@ "about.blocks": "Moderatutako zerbitzariak", "about.contact": "Kontaktua:", "about.default_locale": "Lehenetsia", - "about.disclaimer": "Mastodon software libre eta kode irekikoa da, eta Mastodon gGmbH-ren marka erregistratua.", "about.domain_blocks.no_reason_available": "Arrazoia ez dago eskuragarri", "about.domain_blocks.preamble": "Mastodonek orokorrean aukera ematen dizu fedibertsoko beste zerbitzarietako erabiltzaileen edukia ikusi eta haiekin komunikatzeko. Zerbitzari zehatz honi ezarritako salbuespenak hauek dira.", "about.domain_blocks.silenced.explanation": "Orokorrean ez duzu zerbitzari honetako profil eta edukirik ikusiko. Profilak jarraitzen badituzu edo edukia esplizituki bilatzen baduzu bai.", diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index a5e9b2b097..f73d504475 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -2,7 +2,6 @@ "about.blocks": "کارسازهای نظارت شده", "about.contact": "تماس:", "about.default_locale": "پیش‌گزیده", - "about.disclaimer": "ماستودون نرم‌افزار آزاد و نشان تجاری یک شرکت غیر انتفاعی با مسئولیت محدود آلمانی است.", "about.domain_blocks.no_reason_available": "دلیلی موجود نیست", "about.domain_blocks.preamble": "ماستودون عموماً می‌گذارد محتوا را از هر کارساز دیگری در دنیای شبکه‌های اجتماعی غیرمتمرکز دیده و با آنان برهم‌کنش داشته باشید. این‌ها استثناهایی هستند که روی این کارساز خاص وضع شده‌اند.", "about.domain_blocks.silenced.explanation": "عموماً نمایه‌ها و محتوا از این کارساز را نمی‌بینید، مگر این که به طور خاص دنبالشان گشته یا با پی گیری، داوطلب دیدنشان شوید.", diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json index f9427dfbcb..9831a52c26 100644 --- a/app/javascript/mastodon/locales/fi.json +++ b/app/javascript/mastodon/locales/fi.json @@ -2,7 +2,7 @@ "about.blocks": "Moderoidut palvelimet", "about.contact": "Yhteydenotto:", "about.default_locale": "Oletus", - "about.disclaimer": "Mastodon on vapaa avoimen lähdekoodin ohjelmisto ja Mastodon gGmbH:n tavaramerkki.", + "about.disclaimer": "Mastodon on vapaa avoimen lähdekoodin ohjelmisto ja Mastodon GmbH:n tavaramerkki.", "about.domain_blocks.no_reason_available": "Syy ei ole tiedossa", "about.domain_blocks.preamble": "Mastodonin avulla voi yleensä tarkastella minkä tahansa fediversumiin kuuluvan palvelimen sisältöä ja olla yhteyksissä eri palvelinten käyttäjien kanssa. Nämä poikkeukset koskevat yksin tätä palvelinta.", "about.domain_blocks.silenced.explanation": "Et yleensä näe tämän palvelimen profiileja ja sisältöä, jollet erityisesti etsi juuri sitä tai liity siihen seuraamalla.", @@ -646,6 +646,7 @@ "empty_column.account_unavailable": "Profiili ei saatavilla", "empty_column.blocks": "Et ole vielä estänyt käyttäjiä.", "empty_column.bookmarked_statuses": "Et ole vielä lisännyt julkaisuja kirjanmerkkeihisi. Kun lisäät yhden, se näkyy tässä.", + "empty_column.collections": "{acct} ei ole luonut vielä yhtään kokoelmaa.", "empty_column.collections.featured_in": "Sinua ei ole vielä lisätty mihinkään kokoelmaan.", "empty_column.collections.featured_in_undiscoverable": "Jotta sinut voi lisätä kokoelmiin, esittely löydettävyyskokemuksissa on sallittava kohdassa Asetukset > Yksityisyys ja tavoittavuus", "empty_column.community": "Paikallinen aikajana on tyhjä. Kirjoita jotain julkista, niin homma lähtee käyntiin!", @@ -819,6 +820,12 @@ "keyboard_shortcuts.heading": "Pikanäppäimet", "keyboard_shortcuts.home": "Avaa kotiaikajana", "keyboard_shortcuts.hotkey": "Pikanäppäin", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "Askelpalautin", + "keyboard_shortcuts.keys.enter": "Enter", + "keyboard_shortcuts.keys.esc": "Esc", + "keyboard_shortcuts.keys.page_down": "Page Down", + "keyboard_shortcuts.keys.page_up": "Page Up", "keyboard_shortcuts.legend": "Näytä tämä ohje", "keyboard_shortcuts.load_more": "Kohdista ”Lataa lisää” -⁠painikkeeseen", "keyboard_shortcuts.local": "Avaa paikallinen aikajana", @@ -1191,6 +1198,7 @@ "search_popout.user": "käyttäjä", "search_results.accounts": "Profiilit", "search_results.all": "Kaikki", + "search_results.collections": "Kokoelmat", "search_results.hashtags": "Aihetunnisteet", "search_results.no_results": "Ei tuloksia.", "search_results.no_search_yet": "Kokeile hakea julkaisuja, profiileja tai aihetunnisteita.", diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json index 7c3a29eafc..fd7506baaa 100644 --- a/app/javascript/mastodon/locales/fil.json +++ b/app/javascript/mastodon/locales/fil.json @@ -2,7 +2,6 @@ "about.blocks": "Mga pinatimping server", "about.contact": "Kontak:", "about.default_locale": "Default", - "about.disclaimer": "Ang Mastodon ay software na malaya at bukas-na-pinagmulan, at isang tatak-pangkalakal ng Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Hindi makuha ang dahilan", "about.domain_blocks.preamble": "Sa kadalasan, hinahayaan ka ng Mastodon na makita ang mga content sa, at makipag-interact sa users ng, ibang servers sa fediverse. Narito ang exceptions na ginawa sa partikular na server na ito.", "about.domain_blocks.silenced.explanation": "Sa kadalasan, hindi mo makikita ang profiles at content mula sa server na ito, maliban na lang kung sasadyain mo silang hanapin o piliing magawa ito sa pamamagitan ng mga sumusunod.", diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json index a8651ba586..4f4df1d18e 100644 --- a/app/javascript/mastodon/locales/fo.json +++ b/app/javascript/mastodon/locales/fo.json @@ -2,7 +2,6 @@ "about.blocks": "Tálmaðir ambætarar", "about.contact": "Samband:", "about.default_locale": "Sjálvvirði", - "about.disclaimer": "Mastodon er fríur ritbúnaður við opnari keldu og eitt vørumerki hjá Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Ókent orsøk", "about.domain_blocks.preamble": "Yvirhøvur, so loyvir Mastodon tær at síggja innihald frá og at samvirka við brúkarar frá ein og hvørjum ambætara í fediverse. Undantøkini, sum eru gjørd á júst hesum ambætaranum, eru hesi.", "about.domain_blocks.silenced.explanation": "Yvirhøvur, so sært tú ikki vangar og innihald frá hesum ambætaranum, uttan so at tú skilliga leitar hesi upp ella velur tey við at fylgja teimum.", diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json index 52482f5c93..839796ffdf 100644 --- a/app/javascript/mastodon/locales/fr-CA.json +++ b/app/javascript/mastodon/locales/fr-CA.json @@ -2,7 +2,7 @@ "about.blocks": "Serveurs modérés", "about.contact": "Contact :", "about.default_locale": "Par défaut", - "about.disclaimer": "Mastodon est un logiciel open-source gratuit et une marque déposée de Mastodon gGmbH.", + "about.disclaimer": "Mastodon est un logiciel libre, open-source et une marque déposée de Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Raison non disponible", "about.domain_blocks.preamble": "Mastodon vous permet généralement de visualiser le contenu et d'interagir avec des comptes de n'importe quel serveur dans le fediverse. Voici les exceptions qui ont été faites sur ce serveur en particulier.", "about.domain_blocks.silenced.explanation": "Vous ne verrez généralement pas de profils ou de contenu de ce serveur, à moins que vous ne les recherchiez explicitement ou que vous ne choisissiez de les suivre.", @@ -646,6 +646,7 @@ "empty_column.account_unavailable": "Profil non disponible", "empty_column.blocks": "Vous n’avez bloqué aucun compte pour le moment.", "empty_column.bookmarked_statuses": "Vous n'avez pas de publications parmi vos signets. Lorsque vous en ajouterez une, elle apparaîtra ici.", + "empty_column.collections": "{acct} n'a pas encore créé de collection.", "empty_column.collections.featured_in": "Vous n'avez pas encore été ajouté·e à une collection.", "empty_column.collections.featured_in_undiscoverable": "Afin que l'on puisse vous ajouter à des collections, vous devez autoriser d'apparaître dans les expériences de découverte depuis Vie privée et visibilité", "empty_column.community": "Le fil local est vide. Écrivez donc quelque chose pour le remplir!", @@ -819,6 +820,12 @@ "keyboard_shortcuts.heading": "Raccourcis clavier", "keyboard_shortcuts.home": "Ouvrir le fil d’accueil", "keyboard_shortcuts.hotkey": "Raccourci clavier", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "Retour arrière", + "keyboard_shortcuts.keys.enter": "Entrée", + "keyboard_shortcuts.keys.esc": "Échap", + "keyboard_shortcuts.keys.page_down": "Page bas", + "keyboard_shortcuts.keys.page_up": "Page haut", "keyboard_shortcuts.legend": "Afficher cette légende", "keyboard_shortcuts.load_more": "Bouton Focus \"Charger plus\"", "keyboard_shortcuts.local": "Ouvrir le fil local", @@ -1192,6 +1199,7 @@ "search_popout.user": "utilisateur·ice", "search_results.accounts": "Profils", "search_results.all": "Tout", + "search_results.collections": "Collections", "search_results.hashtags": "Hashtags", "search_results.no_results": "Aucun résultat.", "search_results.no_search_yet": "Essayez de rechercher des messages, des profils ou des hashtags.", @@ -1333,12 +1341,12 @@ "upload_button.label": "Ajouter des images, une vidéo ou un fichier audio", "upload_error.limit": "Taille maximale d'envoi de fichier dépassée.", "upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.", - "upload_error.quote": "L’envoi de fichiers n’est pas autorisé avec les sondages.", - "upload_form.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Tout en faisant glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.", - "upload_form.drag_and_drop.on_drag_cancel": "Le glissement a été annulé. La pièce jointe {item} n'a pas été ajoutée.", - "upload_form.drag_and_drop.on_drag_end": "La pièce jointe du média {item} a été déplacée.", + "upload_error.quote": "L’envoi de fichiers n’est pas autorisé avec les citations.", + "upload_form.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Pour glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.", + "upload_form.drag_and_drop.on_drag_cancel": "Déplacement annulé. La pièce jointe {item} n'a pas été ajoutée.", + "upload_form.drag_and_drop.on_drag_end": "La pièce jointe du média {item} a été déposée.", "upload_form.drag_and_drop.on_drag_over": "La pièce jointe du média {item} a été déplacée.", - "upload_form.drag_and_drop.on_drag_start": "A récupéré la pièce jointe {item}.", + "upload_form.drag_and_drop.on_drag_start": "Sélection de la pièce jointe {item}.", "upload_form.edit": "Modifier", "upload_progress.label": "Envoi en cours...", "upload_progress.processing": "Traitement en cours…", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index 0ccc72f517..d4dcae1f96 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -2,7 +2,7 @@ "about.blocks": "Serveurs modérés", "about.contact": "Contact :", "about.default_locale": "Défaut", - "about.disclaimer": "Mastodon est un logiciel libre, open-source et une marque déposée de Mastodon gGmbH.", + "about.disclaimer": "Mastodon est un logiciel libre, open-source et une marque déposée de Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Raison non disponible", "about.domain_blocks.preamble": "Mastodon vous permet généralement de visualiser le contenu et d'interagir avec les utilisateurs et utilisatrices de n'importe quel autre serveur dans le fédivers. Voici les exceptions qui ont été faites sur ce serveur.", "about.domain_blocks.silenced.explanation": "Vous ne verrez généralement pas les profils et le contenu de ce serveur, à moins que vous ne les recherchiez explicitement ou que vous ne choisissiez de les suivre.", @@ -646,6 +646,7 @@ "empty_column.account_unavailable": "Profil non disponible", "empty_column.blocks": "Vous n’avez bloqué aucun compte pour le moment.", "empty_column.bookmarked_statuses": "Vous n'avez pas de message en marque-page. Lorsque vous en ajouterez un, il apparaîtra ici.", + "empty_column.collections": "{acct} n'a pas encore créé de collection.", "empty_column.collections.featured_in": "Vous n'avez pas encore été ajouté·e à une collection.", "empty_column.collections.featured_in_undiscoverable": "Afin que l'on puisse vous ajouter à des collections, vous devez autoriser d'apparaître dans les expériences de découverte depuis Vie privée et visibilité", "empty_column.community": "Le fil public local est vide. Écrivez donc quelque chose pour le remplir !", @@ -819,6 +820,12 @@ "keyboard_shortcuts.heading": "Raccourcis clavier", "keyboard_shortcuts.home": "Ouvrir le fil d’accueil", "keyboard_shortcuts.hotkey": "Raccourci clavier", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "Retour arrière", + "keyboard_shortcuts.keys.enter": "Entrée", + "keyboard_shortcuts.keys.esc": "Échap", + "keyboard_shortcuts.keys.page_down": "Page bas", + "keyboard_shortcuts.keys.page_up": "Page haut", "keyboard_shortcuts.legend": "Afficher cet aide-mémoire", "keyboard_shortcuts.load_more": "Bouton Focus \"Charger plus\"", "keyboard_shortcuts.local": "Ouvrir le fil public local", @@ -1192,6 +1199,7 @@ "search_popout.user": "utilisateur·ice", "search_results.accounts": "Profils", "search_results.all": "Tous les résultats", + "search_results.collections": "Collections", "search_results.hashtags": "Hashtags", "search_results.no_results": "Aucun résultat.", "search_results.no_search_yet": "Essayez de rechercher des messages, des profils ou des hashtags.", @@ -1333,12 +1341,12 @@ "upload_button.label": "Ajouter des images, une vidéo ou un fichier audio", "upload_error.limit": "Taille maximale d'envoi de fichier dépassée.", "upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.", - "upload_error.quote": "L’envoi de fichiers n’est pas autorisé avec les sondages.", - "upload_form.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Tout en faisant glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.", - "upload_form.drag_and_drop.on_drag_cancel": "Le glissement a été annulé. La pièce jointe {item} n'a pas été ajoutée.", - "upload_form.drag_and_drop.on_drag_end": "La pièce jointe du média {item} a été déplacée.", + "upload_error.quote": "L’envoi de fichiers n’est pas autorisé avec les citations.", + "upload_form.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Pour glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.", + "upload_form.drag_and_drop.on_drag_cancel": "Déplacement annulé. La pièce jointe {item} n'a pas été ajoutée.", + "upload_form.drag_and_drop.on_drag_end": "La pièce jointe du média {item} a été déposée.", "upload_form.drag_and_drop.on_drag_over": "La pièce jointe du média {item} a été déplacée.", - "upload_form.drag_and_drop.on_drag_start": "A récupéré la pièce jointe {item}.", + "upload_form.drag_and_drop.on_drag_start": "Sélection de la pièce jointe {item}.", "upload_form.edit": "Modifier", "upload_progress.label": "Envoi en cours…", "upload_progress.processing": "En cours…", diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json index 63d4dce56c..8930e18ba0 100644 --- a/app/javascript/mastodon/locales/fy.json +++ b/app/javascript/mastodon/locales/fy.json @@ -2,7 +2,6 @@ "about.blocks": "Moderearre servers", "about.contact": "Kontakt:", "about.default_locale": "Standert", - "about.disclaimer": "Mastodon is frije, iepenboarnesoftware en in hannelsmerk fan Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Reden net beskikber", "about.domain_blocks.preamble": "Yn it algemien kinne jo mei Mastodon berjochten ûntfange fan, en ynteraksje hawwe mei brûkers fan elke server yn de fediverse. Dit binne de útsûnderingen dy’t op dizze spesifike server jilde.", "about.domain_blocks.silenced.explanation": "Yn it algemien sjogge jo gjin berjochten en accounts fan dizze server, útsein as jo berjochten eksplisyt opsikje of derfoar kieze om in account fan dizze server te folgjen.", diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json index cd9a83745a..7375e57ef5 100644 --- a/app/javascript/mastodon/locales/ga.json +++ b/app/javascript/mastodon/locales/ga.json @@ -2,7 +2,7 @@ "about.blocks": "Freastalaithe modhnaithe", "about.contact": "Teagmháil:", "about.default_locale": "Réamhshocrú", - "about.disclaimer": "Bogearra foinse oscailte saor in aisce is ea Mastodon, agus is le Mastodon gGmbH an trádmharc.", + "about.disclaimer": "Is bogearraí foinse oscailte saor in aisce é Mastodon, agus trádmharc de chuid Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Cúis nach bhfuil ar fáil", "about.domain_blocks.preamble": "Go ginearálta, tugann Mastodon deis duit ábhar a fheiceáil ó aon fhreastalaí eile sa fediverse agus idirghníomhú leo. Seo iad na heisceachtaí atá déanta ar an bhfreastalaí seo.", "about.domain_blocks.silenced.explanation": "Go hiondúil ní fheicfidh tú próifílí ná inneachar ón bhfreastalaí seo, ach amháin má bhíonn tú á lorg nó má ghlacann tú lena leanúint d'aon ghnó.", @@ -646,6 +646,7 @@ "empty_column.account_unavailable": "Níl an phróifíl ar fáil", "empty_column.blocks": "Níl aon úsáideoir bactha agat fós.", "empty_column.bookmarked_statuses": "Níl aon phostáil leabharmharcaithe agat fós. Nuair a dhéanann tú leabharmharc, beidh sé le feiceáil anseo.", + "empty_column.collections": "Níl aon bhailiúcháin cruthaithe ag {acct} go fóill.", "empty_column.collections.featured_in": "Níor cuireadh le haon bhailiúchán thú go fóill.", "empty_column.collections.featured_in_undiscoverable": "Chun go mbeidh daoine in ann tú a chur le bailiúcháin, ní mór duit cead a thabhairt duit a bheith le feiceáil i dtaithí fionnachtana ó Sainroghanna > Príobháideacht agus raon feidhme", "empty_column.community": "Tá an amlíne áitiúil folamh. Foilsigh rud éigin go poiblí le tús a chur le cúrsaí!", @@ -819,6 +820,12 @@ "keyboard_shortcuts.heading": "Aicearraí méarchláir", "keyboard_shortcuts.home": "Oscail amlíne bhaile", "keyboard_shortcuts.hotkey": "Eochair aicearra", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "Cúlspás", + "keyboard_shortcuts.keys.enter": "Iontráil", + "keyboard_shortcuts.keys.esc": "Esc", + "keyboard_shortcuts.keys.page_down": "Leathanach Síos", + "keyboard_shortcuts.keys.page_up": "Leathanach Suas", "keyboard_shortcuts.legend": "Taispeáin an finscéal seo", "keyboard_shortcuts.load_more": "Dírigh ar an gcnaipe \"Lódáil níos mó\"", "keyboard_shortcuts.local": "Oscail an amlíne áitiúil", @@ -1192,6 +1199,7 @@ "search_popout.user": "úsáideoir", "search_results.accounts": "Próifílí", "search_results.all": "Gach", + "search_results.collections": "Bailiúcháin", "search_results.hashtags": "Haischlib", "search_results.no_results": "Gan torthaí.", "search_results.no_search_yet": "Bain triail as postálacha, próifílí nó hashtags a chuardach.", diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json index 9c6ecb5533..3cd3821e46 100644 --- a/app/javascript/mastodon/locales/gd.json +++ b/app/javascript/mastodon/locales/gd.json @@ -2,7 +2,6 @@ "about.blocks": "Frithealaichean fo mhaorsainneachd", "about.contact": "Fios thugainn:", "about.default_locale": "Bun-roghainn", - "about.disclaimer": "’S e bathar-bog saor le bun-tùs fosgailte a th’ ann am Mastodon agus ’na chomharra-mhalairt aig Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Chan eil an t-adhbhar ga thoirt seachad", "about.domain_blocks.preamble": "San fharsaingeachd, leigidh Mastodon leat susbaint o fhrithealaiche sam bith sa cho-shaoghal a shealltainn agus eadar-ghìomh a ghabhail leis na cleachdaichean uapa-san. Seo na h-easgaidhean a tha an sàs air an fhrithealaiche shònraichte seo.", "about.domain_blocks.silenced.explanation": "San fharsaingeachd, chan fhaic thu pròifilean agus susbaint an fhrithealaiche seo ach ma nì thu lorg no ma tha thu ga leantainn.", diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json index 45b7d7af9d..3d0843525b 100644 --- a/app/javascript/mastodon/locales/gl.json +++ b/app/javascript/mastodon/locales/gl.json @@ -2,7 +2,7 @@ "about.blocks": "Servidores suxeitos a moderación", "about.contact": "Contacto:", "about.default_locale": "Por defecto", - "about.disclaimer": "Mastodon é software libre, de código aberto, e unha marca comercial de Mastodon gGmbH.", + "about.disclaimer": "Mastodon é software libre, de código aberto, e unha marca comercial de Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Motivo non indicado", "about.domain_blocks.preamble": "Mastodon de xeito xeral permíteche ver contidos doutros servidores do fediverso e interactuar coas súas usuarias. Estas son as excepcións que se estabeleceron neste servidor en particular.", "about.domain_blocks.silenced.explanation": "Por defecto non verás perfís e contido desde este servidor, a menos que mires de xeito explícito ou optes por seguir ese contido ou usuaria.", @@ -646,6 +646,7 @@ "empty_column.account_unavailable": "Perfil non dispoñible", "empty_column.blocks": "Aínda non bloqueaches a ningún usuaria.", "empty_column.bookmarked_statuses": "Aínda non marcaches ningunha publicación. Cando o fagas, aparecerán aquí.", + "empty_column.collections": "{acct} aínda non creou ningunha colección.", "empty_column.collections.featured_in": "Non te engadiron a ningunha colección.", "empty_column.collections.featured_in_undiscoverable": "Para que outras persoas poidan engadirte ás súas coleccións ter que conceder permiso para descubrimento da conta en Preferencias > Privacidade e alcance", "empty_column.community": "A cronoloxía local está baleira. Escribe algo de xeito público para espallalo!", @@ -819,6 +820,12 @@ "keyboard_shortcuts.heading": "Atallos do teclado", "keyboard_shortcuts.home": "Para abrir a cronoloxía inicial", "keyboard_shortcuts.hotkey": "Tecla de atallo", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "Retroceso", + "keyboard_shortcuts.keys.enter": "Entrar", + "keyboard_shortcuts.keys.esc": "Escape", + "keyboard_shortcuts.keys.page_down": "Frecha abaixo", + "keyboard_shortcuts.keys.page_up": "Frecha arriba", "keyboard_shortcuts.legend": "Para amosar esta lenda", "keyboard_shortcuts.load_more": "Foco no botón \"Cargar máis\"", "keyboard_shortcuts.local": "Para abrir a cronoloxía local", @@ -1192,6 +1199,7 @@ "search_popout.user": "usuaria", "search_results.accounts": "Perfís", "search_results.all": "Todo", + "search_results.collections": "Coleccións", "search_results.hashtags": "Cancelos", "search_results.no_results": "Sen resultados.", "search_results.no_search_yet": "Intenta buscando publicacións, perfís ou cancelos.", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index dc9382e7f9..39991d3bc7 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -2,7 +2,6 @@ "about.blocks": "שרתים תחת פיקוח תוכן", "about.contact": "יצירת קשר:", "about.default_locale": "ברירת המחדל", - "about.disclaimer": "מסטודון היא תוכנת קוד פתוח חינמית וסימן מסחרי של Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "הסיבה אינה זמינה", "about.domain_blocks.preamble": "ככלל מסטודון מאפשרת לך לצפות בתוכן ולתקשר עם משתמשים מכל שרת בפדיברס. אלו הם היוצאים מן הכלל שהוגדרו עבור השרת המסוים הזה.", "about.domain_blocks.silenced.explanation": "ככלל פרופילים ותוכן משרת זה לא יוצגו, אלא אם חיפשת אותם באופן מפורש או בחרת להשתתף בו על ידי מעקב.", diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json index a6215bc6b1..c2784a769a 100644 --- a/app/javascript/mastodon/locales/hi.json +++ b/app/javascript/mastodon/locales/hi.json @@ -2,7 +2,6 @@ "about.blocks": "मॉडरेट सर्वर", "about.contact": "कांटेक्ट:", "about.default_locale": "Default", - "about.disclaimer": "मास्टोडन एक ओपन सोर्स सॉफ्टवेयर है, और मास्टोडन gGmbH का ट्रेडमार्क है।", "about.domain_blocks.no_reason_available": "कारण उपलब्ध नहीं है!", "about.domain_blocks.preamble": "मास्टोडन आम तौर पर आपको कंटेंट को देखने और फेडिवेर्से में किसी अन्य सर्वर से उपयोगकर्ताओं के साथ बातचीत करने की अनुमति देता है। ये अपवाद हैं जो इस विशेष सर्वर पर बनाए गए हैं।", "about.domain_blocks.silenced.explanation": "आप आमतौर पर इस सर्वर से प्रोफ़ाइल और कंटेंट नहीं देख पाएंगे, जब तक कि आप इसे स्पष्ट रूप से नहीं देखते या इसका अनुसरण करके इसका चयन नहीं करते।", diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json index 859aaaa9ac..a8d3c0e781 100644 --- a/app/javascript/mastodon/locales/hr.json +++ b/app/javascript/mastodon/locales/hr.json @@ -1,7 +1,6 @@ { "about.blocks": "Moderirani poslužitelji", "about.contact": "Kontakt:", - "about.disclaimer": "Mastodon je besplatan softver otvorenog koda i zaštitni znak tvrtke Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Razlog nije dostupan", "about.domain_blocks.preamble": "Mastodon vam općenito omogućuje pregled sadržaja i interakciju s korisnicima s bilo kojeg drugog poslužitelja u fediverse. Ovo su iznimke napravljene na ovom poslužitelju.", "about.domain_blocks.silenced.explanation": "Obično nećete vidjeti profile i sadržaj s ovog poslužitelja, osim ako ga izričito ne potražite ili uključite u njega slijedeći ga.", diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index 4af2e3d474..dfa722d2d7 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -2,7 +2,6 @@ "about.blocks": "Moderált kiszolgálók", "about.contact": "Kapcsolat:", "about.default_locale": "Alapértelmezett", - "about.disclaimer": "A Mastodon ingyenes, nyílt forráskódú szoftver, a Mastodon gGmbH védjegye.", "about.domain_blocks.no_reason_available": "Nem áll rendelkezésre indoklás", "about.domain_blocks.preamble": "A Mastodon általában mindenféle tartalomcserét és interakciót lehetővé tesz bármelyik másik kiszolgálóval a födiverzumban. Ezek azok a kivételek, amelyek a mi kiszolgálónkon érvényben vannak.", "about.domain_blocks.silenced.explanation": "Általában nem fogsz profilokat és tartalmat látni erről a kiszolgálóról, hacsak közvetlenül fel nem keresed vagy követed.", diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json index dc5683b730..01fb6bb5f3 100644 --- a/app/javascript/mastodon/locales/hy.json +++ b/app/javascript/mastodon/locales/hy.json @@ -1,7 +1,6 @@ { "about.blocks": "Մոդերացուող սպասարկիչներ", "about.contact": "Կապ՝", - "about.disclaimer": "Մաստոդոնը ազատ, բաց ելակոդով ծրագրակազմ է, յայտնի Mastodon gGmbH ապրանքանշանով։", "about.domain_blocks.silenced.title": "Սահմանափակ", "about.domain_blocks.suspended.title": "Սպասող", "about.not_available": "Այս տեղեկութիւնը տեսանելի չի այս սերուերում։", diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json index fb1ec026a8..55cc89f138 100644 --- a/app/javascript/mastodon/locales/ia.json +++ b/app/javascript/mastodon/locales/ia.json @@ -2,7 +2,6 @@ "about.blocks": "Servitores moderate", "about.contact": "Contacto:", "about.default_locale": "Default", - "about.disclaimer": "Mastodon es software libere, de codice aperte, e un marca de Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Ration non disponibile", "about.domain_blocks.preamble": "Mastodon generalmente permitte vider le contento de, e interager con, usatores de qualcunque altere servitor in le fediverso. Istes es le exceptiones que ha essite facite sur iste servitor particular.", "about.domain_blocks.silenced.explanation": "Generalmente, tu non videra le profilos e le contento de iste servitor, excepte si tu expressemente cerca le contento o seque le profilos.", diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json index 63bd8f231e..36885c906f 100644 --- a/app/javascript/mastodon/locales/id.json +++ b/app/javascript/mastodon/locales/id.json @@ -2,7 +2,6 @@ "about.blocks": "Server yang dimoderasi", "about.contact": "Kontak:", "about.default_locale": "Default", - "about.disclaimer": "Mastodon adalah perangkat lunak bebas dan sumber terbuka, serta merek dagang milik Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Alasan tidak tersedia", "about.domain_blocks.preamble": "Mastodon umumnya mengizinkan Anda untuk melihat konten dan berinteraksi dengan pengguna dari server lain di fediverse. Ini adalah pengecualian yang dibuat untuk beberapa server.", "about.domain_blocks.silenced.explanation": "Anda secara umum tidak melihat profil dan konten dari server ini, kecuali jika Anda mencarinya atau memilihnya dengan mengikuti secara eksplisit.", diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json index 42f8bad5bf..516604acca 100644 --- a/app/javascript/mastodon/locales/ie.json +++ b/app/javascript/mastodon/locales/ie.json @@ -1,7 +1,6 @@ { "about.blocks": "Moderat servitores", "about.contact": "Contacter:", - "about.disclaimer": "Mastodon es programmatura líber e con fonte apert, e un marca de fabrica de Mastodon dGmbH.", "about.domain_blocks.no_reason_available": "Rason ne disponibil", "about.domain_blocks.preamble": "Mastodon generalmen possibilisa regardar li contenete de, e li interaction con usatores de quelcunc altri servitor in li fediverse. Ci trova se li exceptiones fat de ti-ci particulari servitor.", "about.domain_blocks.silenced.explanation": "Generalmen, li profiles e contenete de ti-ci servitor ne va aparir, except si on sercha les explicitmen o optionalisa it per sequer.", diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json index bbba5af9a3..660747bcce 100644 --- a/app/javascript/mastodon/locales/io.json +++ b/app/javascript/mastodon/locales/io.json @@ -2,7 +2,6 @@ "about.blocks": "Jerata servili", "about.contact": "Kontaktajo:", "about.default_locale": "Predeterminita", - "about.disclaimer": "Mastodon esas libera, publikfonta e komercmarko di Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Expliko nedisponebla", "about.domain_blocks.preamble": "Mastodon generale permisas on vidar kontenajo e interagar kun uzanti de irga altra servilo en fediverso. Existas eceptioni quo facesis che ca partikulara servilo.", "about.domain_blocks.silenced.explanation": "On generale ne vidar profili e enhavajo de ca servilo, se on ne intence serchar o voleskar per sequar.", diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json index 56f1ca4358..bce1167c11 100644 --- a/app/javascript/mastodon/locales/is.json +++ b/app/javascript/mastodon/locales/is.json @@ -2,7 +2,7 @@ "about.blocks": "Netþjónar með efnisumsjón", "about.contact": "Hafa samband:", "about.default_locale": "Sjálfgefið", - "about.disclaimer": "Mastodon er frjáls hugbúnaður með opinn grunnkóða og er skrásett vörumerki í eigu Mastodon gGmbH.", + "about.disclaimer": "Mastodon er frjáls hugbúnaður með opinn grunnkóða og er skrásett vörumerki í eigu Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Ástæða ekki tiltæk", "about.domain_blocks.preamble": "Mastodon leyfir þér almennt að skoða og eiga við efni frá notendum frá hvaða vefþjóni sem er í vefþjónasambandinu. Þetta eru þær undantekningar sem hafa verið gerðar á þessum tiltekna vefþjóni.", "about.domain_blocks.silenced.explanation": "Þú munt almennt ekki sjá notandasnið og efni af þessum netþjóni nema þú flettir því upp sérstaklega eða veljir að fylgjast með því.", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index 5b0e89a0bf..3c7dadd248 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -2,7 +2,7 @@ "about.blocks": "Server moderati", "about.contact": "Contatti:", "about.default_locale": "Predefinito", - "about.disclaimer": "Mastodon è un software libero e open-source e un marchio di Mastodon gGmbH.", + "about.disclaimer": "Mastodon è un software libero, open-source e un marchio di Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Motivo non disponibile", "about.domain_blocks.preamble": "Mastodon, generalmente, ti consente di visualizzare i contenuti e interagire con gli utenti da qualsiasi altro server nel fediverso. Queste sono le eccezioni che sono state fatte su questo particolare server.", "about.domain_blocks.silenced.explanation": "Generalmente non vedrai i profili e i contenuti di questo server, a meno che tu non lo cerchi esplicitamente o che tu scelga di seguirlo.", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index f864cb0b77..cc7271c3e2 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -2,7 +2,6 @@ "about.blocks": "制限中のサーバー", "about.contact": "連絡先", "about.default_locale": "デフォルト", - "about.disclaimer": "Mastodonは自由なオープンソースソフトウェアであり、Mastodon gGmbHの商標です。", "about.domain_blocks.no_reason_available": "理由未記載", "about.domain_blocks.preamble": "Mastodonでは原則的にあらゆるサーバー同士で交流したり、互いの投稿を読んだりできますが、当サーバーでは例外的に次のような制限を設けています。", "about.domain_blocks.silenced.explanation": "このサーバーのプロフィールやコンテンツは、明示的に検索したり、フォローでオプトインしない限り、通常は表示されません。", diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json index a07c68efcb..73f0859251 100644 --- a/app/javascript/mastodon/locales/kab.json +++ b/app/javascript/mastodon/locales/kab.json @@ -2,7 +2,6 @@ "about.blocks": "Iqeddacen yettwaɛassen", "about.contact": "Anermis:", "about.default_locale": "Tamezwert", - "about.disclaimer": "Mastodon d aseɣẓan ilelli, d aseɣẓan n uɣbalu yeldin, d tnezzut n Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Ulac taɣẓint", "about.domain_blocks.preamble": "Maṣṭudun s umata yeḍmen-ak ad teẓreḍ agbur, ad tesdemreḍ akked yimseqdacen-nniḍen seg yal aqeddac deg fedivers. Ha-tent-an ɣur-k tsuraf i yellan deg uqeddac-agi.", "about.domain_blocks.silenced.title": "Ɣur-s talast", diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json index ad693c14b2..7e4f2cf9a7 100644 --- a/app/javascript/mastodon/locales/kk.json +++ b/app/javascript/mastodon/locales/kk.json @@ -2,7 +2,6 @@ "about.blocks": "Модерацияланған серверлер", "about.contact": "Байланыс:", "about.default_locale": "Әдепкі", - "about.disclaimer": "Mastodon деген тегін, бастапқы коды ашық бағдарламалық жасақтама және Mastodon gGmbH-тің сауда маркасы.", "about.domain_blocks.no_reason_available": "Себеп қолжетімсіз", "about.domain_blocks.preamble": "Mastodon әдетте сізге Fediverse'тің кез келген серверінің қолданушыларының контентін көріп, олармен байланысуға мүмкіндік береді. Осы белгілі серверде жасалған ережеден тыс жағдайлар міне.", "about.domain_blocks.silenced.explanation": "Сіз бұл сервердің профильдері мен контентін іздегенше немесе жазылмағанша, оларды әдетте көрмейсіз.", diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json index 1c8875fc34..f118ba6d8c 100644 --- a/app/javascript/mastodon/locales/kn.json +++ b/app/javascript/mastodon/locales/kn.json @@ -1,7 +1,6 @@ { "about.blocks": "ನಿಯಂತ್ರಿತ ಸರ್ವರ್‌ಗಳು", "about.contact": "ಸಂಪರ್ಕ:", - "about.disclaimer": "ಮಾಸ್ಟೋಡಾನ್ ಇದು ಉಚಿತ, ಮುಕ್ತ ತಂತ್ರಾಂಶ ಮತ್ತು Mastodon gGmbH ಇದರ ನೊಂದಾಯಿತ ಗುರುತು.", "about.domain_blocks.no_reason_available": "ಕಾರಣ ಲಭ್ಯವಿಲ್ಲ", "about.domain_blocks.preamble": "ಸಾಮಾನ್ಯವಾಗಿ ಮಾಸ್ಟೊಡಾನ್ ನಿಮಗೆ ಇತರೆ ಬಳಕೆದಾರರಿಂದ ಹಂಚಲ್ಪಟ್ಟ ವಿಷಯಗಳನ್ನು ನೋಡಲು ಮತ್ತು ಅವರೊಂದಿಗೆ ಸಂಭಾಷಿಸಲು ಅನುಮತಿಸುತ್ತದೆ.\nಆದರೆ ಈ ಸರ್ವ್ರರ್‌ನಲ್ಲಿ ಅಳವಡಿಸಲಾದ ಕೆಲವು ವಿನಾಯಿತಿಗಳು ಇಂತಿವೆ.", "account.add_or_remove_from_list": "ಪಟ್ಟಿಗೆ ಸೇರಿಸು ಅಥವ ಪಟ್ಟಿಯಿಂದ ತೆಗೆದುಹಾಕು", diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index 507c2d0312..4b7be7ebaf 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -2,7 +2,6 @@ "about.blocks": "제한된 서버들", "about.contact": "연락처:", "about.default_locale": "기본", - "about.disclaimer": "Mastodon은 자유 오픈소스 소프트웨어이며, Mastodon gGmbH의 상표입니다", "about.domain_blocks.no_reason_available": "사유를 밝히지 않음", "about.domain_blocks.preamble": "마스토돈은 일반적으로 연합우주에 있는 어떤 서버의 사용자와도 게시물을 보고 응답을 할 수 있도록 허용합니다. 다음 항목들은 특정한 서버에 대해 만들어 진 예외사항입니다.", "about.domain_blocks.silenced.explanation": "명시적으로 찾아보거나 팔로우를 하기 전까지는, 이 서버에 있는 프로필이나 게시물 등을 일반적으로 볼 수 없습니다.", diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json index 202a15d2ac..020ab0f82b 100644 --- a/app/javascript/mastodon/locales/ku.json +++ b/app/javascript/mastodon/locales/ku.json @@ -2,7 +2,6 @@ "about.blocks": "Rajekarên çavdêrkirî", "about.contact": "Têkilî:", "about.default_locale": "Berdest", - "about.disclaimer": "Mastodon belaş e, nermalaveke çavkaniya vekirî ye û markeyeke Mastodon gGmbHê ye.", "about.domain_blocks.no_reason_available": "Sedem ne berdest e", "about.domain_blocks.preamble": "Mastodon bi gelemperî dihêle ku tu naverokê bibînî û bi bikarhênerên ji rajekareke din a li fendiverse re têkilî dayne. Ev awaretyên ku li ser vê rajekara taybetî hatine çêkirin ev in.", "about.domain_blocks.silenced.explanation": "Heye ku tu bi awayekî vekirî lê negerî an jî bi şopandinê hilnebijêrî, tu yêbi giştî profîl û naverok ji vê rajekarê nebînî.", diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json index 59b724d17d..09098f089d 100644 --- a/app/javascript/mastodon/locales/la.json +++ b/app/javascript/mastodon/locales/la.json @@ -2,7 +2,6 @@ "about.blocks": "Servī moderātī", "about.contact": "Ratio:", "about.default_locale": "Default", - "about.disclaimer": "Mastodon est software līberum, apertum fontem, et nōtam commercium Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Ratio abdere est", "about.domain_blocks.preamble": "Mastodon genērāliter sinit tē contentum ex aliīs servientibus in fedīversō vidēre et cum usoribus ab iīs interāgere. Haē sunt exceptionēs quae in hōc particulārī servientē factae sunt.", "about.domain_blocks.silenced.explanation": "Tua profilia atque tuum contentum ab hac serve praecipue non videbis, nisi explōrēs expresse aut subsequeris et optēs.", diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json index e22aa33ab6..f655a6e003 100644 --- a/app/javascript/mastodon/locales/lad.json +++ b/app/javascript/mastodon/locales/lad.json @@ -2,7 +2,6 @@ "about.blocks": "Sirvidores moderados", "about.contact": "Kontakto:", "about.default_locale": "Predeterminado", - "about.disclaimer": "Mastodon es un programario libero, kon kodiche avierto i una marka komersiala de Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Razon no desponivle", "about.domain_blocks.preamble": "Mastodon djeneralmente te permete ver kontenido de i enteraktuar kon utilizadores de kualseker otro sirvidor en el fediverso. Estas son las eksepsiones en este sirvidor en partikolar.", "about.domain_blocks.silenced.explanation": "Djeneralmente no veras profiles i kontenido de este sirvidor, salvo ke eksplisitamente lo bushkes o sigas algun kuento de el.", diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json index 61525d0ec7..a1409be70b 100644 --- a/app/javascript/mastodon/locales/lt.json +++ b/app/javascript/mastodon/locales/lt.json @@ -2,7 +2,6 @@ "about.blocks": "Prižiūrimi serveriai", "about.contact": "Kontaktai:", "about.default_locale": "Numatyta", - "about.disclaimer": "„Mastodon“ – tai nemokama atvirojo kodo programinė įranga ir „Mastodon gGmbH“ prekės ženklas.", "about.domain_blocks.no_reason_available": "Priežastis nepateikta", "about.domain_blocks.preamble": "„Mastodon“ paprastai leidžia peržiūrėti turinį ir bendrauti su naudotojais iš bet kurio kito fediverse esančio serverio. Šios yra išimtys, kurios buvo padarytos šiame konkrečiame serveryje.", "about.domain_blocks.silenced.explanation": "Paprastai nematysi profilių ir turinio iš šio serverio, nebent jį aiškiai ieškosi arba pasirinksi jį sekant.", diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json index 0ac38ecd00..34558d6ca5 100644 --- a/app/javascript/mastodon/locales/lv.json +++ b/app/javascript/mastodon/locales/lv.json @@ -2,7 +2,6 @@ "about.blocks": "Moderētie serveri", "about.contact": "Kontakts:", "about.default_locale": "Noklusējums", - "about.disclaimer": "Mastodon ir bezmaksas atklātā pirmkoda programmatūra un Mastodon gGmbH preču zīme.", "about.domain_blocks.no_reason_available": "Iemesls nav norādīts", "about.domain_blocks.preamble": "Mastodon parasti ļauj apskatīt saturu un mijiedarboties ar lietotājiem no jebkura cita fediversa servera. Šie ir izņēmumi, kas veikti tieši šajā serverī.", "about.domain_blocks.silenced.explanation": "Parasti tu neredzēsi profilus un saturu no šī servera, ja vien tu nepārprotami izvēlēsies to pārskatīt vai sekot.", diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json index 567c586aff..a4f53d0cfd 100644 --- a/app/javascript/mastodon/locales/mk.json +++ b/app/javascript/mastodon/locales/mk.json @@ -2,7 +2,6 @@ "about.blocks": "Модерирани сервери", "about.contact": "Контакт:", "about.default_locale": "Стандардно", - "about.disclaimer": "Mastodon е бесплатен, open-source софтвер, и заштитен знак на Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Причината не е достапна", "about.domain_blocks.preamble": "Mastodon вообичаено ви дозволува да прегледувате содржини и комуницирате со корисниците од било кој сервер во федиверзумот. На овој сервер има исклучоци.", "about.domain_blocks.silenced.explanation": "Вообичаено нема да гледате профили и содржина од овој сервер, освен ако не го пребарате намерно, или го заследите.", diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json index ca6b67046a..ac3563fbe0 100644 --- a/app/javascript/mastodon/locales/mr.json +++ b/app/javascript/mastodon/locales/mr.json @@ -1,7 +1,6 @@ { "about.blocks": "नियंत्रित सर्व्हर", "about.contact": "संपर्क:", - "about.disclaimer": "Mastodon हे विनामूल्य, मुक्त-स्रोत सॉफ्टवेअर आहे आणि Mastodon gGmbH चे ट्रेडमार्क आहे.", "about.domain_blocks.no_reason_available": "कारण उपलब्ध नाही", "about.domain_blocks.preamble": "मास्टोडॉन तुम्हाला सामान्यत: फेडिव्हर्समधील इतर कोणत्याही सर्व्हरवरील वापरकर्त्यांवरील मजकूर पाहण्याची आणि त्यांच्याशी संवाद साधण्याची परवानगी देते. या विशिष्ट सर्व्हरवर केलेले हे अपवाद आहेत.", "about.domain_blocks.silenced.explanation": "जोपर्यंत तुम्ही ते स्पष्टपणे शोधत नाही किंवा अनुसरण करून निवड करत नाही तोपर्यंत तुम्हाला या सर्व्हरवरील प्रोफाइल आणि मजकूर दिसणार नाही.", diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json index 2024174bf6..cd34aae576 100644 --- a/app/javascript/mastodon/locales/ms.json +++ b/app/javascript/mastodon/locales/ms.json @@ -2,7 +2,6 @@ "about.blocks": "Pelayan yang diselaraskan", "about.contact": "Hubungi:", "about.default_locale": "Lalai", - "about.disclaimer": "Mastodon ialah perisian sumber terbuka percuma, dan merupakan tanda dagangan Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Sebab tidak tersedia", "about.domain_blocks.preamble": "Secara amnya, Mastodon membenarkan anda melihat kandungan pengguna daripada mana-mana pelayan dalam alam bersekutu dan berinteraksi dengan mereka. Berikut ialah pengecualian yang khusus pada pelayan ini.", "about.domain_blocks.silenced.explanation": "Secara amnya, anda tidak akan melihat profil dan kandungan daripada pelayan ini, kecuali anda mencarinya secara khusus atau ikut serta dengan mengikutinya.", diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json index a08722a66e..4a89b6dc4f 100644 --- a/app/javascript/mastodon/locales/my.json +++ b/app/javascript/mastodon/locales/my.json @@ -1,7 +1,6 @@ { "about.blocks": "ထိန်းချုပ်မှုရှိသော ဆာဗာများ", "about.contact": "ဆက်သွယ်ရန်:", - "about.disclaimer": "Mastodon သည် အခမဲ့ဖြစ်ပြီး open-source software နှင့် Mastodon gGmbH ၏ ကုန်အမှတ်တံဆိပ်တစ်ခုဖြစ်သည်။.", "about.domain_blocks.no_reason_available": "အကြောင်းပြချက်မရှိပါ", "about.domain_blocks.preamble": "Mastodon သည် ယေဘုယျအားဖြင့် fediverse ရှိ အခြား​ဆာဗာ အသုံးပြုသူများထံမှ အကြောင်းအရာများကို ကြည့်ရှုနိုင်သည့်အပြင် အပြန်အလှန်တုံ့ပြန်နိုင်စေပါသည်။ ဤသည်တို့မှာ သီးခြားဆာဗာများအတွက် ပြုလုပ်ထားသောအရာများဖြစ်သည်။", "about.domain_blocks.silenced.explanation": "ရှင်းရှင်းလင်းလင်း ရှာကြည့်ခြင်း သို့မဟုတ် လိုက်ကြည့်ခြင်းဖြင့် ၎င်းကို ရွေးချယ်ခြင်းမှလွဲ၍ ဤဆာဗာမှ ပရိုဖိုင်များနှင့် အကြောင်းအရာများကို ယေဘုယျအားဖြင့် သင်သည် မမြင်ရပါ။", diff --git a/app/javascript/mastodon/locales/nan-TW.json b/app/javascript/mastodon/locales/nan-TW.json index 393351265c..cd93bc69d1 100644 --- a/app/javascript/mastodon/locales/nan-TW.json +++ b/app/javascript/mastodon/locales/nan-TW.json @@ -2,7 +2,6 @@ "about.blocks": "Siū 管制 ê 服侍器", "about.contact": "聯絡方法：", "about.default_locale": "預設", - "about.disclaimer": "Mastodon是自由、開放原始碼ê軟體，mā是Mastodon gGmbH ê商標。", "about.domain_blocks.no_reason_available": "原因bē-tàng用", "about.domain_blocks.preamble": "Mastodon一般ē允准lí看別ê fediverse 服侍器來ê聯絡人kap hām用者交流。Tsiah ê 是本服侍器建立ê例外。", "about.domain_blocks.silenced.explanation": "Lí一般buē-tàng tuì tsit ê服侍器看用戶ê紹介kap內容，除非lí明白tshiau-tshuē á是跟tuè伊。", diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json index ccc4e18b0c..0e7831318b 100644 --- a/app/javascript/mastodon/locales/ne.json +++ b/app/javascript/mastodon/locales/ne.json @@ -1,7 +1,6 @@ { "about.contact": "सम्पर्क:", "about.default_locale": "पूर्वनिर्धारित", - "about.disclaimer": "Mastodon नि:शुल्क, खुला स्रोत सफ्टवेयर, र Mastodon gGmbH को ट्रेडमार्क हो।", "about.domain_blocks.no_reason_available": "कारण उपलब्ध छैन", "about.domain_blocks.preamble": "Mastodon ले तपाइँलाई सामान्यतया फेडिभर्समा कुनै पनि अन्य सर्भरका सामग्री हेर्न र प्रयोगकर्ताहरूसँग अन्तरक्रिया गर्न दिन्छ। यी अपवादहरू हुन् जुन यस विशेष सर्भरमा बनाइएका छन्।", "about.domain_blocks.silenced.title": "सीमित", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index 89e98a4553..1d71409ced 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -2,7 +2,7 @@ "about.blocks": "Beperkte en opgeschorte servers", "about.contact": "Contact:", "about.default_locale": "Standaard", - "about.disclaimer": "Mastodon is vrije, opensourcesoftware en een handelsmerk van Mastodon gGmbH.", + "about.disclaimer": "Mastodon is vrije, opensourcesoftware en een handelsmerk van Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Reden niet beschikbaar", "about.domain_blocks.preamble": "In het algemeen kun je met Mastodon berichten ontvangen van, en interactie hebben met gebruikers van elke server in de fediverse. Dit zijn de uitzonderingen die op deze specifieke server gelden.", "about.domain_blocks.silenced.explanation": "In het algemeen zie je geen berichten en accounts van deze server, tenzij je berichten expliciet opzoekt of ervoor kiest om een account van deze server te volgen.", @@ -646,6 +646,7 @@ "empty_column.account_unavailable": "Profiel is niet beschikbaar", "empty_column.blocks": "Je hebt nog geen gebruikers geblokkeerd.", "empty_column.bookmarked_statuses": "Jij hebt nog geen berichten aan je bladwijzers toegevoegd. Wanneer je er een aan jouw bladwijzers toevoegt, valt deze hier te zien.", + "empty_column.collections": "{acct} heeft nog geen verzamelingen aangemaakt.", "empty_column.collections.featured_in": "Je bent aan nog geen enkele verzameling toegevoegd.", "empty_column.collections.featured_in_undiscoverable": "Om ervoor te zorgen dat mensen je aan verzamelingen kunnen toevoegen, moet je jouw account en berichten laten uitlichten door Mastodon onder Instellingen > Privacy en bereik", "empty_column.community": "De lokale tijdlijn is nog leeg. Plaats een openbaar bericht om de spits af te bijten!", @@ -819,6 +820,12 @@ "keyboard_shortcuts.heading": "Sneltoetsen", "keyboard_shortcuts.home": "Starttijdlijn tonen", "keyboard_shortcuts.hotkey": "Sneltoets", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "Backspace", + "keyboard_shortcuts.keys.enter": "Enter", + "keyboard_shortcuts.keys.esc": "Esc", + "keyboard_shortcuts.keys.page_down": "Page Down", + "keyboard_shortcuts.keys.page_up": "Page Up", "keyboard_shortcuts.legend": "Deze legenda tonen", "keyboard_shortcuts.load_more": "\"Meer laden\"-knop focussen", "keyboard_shortcuts.local": "Lokale tijdlijn tonen", @@ -1192,6 +1199,7 @@ "search_popout.user": "gebruiker", "search_results.accounts": "Accounts", "search_results.all": "Alles", + "search_results.collections": "Verzamelingen", "search_results.hashtags": "Hashtags", "search_results.no_results": "Geen resultaten.", "search_results.no_search_yet": "Probeer te zoeken naar berichten, profielen of hashtags.", diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json index f95af7bb5d..924973e0b3 100644 --- a/app/javascript/mastodon/locales/nn.json +++ b/app/javascript/mastodon/locales/nn.json @@ -2,7 +2,7 @@ "about.blocks": "Modererte tenarar", "about.contact": "Kontakt:", "about.default_locale": "Standard", - "about.disclaimer": "Mastodon er gratis programvare med open kjeldekode, og eit varemerke frå Mastodon gGmbH.", + "about.disclaimer": "Mastodon er gratis programvare med open kjeldekode, og eit varemerke frå Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Årsaka er ikkje tilgjengeleg", "about.domain_blocks.preamble": "Mastodon gjev deg som regel lov til å sjå innhald og samhandla med brukarar frå alle andre tenarar i allheimen. Dette er unntaka som er valde for akkurat denne tenaren.", "about.domain_blocks.silenced.explanation": "Med mindre du leiter den opp eller fylgjer profiler på tenaren, vil du vanlegvis ikkje sjå profilar og innhald frå denne tenaren.", @@ -86,6 +86,7 @@ "account.locked_info": "Denne kontoen er privat. Eigaren kan sjølv velja kven som kan fylgja han.", "account.media": "Media", "account.mention": "Nemn @{name}", + "account.menu.add_to_collection": "Legg til i samling…", "account.menu.add_to_list": "Legg til liste…", "account.menu.block": "Blokker konto", "account.menu.block_domain": "Blokker {domain}", @@ -327,11 +328,15 @@ "annual_report.summary.share_on_mastodon": "Del på Mastodon", "attachments_list.unprocessed": "(ubehandla)", "audio.hide": "Gøym lyd", + "block_modal.no_collections": "Ingen av dykk kan leggja kvarandre til i samlingar. Viss de har samlingar der den andre er med, vil de bli automatisk fjerna derifrå.", "block_modal.remote_users_caveat": "Me vil be tenaren {domain} om å respektera di avgjerd. Me kan ikkje garantera at det vert gjort, sidan nokre tenarar kan handtera blokkering ulikt. Offentlege innlegg kan framleis vera synlege for ikkje-innlogga brukarar.", "block_modal.show_less": "Vis mindre", "block_modal.show_more": "Vis meir", + "block_modal.they_cant_mention": "De kan ikkje nemna, fylgja eller sitera kvarandre.", + "block_modal.they_cant_see_posts": "Dei kan ikkje sjå innhaldet ditt, og du vil ikkje sjå deira.", "block_modal.they_will_know": "Dei kan sjå at dei er blokkerte.", "block_modal.title": "Blokker brukaren?", + "block_modal.you_wont_see_mentions": "Du kjem ikkje til å sjå innlegg frå andre som nemner dei.", "boost_modal.combo": "Du kan trykkja {combo} for å hoppa over dette neste gong", "boost_modal.reblog": "Framhev innlegget?", "boost_modal.undo_reblog": "Fjern framhevinga?", @@ -357,12 +362,19 @@ "closed_registrations_modal.find_another_server": "Finn ein annan tenar", "closed_registrations_modal.preamble": "Mastodon er desentralisert, så uansett kvar du opprettar ein konto, vil du kunne fylgje og samhandle med alle på denne tenaren. Du kan til og med ha din eigen tenar!", "closed_registrations_modal.title": "Registrer deg på Mastodon", + "collection.share_modal.share_link_label": "Del lenka", "collection.share_modal.share_via_post": "Legg ut på Mastodon", "collection.share_modal.share_via_system": "Del med…", "collection.share_modal.title": "Del ei samling", "collection.share_modal.title_new": "Del den nye samlinga di!", + "collection.share_template_other": "Sjekk denne samlinga:", + "collection.share_template_own": "Sjekk den nye samlinga mi:", "collections.account_count": "{count, plural, one {# konto} other {# kontoar}}", + "collections.accounts.empty_description": "Legg til opp til {count} kontoar", + "collections.accounts.empty_editor_title": "Det er ingen i denne samlinga enno", "collections.accounts.empty_title": "Denne samlinga er tom", + "collections.add_to_collection": "Legg til {name} i samlingar", + "collections.block_collection_owner": "Blokker konto", "collections.by_account": "av {account_handle}", "collections.collection_description": "Skildring", "collections.collection_language": "Språk", @@ -372,6 +384,8 @@ "collections.confirm_account_removal": "Er du sikker på at du vil fjerna denne brukarkontoen frå samlinga?", "collections.content_warning": "Innhaldsåtvaring", "collections.continue": "Hald fram", + "collections.copy_link": "Kopier lenka", + "collections.copy_link_confirmation": "Kopierte samlingslenka til utklippstavla", "collections.create.accounts_title": "Kven vil du leggja vekt på denne samlinga?", "collections.create.basic_details_title": "Grunnleggjande opplysingar", "collections.create.steps": "Steg {step}/{total}", @@ -382,23 +396,50 @@ "collections.detail.loading": "Lastar inn samling…", "collections.detail.revoke_inclusion": "Fjern meg", "collections.detail.sensitive_content": "Ømtolig innhald", + "collections.detail.sensitive_note": "Skildringa og kontoane er kanskje ikkje høvelege for alle lesarar.", "collections.detail.share": "Del denne samlinga", "collections.detail.you_are_in_this_collection": "Du er framheva i denne samlinga", "collections.edit_details": "Rediger detaljar", + "collections.error_loading_collections": "Noko gjekk gale då me prøvde å lasta desse samlingane.", + "collections.hidden_accounts_description": "Du har blokkert eller dempa {count, plural, one {denne brukaren} other {desse brukarane}}", + "collections.hidden_accounts_link": "{count, plural, one {# gøymd konto} other {# gøymde kontoar}}", + "collections.hints.accounts_counter": "{count}/{max} kontoar", "collections.last_updated_at": "Sist oppdatert: {date}", + "collections.list.collections_with_count": "{count, plural, one {# samling} other {# samlingar}}", + "collections.list.created_by_author": "Oppretta av {name}", + "collections.list.created_by_you": "Oppretta av deg", + "collections.list.featuring_you": "Med deg", "collections.manage_accounts": "Handter kontoar", "collections.mark_as_sensitive": "Merk som ømtolig", "collections.mark_as_sensitive_hint": "Gøymer skildringa og kontoane i samlinga bak ei innhaldsåtvaring. Namnet på samlinga blir framleis synleg.", + "collections.maximum_collection_count_description": "Tenaren din tillèt opp til {count} samlingar.", + "collections.maximum_collection_count_reached": "Du har nådd grensa for kor mange samlingar du kan ha", "collections.name_length_hint": "Maks 40 teikn", "collections.new_collection": "Ny samling", + "collections.pending_accounts.message": "Kontoar kan ha ventestatus når dei ventar på svar frå brukaren eller tenaren deira. Berre du kan sjå ventande kontoar.", + "collections.pending_accounts.title": "Kvifor ser eg ventande kontoar?", + "collections.remove_account": "Fjern", "collections.report_collection": "Rapporter denne samlinga", "collections.revoke_collection_inclusion": "Fjern meg frå denne samlinga", "collections.revoke_inclusion.confirmation": "Du er fjerna frå «{collection}»", "collections.revoke_inclusion.error": "Noko gjekk gale, prøv att seinare.", + "collections.search_accounts_label": "Søk etter ein brukarkonto å leggja til", "collections.search_accounts_max_reached": "Du har nådd grensa for kor mange kontoar du kan leggja til", "collections.sensitive": "Ømtolig", + "collections.share_short": "Del", + "collections.sort_alphabetical": "Alfabetisk", + "collections.sort_by": "Sorter etter:", + "collections.sort_date_added": "Dato lagt til", + "collections.sort_last_active": "Sist aktiv", + "collections.sort_most_followers": "Flest fylgjarar", + "collections.suggestions.can_not_add": "Kan ikkje leggjast til", + "collections.suggestions.can_not_add_desc": "Desse kontoane har kanskje valt å ikkje bli oppdaga, eller dei kan vera på ein tenar som ikkje støttar samlingar.", + "collections.suggestions.must_follow": "Må fylgja fyrst", + "collections.suggestions.must_follow_desc": "Desse kontoane går gjennom alle som vil fylgja dei. Fylgjarar kan leggja dei til i samlingar.", "collections.topic_hint": "Legg til ein emneknagg som hjelper andre å forstå hovudemnet for denne samlinga.", "collections.topic_special_chars_hint": "Spesialteikn vil bli fjerna ved lagring", + "collections.unlisted_collections_description": "Desse syner ikkje på på profilen din til andre. Alle med lenka kan oppdaga dei.", + "collections.unlisted_collections_with_count": "Ulista samlingar ({count})", "collections.view_collection": "Sjå samlinga", "collections.visibility_public": "Offentleg", "collections.visibility_public_hint": "Kan koma opp i søkjeresultat og andre stader der tilrådingar syner.", @@ -424,8 +465,10 @@ "column.lists": "Lister", "column.mutes": "Målbundne brukarar", "column.notifications": "Varsel", + "column.other_collections": "Samlingar av {name}", "column.pins": "Festa tut", "column.public": "Samla tidsline", + "column.your_collections": "Samlingane dine", "column_back_button.label": "Attende", "column_header.hide_settings": "Gøym innstillingane", "column_header.moveLeft_settings": "Flytt kolonne til venstre", @@ -490,6 +533,10 @@ "confirmations.follow_to_list.confirm": "Fylg og legg til lista", "confirmations.follow_to_list.message": "Du må fylgja {name} for å leggja dei til ei liste.", "confirmations.follow_to_list.title": "Vil du fylgja brukaren?", + "confirmations.hide_featured_tab.confirm": "Gøym fana", + "confirmations.hide_featured_tab.intro": "Du kan endra dette når som helst under Rediger profil > Innstillingar for profilfane.", + "confirmations.hide_featured_tab.message": "Dette gøymer fana for folk på {serverName} og andre tenarar som køyrer siste utgåva av Mastodon. Andre stader kan visinga variera.", + "confirmations.hide_featured_tab.title": "Gøym «framheva»-fana?", "confirmations.logout.confirm": "Logg ut", "confirmations.logout.message": "Er du sikker på at du vil logga ut?", "confirmations.logout.title": "Logg ut?", @@ -537,6 +584,12 @@ "copy_icon_button.copy_this_text": "Kopier til utklippstavla", "copypaste.copied": "Kopiert", "copypaste.copy_to_clipboard": "Kopier til utklippstavla", + "custom_homepage.about": "Om", + "custom_homepage.about_this_server": "Om denne tenaren", + "custom_homepage.administered_by": "Administrert av", + "custom_homepage.contact": "Kontakt:", + "custom_homepage.latest_activity": "Siste aktivitet", + "custom_homepage.these_are_the_latest_posts": "Her er dei siste 40 innlegga frå folk på denne tenaren.", "directory.federated": "Frå den kjende allheimen", "directory.local": "Berre frå {domain}", "directory.new_arrivals": "Nyleg tilkomne", @@ -581,7 +634,11 @@ "emoji_button.search_results": "Søkeresultat", "emoji_button.symbols": "Symbol", "emoji_button.travel": "Reise & stader", + "empty_column.account_featured.other": "{acct} har ikkje valt ut noko enno.", "empty_column.account_featured_self.no_collections_button": "Lag ei samling", + "empty_column.account_featured_self.no_collections_hide_tab": "Gøym denne fana i staden", + "empty_column.account_featured_self.showcase_accounts": "Syn fram favorittkontoane dine", + "empty_column.account_featured_self.showcase_accounts_desc": "Samlingar er handlaga lister over folk for å hjelpa andre å oppdaga meir av Allheimen.", "empty_column.account_featured_unknown.other": "Denne kontoen har ikkje valt ut noko enno.", "empty_column.account_hides_collections": "Denne brukaren har valt å ikkje gjere denne informasjonen tilgjengeleg", "empty_column.account_suspended": "Kontoen er utestengd", @@ -589,6 +646,8 @@ "empty_column.account_unavailable": "Profil ikkje tilgjengeleg", "empty_column.blocks": "Du har ikkje blokkert nokon enno.", "empty_column.bookmarked_statuses": "Du har ikkje lagra noko bokmerke enno. Når du set bokmerke på eit innlegg, dukkar det opp her.", + "empty_column.collections.featured_in": "Du er ikkje lagt til i nokon samlingar enno.", + "empty_column.collections.featured_in_undiscoverable": "For at folk skal kunna leggja deg til i samlingar, må du gje dei løyve til å oppdaga deg i Innstillingar > Personvern og rekkjevidd", "empty_column.community": "Den lokale tidslina er tom. Skriv noko offentleg å få ballen til å rulle!", "empty_column.direct": "Du har ingen private omtaler enda. Etter du har sendt eller mottatt en, så vil den dukke opp her.", "empty_column.disabled_feed": "Administratorane på tenaren din har skrudd av denne straumen.", @@ -734,6 +793,7 @@ "info_button.label": "Hjelp", "info_button.what_is_alt_text": "

Kva er alternativ tekst?

Alternativ eller skildrande tekst gjev ei skildring av biletet for menneske som har synsvanskar, sein nettilkopling eller dei som ser etter ekstra innhald.

Du gjer innhaldet ditt meir tilgjengeleg og forståeleg for alle ved å skriva klåre, presise og nøytrale alt-tekstar.

  • Skriv om viktige element
  • Oppsummer tekst i bilete
  • Skriv vanlege setningar
  • Unngå unyttige opplysingar
  • Legg vekt på hovudpunkta i innhaldsrike visuelle element, som grafar eller kart
", "interaction_modal.action": "For å handla med innlegget til {name}, må du logga inn på den Mastodon-tenaren du bruker.", + "interaction_modal.action_follow": "For å fylgja {name}, må du logga inn på den Mastodon-tenaren du bruker.", "interaction_modal.go": "Gå", "interaction_modal.no_account_yet": "Har du ikkje ein konto enno?", "interaction_modal.on_another_server": "På ein annan tenar", @@ -790,6 +850,7 @@ "lightbox.zoom_in": "Zoom til faktisk storleik", "lightbox.zoom_out": "Vis heile", "limited_account_hint.action": "Vis profilen likevel", + "limited_account_hint.title": "Moderatorane på {domain} har gøymt denne brukarprofilen eller tenaren.", "link_preview.author": "Av {name}", "link_preview.more_from_author": "Meir frå {name}", "link_preview.shares": "{count, plural,one {{counter} innlegg} other {{counter} innlegg}}", @@ -851,6 +912,7 @@ "navigation_bar.live_feed_local": "Direktestraum (lokal)", "navigation_bar.live_feed_public": "Direktestraum (allheimen)", "navigation_bar.logout": "Logg ut", + "navigation_bar.main": "Hovudmeny", "navigation_bar.moderation": "Moderering", "navigation_bar.more": "Meir", "navigation_bar.mutes": "Målbundne brukarar", @@ -864,6 +926,7 @@ "navigation_panel.expand_followed_tags": "Utvid menyen over emneknaggar du fylgjer", "navigation_panel.expand_lists": "Utvid listemenyen", "not_signed_in_indicator.not_signed_in": "Du må logga inn for å få tilgang til denne ressursen.", + "notification.added_to_collection": "{name} la deg til i ei samling", "notification.admin.report": "{name} rapporterte {target}", "notification.admin.report_account": "{name} rapporterte {count, plural, one {eitt innlegg} other {# innlegg}} frå {target} for {category}", "notification.admin.report_account_other": "{name} rapporterte {count, plural, one {eitt innlegg} other {# innlegg}} frå {target}", @@ -873,6 +936,7 @@ "notification.admin.sign_up.name_and_others": "{name} og {count, plural, one {# annan} other {# andre}} vart med", "notification.annual_report.message": "#Året ditt for {year} ventar! Sjå kva som skjedde i løpet av Mastodon-året ditt!", "notification.annual_report.view": "Sjå #Året ditt", + "notification.collection_update": "{name} redigerte ei samling du er med i", "notification.favourite": "{name} markerte innlegget ditt som favoritt", "notification.favourite.name_and_others_with_link": "{name} og {count, plural, one {# annan} other {# andre}} favorittmerka innlegget ditt", "notification.favourite_pm": "{name} favorittmerka den private omtalen din", @@ -934,6 +998,7 @@ "notifications.column_settings.admin.report": "Nye rapportar:", "notifications.column_settings.admin.sign_up": "Nyleg registrerte:", "notifications.column_settings.alert": "Skrivebordsvarsel", + "notifications.column_settings.collections": "Samlingar:", "notifications.column_settings.favourite": "Favorittar:", "notifications.column_settings.filter_bar.advanced": "Vis alle kategoriar", "notifications.column_settings.filter_bar.category": "Snøggfilterline", @@ -953,6 +1018,7 @@ "notifications.column_settings.update": "Redigeringar:", "notifications.filter.all": "Alle", "notifications.filter.boosts": "Framhevingar", + "notifications.filter.collections": "Samlingar", "notifications.filter.favourites": "Favorittar", "notifications.filter.follows": "Fylgjer", "notifications.filter.mentions": "Omtalar", @@ -1136,6 +1202,7 @@ "server_banner.active_users": "aktive brukarar", "server_banner.administered_by": "Administrert av:", "server_banner.is_one_of_many": "{domain} er ein av dei mange uavhengige Mastodon-tenarane du kan bruka til å delta i Allheimen.", + "server_banner.more_about_this_server": "Meir om denne tenaren", "server_banner.server_stats": "Tenarstatistikk:", "sign_in_banner.create_account": "Opprett konto", "sign_in_banner.follow_anyone": "Fylg kven som helst på tvers av Allheimen og sjå alt i kronologisk rekkjefylgje. Ingen algoritmar, reklame eller klikkfeller.", @@ -1245,6 +1312,7 @@ "tabs_bar.menu": "Meny", "tabs_bar.notifications": "Varsel", "tabs_bar.publish": "Nytt innlegg", + "tabs_bar.quick_links": "Hurtiglenkjer", "tabs_bar.search": "Søk", "tag.remove": "Fjern", "terms_of_service.effective_as_of": "I kraft frå {date}", diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json index afb565e3c4..0761a9e984 100644 --- a/app/javascript/mastodon/locales/no.json +++ b/app/javascript/mastodon/locales/no.json @@ -2,7 +2,6 @@ "about.blocks": "Modererte servere", "about.contact": "Kontakt:", "about.default_locale": "Standard", - "about.disclaimer": "Mastodon er gratis, åpen kildekode-programvare og et varemerke fra Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Årsak ikke tilgjengelig", "about.domain_blocks.preamble": "Mastodon lar deg normalt sett se innholdet fra og samhandle med brukere fra enhver annen server i fødiverset. Dette er unntakene som har blitt lagt inn på denne serveren.", "about.domain_blocks.silenced.explanation": "Du vil vanligvis ikke se profiler og innhold fra denne serveren, med mindre du eksplisitt søker dem opp eller velger å følge dem.", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index 400f14ba0c..deb5d44962 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -2,7 +2,6 @@ "about.blocks": "Servidors moderats", "about.contact": "Contacte :", "about.default_locale": "Per defaut", - "about.disclaimer": "Mastodon es gratuit, un logicial libre e una marca de Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Rason pas disponibla", "about.domain_blocks.silenced.title": "Limitats", "about.domain_blocks.suspended.title": "Suspenduts", diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json index 5dcbc67c43..2a35a00f95 100644 --- a/app/javascript/mastodon/locales/pa.json +++ b/app/javascript/mastodon/locales/pa.json @@ -1,7 +1,6 @@ { "about.contact": "ਸੰਪਰਕ:", "about.default_locale": "ਮੂਲ", - "about.disclaimer": "ਮਸਟੋਡੋਨ ਇੱਕ ਆਜ਼ਾਦ, ਖੁੱਲ੍ਹੇ ਸਰੋਤ ਵਾਲਾ ਸਾਫਟਵੇਅਰ ਹੈ ਅਤੇ Mastodon gGmbH ਦਾ ਮਾਰਕਾ ਹੈ।", "about.domain_blocks.no_reason_available": "ਕਾਰਨ ਮੌਜੂਦ ਨਹੀਂ ਹੈ", "about.domain_blocks.silenced.title": "ਸੀਮਿਤ", "about.domain_blocks.suspended.title": "ਸਸਪੈਂਡ ਕੀਤਾ", diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index 4756b753eb..14865249e7 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -2,7 +2,7 @@ "about.blocks": "Serwery moderowane", "about.contact": "Kontakt:", "about.default_locale": "Domyślny", - "about.disclaimer": "Mastodon jest darmowym, otwartym oprogramowaniem i znakiem towarowym Mastodon gGmbH.", + "about.disclaimer": "Mastodon to wolne oprogramowanie o otwartym kodzie źródłowym, będące znakiem towarowym Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Powód niedostępny", "about.domain_blocks.preamble": "Domyślnie Mastodon pozwala ci przeglądać i reagować na treści od innych użytkowników z jakiegokolwiek serwera w fediwersum. Poniżej znajduje się lista wyjątków, które zostały stworzone na tym konkretnym serwerze.", "about.domain_blocks.silenced.explanation": "Zazwyczaj nie zobaczysz profili i treści z tego serwera, chyba że wyraźnie go poszukasz lub zdecydujesz się go obserwować.", @@ -127,6 +127,9 @@ "account.unmute": "Nie wyciszaj @{name}", "account.unmute_notifications_short": "Nie wyciszaj powiadomień", "account.unmute_short": "Nie wyciszaj", + "account_edit.advanced_settings.bot_hint": "To konto wykonuje głównie zautomatyzowane działania i może nie być monitorowane", + "account_edit.advanced_settings.bot_label": "Konto prowadzone przez bota", + "account_edit.advanced_settings.title": "Ustawienia zaawansowane", "account_edit.bio.add_label": "Szczegóły profilu", "account_edit.bio.edit_label": "Edytuj szczegóły profilu", "account_edit.bio.placeholder": "Dodaj krótkie wprowadzenie, aby pomóc innym zidentyfikować cię.", @@ -171,6 +174,18 @@ "account_edit.image_edit.remove_button": "Usuń obraz", "account_edit.image_edit.replace_button": "Zastąp obraz", "account_edit.profile_tab.button_label": "Dostosuj", + "account_edit.profile_tab.hint.description": "Te ustawienia wpływają na to, co użytkownicy widzą na {server} w oficjalnych aplikacjach, ale mogą nie obowiązywać na innych serwerach i w aplikacjach zewnętrznych.", + "account_edit.profile_tab.hint.title": "Wyświetlanie może się różnić", + "account_edit.profile_tab.show_featured.description": "\"Wyróżnione\" to opcjonalna zakładka, na której możesz wyświetlać inne konta.", + "account_edit.profile_tab.show_featured.title": "Pokaż zakładkę \"Wyróżnione\"", + "account_edit.profile_tab.show_media.description": "\"Multimedia\" jest opcjonalną zakładką, która wyświetla Twoje wpisy zawierające zdjęcia lub filmy.", + "account_edit.profile_tab.show_media.title": "Pokaż zakładkę \"Multimedia\"", + "account_edit.profile_tab.show_media_replies.description": "Po włączeniu zakładka Multimedia pokazuje zarówno Twoje wpisy, jak i odpowiedzi na wpisy innych osób.", + "account_edit.profile_tab.show_media_replies.title": "Uwzględniaj odpowiedzi w zakładce \"Multimedia\"", + "account_edit.profile_tab.show_relations.description": "Pokazuje innym użytkownikom konta, które obserwujesz oraz Twoich obserwujących w Twoim profilu. Inni użytkownicy nadal będą mogli zobaczyć, czy ich obserwujesz.", + "account_edit.profile_tab.show_relations.title": "Pokaż \"Obserwujących\" i \"Obserwowanych\"", + "account_edit.profile_tab.subtitle": "Dostosuj wygląd i układ swojego profilu.", + "account_edit.profile_tab.title": "Ustawienia wyświetlania profilu", "account_edit.save": "Zapisz", "account_edit.upload_modal.back": "Wstecz", "account_edit.upload_modal.done": "Gotowe", @@ -258,6 +273,7 @@ "closed_registrations_modal.find_another_server": "Znajdź inny serwer", "closed_registrations_modal.preamble": "Mastodon jest zdecentralizowany, więc bez względu na to, gdzie się zarejestrujesz, będziesz w stanie obserwować i wchodzić w interakcje z innymi osobami na tym serwerze. Możesz nawet uruchomić własny serwer!", "closed_registrations_modal.title": "Rejestracja na Mastodonie", + "collections.last_updated_at": "Ostatnia aktualizacja: {date}", "column.about": "O serwerze", "column.blocks": "Zablokowani", "column.bookmarks": "Zakładki", @@ -335,6 +351,7 @@ "confirmations.follow_to_list.confirm": "Obserwuj i dodaj do listy", "confirmations.follow_to_list.message": "Musisz obserwować {name}, aby dodać do listy.", "confirmations.follow_to_list.title": "Zaobserwować?", + "confirmations.hide_featured_tab.title": "Ukryć zakładkę \"Wyróżnione\"?", "confirmations.logout.confirm": "Wyloguj", "confirmations.logout.message": "Czy na pewno chcesz się wylogować?", "confirmations.logout.title": "Wylogować?", @@ -488,6 +505,9 @@ "follow_suggestions.view_all": "Pokaż wszystkie", "follow_suggestions.who_to_follow": "Kogo warto obserwować", "followed_tags": "Obserwowane hasztagi", + "followers.title": "Obserwujący {name}", + "following.hide_other_following": "Ten użytkownik ukrył pozostałe obserwowane konta", + "following.title": "Obserwowani przez {name}", "footer.about": "O serwerze", "footer.about_mastodon": "O Mastodonie", "footer.about_server": "O {domain}", @@ -650,6 +670,7 @@ "navigation_bar.automated_deletion": "Automatyczne usuwanie postów", "navigation_bar.blocks": "Zablokowani", "navigation_bar.bookmarks": "Zakładki", + "navigation_bar.collections": "Kolekcje", "navigation_bar.direct": "Wzmianki bezpośrednie", "navigation_bar.domain_blocks": "Zablokowane domeny", "navigation_bar.favourites": "Polubione", @@ -745,6 +766,7 @@ "notifications.column_settings.admin.report": "Nowe zgłoszenia:", "notifications.column_settings.admin.sign_up": "Nowo zarejestrowani:", "notifications.column_settings.alert": "Powiadomienia na pulpicie", + "notifications.column_settings.collections": "Kolekcje:", "notifications.column_settings.favourite": "Polubione:", "notifications.column_settings.filter_bar.advanced": "Wyświetl wszystkie kategorie", "notifications.column_settings.filter_bar.category": "Szybkie filtrowanie", @@ -764,6 +786,7 @@ "notifications.column_settings.update": "Edycje:", "notifications.filter.all": "Wszystkie", "notifications.filter.boosts": "Podbicia", + "notifications.filter.collections": "Kolekcje", "notifications.filter.favourites": "Polubione", "notifications.filter.follows": "Obserwacje", "notifications.filter.mentions": "Wzmianki", @@ -828,6 +851,7 @@ "privacy.private.short": "Obserwujący", "privacy.public.long": "Każdy na i poza Mastodon", "privacy.public.short": "Publiczny", + "privacy.quote.anyone": "{visibility}, każdy może cytować", "privacy.quote.disabled": "{visibility}, cytaty wyłączone", "privacy.quote.limited": "{visibility}, cytaty ograniczone", "privacy.unlisted.additional": "Dostępny podobnie jak wpis publiczny, ale nie będzie widoczny w aktualnościach, hashtagach ani wyszukiwarce Mastodon, nawet jeśli twoje konto jest widoczne.", diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index c8b24dcd1b..8e60ac6a49 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -2,7 +2,7 @@ "about.blocks": "Servidores moderados", "about.contact": "Contato:", "about.default_locale": "Padrão", - "about.disclaimer": "Mastodon é um software de código aberto e livre, e uma marca registrada de Mastodon gGmbH.", + "about.disclaimer": "Mastodon é um software grátis de código aberto, também é marca registrada de Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Razão não disponível", "about.domain_blocks.preamble": "O \"Mastodon\" geralmente permite que você veja o conteúdo e interaja com usuários de qualquer outro servidor no \"fediverso\". Estas são as exceções deste servidor em específico.", "about.domain_blocks.silenced.explanation": "Você geralmente não verá perfis e conteúdo deste servidor, a menos que você o procure explicitamente ou opte por seguir.", @@ -646,6 +646,7 @@ "empty_column.account_unavailable": "Perfil indisponível", "empty_column.blocks": "Nada aqui.", "empty_column.bookmarked_statuses": "Nada aqui. Quando você salvar uma publicação, ela aparecerá aqui.", + "empty_column.collections": "{acct} não criou nenhuma coleção ainda.", "empty_column.collections.featured_in": "Você ainda não foi adicionado a uma coleção.", "empty_column.collections.featured_in_undiscoverable": "Para as pessoas adicionarem você às coleções, você precisa permitir destaque de experiências de descoberta através de Preferências > Privacidade e alcance", "empty_column.community": "A linha local está vazia. Publique algo para começar!", @@ -787,19 +788,19 @@ "ignore_notifications_modal.ignore": "Ignorar notificações", "ignore_notifications_modal.limited_accounts_title": "Ignorar notificações de contas moderadas?", "ignore_notifications_modal.new_accounts_title": "Ignorar notificações de novas contas?", - "ignore_notifications_modal.not_followers_title": "Ignorar notificações de pessoas que não seguem você?", + "ignore_notifications_modal.not_followers_title": "Ignorar notificações de pessoas que não o sigam?", "ignore_notifications_modal.not_following_title": "Ignorar notificações de pessoas que você não segue?", "ignore_notifications_modal.private_mentions_title": "Ignorar notificações de menções privadas não solicitadas?", "info_button.label": "Ajuda", - "info_button.what_is_alt_text": "

O que é texto alternativo?

O texto alternativo fornece descrições de imagens para pessoas com deficiências visuais, conexões de internet de baixa largura de banda ou aquelas que buscam mais contexto.

Você pode melhorar a acessibilidade e a compreensão para todos escrevendo texto alternativo claro, conciso e objetivo.

  • Capture elementos importantes
  • Resuma textos em imagens
  • Use estrutura de frases regular
  • Evite informações redundantes
  • Foque em tendências e descobertas principais em visuais complexos (como diagramas ou mapas)
", - "interaction_modal.action": "Para interagir com o post de {name}, você precisa entrar em sua conta em qualquer servidor Mastodon que você use.", - "interaction_modal.action_follow": "Para seguir {name}, você deve fazer login em sua conta em auqlquer servidor Mastodon que você use.", + "info_button.what_is_alt_text": "

O que é texto alternativo?

O texto alternativo descreve imagens para pessoas com deficiências visuais, conexões lentas ou para quem necessita de contexto adicional.

Você pode melhorar a acessibilidade e compreensão de todos escrevendo um texto alternativo claro, conciso e objetivo.

  • Capture elementos importantes
  • Resuma o texto das imagens
  • Use uma estrutura regular de frases
  • Evite informações redundantes
  • Foque em tendências e buscas em visuais complexos (como diagramas e mapas)
", + "interaction_modal.action": "Para interagir com a publicação de {name}, você precisa registrar em sua conta em qualquer servidor do Mastodon.", + "interaction_modal.action_follow": "Para seguir {name}, você precisa registrar em sua conta em qualquer servidor do Mastodon.", "interaction_modal.go": "Ir", - "interaction_modal.no_account_yet": "Não possui uma conta ainda?", + "interaction_modal.no_account_yet": "Não tem uma conta ainda?", "interaction_modal.on_another_server": "Em um servidor diferente", "interaction_modal.on_this_server": "Neste servidor", - "interaction_modal.title": "Faça login para continuar", - "interaction_modal.username_prompt": "p. e.x.: {example}", + "interaction_modal.title": "Registre-se para continuar", + "interaction_modal.username_prompt": "Por exemplo: {example}", "intervals.full.days": "{number, plural, one {# dia} other {# dias}}", "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}", "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}", @@ -812,15 +813,21 @@ "keyboard_shortcuts.direct": "Abrir coluna de menções privadas", "keyboard_shortcuts.down": "mover para baixo", "keyboard_shortcuts.enter": "Abrir publicação", - "keyboard_shortcuts.explore": "Abrir linha do tempo atual", + "keyboard_shortcuts.explore": "Abrir timeline em alta", "keyboard_shortcuts.favourite": "Favoritar publicação", "keyboard_shortcuts.favourites": "Abrir lista de favoritos", "keyboard_shortcuts.federated": "abrir linha global", "keyboard_shortcuts.heading": "Atalhos de teclado", "keyboard_shortcuts.home": "abrir página inicial", "keyboard_shortcuts.hotkey": "Atalho", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "Backspace", + "keyboard_shortcuts.keys.enter": "Enter", + "keyboard_shortcuts.keys.esc": "Esc", + "keyboard_shortcuts.keys.page_down": "Page Down", + "keyboard_shortcuts.keys.page_up": "Page Up", "keyboard_shortcuts.legend": "mostrar estes atalhos", - "keyboard_shortcuts.load_more": "Focar \"Carregar mais\" botão", + "keyboard_shortcuts.load_more": "Focar no botão de Carregar mais", "keyboard_shortcuts.local": "abrir linha local", "keyboard_shortcuts.mention": "mencionar usuário", "keyboard_shortcuts.muted": "abrir usuários silenciados", @@ -839,7 +846,7 @@ "keyboard_shortcuts.toggle_sensitivity": "mostrar/ocultar mídia", "keyboard_shortcuts.toot": "Começar nova publicação", "keyboard_shortcuts.top": "Mover para o topo da lista", - "keyboard_shortcuts.translate": "para traduzir um post", + "keyboard_shortcuts.translate": "para traduzir uma publicação", "keyboard_shortcuts.unfocus": "Desfocar da área de composição/busca", "keyboard_shortcuts.up": "mover para cima", "learn_more_link.got_it": "Entendido", @@ -916,29 +923,29 @@ "navigation_bar.moderation": "Moderação", "navigation_bar.more": "Mais", "navigation_bar.mutes": "Usuários silenciados", - "navigation_bar.opened_in_classic_interface": "Publicações, contas e outras páginas específicas são abertas por padrão na interface 'web' clássica.", + "navigation_bar.opened_in_classic_interface": "As publicações, contas e outras páginas são abertas por padrão na interface web clássica.", "navigation_bar.preferences": "Preferências", "navigation_bar.privacy_and_reach": "Privacidade e alcance", "navigation_bar.search": "Buscar", "navigation_bar.search_trends": "Busca / Em alta", - "navigation_panel.collapse_followed_tags": "Recolher menu de hashtags seguidas", - "navigation_panel.collapse_lists": "Fechar lista de menu", - "navigation_panel.expand_followed_tags": "Expandir o menu de hashtags seguidas", - "navigation_panel.expand_lists": "Expandir lista de menu", - "not_signed_in_indicator.not_signed_in": "Você precisa se autenticar para acessar este recurso.", - "notification.added_to_collection": "{name} te adicionou a uma coleção", + "navigation_panel.collapse_followed_tags": "Recolher hashtags seguidas", + "navigation_panel.collapse_lists": "Recolher menu da lista", + "navigation_panel.expand_followed_tags": "Expandir hashtags seguidas", + "navigation_panel.expand_lists": "Expandir menu da lista", + "not_signed_in_indicator.not_signed_in": "É necessário registrar para acessar este recurso.", + "notification.added_to_collection": "{name} adicionou você a uma coleção", "notification.admin.report": "{name} denunciou {target}", "notification.admin.report_account": "{name} denunciou {count, plural, one {uma publicação} other {# publicações}} de {target} para {category}", "notification.admin.report_account_other": "{name} denunciou {count, plural, one {uma publicação} other {# publicações}} de {target}", - "notification.admin.report_statuses": "{name} Reportou {target} para {category}", + "notification.admin.report_statuses": "{name} denunciou {target} para {category}", "notification.admin.report_statuses_other": "{name} denunciou {target}", - "notification.admin.sign_up": "{name} se inscreveu", - "notification.admin.sign_up.name_and_others": "{name} e {count, plural, one {# outro} other {# outros}} se inscreveram", - "notification.annual_report.message": "O seu #Wrapstodon de {year} está esperando! Desvende seus destaques do ano e momentos memoráveis no Mastodon!", - "notification.annual_report.view": "Ver #Wrapstodon", + "notification.admin.sign_up": "{name} registrou-se", + "notification.admin.sign_up.name_and_others": "{name} e {count, plural, one {# other} other {# outros}}", + "notification.annual_report.message": "O #Wrapstodon de {year} lhe aguarda! Desvende seus destaques e momentos memoráveis do ano no Mastodon!", + "notification.annual_report.view": "Conferir #Wrapstodon", "notification.collection_update": "{name} editou uma coleção em que você está", "notification.favourite": "{name} favoritou sua publicação", - "notification.favourite.name_and_others_with_link": "{name} e {count, plural, one {# outro} other {# others}} favoritaram a publicação", + "notification.favourite.name_and_others_with_link": "{name} e {count, plural, one {# outro} other {# outros}} favoritam sua publicação", "notification.favourite_pm": "{name} favoritou sua menção privada", "notification.favourite_pm.name_and_others_with_link": "{name} e {count, plural, one {# outro} other {# outros}} favoritaram sua menção privada", "notification.follow": "{name} te seguiu", @@ -948,45 +955,45 @@ "notification.label.mention": "Menção", "notification.label.private_mention": "Menção privada", "notification.label.private_reply": "Resposta privada", - "notification.label.quote": "{name} Citou a sua publicação", + "notification.label.quote": "{name} citou sua publicação", "notification.label.reply": "Resposta", "notification.mention": "Menção", - "notification.mentioned_you": "{name} te mencionou", - "notification.moderation-warning.learn_more": "Aprender mais", + "notification.mentioned_you": "{name} mencionou você", + "notification.moderation-warning.learn_more": "Saiba mais", "notification.moderation_warning": "Você recebeu um aviso de moderação", - "notification.moderation_warning.action_delete_statuses": "Algumas das suas publicações foram removidas.", + "notification.moderation_warning.action_delete_statuses": "Algumas publicações suas foram removidas.", "notification.moderation_warning.action_disable": "Sua conta foi desativada.", - "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algumas de suas publicações foram marcadas por ter conteúdo sensível.", + "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algumas publicações suas foram marcadas como sensíveis.", "notification.moderation_warning.action_none": "Sua conta recebeu um aviso de moderação.", "notification.moderation_warning.action_sensitive": "Suas publicações serão marcadas como sensíveis a partir de agora.", "notification.moderation_warning.action_silence": "Sua conta foi limitada.", "notification.moderation_warning.action_suspend": "Sua conta foi suspensa.", "notification.own_poll": "Sua enquete terminou", - "notification.poll": "Uma enquete que você votou terminou", - "notification.quoted_update": "{name} editou uma pulicação que você citou", + "notification.poll": "Uma enquete que você votou encerrou", + "notification.quoted_update": "{name} editou uma publicação que você citou", "notification.reblog": "{name} impulsionou sua publicação", - "notification.reblog.name_and_others_with_link": "{name} e {count, plural, one {# outra} other {# outras}} impulsionaram a publicação", + "notification.reblog.name_and_others_with_link": "{name} e {count, plural, one {# outro} other {# outros}} impulsionaram sua publicação", "notification.relationships_severance_event": "Conexões perdidas com {name}", - "notification.relationships_severance_event.account_suspension": "Um administrador de {from} suspendeu {target}, o que significa que você não pode mais receber atualizações deles ou interagir com eles.", - "notification.relationships_severance_event.domain_block": "An admin from {from} has blocked {target}, including {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.", - "notification.relationships_severance_event.learn_more": "Saber mais", - "notification.relationships_severance_event.user_domain_block": "You have blocked {target}, removing {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.", + "notification.relationships_severance_event.account_suspension": "Um administrador de {from} suspendeu {target}, significando que você não receberá mais atualizações ou poderá interagir com ele.", + "notification.relationships_severance_event.domain_block": "Um administrador de {from} bloqueou {target}, incluindo {followersCount} de seus seguidores e {followingCount, plural, one {# conta} other {# contas}} que você segue.", + "notification.relationships_severance_event.learn_more": "Saiba mais", + "notification.relationships_severance_event.user_domain_block": "Você bloqueou {target}, removendo {followersCount} de seus seguidores e {followingCount, plural, one {# conta} other {# contas}} que você segue.", "notification.status": "{name} acabou de publicar", "notification.update": "{name} editou uma publicação", "notification_requests.accept": "Aceitar", - "notification_requests.accept_multiple": "{count, plural, one {Aceite # pedido…} other {Aceite # pedidos…}}", - "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Aceite # pedido} other {Aceite # pedidos}}", - "notification_requests.confirm_accept_multiple.message": "Você está prestes a aceitar {count, plural, one {um pedido de notificação} other {# pedidos de notificação}}. Tem certeza de que deseja continuar?", - "notification_requests.confirm_accept_multiple.title": "Aceitar solicitações de notificação?", - "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Dispensar pedido} other {Dispensar pedidos}}", - "notification_requests.confirm_dismiss_multiple.message": "Você está prestes a descartar {count, plural, one {um pedido de notificação} other {# pedidos de notificação}}. Você não será capaz de acessar facilmente{count, plural, one {} other {}} novamente. Tem certeza de que deseja continuar?", - "notification_requests.confirm_dismiss_multiple.title": "Descartar solicitações de notificação?", + "notification_requests.accept_multiple": "{count, plural, one {Aceitar # pedido…} other {Aceitar # pedidos…}}", + "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Aceitar pedido} other {Aceitar pedidos}}", + "notification_requests.confirm_accept_multiple.message": "Você está prestes a aceitar {count, plural, one {um pedido de notificação} other {# pedidos de notificação}}. Deseja mesmo continuar?", + "notification_requests.confirm_accept_multiple.title": "Aceitar pedidos de notificação?", + "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Rejeitar pedido} other {Rejeitar pedidos}}", + "notification_requests.confirm_dismiss_multiple.message": "Você está prestes a rejeitar {count, plural, one {um pedido de notificação} other {# pedidos de notificação}}. Você não conseguirá mais acessá{count, plural, one {-lo} other {-los}} facilmente de novo. Deseja mesmo continuar?", + "notification_requests.confirm_dismiss_multiple.title": "Rejeitar pedidos de notificação?", "notification_requests.dismiss": "Rejeitar", - "notification_requests.dismiss_multiple": "{count, plural, one {Dispensar # pedido…} other {Dispensar # pedidos…}}", + "notification_requests.dismiss_multiple": "{count, plural, one {Rejeitar # pedido…} other {Rejeitar # pedidos…}}", "notification_requests.edit_selection": "Editar", "notification_requests.exit_selection": "Concluído", "notification_requests.explainer_for_limited_account": "As notificações desta conta foram filtradas porque a conta foi limitada por um moderador.", - "notification_requests.explainer_for_limited_remote_account": "As notificações desta conta foram filtradas porque a conta ou o seu servidor foi limitado por um moderador.", + "notification_requests.explainer_for_limited_remote_account": "As notificações desta conta foram filtradas porque a conta ou o servidor foi limitado por um servidor.", "notification_requests.maximize": "Maximizar", "notification_requests.minimize_banner": "Minimizar banner de notificações filtradas", "notification_requests.notifications_from": "Notificações de {name}", @@ -996,15 +1003,15 @@ "notifications.clear_confirmation": "Você tem certeza de que deseja limpar todas as suas notificações?", "notifications.clear_title": "Limpar notificações?", "notifications.column_settings.admin.report": "Novas denúncias:", - "notifications.column_settings.admin.sign_up": "Novas inscrições:", + "notifications.column_settings.admin.sign_up": "Novos registros:", "notifications.column_settings.alert": "Notificações no computador", "notifications.column_settings.collections": "Coleções:", "notifications.column_settings.favourite": "Favoritos:", "notifications.column_settings.filter_bar.advanced": "Exibir todas as categorias", - "notifications.column_settings.filter_bar.category": "Barra de filtro rápido", + "notifications.column_settings.filter_bar.category": "Barra de filtros rápidos", "notifications.column_settings.follow": "Seguidores:", "notifications.column_settings.follow_request": "Seguidores pendentes:", - "notifications.column_settings.group": "Grupo", + "notifications.column_settings.group": "Agrupar", "notifications.column_settings.mention": "Menções:", "notifications.column_settings.poll": "Enquetes:", "notifications.column_settings.push": "Notificações push", @@ -1015,7 +1022,7 @@ "notifications.column_settings.status": "Novas publicações:", "notifications.column_settings.unread_notifications.category": "Notificações não lidas", "notifications.column_settings.unread_notifications.highlight": "Destacar notificações não lidas", - "notifications.column_settings.update": "Editar:", + "notifications.column_settings.update": "Edições:", "notifications.filter.all": "Tudo", "notifications.filter.boosts": "Impulsos", "notifications.filter.collections": "Coleções", @@ -1031,11 +1038,11 @@ "notifications.permission_denied_alert": "Verifique a permissão do navegador para ativar notificações no computador.", "notifications.permission_required": "Ativar notificações no computador exige permissão do navegador.", "notifications.policy.accept": "Aceitar", - "notifications.policy.accept_hint": "Mostrar nas notificações", + "notifications.policy.accept_hint": "Exibir nas notificações", "notifications.policy.drop": "Ignorar", - "notifications.policy.drop_hint": "Envie para o void, para nunca mais ser visto novamente", + "notifications.policy.drop_hint": "Enviar para o vácuo, para nunca mais ser visto", "notifications.policy.filter": "Filtrar", - "notifications.policy.filter_hint": "Enviar para caixa de notificações filtradas", + "notifications.policy.filter_hint": "Enviar para a caixa de notificações filtradas", "notifications.policy.filter_limited_accounts_hint": "Limitado pelos moderadores do servidor", "notifications.policy.filter_limited_accounts_title": "Contas moderadas", "notifications.policy.filter_new_accounts.hint": "Created within the past {days, plural, one {one day} other {# days}}", @@ -1192,6 +1199,7 @@ "search_popout.user": "usuário", "search_results.accounts": "Perfis", "search_results.all": "Tudo", + "search_results.collections": "Coleções", "search_results.hashtags": "Hashtags", "search_results.no_results": "Sem resultados.", "search_results.no_search_yet": "Tente buscar por publicações, perfis e hashtags.", diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json index 3a93b7273b..22a55d48c3 100644 --- a/app/javascript/mastodon/locales/pt-PT.json +++ b/app/javascript/mastodon/locales/pt-PT.json @@ -2,7 +2,6 @@ "about.blocks": "Servidores moderados", "about.contact": "Contacto:", "about.default_locale": "Padrão", - "about.disclaimer": "O Mastodon é um 'software' livre, de código aberto e marca registada de Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Motivo não disponível", "about.domain_blocks.preamble": "O Mastodon, geralmente, permite-lhe ver conteúdo e interagir com utilizadores de qualquer outro servidor na fediverso. Estas são as exceções aplicadas neste servidor em particular.", "about.domain_blocks.silenced.explanation": "Normalmente não verá perfis e conteúdos deste servidor, a não ser que os procures explicitamente ou opte por segui-los.", diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json index 07da3389c3..f1424f7d88 100644 --- a/app/javascript/mastodon/locales/ro.json +++ b/app/javascript/mastodon/locales/ro.json @@ -2,7 +2,6 @@ "about.blocks": "Servere moderate", "about.contact": "Contact:", "about.default_locale": "Standard", - "about.disclaimer": "Mastodon este o aplicație gratuită, cu sursă deschisă și o marcă înregistrată a Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Motivul nu este disponibil", "about.domain_blocks.preamble": "Mastodon îți permite în general să vezi conținut de la și să interacționezi cu utilizatori de pe oricare server în fediverse. Acestea sunt excepțiile care au fost făcute pe acest server.", "about.domain_blocks.silenced.explanation": "În general, nu vei vedea profiluri și conținut de pe acest server, cu excepția cazului în care îl cauți în mod explicit sau optezi pentru el prin urmărire.", diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json index 56a4e98fe1..d439a1e8b4 100644 --- a/app/javascript/mastodon/locales/ru.json +++ b/app/javascript/mastodon/locales/ru.json @@ -2,7 +2,6 @@ "about.blocks": "Модерируемые серверы", "about.contact": "Связаться:", "about.default_locale": "по умолчанию", - "about.disclaimer": "Mastodon — свободное программное обеспечение с открытым исходным кодом и торговая марка Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Причина не указана", "about.domain_blocks.preamble": "Обычно Mastodon даёт вам возможность просматривать содержимое с любых других серверов в федивёрсе и взаимодействовать с их пользователями. Вот исключения, сделанные конкретно для этого сервера:", "about.domain_blocks.silenced.explanation": "Как правило, вы не увидите профили и содержимое с этого сервера, если только вы не запросите их с помощью поиска или не подпишетесь на пользователя с этого сервера.", diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json index b66497a751..ea9a0e7fdf 100644 --- a/app/javascript/mastodon/locales/ry.json +++ b/app/javascript/mastodon/locales/ry.json @@ -1,7 +1,6 @@ { "about.blocks": "Модеровані серверы", "about.contact": "Контакт:", - "about.disclaimer": "Mastodon є задарьнов проґрамов из удпертым кодом тай торговов значков Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Причины не ясні", "about.domain_blocks.preamble": "Майбульш Mastodon поволят вам позирати контент тай комуніковати из хосновачами из другых федерованых серверув. Туй лиш уняткы учинені про сись конкретный сервер.", "about.domain_blocks.silenced.explanation": "Вы майбульш не будете видіти профілі тай контент из сього сервера, кидь не будете го самі глядати авадь пудпишете ся на нього.", diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json index d536301f60..7d2b25c2c6 100644 --- a/app/javascript/mastodon/locales/sa.json +++ b/app/javascript/mastodon/locales/sa.json @@ -1,7 +1,6 @@ { "about.blocks": "प्रशमितानि सर्वरः", "about.contact": "सम्पर्कः:", - "about.disclaimer": "मास्तोडनस्ति निश्शुल्को विवृत्तस्तन्त्रांशः, मास्तोडन् gGmbH इत्यस्य च व्यापारमुद्रा।", "about.domain_blocks.no_reason_available": "कारणं न लभ्यते", "about.domain_blocks.preamble": "मास्तोडन्सामान्यतया फेडिभर्सि अन्यस्मात्सर्वरादुपयोक्तृभ्यस्सामग्रीं द्रष्टुम्, तैस्संवादं कर्तुञ्च शक्नोति । एतानि वर्जनानि अस्मिन्सर्वरि कृतास्सन्ति।", "about.domain_blocks.silenced.explanation": "सामान्यतया अस्मात्सर्वरात्प्रोफाइल्सामग्रीञ्च न पश्यसि, यावत्स्पष्टतया तन्न पश्यसि अथवा अनुसरणं कृत्वा तस्मिन्विकल्पं न करोति ।", diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json index bb377da384..d70791a0b6 100644 --- a/app/javascript/mastodon/locales/sc.json +++ b/app/javascript/mastodon/locales/sc.json @@ -2,7 +2,6 @@ "about.blocks": "Serbidores moderados", "about.contact": "Cuntatu:", "about.default_locale": "Predefinidu", - "about.disclaimer": "Mastodon est software de còdighe lìberu e unu màrchiu de Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Peruna resone a disponimentu", "about.domain_blocks.preamble": "Mastodon ti permitit de bìdere su cuntenutu de utentes de cale si siat àteru serbidore de su fediversu. Custas sunt etzetziones fatas in custu serbidore ispetzìficu.", "about.domain_blocks.silenced.explanation": "As a bìdere profilos e cuntenutos dae custu serbidore isceti chi ddos chircas o detzides de ddu sighire.", diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json index 59680e7c79..7c0c888456 100644 --- a/app/javascript/mastodon/locales/sco.json +++ b/app/javascript/mastodon/locales/sco.json @@ -1,7 +1,6 @@ { "about.blocks": "Moderatit servers", "about.contact": "Contack:", - "about.disclaimer": "Mastodon is free, open-soorced saftware, an a trademairk o Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Raison no available", "about.domain_blocks.preamble": "On the hail, Mastodon lats ye view content frae an interack wi uisers fae onie ither server in the fediverse.", "about.domain_blocks.silenced.explanation": "Ye'll generally no see profiles an content frae this server, unless ye explicitly luik it up or opt intae it bi follaein.", diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json index 7506b04958..25f5f3858c 100644 --- a/app/javascript/mastodon/locales/si.json +++ b/app/javascript/mastodon/locales/si.json @@ -2,7 +2,6 @@ "about.blocks": "මැදිහත්කරණ සේවාදායක", "about.contact": "සබඳතාව:", "about.default_locale": "Default", - "about.disclaimer": "මාස්ටඩන් යනු නිදහස් විවෘත මූලාශ්‍ර මෘදුකාංගයකි. එය මාස්ටඩන් gGmbH හි වෙළඳ නාමයකි.", "about.domain_blocks.no_reason_available": "හේතුව ලබා ගත නොහැක.", "about.domain_blocks.preamble": "Mastodon සාමාන්‍යයෙන් ඔබට fediverse හි වෙනත් ඕනෑම සේවාදායකයකින් අන්තර්ගතයන් බැලීමට සහ පරිශීලකයින් සමඟ අන්තර් ක්‍රියා කිරීමට ඉඩ සලසයි. මෙම විශේෂිත සේවාදායකයේ සිදු කර ඇති ව්‍යතිරේක මේවාය.", "about.domain_blocks.silenced.explanation": "ඔබ එය පැහැදිලිව සොයා බැලුවහොත් හෝ අනුගමනය කිරීමෙන් එයට සම්බන්ධ නොවන්නේ නම්, සාමාන්‍යයෙන් ඔබට මෙම සේවාදායකයෙන් පැතිකඩ සහ අන්තර්ගතයන් නොපෙනේ.", diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index 381e194817..555a58b0ed 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -2,7 +2,6 @@ "about.blocks": "Moderované servery", "about.contact": "Kontakt:", "about.default_locale": "Predvolený", - "about.disclaimer": "Mastodon je bezplatný open-source softvér s otvoreným zdrojovým kódom a ochranná známka spoločnosti Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Dôvod nebol uvedený", "about.domain_blocks.preamble": "Mastodon vo všeobecnosti umožňuje prezerať obsah a komunikovať s používateľmi z akéhokoľvek iného servera vo fediverze. Tu sú uvedené výnimky, ktoré boli urobené na tomto konkrétnom serveri.", "about.domain_blocks.silenced.explanation": "Vo všeobecnosti neuvidíte profily a obsah z tohto servera, pokiaľ si ich nevyhľadáte alebo sa neprihlásite k ich sledovaniu.", diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json index 43e01d231c..ec73501f47 100644 --- a/app/javascript/mastodon/locales/sl.json +++ b/app/javascript/mastodon/locales/sl.json @@ -2,7 +2,6 @@ "about.blocks": "Moderirani strežniki", "about.contact": "Stik:", "about.default_locale": "Privzeto", - "about.disclaimer": "Mastodon je prosto, odprtokodno programje in blagovna znamka podjetja Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Razlog ni na voljo", "about.domain_blocks.preamble": "Mastodon vam na splošno omogoča ogled vsebin in interakcijo z uporabniki z vseh drugih strežnikov v fediverzumu. Tu so navedene izjeme, ki jih postavlja ta strežnik.", "about.domain_blocks.silenced.explanation": "V splošnem ne boste videli profilov in vsebin s tega strežnika, razen če jih izrecno poiščete ali jim začnete slediti.", diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json index 2456186445..a020074e91 100644 --- a/app/javascript/mastodon/locales/sq.json +++ b/app/javascript/mastodon/locales/sq.json @@ -2,7 +2,7 @@ "about.blocks": "Shërbyes të moderuar", "about.contact": "Kontakt:", "about.default_locale": "Parazgjedhje", - "about.disclaimer": "Mastodon-i është software i lirë, me burim të hapët dhe shenjë tregtare e Mastodon gGmbH.", + "about.disclaimer": "Mastodon-i është “software” i lirë, me burim të hapët dhe shenjë tregtare e Mastodon GmbH-së.", "about.domain_blocks.no_reason_available": "S’ka arsye", "about.domain_blocks.preamble": "Mastodon-i ju lë përgjithësisht të shihni lëndë prej përdoruesish dhe të ndërveproni me ta nga cilido shërbyes tjetër qofshin në fedivers. Ka përjashtime që janë bërë në këtë shërbyes të dhënë.", "about.domain_blocks.silenced.explanation": "Përgjithësisht s’do të shihni profile dhe lëndë nga ky shërbyes, veç në i kërkofshi shprehimisht apo zgjidhni të bëhet kjo, duke i ndjekur.", @@ -641,6 +641,7 @@ "empty_column.account_unavailable": "Profil jashtë funksionimi", "empty_column.blocks": "S’keni bllokuar ende ndonjë përdorues.", "empty_column.bookmarked_statuses": "S’keni faqeruajtur ende ndonjë mesazh. Kur faqeruani një të tillë, ai do të shfaqet këtu.", + "empty_column.collections": "{acct} s’ka krijuar ende ndonjë koleksion.", "empty_column.collections.featured_in": "S’jeni shtuar ende te ndonjë koleksion.", "empty_column.collections.featured_in_undiscoverable": "Që njerëzit t’ju shtojnë te koleksione, lypset të lejoni shfaqjen si i zgjedhur në raste zbulimi, që nga Parapëlqime > Privatësi dhe shtrirje", "empty_column.community": "Rrjedha kohore vendore është e zbrazët. Shkruani diçka publikisht që t’i hyhet valles!", @@ -814,6 +815,12 @@ "keyboard_shortcuts.heading": "Shkurtore tastiere", "keyboard_shortcuts.home": "Për hapje rrjedhe kohore vetjake", "keyboard_shortcuts.hotkey": "Tast përkatës", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "Backspace", + "keyboard_shortcuts.keys.enter": "Enter", + "keyboard_shortcuts.keys.esc": "Esc", + "keyboard_shortcuts.keys.page_down": "Page Down", + "keyboard_shortcuts.keys.page_up": "Page Up", "keyboard_shortcuts.legend": "Për shfaqje të kësaj legjende", "keyboard_shortcuts.load_more": "Kaloje fokusin te butoni “Ngarko më tepër”", "keyboard_shortcuts.local": "Për hapje rrjedhe kohore vendore", @@ -1187,6 +1194,7 @@ "search_popout.user": "përdorues", "search_results.accounts": "Profile", "search_results.all": "Krejt", + "search_results.collections": "Koleksione", "search_results.hashtags": "Hashtag-ë", "search_results.no_results": "S’ka përfundime.", "search_results.no_search_yet": "Provoni të kërkoni për postime, profile ose hashtag-ë.", diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json index 841c8e5473..defab5c34d 100644 --- a/app/javascript/mastodon/locales/sr-Latn.json +++ b/app/javascript/mastodon/locales/sr-Latn.json @@ -1,7 +1,6 @@ { "about.blocks": "Moderirani serveri", "about.contact": "Kontakt:", - "about.disclaimer": "Mastodon je besplatan softver otvorenog koda i zaštićeni znak kompanije Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Razlog nije naveden", "about.domain_blocks.preamble": "Mastodon vam generalno omogućava da vidite sadržaj i komunicirate sa korisnicima sa bilo kog drugog servera u fediverzumu. Ovo su izuzeci koji su napravljeni na ovom serveru.", "about.domain_blocks.silenced.explanation": "Nećete videti profile i sadržaj sa ovog servera osim ako ih eksplicitno ne potražite ili ne zapratite neki profil sa servera.", diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json index 93731afcfd..87b50a6ecc 100644 --- a/app/javascript/mastodon/locales/sr.json +++ b/app/javascript/mastodon/locales/sr.json @@ -1,7 +1,6 @@ { "about.blocks": "Модерирани сервери", "about.contact": "Контакт:", - "about.disclaimer": "Mastodon је бесплатан софтвер отвореног кода и заштићени знак компаније Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Разлог није наведен", "about.domain_blocks.preamble": "Mastodon вам генерално омогућава да видите садржај и комуницирате са корисницима са било ког другог сервера у федиверзуму. Ово су изузеци који су направљени на овом серверу.", "about.domain_blocks.silenced.explanation": "Нећете видети профиле и садржај са овог сервера осим ако их експлицитно не потражите или не запратите неки профил са сервера.", diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json index a5cda9c93f..6ffd62c62a 100644 --- a/app/javascript/mastodon/locales/sv.json +++ b/app/javascript/mastodon/locales/sv.json @@ -2,7 +2,7 @@ "about.blocks": "Modererade servrar", "about.contact": "Kontakt:", "about.default_locale": "Standard", - "about.disclaimer": "Mastodon är fri programvara med öppen källkod och ett varumärke tillhörande Mastodon gGmbH.", + "about.disclaimer": "Mastodon är fri programvara med öppen källkod och ett varumärke som tillhör Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Okänd orsak", "about.domain_blocks.preamble": "Som regel låter Mastodon dig interagera med användare från andra servrar i fediversumet och se deras innehåll. Detta är de undantag som gjorts på just denna server.", "about.domain_blocks.silenced.explanation": "Såvida du inte uttryckligen söker upp dem eller samtycker till att se dem genom att följa dem kommer du i allmänhet inte se profiler från den här servern, eller deras innehåll.", diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json index a758170fa9..65d5771415 100644 --- a/app/javascript/mastodon/locales/szl.json +++ b/app/javascript/mastodon/locales/szl.json @@ -1,7 +1,6 @@ { "about.blocks": "Moderowane serwery", "about.contact": "Kōntakt:", - "about.disclaimer": "Mastodon je wolne a ôtwartozdrzōdłowe ôprogramowanie i towarowy znak ôd Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Brak prziczyny", "about.domain_blocks.preamble": "Mastodon z wiynksza dŏwŏ ôglōndać treści i kōmunikować sie ze używŏczami inkszych serwerōw we fediverse. To sōm wyjōntki, co fungujōm na tym kōnkretnym serwerze.", "about.domain_blocks.silenced.explanation": "Normalniy niy bydziesz widzieć profilōw a treściōw ze tygo serwera. Ôboczysz je ino jak specjalniy bydziesz ich szukać abo jak je zaôbserwujesz.", diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json index 45a218ebbd..ae44902b59 100644 --- a/app/javascript/mastodon/locales/ta.json +++ b/app/javascript/mastodon/locales/ta.json @@ -1,7 +1,6 @@ { "about.blocks": "நடுநிலையான சேவையகங்கள்", "about.contact": "தொடர்பு:", - "about.disclaimer": "மாஸ்டோடன் இலவச, திறந்த மூல மென்பொருள் மற்றும் மாஸ்டோடன் gGmbH இன் வர்த்தக முத்திரை.", "about.domain_blocks.no_reason_available": "காரணம் கிடைக்கவில்லை", "about.domain_blocks.preamble": "மாஸ்டோடன் பொதுவாக நீங்கள் ஃபெடிவர்ஸில் உள்ள வேறு எந்தச் சர்வரிலிருந்தும் உள்ளடக்கத்தைப் பார்க்கவும், பயனர்களுடன் தொடர்பு கொள்ளவும் அனுமதிக்கிறது. இந்தக் குறிப்பிட்ட சர்வரில் செய்யப்பட்ட விதிவிலக்குகள் இவை.", "account.add_or_remove_from_list": "பட்டியல்களில் சேர்/நீக்கு", diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json index c2f0a3ce5d..189ae32792 100644 --- a/app/javascript/mastodon/locales/tai.json +++ b/app/javascript/mastodon/locales/tai.json @@ -1,7 +1,6 @@ { "about.blocks": "Siū kuán-tsè ê su-hāu-khì", "about.contact": "Liân-lo̍k:", - "about.disclaimer": "Ling-khí-tshiūnn sī tsi̍t-ê khai-guân nńg-thé，i ê siong-phiau sī Mastodon gGmbH.", "account.badges.bot": "Tsū-tōng-ê", "account.cancel_follow_request": "Mài-koh tui-tsong", "account.media": "Mûi-thé", diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json index 64df55cd2c..3c91b84f23 100644 --- a/app/javascript/mastodon/locales/th.json +++ b/app/javascript/mastodon/locales/th.json @@ -2,7 +2,6 @@ "about.blocks": "เซิร์ฟเวอร์ที่ได้รับการกลั่นกรอง", "about.contact": "ติดต่อ:", "about.default_locale": "ค่าเริ่มต้น", - "about.disclaimer": "Mastodon เป็นซอฟต์แวร์เสรี โอเพนซอร์ส และเครื่องหมายการค้าของ Mastodon gGmbH", "about.domain_blocks.no_reason_available": "เหตุผลไม่พร้อมใช้งาน", "about.domain_blocks.preamble": "โดยทั่วไป Mastodon อนุญาตให้คุณดูเนื้อหาจากและโต้ตอบกับผู้ใช้จากเซิร์ฟเวอร์อื่นใดในจักรวาลสหพันธ์ นี่คือข้อยกเว้นที่ทำขึ้นในเซิร์ฟเวอร์นี้โดยเฉพาะ", "about.domain_blocks.silenced.explanation": "โดยทั่วไปคุณจะไม่เห็นโปรไฟล์และเนื้อหาจากเซิร์ฟเวอร์นี้ เว้นแต่คุณจะค้นหาเซิร์ฟเวอร์หรือเลือกรับเซิร์ฟเวอร์โดยการติดตามอย่างชัดเจน", diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json index 265d5f422e..b48d2532a4 100644 --- a/app/javascript/mastodon/locales/tok.json +++ b/app/javascript/mastodon/locales/tok.json @@ -2,7 +2,6 @@ "about.blocks": "ma lawa", "about.contact": "toki:", "about.default_locale": "ante ala", - "about.disclaimer": "ilo Mastodon la jan ale li lawa e ona li pana e pona tawa ona. kulupu esun Mastodon gGmbH li lawa e nimi ona.", "about.domain_blocks.no_reason_available": "mi sona ala e tan", "about.domain_blocks.preamble": "ilo Mastodon li ken e ni: sina lukin e toki jan pi ma ilo mute. sina ken toki tawa ona lon kulupu ma. taso, ma ni li ken ala e ni tawa ma ni:", "about.domain_blocks.silenced.explanation": "sina lukin ala e toki e jan tan ma ni. taso, sina wile la, sina ken ni.", diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json index e1306a87fc..efea49d3bf 100644 --- a/app/javascript/mastodon/locales/tr.json +++ b/app/javascript/mastodon/locales/tr.json @@ -2,7 +2,7 @@ "about.blocks": "Denetlenen sunucular", "about.contact": "İletişim:", "about.default_locale": "Varsayılan", - "about.disclaimer": "Mastodon özgür, açık kaynak bir yazılımdır ve Mastodon gGmbH şirketinin ticari markasıdır.", + "about.disclaimer": "Mastodon özgür, açık kaynak bir yazılımdır ve Mastodon GmbH şirketinin ticari markasıdır.", "about.domain_blocks.no_reason_available": "Gerekçe mevcut değil", "about.domain_blocks.preamble": "Mastodon, genel olarak fediverse'teki herhangi bir sunucudan içerik görüntülemenize ve kullanıcılarıyla etkileşim kurmanıza izin verir. Bunlar, bu sunucuda yapılmış olan istisnalardır.", "about.domain_blocks.silenced.explanation": "Açık bir şekilde aramadığınız veya takip ederek abone olmadığınız sürece, bu sunucudaki profilleri veya içerikleri genelde göremeyeceksiniz.", diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json index 9dabb0d256..a1afa508ec 100644 --- a/app/javascript/mastodon/locales/tt.json +++ b/app/javascript/mastodon/locales/tt.json @@ -2,7 +2,6 @@ "about.blocks": "Модерациялана торган серверлар", "about.contact": "Бәйләнеш:", "about.default_locale": "Килешү буенча", - "about.disclaimer": "Mastodon-бушлай ачык чыганак программасы һәм Mastodon gmbh сәүдә маркасы.", "about.domain_blocks.no_reason_available": "Сәбәбе юк", "about.domain_blocks.preamble": "Mastodon гадәттә сезгә бүтән fediverse серверыннан эчтәлекне карарга һәм аның белән кулланучылар белән аралашырга мөмкинлек бирә. Бу конкрет серверда ясалган искәрмәләр.", "about.domain_blocks.silenced.explanation": "Гадәттә, сез бу серверның профильләрен һәм эчтәлеген күрмәячәксез, әгәр сез аларны ачыктан-ачык карамасагыз яки бу адымнарны үтәп язылмасагыз.", diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json index df88e26645..cf39b9193d 100644 --- a/app/javascript/mastodon/locales/ug.json +++ b/app/javascript/mastodon/locales/ug.json @@ -2,7 +2,6 @@ "about.blocks": "باشقۇرۇلىدىغان مۇلازىمېتىر", "about.contact": "ئالاقە:", "about.default_locale": "كۆڭۈلدىكى", - "about.disclaimer": "Mastodon ھەقسىز، ئوچۇق كودلۇق يۇمشاق دېتال تاۋار ماركىسى Mastodon gGmbH غا تەۋە.", "about.domain_blocks.no_reason_available": "سەۋەبىنى ئىشلەتكىلى بولمايدۇ", "about.language_label": "تىل", "account.badges.bot": "ماشىنا ئادەم", diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json index 54917fab1d..9ad58bdaa3 100644 --- a/app/javascript/mastodon/locales/uk.json +++ b/app/javascript/mastodon/locales/uk.json @@ -2,7 +2,6 @@ "about.blocks": "Модеровані сервери", "about.contact": "Контакти:", "about.default_locale": "За замовчуванням", - "about.disclaimer": "Mastodon — це вільне програмне забезпечення з відкритим кодом і торгова марка компанії Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Причина недоступна", "about.domain_blocks.preamble": "Mastodon зазвичай дозволяє вам взаємодіяти з користувачами будь-яких серверів у Федіверсі та переглядати їх вміст. Ось винятки, які було зроблено на цьому конкретному сервері.", "about.domain_blocks.silenced.explanation": "Ви загалом не будете бачити профілі та вміст цього сервера, якщо ви не шукаєте їх цілеспрямовано або не підписані на його користувачів.", diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json index 1e518485a7..958c806010 100644 --- a/app/javascript/mastodon/locales/ur.json +++ b/app/javascript/mastodon/locales/ur.json @@ -1,7 +1,6 @@ { "about.blocks": "معتدل سرورز", "about.contact": "رابطہ:", - "about.disclaimer": "میسٹادان مفت، اوپن سورس سافٹ ویئر ہے، اور میسٹادان غیر منافع بخش کا ٹریڈ مارک ہے۔", "about.domain_blocks.no_reason_available": "وجوہات نہیں دستیاب", "about.domain_blocks.silenced.title": "محدود", "about.domain_blocks.suspended.title": "معطل شدہ", diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json index f0db658b5e..bcbd6cc174 100644 --- a/app/javascript/mastodon/locales/uz.json +++ b/app/javascript/mastodon/locales/uz.json @@ -1,7 +1,6 @@ { "about.blocks": "Moderatsiya qilingan serverlar", "about.contact": "Ulanish:", - "about.disclaimer": "Mastodon bepul, ochiq kodli dastur va Mastodon gGmbH kompaniyasining savdo belgisidir.", "about.domain_blocks.no_reason_available": "Sabab mavjud emas", "about.domain_blocks.preamble": "Mastodon odatda fediversedagi istalgan boshqa serverdagi foydalanuvchilar tarkibini ko'rish va ular bilan muloqot qilish imkonini beradi. Bu alohida serverda qilingan istisnolar.", "about.domain_blocks.silenced.explanation": "Bu serverdagi profillar va kontentni koʻrmaysiz, agar siz uni aniq koʻrib chiqmasangiz yoki unga amal qilish orqali kirishni xohlamasangiz.", diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json index 973ecf626e..9790d927f0 100644 --- a/app/javascript/mastodon/locales/vi.json +++ b/app/javascript/mastodon/locales/vi.json @@ -2,7 +2,7 @@ "about.blocks": "Kiểm duyệt máy chủ khác", "about.contact": "Liên lạc:", "about.default_locale": "Mặc định", - "about.disclaimer": "Mastodon là phần mềm tự do nguồn mở của Mastodon gGmbH.", + "about.disclaimer": "Mastodon là phần mềm tự do nguồn mở của Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Lý do không được cung cấp", "about.domain_blocks.preamble": "Mastodon cho phép bạn đọc nội dung và giao tiếp với tài khoản từ bất kỳ máy chủ nào. Còn đây là những ngoại lệ trên máy chủ này.", "about.domain_blocks.silenced.explanation": "Nói chung, bạn sẽ không thấy tài khoản và nội dung từ máy chủ này, trừ khi bạn tự tìm kiếm hoặc tự theo dõi.", @@ -646,6 +646,7 @@ "empty_column.account_unavailable": "Tài khoản bị đình chỉ", "empty_column.blocks": "Bạn chưa chặn ai.", "empty_column.bookmarked_statuses": "Bạn chưa lưu tút nào. Nếu có, nó sẽ hiển thị ở đây.", + "empty_column.collections": "{acct} chưa tạo gói khởi đầu nào.", "empty_column.collections.featured_in": "Bạn chưa được thêm vào gói khởi đầu nào.", "empty_column.collections.featured_in_undiscoverable": "Để mọi người có thể thêm bạn vào gói khởi đầu, bạn cần cho phép hiển thị trong trải nghiệm khám phá ở Thiết lập > Riêng tư và tiếp cận", "empty_column.community": "Máy chủ của bạn chưa có tút nào công khai. Bạn hãy thử viết gì đó đi!", @@ -734,7 +735,7 @@ "footer.about_mastodon": "Về Mastodon", "footer.about_server": "Về {domain}", "footer.about_this_server": "Giới thiệu", - "footer.directory": "Danh bạ", + "footer.directory": "Chỉ mục", "footer.get_app": "Ứng dụng", "footer.keyboard_shortcuts": "Phím tắt", "footer.privacy_policy": "Bảo mật", @@ -819,6 +820,12 @@ "keyboard_shortcuts.heading": "Danh sách phím tắt", "keyboard_shortcuts.home": "mở trang chủ", "keyboard_shortcuts.hotkey": "Phím tắt", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "Backspace", + "keyboard_shortcuts.keys.enter": "Enter", + "keyboard_shortcuts.keys.esc": "Esc", + "keyboard_shortcuts.keys.page_down": "Page Down", + "keyboard_shortcuts.keys.page_up": "Page Up", "keyboard_shortcuts.legend": "hiện bảng hướng dẫn này", "keyboard_shortcuts.load_more": "mở nút \"Tải thêm\"", "keyboard_shortcuts.local": "mở máy chủ của bạn", @@ -850,6 +857,7 @@ "lightbox.zoom_in": "Kích cỡ gốc", "lightbox.zoom_out": "Vừa màn hình", "limited_account_hint.action": "Vẫn cứ xem", + "limited_account_hint.title": "Tài khoản hoặc máy chủ đã bị quản trị viên {domain} ẩn.", "link_preview.author": "Bởi {name}", "link_preview.more_from_author": "Viết bởi {name}", "link_preview.shares": "{count, plural, other {{counter} lượt chia sẻ}}", @@ -1191,6 +1199,7 @@ "search_popout.user": "địa chỉ Mastodon", "search_results.accounts": "Mọi người", "search_results.all": "Toàn bộ", + "search_results.collections": "Gói khởi đầu", "search_results.hashtags": "Hashtag", "search_results.no_results": "Không có kết quả.", "search_results.no_search_yet": "Thử tìm tút, người dùng hoặc hashtag.", diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index 7312742aa2..15f0f42da2 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -2,7 +2,7 @@ "about.blocks": "被限制的服务器", "about.contact": "联系方式：", "about.default_locale": "默认", - "about.disclaimer": "Mastodon 是自由的开源软件，商标由 Mastodon gGmbH 持有。", + "about.disclaimer": "Mastodon 是自由的开源软件，商标由 Mastodon GmbH 持有。", "about.domain_blocks.no_reason_available": "原因不可用", "about.domain_blocks.preamble": "通常来说，在 Mastodon 上，你可以浏览联邦宇宙中任何一台服务器上的内容，并且和上面的用户互动。但其中一些在本服务器上被设置为例外。", "about.domain_blocks.silenced.explanation": "除非明确地搜索并关注对方，否则你不会看到来自此服务器的用户信息与内容。", @@ -646,6 +646,7 @@ "empty_column.account_unavailable": "个人资料不可用", "empty_column.blocks": "你还未屏蔽任何用户。", "empty_column.bookmarked_statuses": "你还没有给任何嘟文添加书签。添加书签后的嘟文会显示在这里。", + "empty_column.collections": "{acct} 尚未创建任何收藏列表。", "empty_column.collections.featured_in": "你还没有被添加到收藏列表过。", "empty_column.collections.featured_in_undiscoverable": "如果想让其他人将你添加到收藏列表，请前往偏好设置 > 隐私与可达性在发现功能中允许推荐", "empty_column.community": "本站时间线还没有内容，写点什么并公开发布，让它活跃起来吧！", @@ -819,6 +820,12 @@ "keyboard_shortcuts.heading": "快捷键列表", "keyboard_shortcuts.home": "打开主页时间线", "keyboard_shortcuts.hotkey": "快捷键", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "Backspace", + "keyboard_shortcuts.keys.enter": "Enter", + "keyboard_shortcuts.keys.esc": "Esc", + "keyboard_shortcuts.keys.page_down": "Page Down", + "keyboard_shortcuts.keys.page_up": "Page Up", "keyboard_shortcuts.legend": "显示此列表", "keyboard_shortcuts.load_more": "将焦点移至“加载更多”按钮", "keyboard_shortcuts.local": "打开本站时间线", @@ -1167,7 +1174,7 @@ "report_notification.categories.legal": "法律义务", "report_notification.categories.legal_sentence": "非法内容", "report_notification.categories.other": "其他", - "report_notification.categories.other_sentence": "其它", + "report_notification.categories.other_sentence": "其他", "report_notification.categories.spam": "骚扰", "report_notification.categories.spam_sentence": "骚扰", "report_notification.categories.violation": "违反规则", @@ -1192,6 +1199,7 @@ "search_popout.user": "用户", "search_results.accounts": "用户", "search_results.all": "全部", + "search_results.collections": "收藏列表", "search_results.hashtags": "话题", "search_results.no_results": "未找到结果。", "search_results.no_search_yet": "不妨试下搜索嘟文、账号或话题。", @@ -1342,7 +1350,7 @@ "upload_form.edit": "编辑", "upload_progress.label": "上传中…", "upload_progress.processing": "正在处理…", - "username.taken": "此用户名已被占用。请换用其它用户名", + "username.taken": "此用户名已被占用。请换用其他用户名", "video.close": "关闭视频", "video.download": "下载文件", "video.exit_fullscreen": "退出全屏", diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json index a64c3ada6e..0232b867bf 100644 --- a/app/javascript/mastodon/locales/zh-HK.json +++ b/app/javascript/mastodon/locales/zh-HK.json @@ -2,7 +2,6 @@ "about.blocks": "受管制的伺服器", "about.contact": "聯絡我們：", "about.default_locale": "預設", - "about.disclaimer": "Mastodon 是免費的開源軟件，為 Mastodon gGmbH 的商標。", "about.domain_blocks.no_reason_available": "沒有原因", "about.domain_blocks.preamble": "Mastodon 通常也讓你查看聯邦宇宙中各伺服器的內容，並與使用者互動。這些是發生在這個特定伺服器上的例外情況。", "about.domain_blocks.silenced.explanation": "一般來說您不會看到來自這個伺服器的個人檔案和內容，除非您明確地打開或著追蹤此個人檔案。", diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json index 724ff38ce1..b3f4fc0321 100644 --- a/app/javascript/mastodon/locales/zh-TW.json +++ b/app/javascript/mastodon/locales/zh-TW.json @@ -2,7 +2,7 @@ "about.blocks": "受管制的伺服器", "about.contact": "聯絡我們：", "about.default_locale": "預設", - "about.disclaimer": "Mastodon 是一個自由的開源軟體，是 Mastodon gGmbH 之註冊商標。", + "about.disclaimer": "Mastodon 是自由的開源軟體，是 Mastodon GmbH 之註冊商標。", "about.domain_blocks.no_reason_available": "無法存取的原因", "about.domain_blocks.preamble": "Mastodon 基本上允許您瀏覽聯邦宇宙中任何伺服器的內容並與使用者互動。以下是於本伺服器上設定之例外。", "about.domain_blocks.silenced.explanation": "一般來說您不會看到來自這個伺服器的個人檔案與內容，除非您明確地檢視或著跟隨此個人檔案。", @@ -646,6 +646,7 @@ "empty_column.account_unavailable": "無法取得個人檔案", "empty_column.blocks": "您尚未封鎖任何使用者。", "empty_column.bookmarked_statuses": "您還沒有新增任何書籤。當您新增書籤時，它將於此顯示。", + "empty_column.collections": "{acct} 尚未建立任何收藏名單。", "empty_column.collections.featured_in": "您尚未被加入至任何收藏名單。", "empty_column.collections.featured_in_undiscoverable": "如欲被其他人將您加入至收藏名單，您必須於 偏好設定 > 隱私權與觸及 啟用探索相關功能", "empty_column.community": "本站時間軸是空的。快公開嘟些文搶頭香啊！", @@ -819,6 +820,12 @@ "keyboard_shortcuts.heading": "鍵盤快速鍵", "keyboard_shortcuts.home": "開啟首頁時間軸", "keyboard_shortcuts.hotkey": "快速鍵", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "Backspace", + "keyboard_shortcuts.keys.enter": "Enter", + "keyboard_shortcuts.keys.esc": "ESC", + "keyboard_shortcuts.keys.page_down": "Page Down", + "keyboard_shortcuts.keys.page_up": "Page Up", "keyboard_shortcuts.legend": "顯示此說明選單", "keyboard_shortcuts.load_more": "將焦點移至「讀取更多」按鈕", "keyboard_shortcuts.local": "開啟本站時間軸", @@ -1192,6 +1199,7 @@ "search_popout.user": "使用者", "search_results.accounts": "個人檔案", "search_results.all": "全部", + "search_results.collections": "收藏名單", "search_results.hashtags": "主題標籤", "search_results.no_results": "沒有結果。", "search_results.no_search_yet": "嘗試搜尋嘟文、個人檔案或主題標籤。", diff --git a/config/locales/doorkeeper.pl.yml b/config/locales/doorkeeper.pl.yml index b11528aeee..85b9013747 100644 --- a/config/locales/doorkeeper.pl.yml +++ b/config/locales/doorkeeper.pl.yml @@ -83,6 +83,8 @@ pl: access_denied: Właściciel zasobu lub serwer autoryzujący odrzuciły żądanie. credential_flow_not_configured: Ścieżka "Resource Owner Password Credentials" zakończyła się błędem, ponieważ Doorkeeper.configure.resource_owner_from_credentials nie został skonfigurowany. invalid_client: Autoryzacja klienta nie powiodła się z powodu nieznanego klienta, braku uwierzytelnienia klienta, lub niewspieranej metody uwierzytelniania. + invalid_code_challenge_method: + zero: Serwer autoryzacji nie obsługuje PKCE — brak akceptowanych wartości code_challenge_method. invalid_grant: Grant uwierzytelnienia jest niepoprawny, przeterminowany, unieważniony, nie pasuje do URI przekierowwania użytego w żądaniu uwierzytelnienia, lub został wystawiony przez innego klienta. invalid_redirect_uri: URI przekierowania jest nieprawidłowy. invalid_request: diff --git a/config/locales/nn.yml b/config/locales/nn.yml index b91de70f08..a599917d50 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -345,12 +345,20 @@ nn: updated_msg: Du oppdaterte kunngjeringa. collections: accounts: Kontoar + back_to_account: Tilbake til kontosida + back_to_report: Tilbake til rapporteringssida + batch: + add_to_report: 'Legg til rapport #%{id}' + remove_from_report: Fjern frå rapport + report: Rapporter collection_title: Samling av %{name} contents: Innhald + no_collection_selected: Ingen samlingar var valde, så ingen vart endra number_of_accounts: one: 1 konto other: "%{count} kontoar" open: Opna + title: Kontosamlingar - @%{name} view_publicly: Vis offentleg critical_update_pending: Kritisk oppdatering ventar custom_emojis: @@ -484,9 +492,76 @@ nn: title: Blokker nytt e-postdomene no_email_domain_block_selected: Blokkering av e-post-domene vart ikkje endra sidan ingen var valde not_permitted: Ikkje tillate + reset: Nullstill resolved_dns_records_hint_html: Domenenamnet gjer oppslag til desse MX-domena som til sist er ansvarlege for å motta e-post. Blokkering av eit MX-domene vil blokkere registreringar frå alle e-postadresser som bruker same MX-domene, sjølv om det synlege domenenamnet skulle vera noko anna. Pass på så du ikkje blokkerer dei store e-postleverandørane. resolved_through_html: Løyst gjennom %{domain} + search: Søk title: Blokkerte e-postdomene + email_subscriptions: + accounts: + account: Konto + active: Aktiv + empty: + hint: Ingen brukarkontoar har abonnentar enno. + no_lists_yet: Ingen lister enno + inactive: Ikkje aktiv + last_email: Siste epost + lead: Nedanfor vil du sjå brukarkontoar som har skrudd på dette og som har abonnentar. + status: Status + subscribers: Abonnentar + title: Epostlister + additional_footer_texts: + show: + title: Ekstra botntekst + compliance_settings: + additional_footer_text: + action: Administrer + hint: Valfri tekst du kan setja i botnteksten på epostutsendingar + title: Ekstra botntekst + lead: Nokre jurisdiksjonar ser på epost-nyhendebrev som marknadsføring, avhengig av kvar du driv tenaren. + privacy_policy: + action: Administrer + hint: Desse retningslinene står i botnteksten på kvar epost + title: Personvernsreglar + title: Samsvarsinnstillingar + danger_zone: + disable_feature: + action: Slå av + hint: Slå av funksjonen for alle kontoar + title: Skru av funksjonen + erase_all_data: + action: Slett data + hint: Slettar alle epostar frå alle epostlister + title: Slett alt innhald + title: Faresone + disabled_msg: Du har skrudd av epostabonnementa. + index: + disabled: + cannot_be_enabled: Den tekniske leverandøren din har ikkje teke i bruk denne funksjonen på tenaren din. + description: Med denne funksjonen kan du la dei gjevne brukarane få leggja til småprogram på profilane sine, slik at lesarar utan Mastodon-brukarkontoar kan få innlegga deira på epost. + get_started: Kom i gang + lead: Lat lesarar få innlegga frå utvalde folk på denne tenaren på epost. + title: Nytt på epost + purged_msg: Alle epost-abonnementa blir sletta. + roles: + accounts: Kontoar + edit_role: Rediger rolle + empty: + hint: Ingen har løyve til å bruka denne funksjonen. + no_roles_added: Ingen roller er lagde til + lead: Folk med desse rollene kan bruka denne funksjonen på profilane sine. + manage_roles: Handsam roller + role_name: Namn på rolla + title: Roller + setups: + show: + enable_feature: Skru på funksjonen + important_information: Viktig informasjon + list: + 1_permission_explanation: Når denne funksjonen er skrudd på, kan brukarar med løyve leggja til eit skjema for å samla inn epostadresser på profilane sine. + 2_feature_explanation: Når gjester registrerer seg på ei profilside og stadfestar abonnementet, får dei epostoppdateringar når kontoen legg ut nye offentlege innlegg. + 3_privacy_policy_warning: Tenaradministratorar får tilgang til innsamla PII (epostadresser). Difor må personvernretnignslinene og brukarvilkåra for tenaren oppdaterast før du kan bruka denne funksjonen. + 4_cost_warning: Nokre tenaroppsett gjev tilleggskostnader for epostutsending. Drøft med nettverten din før du skrur på funksjonen, fordi det kan føra med seg store mengder epostar frå tenaren din. export_domain_allows: new: title: Importer domenetillatingar @@ -671,6 +746,7 @@ nn: action_log: Tilsynslogg action_taken_by: Handling gjort av actions: + delete_description_html: Dei rapporterte innlegga og/eller samlingane vil bli sletta, og det vil bli lagra ein merknad slik at du kan handla raskare ved framtidige regelbrot frå same person. mark_as_sensitive_description_html: Mediene i dei rapporterte innlegga vil verte markerte som ømtolege, og ein merknad vil verte lagra for å hjelpe deg å eskalera ved framtidige regelbrot frå same konto. other_description_html: Sjå fleire alternativ når det gjeld kontroll av kontoåtferd og tilpassing av kommunikasjonen til den rapporterte kontoen. resolve_description_html: Ingen handling utføres mot den rapporterte kontoen, ingen advarsel gis, og rapporten lukkes. @@ -697,6 +773,7 @@ nn: confirm: Stadfest confirm_action: Stadfest at du vil moderera brukarkontoen @%{acct} created_at: Rapportert + delete_and_resolve: Slett innhald forwarded: Videresendt forwarded_replies_explanation: Denne rapporten gjeld innhald på ein annan nettstad. Rapporten er vidaresend til deg fordi det rapporterte innhaldet er eit svar på noko ein av brukarane på nettstaden din har skrive. forwarded_to: Videresendt til %{domain} diff --git a/config/locales/pl.yml b/config/locales/pl.yml index a7b1c1c24e..5c912489de 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -55,6 +55,7 @@ pl: label: Zmień rolę no_role: Brak roli title: Zmień rolę dla %{username} + collections: Kolekcje confirm: Potwierdź confirmed: Potwierdzono confirming: Potwierdzanie @@ -838,6 +839,9 @@ pl: preamble: Podaj szczegółowe informacje na temat sposobu działania, moderacji i finansowania serwera. rules_hint: Istnieje dedykowany obszar dla reguł, których twoi użytkownicy mają przestrzegać. title: O... + allow_referrer_origin: + desc: Gdy użytkownicy klikają w linki do zewnętrznych stron, ich przeglądarka może wysłać adres Twojego serwera Mastodona jako stronę odsyłającą. Wyłącz tę opcję, jeśli mogłoby to jednoznacznie zidentyfikować Twoich użytkowników, np. jeśli jest to osobisty serwer Mastodona. + title: Zezwalaj zewnętrznym stronom na rozpoznawanie Twojego serwera Mastodona jako źródła ruchu appearance: preamble: Dostosuj interfejs www Mastodon. title: Wygląd @@ -856,6 +860,7 @@ pl: title: Domyślnie żądaj nieindeksowania użytkowników przez wyszukiwarki discovery: follow_recommendations: Polecane konta + preamble: Prezentowanie ciekawych treści jest kluczowe przy wdrażaniu nowych użytkowników, którzy mogą jeszcze nikogo nie znać na Mastodonie. Tutaj kontrolujesz, jak działają różne funkcje odkrywania treści na Twoim serwerze. privacy: Prywatność profile_directory: Katalog profilów public_timelines: Publiczne osie czasu @@ -869,7 +874,7 @@ pl: users: Zalogowanym lokalnym użytkownikom feed_access: modes: - authenticated: tylko zalogowani użytkownicy + authenticated: Tylko zalogowani użytkownicy disabled: Wymagaj określonej roli użytkownika public: Wszyscy registrations: @@ -1330,9 +1335,9 @@ pl: invalid_password: Nieprawidłowe hasło prompt: Potwierdź hasło, aby kontynuować color_scheme: - auto: Automatyczne - dark: Ciemny - light: Jasny + auto: Automatyczna + dark: Ciemna + light: Jasna contrast: auto: Automatyczny high: Wysoki @@ -1406,6 +1411,9 @@ pl: your_appeal_rejected: Twoje odwołanie zostało odrzucone edit_profile: other: Inne + redesign_body: Profil możesz teraz edytować bezpośrednio ze swojej publicznej strony. + redesign_button: Przejdź do edycji + redesign_title: Nowy sposób edycji profilu emoji_styles: auto: Automatycznie native: Natywny @@ -1980,7 +1988,9 @@ pl: public: Każdy title: '%{name}: "%{quote}"' visibilities: + private: Tylko dla obserwujących public: Publiczne + public_long: Każdy na i poza Mastodon unlisted: Niewidoczny unlisted_long: Ukryte w wynikach wyszukiwania Mastodona, trendach i publicznych osiach czasu statuses_cleanup: diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml index 1db5bdfaf1..2532957821 100644 --- a/config/locales/simple_form.pl.yml +++ b/config/locales/simple_form.pl.yml @@ -60,6 +60,9 @@ pl: setting_default_quote_policy_private: Wpisy publikowane na Mastodonie wyłącznie dla obserwujących nie mogą być cytowane przez inne osoby. setting_default_quote_policy_unlisted: Kiedy ktoś cytuje twoje wpisy, będą one również ukryte na popularnych osiach czasu. setting_default_sensitive: Wrażliwe multimedia są domyślnie schowane i mogą być odkryte kliknięciem + setting_display_media_default: Ostrzegaj przed wyświetleniem multimediów oznaczonych jako wrażliwe + setting_display_media_hide_all: Ostrzegaj przed wyświetleniem wszystkich multimediów + setting_display_media_show_all: Pokazuj wszystkie multimedia bez ostrzeżenia, w tym multimedia oznaczone jako wrażliwe setting_emoji_style: Jak wyświetlić emotikony. "Auto" spróbuje użyć natywnych emoji, ale wróci do Twemoji dla starszych przeglądarek. setting_quick_boosting_html: Po włączeniu tej opcji kliknięcie ikonki %{boost_icon} spowoduje natychmiastowe podbicie zamiast otwarcia menu rozwijanego z opcją podbicia lub cytatu. Przenosi to akcję cytowania do menu %{options_icon} (Opcje). setting_system_scrollbars_ui: Stosuje się tylko do przeglądarek komputerowych opartych na Safari i Chrome @@ -145,6 +148,7 @@ pl: jurisdiction: Wymień państwo, w którym mieszkają osoby płacące rachunki. Jeżeli jest to spółka lub inny zarejestrowany podmiot, w zależności od przypadku podaj państwo, w którym jest zarejestrowany, a także miasto, region czy województwo. min_age: Nie powinien być niższy niż minimalny wiek wymagany przez prawo twojego państwa. user: + chosen_languages: Jeżeli zaznaczone, tylko wpisy w wybranych językach będą wyświetlane na publicznych osiach czasu. To ustawienie nie ma wpływu na Twoją główną oś czasu i listy. date_of_birth: few: Musimy upewnić się, że jesteś co najmniej %{count} aby użyć %{domain}. Nie będziemy tego przechowywać. many: Musimy upewnić się, że jesteś co najmniej %{count} aby użyć %{domain}. Nie będziemy tego przechowywać. @@ -231,6 +235,7 @@ pl: setting_always_send_emails: Zawsze wysyłaj powiadomienia e-mail setting_auto_play_gif: Automatycznie odtwarzaj animowane GIFy setting_boost_modal: Kontroluj widoczność podbić + setting_color_scheme: Kolorystyka setting_contrast: Kontrast setting_default_language: Język wpisów setting_default_privacy: Widoczność wpisów diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml index 7e33b34500..7135bb359e 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -90,7 +90,7 @@ zh-CN: backups_retention_period: 用户可以生成其嘟文存档以供之后下载。当该值被设为正值时，这些存档将在指定的天数后自动从你的存储中删除。 bootstrap_timeline_accounts: 这些账号将在新用户关注推荐中置顶显示。请提供以逗号分隔的账号列表。 closed_registrations_message: 在关闭注册时显示 - content_cache_retention_period: 来自其它实例的所有嘟文（包括转嘟与回复）都将在指定天数后被删除，不论本实例用户是否与这些嘟文产生过交互。这包括被本实例用户喜欢和收藏的嘟文。实例间用户的私下提及也将丢失并无法恢复。此设置针对的是特殊用途的实例，用于一般用途时会打破许多用户的期望。 + content_cache_retention_period: 来自其他实例的所有嘟文（包括转嘟与回复）都将在指定天数后被删除，不论本实例用户是否与这些嘟文产生过交互。这包括被本实例用户喜欢和收藏的嘟文。实例间用户的私下提及也将丢失并无法恢复。此设置针对的是特殊用途的实例，用于一般用途时会打破许多用户的期望。 custom_css: 你可以为网页版 Mastodon 应用自定义样式。 email_footer_text: 仅在电子报邮件页脚中显示的可选文本。 favicon: WEBP、PNG、GIF 或 JPG。使用自定义图标覆盖 Mastodon 的默认图标。 diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index d8255d01a1..46bffcefb6 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -1107,7 +1107,7 @@ zh-CN: history: 历史记录 live: 生效中 no_history: 尚无服务条款变更记录。 - no_terms_of_service_html: 你还没有设置任何服务条款。设置服务条款可以清晰地界定责任，并在与用户发生争议时有效保护您的权益。 + no_terms_of_service_html: 你还没有设置任何服务条款。设置服务条款可以清晰地界定责任，并在与用户发生争议时有效保护你的权益。 notified_on_html: 已于 %{date} 通知用户 notify_users: 通知用户 preview: @@ -1328,7 +1328,7 @@ zh-CN: description: prefix_invited_by_user: "@%{name} 邀请你加入这个Mastodon服务器！" prefix_sign_up: 现在就注册 Mastodon 吧！ - suffix: 注册一个账号，你就可以关注他人、发布嘟文、并和其它任何 Mastodon 服务器上的用户交流，而且还有其它更多功能！ + suffix: 注册一个账号，你就可以关注他人、发布嘟文、并和其他任何 Mastodon 服务器上的用户交流，而且还有其他更多功能！ didnt_get_confirmation: 没有收到确认链接？ dont_have_your_security_key: 没有你的安全密钥？ forgot_password: 忘记密码？ @@ -1593,7 +1593,7 @@ zh-CN: batch: remove: 从过滤规则中移除 index: - hint: 此过滤规则适用于选中的个别嘟文，不受其它条件限制。你可以通过网页界面向此过滤规则添加更多嘟文。 + hint: 此过滤规则适用于选中的个别嘟文，不受其他条件限制。你可以通过网页界面向此过滤规则添加更多嘟文。 title: 过滤的嘟文 generic: all: 全部 @@ -1746,7 +1746,7 @@ zh-CN: not_found: 找不到 on_cooldown: 你正处于冷却状态 followers_count: 迁移时的关注者 - incoming_migrations: 从其它账号迁入 + incoming_migrations: 从其他账号迁入 incoming_migrations_html: 要把另一个账号移动到本账号，首先你需要创建一个账号别名 。 moved_msg: 你的账号现在会跳转到 %{acct} ，同时关注者也会一并迁移 。 not_redirecting: 你的账号当前未跳转到其它账号。 @@ -2254,7 +2254,7 @@ zh-CN: edit_profile_title: 个性化你的个人资料 explanation: 下面是几个小贴士，希望它们能帮到你 feature_action: 详细了解 - feature_audience: Mastodon 为你提供了无需中间商即可管理受众的独特可能。Mastodon 可被部署在你自己的基础设施上，允许你关注其它任何 Mastodon 在线服务器的用户，或被任何其他在线 Mastodon 服务器的用户关注，并且不受你之外的任何人控制。 + feature_audience: Mastodon 为你提供了无需中间商即可管理受众的独特可能。Mastodon 可被部署在你自己的基础设施上，允许你关注其他任何 Mastodon 在线服务器的用户，或被任何其他在线 Mastodon 服务器的用户关注，并且不受你之外的任何人控制。 feature_audience_title: 自由吸引你的受众 feature_control: 你最清楚你想在你自己的主页中看到什么动态。没有算法或广告浪费你的时间。你可以用一个账号关注任何 Mastodon 服务器上的任何人，并按时间顺序获得他们发布的嘟文，让你的互联网的角落更合自己的心意。 feature_control_title: 掌控自己的时间线 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index f83dbdaa07..ebe16757b6 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1,7 +1,9 @@ --- zh-TW: about: - about_mastodon_html: Mastodon （長毛象）是一個自由、開放原始碼的社群網站。它是一個分散式的服務，避免您的通訊被單一商業機構壟斷操控。請您選擇一家您信任的 Mastodon 站點，於其建立帳號，您就能與任一 Mastodon 站點上的使用者互通，享受無縫的社群網路交流。 + about_mastodon_html: |- + 社交網路的未來：無廣告、無企業監控、道德 + 去中心化設計！加入 Mastodon，擁有您的資料！ contact_missing: 未設定 contact_unavailable: 未公開 hosted_on: 於 %{domain} 託管之 Mastodon 站點 @@ -776,7 +778,7 @@ zh-TW: title: 備註 notes_description_html: 檢視及留下些給其他管理員與未來的自己的備註 processed_msg: '檢舉報告 #%{id} 已被成功處理' - quick_actions_description_html: 採取一個快速行動，或者下捲以檢視檢舉內容： + quick_actions_description_html: 採取快速行動，或者下捲以檢視檢舉內容： remote_user_placeholder: 來自 %{instance} 之遠端使用者 reopen: 重開檢舉 report: '檢舉 #%{id}' From 4b7cb59d16fbf4bd1b59530c493a2f53a0271cc3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 5 Jun 2026 10:31:52 +0200 Subject: [PATCH 20/34] Update dependency axios to v1.17.0 (#39277) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 847501e2f4..b6b489b702 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5824,14 +5824,14 @@ __metadata: linkType: hard "axios@npm:^1.4.0": - version: 1.16.1 - resolution: "axios@npm:1.16.1" + version: 1.17.0 + resolution: "axios@npm:1.17.0" dependencies: follow-redirects: "npm:^1.16.0" form-data: "npm:^4.0.5" https-proxy-agent: "npm:^5.0.1" proxy-from-env: "npm:^2.1.0" - checksum: 10c0/2f77e37e6552bbff8a772d058fb09500198e9188c6b20dc799d82dbe12a8cb506f6eed4e4e62a9ba612a35cbab496faa26d68f9bff14a53af6d15c3e136391a7 + checksum: 10c0/c4fa19ff3a3a63bde48beec03ad816b133b9a6385cccffffe172577ab18c6a70e299280d57f12c80c867fe25df41f92cb91d3a8258708a6d2be3e9e085f92650 languageName: node linkType: hard From 20c535acc4ae21c50a236c9f2c33e7a5ece5f450 Mon Sep 17 00:00:00 2001 From: Shlee Date: Fri, 5 Jun 2026 18:03:15 +0930 Subject: [PATCH 21/34] Fix: Blocked Domains Persist in Elasticsearch InstancesIndex (#39109) --- app/workers/scheduler/instance_refresh_scheduler.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/workers/scheduler/instance_refresh_scheduler.rb b/app/workers/scheduler/instance_refresh_scheduler.rb index 818682a5d2..f39abd5d86 100644 --- a/app/workers/scheduler/instance_refresh_scheduler.rb +++ b/app/workers/scheduler/instance_refresh_scheduler.rb @@ -7,6 +7,6 @@ class Scheduler::InstanceRefreshScheduler def perform Instance.refresh - InstancesIndex.import if Chewy.enabled? + InstancesIndex.sync if Chewy.enabled? end end From 906ae955fb694588d3c948e8c774937e83933098 Mon Sep 17 00:00:00 2001 From: diondiondion Date: Fri, 5 Jun 2026 10:34:39 +0200 Subject: [PATCH 22/34] Prefetch collection accounts for statuses and notifications (#39291) --- .../mastodon/actions/importer/index.js | 7 ++++++ .../mastodon/actions/notification_groups.ts | 11 +++++++++ app/javascript/mastodon/actions/search.ts | 6 ++--- .../mastodon/reducers/slices/collections.ts | 24 ++++++++++--------- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/app/javascript/mastodon/actions/importer/index.js b/app/javascript/mastodon/actions/importer/index.js index fe31b84bff..efe63f02d5 100644 --- a/app/javascript/mastodon/actions/importer/index.js +++ b/app/javascript/mastodon/actions/importer/index.js @@ -4,6 +4,7 @@ import { importAccounts } from './accounts'; import { importCustomEmoji } from './emoji'; import { normalizeStatus } from './normalizer'; import { importPolls } from './polls'; +import { fetchAccountsForCollectionPreview } from '@/mastodon/reducers/slices/collections'; export const STATUS_IMPORT = 'STATUS_IMPORT'; export const STATUSES_IMPORT = 'STATUSES_IMPORT'; @@ -61,6 +62,7 @@ export function importFetchedStatuses(statuses, options = {}) { const normalStatuses = []; const polls = []; const filters = []; + const collections = []; function processStatus(status) { pushUnique(normalStatuses, normalizeStatus(status, getState().getIn(['statuses', status.id]), options)); @@ -82,6 +84,10 @@ export function importFetchedStatuses(statuses, options = {}) { pushUnique(polls, createPollFromServerJSON(status.poll, getState().polls[status.poll.id])); } + if (status.tagged_collections.length) { + status.tagged_collections.forEach(collection => pushUnique(collections, collection)); + } + if (status.card) { status.card.authors.forEach(author => author.account && pushUnique(accounts, author.account)); } @@ -97,5 +103,6 @@ export function importFetchedStatuses(statuses, options = {}) { dispatch(importFetchedAccounts(accounts)); dispatch(importStatuses(normalStatuses)); dispatch(importFilters(filters)); + fetchAccountsForCollectionPreview(collections, dispatch); }; } diff --git a/app/javascript/mastodon/actions/notification_groups.ts b/app/javascript/mastodon/actions/notification_groups.ts index eddd6a9300..6d2f00ece8 100644 --- a/app/javascript/mastodon/actions/notification_groups.ts +++ b/app/javascript/mastodon/actions/notification_groups.ts @@ -5,6 +5,7 @@ import { apiFetchNotificationGroups, } from 'mastodon/api/notifications'; import type { ApiAccountJSON } from 'mastodon/api_types/accounts'; +import type { ApiCollectionJSON } from 'mastodon/api_types/collections'; import type { ApiNotificationGroupJSON, ApiNotificationJSON, @@ -26,6 +27,8 @@ import { createDataLoadingThunk, } from 'mastodon/store/typed_functions'; +import { fetchAccountsForCollectionPreview } from '../reducers/slices/collections'; + import { importFetchedAccounts, importFetchedStatuses } from './importer'; import { NOTIFICATIONS_FILTER_SET } from './notifications'; import { saveSettings } from './settings'; @@ -70,6 +73,7 @@ function dispatchAssociatedRecords( ) { const fetchedAccounts: ApiAccountJSON[] = []; const fetchedStatuses: ApiStatusJSON[] = []; + const collections: ApiCollectionJSON[] = []; notifications.forEach((notification) => { if (notification.type === 'admin.report') { @@ -83,6 +87,10 @@ function dispatchAssociatedRecords( if ('status' in notification && notification.status) { fetchedStatuses.push(notification.status); } + + if ('collection' in notification) { + collections.push(notification.collection); + } }); if (fetchedAccounts.length > 0) @@ -90,6 +98,9 @@ function dispatchAssociatedRecords( if (fetchedStatuses.length > 0) dispatch(importFetchedStatuses(fetchedStatuses)); + + if (collections.length > 0) + void fetchAccountsForCollectionPreview(collections, dispatch); } function selectNotificationGroupedTypes(state: RootState) { diff --git a/app/javascript/mastodon/actions/search.ts b/app/javascript/mastodon/actions/search.ts index 4b97682a74..b3ec7df0eb 100644 --- a/app/javascript/mastodon/actions/search.ts +++ b/app/javascript/mastodon/actions/search.ts @@ -13,7 +13,7 @@ import { } from 'mastodon/store/typed_functions'; import { - importAccountsForPreviewCard, + fetchAccountsForCollectionPreview, importFetchedCollections, } from '../reducers/slices/collections'; @@ -46,7 +46,7 @@ export const submitSearch = createDataLoadingThunk( if (data.collections.length > 0) { dispatch(importFetchedCollections(data.collections)); - await importAccountsForPreviewCard(data.collections, dispatch); + await fetchAccountsForCollectionPreview(data.collections, dispatch); } return data; @@ -82,7 +82,7 @@ export const expandSearch = createDataLoadingThunk( if (data.collections.length > 0) { dispatch(importFetchedCollections(data.collections)); - await importAccountsForPreviewCard(data.collections, dispatch); + await fetchAccountsForCollectionPreview(data.collections, dispatch); } return data; diff --git a/app/javascript/mastodon/reducers/slices/collections.ts b/app/javascript/mastodon/reducers/slices/collections.ts index 41bda5aa95..2f54cd256d 100644 --- a/app/javascript/mastodon/reducers/slices/collections.ts +++ b/app/javascript/mastodon/reducers/slices/collections.ts @@ -337,7 +337,7 @@ const collectionSlice = createSlice({ /** * Prefetch accounts whose avatars will be displayed in the collection list */ -export async function importAccountsForPreviewCard( +export async function fetchAccountsForCollectionPreview( collections: ApiCollectionJSON[], dispatch: AppDispatch, ) { @@ -347,15 +347,17 @@ export async function importAccountsForPreviewCard( ) .filter((id): id is string => !!id); - // fetchAccounts can only process up to 40 item ids, so we'll - // batch the list of ids - const batchedAccountIdLists = batchArray(previewAccountIds, 40); + if (previewAccountIds.length > 0) { + // fetchAccounts can only process up to 40 item ids, so we'll + // batch the list of ids + const batchedAccountIdLists = batchArray(previewAccountIds, 40); - await Promise.allSettled( - batchedAccountIdLists.map((accountIds) => - dispatch(fetchAccounts({ accountIds })), - ), - ); + await Promise.allSettled( + batchedAccountIdLists.map((accountIds) => + dispatch(fetchAccounts({ accountIds })), + ), + ); + } } export const fetchCollectionsCreatedByAccount = createDataLoadingThunk( @@ -363,7 +365,7 @@ export const fetchCollectionsCreatedByAccount = createDataLoadingThunk( ({ accountId }: { accountId: string }) => apiGetCollectionsCreatedByAccount(accountId), async ({ collections }, { dispatch }) => { - await importAccountsForPreviewCard(collections, dispatch); + await fetchAccountsForCollectionPreview(collections, dispatch); }, ); @@ -372,7 +374,7 @@ export const fetchCollectionsFeaturingAccount = createDataLoadingThunk( ({ accountId }: { accountId: string }) => apiGetCollectionsFeaturingAccount(accountId), async ({ collections }, { dispatch }) => { - await importAccountsForPreviewCard(collections, dispatch); + await fetchAccountsForCollectionPreview(collections, dispatch); }, ); From 09689103390d10d77de5146483cbbb8abb5c94c9 Mon Sep 17 00:00:00 2001 From: diondiondion Date: Fri, 5 Jun 2026 10:39:23 +0200 Subject: [PATCH 23/34] [Accessibility] Make post/feed navigation by hotkey more robust (#39270) --- app/javascript/mastodon/features/ui/index.jsx | 12 ++- .../mastodon/features/ui/util/focusUtils.ts | 76 ++++++++++++++++--- 2 files changed, 69 insertions(+), 19 deletions(-) diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx index 22332eae6e..73ff427e6f 100644 --- a/app/javascript/mastodon/features/ui/index.jsx +++ b/app/javascript/mastodon/features/ui/index.jsx @@ -86,7 +86,7 @@ import { Quotes, } from './util/async-components'; import { ColumnsContextProvider } from './util/columns_context'; -import { focusColumn, getFocusedItemIndex, focusItemSibling, focusFirstItem } from './util/focusUtils'; +import { focusColumn, getFocusedItemIndex, focusItemSibling, focusFirstItem, getFocusedColumnIndex } from './util/focusUtils'; import { WrappedSwitch, WrappedRoute } from './util/react_router_helpers'; import { CustomHomepage } from 'mastodon/features/custom_homepage'; @@ -506,20 +506,18 @@ class UI extends PureComponent { handleMoveUp = () => { const currentItemIndex = getFocusedItemIndex(); if (currentItemIndex === -1) { - focusColumn(1); + return focusColumn(getFocusedColumnIndex()); } else { - const wasHandled = focusItemSibling(currentItemIndex, -1); - return wasHandled; + return focusItemSibling(currentItemIndex, -1); } }; handleMoveDown = () => { const currentItemIndex = getFocusedItemIndex(); if (currentItemIndex === -1) { - focusColumn(1); + return focusColumn(getFocusedColumnIndex()); } else { - const wasHandled = focusItemSibling(currentItemIndex, 1); - return wasHandled; + return focusItemSibling(currentItemIndex, 1); } }; diff --git a/app/javascript/mastodon/features/ui/util/focusUtils.ts b/app/javascript/mastodon/features/ui/util/focusUtils.ts index 80e9cb9768..6e6b8e24e0 100644 --- a/app/javascript/mastodon/features/ui/util/focusUtils.ts +++ b/app/javascript/mastodon/features/ui/util/focusUtils.ts @@ -62,18 +62,17 @@ export function focusColumn(index = 1) { function fallback() { focusColumnTitle(index + indexOffset, isMultiColumnLayout); + return false; } if (!column) { - fallback(); - return; + return fallback(); } const container = column.querySelector('.scrollable'); if (!container) { - fallback(); - return; + return fallback(); } const focusableItems = Array.from( @@ -86,8 +85,7 @@ export function focusColumn(index = 1) { const itemToFocus = findFirstVisibleWithRect(focusableItems); if (!itemToFocus) { - fallback(); - return; + return fallback(); } const viewportWidth = @@ -110,6 +108,7 @@ export function focusColumn(index = 1) { itemToFocus.item.scrollIntoView(true); } itemToFocus.item.focus(); + return true; } /** @@ -126,6 +125,18 @@ export function getFocusedItemIndex() { return items.indexOf(focusedItem); } +/** + * Get the index of the column that contains the user's focus + */ +export function getFocusedColumnIndex() { + const columnWithFocus = document.activeElement?.closest('.column'); + + if (!columnWithFocus) return 1; + + const allColumns = Array.from(document.querySelectorAll('.column')); + return allColumns.indexOf(columnWithFocus) + 1; +} + /** * Focus the topmost item of the column that currently has focus, * or the first column if none @@ -159,12 +170,7 @@ export function focusItemSibling(index: number, direction: 1 | -1) { ); if (!siblingItem) { - return false; - } - - // If sibling element is empty, we skip it - if (siblingItem.matches(':empty')) { - return focusItemSibling(index + direction, direction); + return focusListSibling(direction); } // Check if the sibling is a post or a 'follow suggestions' widget @@ -177,6 +183,52 @@ export function focusItemSibling(index: number, direction: 1 | -1) { targetElement = siblingItem; } + // If sibling element is empty, we skip it + if (!targetElement || siblingItem.matches(':empty')) { + return focusItemSibling(index + direction, direction); + } + + targetElement.scrollIntoView({ + block: 'start', + }); + + targetElement.focus(); + + return true; +} + +/** + * Finds the next or previous .item-list on the page or in the column, + * and focuses its first or last item. + */ +function focusListSibling(direction: 1 | -1) { + const container = document.activeElement?.closest('.item-list'); + + if (!container) { + return false; + } + + // Get all item lists in the current column or page + const currentColumn = container.closest('.column') ?? document; + + const columnItemLists = Array.from( + currentColumn.querySelectorAll('.item-list'), + ); + const currentListIndex = columnItemLists.indexOf(container); + + // Find the next or previous item-list + const listSibling = columnItemLists[currentListIndex + direction]; + + // Depending on the direction, find the first or last focusable in the list + let targetElement: HTMLElement | null | undefined; + if (direction > 0) { + targetElement = listSibling?.querySelector('.focusable'); + } else { + const allFocusables = + listSibling?.querySelectorAll('.focusable'); + targetElement = allFocusables?.[allFocusables.length - 1]; + } + if (targetElement) { targetElement.scrollIntoView({ block: 'start', From ff4d97180dfd247f5949176ecfd4c605f3ada8aa Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 5 Jun 2026 04:39:33 -0400 Subject: [PATCH 24/34] Use bundler version 4.0.13 (#39106) --- Gemfile.lock | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7e42276621..3a744a28c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,7 +10,7 @@ GIT GEM remote: https://rubygems.org/ specs: - action_text-trix (2.1.18) + action_text-trix (2.1.19) railties actioncable (8.1.3) actionpack (= 8.1.3) @@ -99,7 +99,7 @@ GEM ast (2.4.3) attr_required (1.0.2) aws-eventstream (1.4.0) - aws-partitions (1.1256.0) + aws-partitions (1.1257.0) aws-sdk-core (3.251.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) @@ -132,7 +132,7 @@ GEM binding_of_caller (2.0.0) debug_inspector (>= 1.2.0) blurhash (0.1.8) - bootsnap (1.24.4) + bootsnap (1.24.6) msgpack (~> 1.2) brakeman (8.0.4) racc @@ -178,13 +178,14 @@ GEM bigdecimal rexml crass (1.0.6) - css_parser (2.1.0) + css_parser (3.0.0) addressable + ssrf_filter (~> 1.5) csv (3.3.5) database_cleaner-active_record (2.2.2) activerecord (>= 5.a) database_cleaner-core (~> 2.0) - database_cleaner-core (2.0.1) + database_cleaner-core (2.1.0) date (3.5.1) debug (1.11.1) irb (~> 1.10) @@ -228,7 +229,7 @@ GEM erubi (1.13.1) et-orbi (1.4.0) tzinfo - excon (1.4.2) + excon (1.5.0) logger fabrication (3.0.0) faker (3.8.0) @@ -246,7 +247,7 @@ GEM fast_blank (1.0.1) fastimage (2.4.1) ffi (1.17.4) - ffi-compiler (1.3.2) + ffi-compiler (1.4.2) ffi (>= 1.15.5) rake flatware (2.4.0) @@ -271,15 +272,15 @@ GEM formatador (1.2.3) reline forwardable (1.4.0) - fugit (1.12.1) + fugit (1.12.2) et-orbi (~> 1.4) raabro (~> 1.4) globalid (1.3.0) activesupport (>= 6.1) - google-protobuf (4.34.1) + google-protobuf (4.35.0) bigdecimal rake (~> 13.3) - googleapis-common-protos-types (1.22.0) + googleapis-common-protos-types (1.23.0) google-protobuf (~> 4.26) haml (7.2.0) temple (>= 0.8.2) @@ -354,7 +355,7 @@ GEM jmespath (1.6.2) json (2.19.8) json-canonicalization (1.0.0) - json-jwt (1.17.0) + json-jwt (1.17.1) activesupport (>= 4.2) aes_key_wrap base64 @@ -450,7 +451,7 @@ GEM minitest (6.0.6) drb (~> 2.0) prism (~> 1.5) - msgpack (1.8.0) + msgpack (1.8.1) multi_json (1.21.1) mutex_m (0.3.0) net-http (0.9.1) @@ -501,7 +502,7 @@ GEM tzinfo validate_url webfinger (~> 2.0) - openssl (4.0.1) + openssl (4.0.2) openssl-signature_algorithm (1.3.0) openssl (> 2.0) opentelemetry-api (1.10.0) @@ -520,7 +521,7 @@ GEM opentelemetry-helpers-sql-processor (0.5.0) opentelemetry-api (~> 1.0) opentelemetry-common (~> 0.21) - opentelemetry-instrumentation-action_mailer (0.8.0) + opentelemetry-instrumentation-action_mailer (0.8.1) opentelemetry-instrumentation-active_support (~> 0.10) opentelemetry-instrumentation-action_pack (0.18.0) opentelemetry-instrumentation-rack (~> 0.29) @@ -532,7 +533,7 @@ GEM opentelemetry-instrumentation-active_support (>= 0.7.0) opentelemetry-instrumentation-active_record (0.13.0) opentelemetry-instrumentation-base (~> 0.25) - opentelemetry-instrumentation-active_storage (0.5.0) + opentelemetry-instrumentation-active_storage (0.5.1) opentelemetry-instrumentation-active_support (~> 0.10) opentelemetry-instrumentation-active_support (0.12.0) opentelemetry-instrumentation-base (~> 0.25) @@ -579,7 +580,7 @@ GEM opentelemetry-common (~> 0.20) opentelemetry-registry (~> 0.2) opentelemetry-semantic_conventions - opentelemetry-semantic_conventions (1.37.1) + opentelemetry-semantic_conventions (1.39.0) opentelemetry-api (~> 1.0) orm_adapter (0.5.0) ostruct (0.6.3) @@ -617,11 +618,11 @@ GEM actionpack (>= 7.0.0) activesupport (>= 7.0.0) rack - psych (5.3.1) + psych (5.4.0) date stringio public_suffix (7.0.5) - puma (8.0.1) + puma (8.0.2) nio4r (~> 2.0) pundit (2.5.2) activesupport (>= 3.0.0) @@ -718,7 +719,8 @@ GEM railties (>= 7.0) rexml (3.4.4) rotp (6.3.0) - rouge (4.7.0) + rouge (5.0.0) + strscan (~> 3.1) rpam2 (4.0.2) rqrcode (3.2.0) chunky_png (~> 1.0) @@ -841,6 +843,7 @@ GEM simplecov-html (0.13.2) simplecov-lcov (0.9.0) simplecov_json_formatter (0.1.4) + ssrf_filter (1.5.0) stackprof (0.2.28) starry (0.2.0) base64 @@ -850,6 +853,7 @@ GEM stringio (3.2.0) strong_migrations (2.8.0) activerecord (>= 7.2) + strscan (3.1.8) swd (2.0.3) activesupport (>= 3) attr_required (>= 0.0.5) @@ -926,7 +930,7 @@ GEM crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webrick (1.9.2) - websocket-driver (0.8.0) + websocket-driver (0.8.1) base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -1097,4 +1101,4 @@ RUBY VERSION ruby 4.0.5 BUNDLED WITH - 4.0.11 + 4.0.13 From be3dce70b855f2866e61043bf306cbde447ba97e Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 5 Jun 2026 05:22:05 -0400 Subject: [PATCH 25/34] Update doorkeeper to version 5.9.1 (#39132) --- Gemfile.lock | 2 +- config/application.rb | 3 --- config/initializers/doorkeeper.rb | 6 ++++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3a744a28c0..57eb2045b0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -210,7 +210,7 @@ GEM activerecord (>= 7.0, < 9.0) docile (1.4.1) domain_name (0.6.20240107) - doorkeeper (5.9.0) + doorkeeper (5.9.1) railties (>= 5) dotenv (3.2.0) drb (2.2.3) diff --git a/config/application.rb b/config/application.rb index 09fe38065e..5c5de3e23a 100644 --- a/config/application.rb +++ b/config/application.rb @@ -111,9 +111,6 @@ module Mastodon end config.to_prepare do - Doorkeeper::Application.include ApplicationExtension - Doorkeeper::AccessGrant.include AccessGrantExtension - Doorkeeper::AccessToken.include AccessTokenExtension Devise::FailureApp.include AbstractController::Callbacks Devise::FailureApp.include Localized end diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index 908acb5503..2fb690032a 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -179,3 +179,9 @@ Doorkeeper.configure do # WWW-Authenticate Realm (default "Doorkeeper"). # realm "Doorkeeper" end + +Rails.application.reloader.to_prepare do + Doorkeeper.config.application_model.include ApplicationExtension + Doorkeeper.config.access_grant_model.include AccessGrantExtension + Doorkeeper.config.access_token_model.include AccessTokenExtension +end From 0c78d1fd0f70bf233cd87445817122467d2c67c8 Mon Sep 17 00:00:00 2001 From: diondiondion Date: Fri, 5 Jun 2026 11:27:45 +0200 Subject: [PATCH 26/34] Remove outdated hint for "Use system scrollbar" preference (#39297) --- app/views/settings/preferences/appearance/show.html.haml | 2 +- config/locales/simple_form.en.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml index f521fd99b5..202dd53103 100644 --- a/app/views/settings/preferences/appearance/show.html.haml +++ b/app/views/settings/preferences/appearance/show.html.haml @@ -82,7 +82,7 @@ = ff.input :'web.disable_swiping', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_disable_swiping') = ff.input :'web.disable_hover_cards', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_disable_hover_cards') = ff.input :'web.use_system_font', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_system_font_ui') - = ff.input :'web.use_system_scrollbars', wrapper: :with_label, hint: I18n.t('simple_form.hints.defaults.setting_system_scrollbars_ui'), label: I18n.t('simple_form.labels.defaults.setting_system_scrollbars_ui') + = ff.input :'web.use_system_scrollbars', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_system_scrollbars_ui') %h2= t 'appearance.discovery' diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index c3fe3871b1..4c9a3bce61 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -66,7 +66,6 @@ en: setting_display_media_show_all: Show all media without warning, including media marked as sensitive setting_emoji_style: How to display emojis. "Auto" will try using native emoji, but falls back to Twemoji for legacy browsers. setting_quick_boosting_html: When enabled, clicking on the %{boost_icon} Boost icon will immediately boost instead of opening the boost/quote dropdown menu. Relocates the quoting action to the %{options_icon} (Options) menu. - setting_system_scrollbars_ui: Applies only to desktop browsers based on Safari and Chrome setting_use_blurhash: Gradients are based on the colors of the hidden visuals but obfuscate any details setting_use_pending_items: Hide timeline updates behind a click instead of automatically scrolling the feed username: You can use letters, numbers, and underscores From 2d2a7ec8d63114ceac17f8af2d43ba5fd4eac1a9 Mon Sep 17 00:00:00 2001 From: diondiondion Date: Fri, 5 Jun 2026 11:28:28 +0200 Subject: [PATCH 27/34] Fix Collections editor allowing to add the same account multiple times (#39296) --- .../features/collections/editor/accounts.tsx | 47 +++++++++++-------- .../mastodon/hooks/useSearchAccounts.ts | 21 +++++---- 2 files changed, 40 insertions(+), 28 deletions(-) diff --git a/app/javascript/mastodon/features/collections/editor/accounts.tsx b/app/javascript/mastodon/features/collections/editor/accounts.tsx index c5d23bdf3e..a27079164e 100644 --- a/app/javascript/mastodon/features/collections/editor/accounts.tsx +++ b/app/javascript/mastodon/features/collections/editor/accounts.tsx @@ -208,6 +208,12 @@ export const CollectionAccounts: React.FC<{ const hasItems = editorItems.length > 0; const hasMaxItems = editorItems.length === MAX_COLLECTION_ACCOUNT_COUNT; + const wasAccountAdded = useCallback( + (account: ApiMutedAccountJSON) => + !!editorItems.find((item) => item.account_id === account.id), + [editorItems], + ); + const { accounts: suggestedAccounts, isLoading: isLoadingSuggestions, @@ -217,8 +223,7 @@ export const CollectionAccounts: React.FC<{ withRelationships: true, withDefaultFollows: searchValue === '', // Don't suggest accounts that were already added - filterResults: (account) => - !editorItems.find((item) => item.account_id === account.id), + filterResults: (account) => !wasAccountAdded(account), }); const relationships = useAppSelector((state) => state.relationships); @@ -256,23 +261,25 @@ export const CollectionAccounts: React.FC<{ const addAccountItem = useCallback( (item: ApiMutedAccountJSON) => { - dispatch( - updateCollectionEditorField({ - field: 'items', - value: [ - ...editorItems, - { - account_id: item.id, - state: - item.feature_approval.current_user === 'manual' - ? 'pending' - : 'accepted', - }, - ], - }), - ); + if (!wasAccountAdded(item)) { + dispatch( + updateCollectionEditorField({ + field: 'items', + value: [ + ...editorItems, + { + account_id: item.id, + state: + item.feature_approval.current_user === 'manual' + ? 'pending' + : 'accepted', + }, + ], + }), + ); + } }, - [editorItems, dispatch], + [editorItems, wasAccountAdded, dispatch], ); const instantRemoveAccountItem = useCallback( @@ -299,13 +306,13 @@ export const CollectionAccounts: React.FC<{ const instantAddAccountItem = useCallback( (item: ApiMutedAccountJSON) => { - if (id) { + if (id && !wasAccountAdded(item)) { void dispatch( addCollectionItem({ collectionId: id, accountId: item.id }), ); } }, - [dispatch, id], + [dispatch, id, wasAccountAdded], ); const handleRemoveAccountItem = useCallback( diff --git a/app/javascript/mastodon/hooks/useSearchAccounts.ts b/app/javascript/mastodon/hooks/useSearchAccounts.ts index b7e6ab9f52..1c26fe19ae 100644 --- a/app/javascript/mastodon/hooks/useSearchAccounts.ts +++ b/app/javascript/mastodon/hooks/useSearchAccounts.ts @@ -51,7 +51,7 @@ export function useSearchAccounts({ searchRequestRef.current = new AbortController(); try { - const data = await apiRequest( + const accounts = await apiRequest( 'GET', 'v1/accounts/search', { @@ -62,7 +62,6 @@ export function useSearchAccounts({ }, }, ); - const accounts = filterResults ? data.filter(filterResults) : data; const accountIds = accounts.map((a) => a.id); dispatch(importFetchedAccounts(accounts)); if (withRelationships) { @@ -95,6 +94,7 @@ export function useSearchAccounts({ const [defaultAccounts, setDefaultAccounts] = useState< ApiAccountJSON[] | null >(null); + useEffect(() => { if ( !currentUserId || @@ -108,12 +108,11 @@ export function useSearchAccounts({ async function doRequest() { setLoadingState('loading'); try { - const data = await apiRequest( + const accounts = await apiRequest( 'GET', `v1/accounts/${currentUserId}/following`, { params: { limit: 40 } }, ); - const accounts = filterResults ? data.filter(filterResults) : data; const accountIds = accounts.map((a) => a.id); dispatch(importFetchedAccounts(accounts)); if (withRelationships) { @@ -137,13 +136,19 @@ export function useSearchAccounts({ withDefaultFollows, ]); + const accountsToReturn = + accounts.length === 0 && withDefaultFollows + ? (defaultAccounts ?? []) + : accounts; + + const filteredAccounts = filterResults + ? accountsToReturn.filter(filterResults) + : accountsToReturn; + return { searchAccounts: startSearch, resetAccounts, - accounts: - accounts.length === 0 && withDefaultFollows - ? (defaultAccounts ?? []) - : accounts, + accounts: filteredAccounts, isLoading: loadingState === 'loading', isError: loadingState === 'error', }; From c08d13a65cc0434bb3c9d1c0e9ff03640cf77526 Mon Sep 17 00:00:00 2001 From: diondiondion Date: Fri, 5 Jun 2026 12:01:55 +0200 Subject: [PATCH 28/34] Fix missing null check when importing collections from notifications (#39300) --- app/javascript/mastodon/actions/notification_groups.ts | 2 +- app/javascript/mastodon/api_types/notifications.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/javascript/mastodon/actions/notification_groups.ts b/app/javascript/mastodon/actions/notification_groups.ts index 6d2f00ece8..8fc2f0d726 100644 --- a/app/javascript/mastodon/actions/notification_groups.ts +++ b/app/javascript/mastodon/actions/notification_groups.ts @@ -88,7 +88,7 @@ function dispatchAssociatedRecords( fetchedStatuses.push(notification.status); } - if ('collection' in notification) { + if ('collection' in notification && notification.collection) { collections.push(notification.collection); } }); diff --git a/app/javascript/mastodon/api_types/notifications.ts b/app/javascript/mastodon/api_types/notifications.ts index 4836c37e6a..a06aab7884 100644 --- a/app/javascript/mastodon/api_types/notifications.ts +++ b/app/javascript/mastodon/api_types/notifications.ts @@ -90,22 +90,22 @@ interface ReportNotificationJSON extends BaseNotificationJSON { interface AddedToCollectionNotificationGroupJSON extends BaseNotificationGroupJSON { type: 'added_to_collection'; - collection: ApiCollectionJSON; + collection: ApiCollectionJSON | null; } interface AddedToCollectionNotificationJSON extends BaseNotificationJSON { type: 'added_to_collection'; - collection: ApiCollectionJSON; + collection: ApiCollectionJSON | null; } interface CollectionUpdateNotificationGroupJSON extends BaseNotificationGroupJSON { type: 'collection_update'; - collection: ApiCollectionJSON; + collection: ApiCollectionJSON | null; } interface CollectionUpdateNotificationJSON extends BaseNotificationJSON { type: 'collection_update'; - collection: ApiCollectionJSON; + collection: ApiCollectionJSON | null; } type SimpleNotificationTypes = 'follow' | 'follow_request' | 'admin.sign_up'; From 7cd824a9983e40dd098e5213aa9598d46b1d44df Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 5 Jun 2026 13:59:57 +0200 Subject: [PATCH 29/34] Update dependency chewy to v8.3.1 (#39298) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 57eb2045b0..4aff8dc416 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -159,7 +159,7 @@ GEM cbor (0.5.10.2) cgi (0.5.1) charlock_holmes (0.7.9) - chewy (8.3.0) + chewy (8.3.1) activesupport (>= 7.2) elasticsearch (>= 8.14, < 9.0) elasticsearch-dsl From 24609bf0418d8f3be7cd1869673eeeaeca6f1909 Mon Sep 17 00:00:00 2001 From: Claire Date: Fri, 5 Jun 2026 14:45:28 +0200 Subject: [PATCH 30/34] Change rule acceptance link to form (#39283) --- app/views/auth/registrations/rules.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/auth/registrations/rules.html.haml b/app/views/auth/registrations/rules.html.haml index 54c21e7798..69b42b993f 100644 --- a/app/views/auth/registrations/rules.html.haml +++ b/app/views/auth/registrations/rules.html.haml @@ -4,7 +4,7 @@ - content_for :header_tags do = render partial: 'shared/og', locals: { description: description_for_sign_up(@invite) } -.simple_form += form_with class: :simple_form, method: :get, url: new_user_registration_path do |form| = render 'auth/shared/progress', stage: 'rules' - if @invite.present? && @invite.autofollow? @@ -20,6 +20,6 @@ = render collection: @rule_translations, partial: 'auth/rule_translations/rule_translation' .stacked-actions - - accept_path = @invite_code.present? ? public_invite_url(invite_code: @invite_code, accept: @accept_token) : new_user_registration_path(accept: @accept_token) - = link_to t('auth.rules.accept'), accept_path, class: 'button' + = form.hidden_field :invite_code, value: @invite_code if @invite_code.present? + = form.button t('auth.rules.accept'), name: :accept, type: :submit, class: :button, value: @accept_token = link_to t('auth.rules.back'), root_path, class: 'button button-secondary' From 472b28e5dd749d8bbdaf798cdd77d20bce464bf9 Mon Sep 17 00:00:00 2001 From: batumi14 Date: Fri, 5 Jun 2026 13:34:13 +0000 Subject: [PATCH 31/34] Add Lazuri, Mingrelian and Ottoman Turkish to languages helper (#38648) --- app/helpers/languages_helper.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb index bc4287c724..892249aab9 100644 --- a/app/helpers/languages_helper.rb +++ b/app/helpers/languages_helper.rb @@ -199,8 +199,10 @@ module LanguagesHelper kab: ['Kabyle', 'Taqbaylit'].freeze, ldn: ['Láadan', 'Láadan'].freeze, lfn: ['Lingua Franca Nova', 'lingua franca nova'].freeze, + lzz: ['Lazuri', 'ლაზური ნენა'].freeze, moh: ['Mohawk', 'Kanienʼkéha'].freeze, nds: ['Low German', 'Plattdüütsch'].freeze, + ota: ['Ottoman Turkish', 'لسان عثمانی'].freeze, pdc: ['Pennsylvania Dutch', 'Pennsilfaani-Deitsch'].freeze, sco: ['Scots', 'Scots'].freeze, sma: ['Southern Sami', 'Åarjelsaemien Gïele'].freeze, @@ -209,6 +211,7 @@ module LanguagesHelper tok: ['Toki Pona', 'toki pona'].freeze, vai: ['Vai', 'ꕙꔤ'].freeze, xal: ['Kalmyk', 'Хальмг келн'].freeze, + xmf: ['Mingrelian', 'მარგალური ნინა'].freeze, zba: ['Balaibalan', 'باليبلن'].freeze, zgh: ['Standard Moroccan Tamazight', 'ⵜⴰⵎⴰⵣⵉⵖⵜ'].freeze, }.freeze From 2778eeffbaf86747c1da84929bdd9acb4adca814 Mon Sep 17 00:00:00 2001 From: Claire Date: Fri, 5 Jun 2026 16:24:42 +0200 Subject: [PATCH 32/34] =?UTF-8?q?Add=20link=20to=20profile=20editing=20fro?= =?UTF-8?q?m=20=E2=80=9CPrivacy=20and=20reach=E2=80=9D=20(#39309)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/javascript/styles/mastodon/admin.scss | 2 ++ app/views/settings/privacy/show.html.haml | 8 ++++++++ config/locales/en.yml | 1 + 3 files changed, 11 insertions(+) diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 0abcefaa4b..836c5c60ca 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -487,6 +487,8 @@ $content-width: 840px; .title { font-weight: 600; margin-bottom: 8px; + font-size: inherit; + line-height: inherit; } a { diff --git a/app/views/settings/privacy/show.html.haml b/app/views/settings/privacy/show.html.haml index 67026a62e8..6de1bdfca8 100644 --- a/app/views/settings/privacy/show.html.haml +++ b/app/views/settings/privacy/show.html.haml @@ -38,6 +38,14 @@ .fields-group = ff.input :show_application, wrapper: :with_label + %aside.callout + = material_symbol 'info' + .content + .body + %p.title= t('edit_profile.redesign_title') + %p= t('edit_profile.privacy_redesign_body') + = link_to t('edit_profile.redesign_button'), '/profile/edit' + - if Rails.application.config.x.email_subscriptions && Setting.email_subscriptions && current_user.can?(:manage_email_subscriptions) %h2= t('privacy.email_subscriptions') diff --git a/config/locales/en.yml b/config/locales/en.yml index 0ad0c8591a..7bd0568fb9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1501,6 +1501,7 @@ en: your_appeal_rejected: Your appeal has been rejected edit_profile: other: Other + privacy_redesign_body: The choice to show your follows and followers is now made directly from your profile. redesign_body: Profile editing can now be accessed directly from the profile page. redesign_button: Go there redesign_title: There’s a new profile editing experience From b3a40bb010c865ffbf90e00e0d0e4f956f13933e Mon Sep 17 00:00:00 2001 From: David Bento Date: Fri, 5 Jun 2026 15:45:01 +0100 Subject: [PATCH 33/34] Fix "change thumbnail" button being visible when it shouldn't (#35186) (#38467) --- .../alt_text_modal/__tests__/index-test.tsx | 91 +++++++++++++++++++ .../features/alt_text_modal/index.tsx | 4 +- 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 app/javascript/mastodon/features/alt_text_modal/__tests__/index-test.tsx diff --git a/app/javascript/mastodon/features/alt_text_modal/__tests__/index-test.tsx b/app/javascript/mastodon/features/alt_text_modal/__tests__/index-test.tsx new file mode 100644 index 0000000000..709e0ff6c2 --- /dev/null +++ b/app/javascript/mastodon/features/alt_text_modal/__tests__/index-test.tsx @@ -0,0 +1,91 @@ +// app/javascript/mastodon/features/alt_text_modal/__tests__/index-test.tsx + +import { IntlProvider } from 'react-intl'; + +import { List, Map } from 'immutable'; + +import { render } from '@testing-library/react'; +import { vi } from 'vitest'; + +import type { RootState } from 'mastodon/store'; +import { useAppSelector } from 'mastodon/store'; + +import { AltTextModal } from '../index'; + +vi.mock('mastodon/store', () => ({ + useAppSelector: vi.fn(), + useAppDispatch: () => vi.fn(), +})); + +describe('', () => { + const mediaId = '123'; + const handleClose = vi.fn(); + + beforeEach(() => { + vi.clearAllMocks(); + }); + + const renderComponent = () => { + return render( + + + , + ); + }; + + it('renders thumbnail upload button when video is unattached', () => { + vi.mocked(useAppSelector).mockImplementation( + (selector: (state: RootState) => unknown) => { + const mockState = { + compose: Map({ + language: 'en', + media_attachments: List([ + Map({ + id: mediaId, + type: 'video', + unattached: true, + meta: Map({ focus: Map({ x: 0, y: 0 }) }), + }), + ]), + }), + accounts: Map(), + } as unknown as RootState; + + return selector(mockState); + }, + ); + + const { container } = renderComponent(); + + const uploadInput = container.querySelector('#upload-modal__thumbnail'); + expect(uploadInput).not.toBeNull(); + }); + + it('hides thumbnail upload button when video is attached', () => { + vi.mocked(useAppSelector).mockImplementation( + (selector: (state: RootState) => unknown) => { + const mockState = { + compose: Map({ + language: 'en', + media_attachments: List([ + Map({ + id: mediaId, + type: 'video', + unattached: false, + meta: Map({ focus: Map({ x: 0, y: 0 }) }), + }), + ]), + }), + accounts: Map(), + } as unknown as RootState; + + return selector(mockState); + }, + ); + + const { container } = renderComponent(); + + const uploadInput = container.querySelector('#upload-modal__thumbnail'); + expect(uploadInput).toBeNull(); + }); +}); diff --git a/app/javascript/mastodon/features/alt_text_modal/index.tsx b/app/javascript/mastodon/features/alt_text_modal/index.tsx index 3c54fa4724..fc00e60a51 100644 --- a/app/javascript/mastodon/features/alt_text_modal/index.tsx +++ b/app/javascript/mastodon/features/alt_text_modal/index.tsx @@ -283,6 +283,7 @@ export const AltTextModal = forwardRef>( ); const type = media?.get('type') as string; const valid = length(description) <= MAX_LENGTH; + const unattached = media?.get('unattached') as boolean | undefined; const handleDescriptionChange = useCallback( (e: React.ChangeEvent) => { @@ -433,7 +434,8 @@ export const AltTextModal = forwardRef>( onPositionChange={handlePositionChange} /> - {(type === 'audio' || type === 'video') && ( + {/* This button is hidden for attached audio/video files, as they are already posted */} + {(type === 'audio' || type === 'video') && unattached && ( Date: Fri, 5 Jun 2026 18:02:20 +0200 Subject: [PATCH 34/34] fix naming of custom filter export param (#39304) --- app/models/export.rb | 2 +- spec/requests/settings/exports/custom_filters_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/export.rb b/app/models/export.rb index 94b2753375..2b92dc6200 100644 --- a/app/models/export.rb +++ b/app/models/export.rb @@ -62,7 +62,7 @@ class Export data_collection[:custom_filters] << { title: filter.title, - expire_at: filter.expires_at, + expires_at: filter.expires_at, context: filter.context, action: filter.action, keywords_attributes: keywords_attributes, diff --git a/spec/requests/settings/exports/custom_filters_spec.rb b/spec/requests/settings/exports/custom_filters_spec.rb index c9c7645ddb..df5bbfdd03 100644 --- a/spec/requests/settings/exports/custom_filters_spec.rb +++ b/spec/requests/settings/exports/custom_filters_spec.rb @@ -17,7 +17,7 @@ RSpec.describe 'Settings / Exports / CustomFilters' do { 'custom_filters' => [ { 'title' => other_filter.phrase, - 'expire_at' => nil, + 'expires_at' => nil, 'context' => other_filter.context, 'action' => other_filter.action, 'keywords_attributes' => [{ @@ -31,7 +31,7 @@ RSpec.describe 'Settings / Exports / CustomFilters' do }, { 'title' => filter.phrase, - 'expire_at' => nil, + 'expires_at' => nil, 'context' => filter.context, 'action' => filter.action, 'keywords_attributes' => [{