diff --git a/Dockerfile b/Dockerfile index df02e48104..53b069ae01 100644 --- a/Dockerfile +++ b/Dockerfile @@ -181,7 +181,7 @@ FROM build AS libvips # libvips version to compile, change with [--build-arg VIPS_VERSION="8.15.2"] # renovate: datasource=github-releases depName=libvips packageName=libvips/libvips -ARG VIPS_VERSION=8.18.1 +ARG VIPS_VERSION=8.18.2 # libvips download URL, change with [--build-arg VIPS_URL="https://github.com/libvips/libvips/releases/download"] ARG VIPS_URL=https://github.com/libvips/libvips/releases/download @@ -204,7 +204,7 @@ FROM build AS ffmpeg # ffmpeg version to compile, change with [--build-arg FFMPEG_VERSION="7.0.x"] # renovate: datasource=repology depName=ffmpeg packageName=openpkg_current/ffmpeg -ARG FFMPEG_VERSION=8.0 +ARG FFMPEG_VERSION=8.1 # ffmpeg download URL, change with [--build-arg FFMPEG_URL="https://ffmpeg.org/releases"] ARG FFMPEG_URL=https://github.com/FFmpeg/FFmpeg/archive/refs/tags diff --git a/Gemfile.lock b/Gemfile.lock index 92cc117b1c..e92684c50d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,7 +10,7 @@ GIT GEM remote: https://rubygems.org/ specs: - action_text-trix (2.1.17) + action_text-trix (2.1.18) railties actioncable (8.1.3) actionpack (= 8.1.3) @@ -631,7 +631,7 @@ GEM activesupport (>= 3.0.0) raabro (1.4.0) racc (1.8.1) - rack (3.2.5) + rack (3.2.6) rack-attack (6.8.0) rack (>= 1.0, < 4) rack-cors (3.0.0) diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb index 49b7287239..6f3b93dfcd 100644 --- a/app/controllers/concerns/signature_verification.rb +++ b/app/controllers/concerns/signature_verification.rb @@ -133,11 +133,22 @@ module SignatureVerification end def keypair_refresh_key!(keypair) - # TODO: this currently only is concerned with refreshing the actor and returning the legacy key, this needs to be reworked return if keypair.actor.local? || !keypair.actor.activitypub? - return keypair.actor.refresh! if keypair.actor.respond_to?(:refresh!) && keypair.actor.possibly_stale? - Keypair.from_legacy_account(ActivityPub::FetchRemoteActorService.new.call(keypair.actor.uri, only_key: true, suppress_errors: false)) + actor = if keypair.actor.possibly_stale? + # Doing a full profile refresh + keypair.actor.refresh! + else + # Only refreshing keys, skipping potentially more expensive requests + ActivityPub::FetchRemoteActorService.new.call(keypair.actor.uri, only_key: true, suppress_errors: false) + end + + keypair_uri = keypair.uri + + keypair = actor.keypairs.find_by(uri: keypair_uri) + return keypair if keypair.present? + + Keypair.from_legacy_account(actor, uri: keypair_uri) if actor.public_key.present? rescue Mastodon::PrivateNetworkAddressError => e raise Mastodon::SignatureVerificationError, "Requests to private network addresses are disallowed (tried to query #{e.host})" rescue Mastodon::HostValidationError, ActivityPub::FetchRemoteActorService::Error, Webfinger::Error => e diff --git a/app/javascript/mastodon/features/account_timeline/components/redesign.module.scss b/app/javascript/mastodon/features/account_timeline/components/redesign.module.scss index 11446104a3..87ecbc4c54 100644 --- a/app/javascript/mastodon/features/account_timeline/components/redesign.module.scss +++ b/app/javascript/mastodon/features/account_timeline/components/redesign.module.scss @@ -355,8 +355,12 @@ svg.badgeIcon { } } -.tabs { +.tabs, +.noTabs { border-bottom: 1px solid var(--color-border-primary); +} + +.tabs { display: flex; gap: 12px; padding: 0 24px; @@ -392,6 +396,11 @@ svg.badgeIcon { } } +.noTabs { + width: 100%; + border-width: 0 0 1px; +} + .bannerBase { box-sizing: border-box; padding: 16px; diff --git a/app/javascript/mastodon/features/account_timeline/components/tabs.tsx b/app/javascript/mastodon/features/account_timeline/components/tabs.tsx index 021005d744..b2ad9a6065 100644 --- a/app/javascript/mastodon/features/account_timeline/components/tabs.tsx +++ b/app/javascript/mastodon/features/account_timeline/components/tabs.tsx @@ -19,10 +19,13 @@ export const AccountTabs: FC = () => { const account = useAccount(accountId); if (!account) { - return null; + return
; } const { acct, show_featured, show_media } = account; + if (!show_featured && !show_media) { + return
; + } return (
diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json index b0e368263d..e7572b2e39 100644 --- a/app/javascript/mastodon/locales/af.json +++ b/app/javascript/mastodon/locales/af.json @@ -42,7 +42,6 @@ "account.muted": "Uitgedoof", "account.open_original_page": "Maak oorspronklike blad oop", "account.posts": "Plasings", - "account.posts_with_replies": "Plasings en antwoorde", "account.report": "Rapporteer @{name}", "account.requested_follow": "{name} het versoek om jou te volg", "account.share": "Deel @{name} se profiel", diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json index 9994e0fb3b..f5ca4718bd 100644 --- a/app/javascript/mastodon/locales/an.json +++ b/app/javascript/mastodon/locales/an.json @@ -42,7 +42,6 @@ "account.muted": "Silenciau", "account.open_original_page": "Ubrir pachina orichinal", "account.posts": "Publicacions", - "account.posts_with_replies": "Publicacions y respuestas", "account.report": "Denunciar a @{name}", "account.requested_follow": "{name} ha demandau seguir-te", "account.share": "Compartir lo perfil de @{name}", diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json index bfd0f8bd60..53489d9317 100644 --- a/app/javascript/mastodon/locales/ar.json +++ b/app/javascript/mastodon/locales/ar.json @@ -84,7 +84,6 @@ "account.note.title": "ملاحظة شخصية (مرئية لك فقط)", "account.open_original_page": "افتح الصفحة الأصلية", "account.posts": "منشورات", - "account.posts_with_replies": "المنشورات والرُدود", "account.remove_from_followers": "إزالة {name} من المتابعين", "account.report": "الإبلاغ عن @{name}", "account.requested_follow": "لقد طلب {name} متابعتك", diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json index 850971819a..2ed84f2fc4 100644 --- a/app/javascript/mastodon/locales/ast.json +++ b/app/javascript/mastodon/locales/ast.json @@ -48,7 +48,6 @@ "account.no_bio": "Nun se fornió nenguna descripción.", "account.open_original_page": "Abrir la páxina orixinal", "account.posts": "Artículos", - "account.posts_with_replies": "Artículos y rempuestes", "account.report": "Informar de @{name}", "account.requested_follow": "{name} solicitó siguite", "account.share": "Compartir el perfil de @{name}", diff --git a/app/javascript/mastodon/locales/az.json b/app/javascript/mastodon/locales/az.json index e664b6bd0c..12932140e9 100644 --- a/app/javascript/mastodon/locales/az.json +++ b/app/javascript/mastodon/locales/az.json @@ -67,7 +67,6 @@ "account.no_bio": "Təsvir göstərilməyib.", "account.open_original_page": "Orijinal səhifəni aç", "account.posts": "Paylaşım", - "account.posts_with_replies": "Paylaşım və cavablar", "account.remove_from_followers": "{name} - izləyicilərdən çıxart", "account.report": "@{name} istifadəçisini şikayət et", "account.requested_follow": "{name} sizi izləmək sorğusu göndərib", diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json index 467c6749ef..59dbf2171e 100644 --- a/app/javascript/mastodon/locales/be.json +++ b/app/javascript/mastodon/locales/be.json @@ -122,7 +122,6 @@ "account.note.title": "Асабістая нататка (бачная толькі Вам)", "account.open_original_page": "Адкрыць арыгінальную старонку", "account.posts": "Допісы", - "account.posts_with_replies": "Допісы і адказы", "account.remove_from_followers": "Выдаліць {name} з падпісчыкаў", "account.report": "Паскардзіцца на @{name}", "account.requested_follow": "{name} адправіў(-ла) запыт на падпіску", @@ -378,14 +377,13 @@ "collections.description_length_hint": "Максімум 100 сімвалаў", "collections.detail.accept_inclusion": "Добра", "collections.detail.accounts_heading": "Уліковыя запісы", - "collections.detail.author_added_you": "{author} дадаў(-ла) Вас у гэтую калекцыю", - "collections.detail.curated_by_author": "Курыруе {author}", - "collections.detail.curated_by_you": "Курыруеце Вы", "collections.detail.loading": "Загружаецца калекцыя…", - "collections.detail.other_accounts_in_collection": "Іншыя ў гэтай калекцыі:", + "collections.detail.other_accounts_count": "{count, plural,one {# іншы ўліковы запіс} few {# іншыя ўліковыя запісы} other {# іншых уліковых запісаў}}", "collections.detail.revoke_inclusion": "Прыбраць сябе", + "collections.detail.sensitive_content": "Адчувальнае змесціва", "collections.detail.sensitive_note": "У гэтай калекцыі прысутнічаюць уліковыя запісы і кантэнт, змесціва якіх можа падацца адчувальным для некаторых карыстальнікаў.", "collections.detail.share": "Падзяліцца гэтай калекцыяй", + "collections.detail.you_were_added_to_this_collection": "Вас дадалі ў гэтую калекцыю", "collections.edit_details": "Рэдагаваць падрабязнасці", "collections.error_loading_collections": "Адбылася памылка падчас загрузкі Вашых калекцый.", "collections.hints.accounts_counter": "{count} / {max} уліковых запісаў", @@ -541,6 +539,7 @@ "content_warning.hide": "Схаваць допіс", "content_warning.show": "Усё адно паказаць", "content_warning.show_more": "Паказаць усё роўна", + "content_warning.show_short": "Паказаць", "conversation.delete": "Выдаліць размову", "conversation.mark_as_read": "Адзначыць прачытаным", "conversation.open": "Прагледзець размову", @@ -581,6 +580,15 @@ "domain_pill.your_server": "Ваш лічбавы дом, дзе захоўваюцца ўсе вашыя допісы. Не падабаецца гэты сервер? Змяніце сервер у любы час з захаваннем сваіх падпісчыкаў.", "domain_pill.your_username": "Ваш унікальны ідэнтыфікатар на гэтым серверы. Можна знайсці карыстальнікаў з аднолькавым іменем карыстальніка на розных серверах.", "dropdown.empty": "Выбраць варыянт", + "email_subscriptions.email": "Адрас электроннай пошты", + "email_subscriptions.form.action": "Падпісацца", + "email_subscriptions.form.disclaimer": "Вы можаце адпісацца ў любы момант. Каб даведацца болей, звярніцеся да Палітыкі прыватнасці.", + "email_subscriptions.form.lead": "Атрымліваць допісы па электроннай пошце без стварэння ўліковага запісу Mastodon.", + "email_subscriptions.form.title": "Зарэгістравацца на абнаўленні па электроннай пошце ад {name}", + "email_subscriptions.submitted.lead": "Праверце сваю паштовую скрыню, каб знайсці там ліст і скончыць рэгістрацыю на абнаўленні па электроннай пошце.", + "email_subscriptions.submitted.title": "Яшчэ адзін крок", + "email_subscriptions.validation.email.blocked": "Заблакіраваны правайдар электроннай пошты", + "email_subscriptions.validation.email.invalid": "Памылковы адрас электроннай пошты", "embed.instructions": "Убудуйце гэты допіс на свой сайт, скапіраваўшы прыведзены ніжэй код.", "embed.preview": "Вось як гэта будзе выглядаць:", "emoji_button.activity": "Актыўнасць", diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json index 850f117544..4ddad0c28c 100644 --- a/app/javascript/mastodon/locales/bg.json +++ b/app/javascript/mastodon/locales/bg.json @@ -71,7 +71,6 @@ "account.no_bio": "Няма представен опис.", "account.open_original_page": "Отваряне на първообразната страница", "account.posts": "Публикации", - "account.posts_with_replies": "Публ. и отговори", "account.remove_from_followers": "Премахване на {name} от последователи", "account.report": "Докладване на @{name}", "account.requested_follow": "{name} поиска да ви последва", diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json index 768ccd19ac..11b553e4bc 100644 --- a/app/javascript/mastodon/locales/bn.json +++ b/app/javascript/mastodon/locales/bn.json @@ -51,7 +51,6 @@ "account.no_bio": "কোনো বর্ণনা দেওয়া হয়নি.", "account.open_original_page": "মূল পৃষ্ঠা খুলুন", "account.posts": "পোষ্টসমূহ", - "account.posts_with_replies": "টুট এবং মতামত", "account.report": "@{name} কে রিপোর্ট করুন", "account.requested_follow": "{name} আপনাকে অনুসরণ করার জন্য অনুরোধ করেছে", "account.share": "@{name} র প্রোফাইল অন্যদের দেখান", diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json index cb55e4a68a..37c35b0b4d 100644 --- a/app/javascript/mastodon/locales/br.json +++ b/app/javascript/mastodon/locales/br.json @@ -70,7 +70,6 @@ "account.no_bio": "Deskrivadur ebet da gaout.", "account.open_original_page": "Digeriñ ar bajenn orin", "account.posts": "Embannadurioù", - "account.posts_with_replies": "Embannadurioù ha respontoù", "account.remove_from_followers": "Dilemel {name} eus an heulierien·ezed", "account.report": "Disklêriañ @{name}", "account.requested_follow": "Gant {name} eo bet goulennet ho heuliañ", diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index 5e8e42371e..f60a30be99 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -111,7 +111,6 @@ "account.note.title": "Nota personal (visible només per a vós)", "account.open_original_page": "Obre la pàgina original", "account.posts": "Tuts", - "account.posts_with_replies": "Tuts i respostes", "account.remove_from_followers": "Elimina {name} dels seguidors", "account.report": "Informa sobre @{name}", "account.requested_follow": "{name} ha demanat de seguir-te", diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json index 35c725a3df..3ae13242ba 100644 --- a/app/javascript/mastodon/locales/ckb.json +++ b/app/javascript/mastodon/locales/ckb.json @@ -50,7 +50,6 @@ "account.no_bio": "هیچ وەسفێک نەخراوەتەڕوو.", "account.open_original_page": "لاپەڕەی ئەسڵی بکەرەوە", "account.posts": "نووسراوەکان", - "account.posts_with_replies": "توتس و وەڵامەکان", "account.report": "گوزارشت @{name}", "account.requested_follow": "{name} داوای کردووە شوێنت بکەوێت", "account.share": "پرۆفایلی @{name} هاوبەش بکە", diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json index a240b88313..03e36a6b2b 100644 --- a/app/javascript/mastodon/locales/co.json +++ b/app/javascript/mastodon/locales/co.json @@ -22,7 +22,6 @@ "account.mute": "Piattà @{name}", "account.muted": "Piattatu", "account.posts": "Statuti", - "account.posts_with_replies": "Statuti è risposte", "account.report": "Palisà @{name}", "account.share": "Sparte u prufile di @{name}", "account.show_reblogs": "Vede spartere da @{name}", diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json index 02fe2ebc19..5b8345a3dd 100644 --- a/app/javascript/mastodon/locales/cs.json +++ b/app/javascript/mastodon/locales/cs.json @@ -120,7 +120,6 @@ "account.note.title": "Vlastní poznámka (viditelná pouze pro vás)", "account.open_original_page": "Otevřít původní stránku", "account.posts": "Příspěvky", - "account.posts_with_replies": "Příspěvky a odpovědi", "account.remove_from_followers": "Odebrat {name} ze sledujících", "account.report": "Nahlásit @{name}", "account.requested_follow": "{name} tě požádal o sledování", diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json index 637534fa1e..251fcc3bab 100644 --- a/app/javascript/mastodon/locales/cy.json +++ b/app/javascript/mastodon/locales/cy.json @@ -122,7 +122,6 @@ "account.note.title": "Nodyn personol (yn weladwy i chi yn unig)", "account.open_original_page": "Agor y dudalen wreiddiol", "account.posts": "Postiadau", - "account.posts_with_replies": "Postiadau ac ymatebion", "account.remove_from_followers": "Tynnu {name} o'ch dilynwyr", "account.report": "Adrodd @{name}", "account.requested_follow": "Mae {name} wedi gwneud cais i'ch dilyn", @@ -353,11 +352,7 @@ "collections.description_length_hint": "Terfyn o 100 nod", "collections.detail.accept_inclusion": "Iawn", "collections.detail.accounts_heading": "Cyfrifon", - "collections.detail.author_added_you": "Ychwanegodd {author} chi at y casgliad hwn", - "collections.detail.curated_by_author": "Wedi'i guradu gan {author}", - "collections.detail.curated_by_you": "Wedi'i guradu gennych chi", "collections.detail.loading": "Yn llwytho casgliad…", - "collections.detail.other_accounts_in_collection": "Eraill yn y casgliad hwn:", "collections.detail.revoke_inclusion": "Tynnu fi", "collections.detail.sensitive_note": "Mae'r casgliad hwn yn cynnwys cyfrifon a chynnwys a allai fod yn sensitif i rai defnyddwyr.", "collections.detail.share": "Rhannu'r casgliad hwn", diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json index 352c716d23..43178970ef 100644 --- a/app/javascript/mastodon/locales/da.json +++ b/app/javascript/mastodon/locales/da.json @@ -122,7 +122,6 @@ "account.note.title": "Personlig note (kun synlige for dig)", "account.open_original_page": "Åbn oprindelig side", "account.posts": "Indlæg", - "account.posts_with_replies": "Indlæg og svar", "account.remove_from_followers": "Fjern {name} fra følgere", "account.report": "Anmeld @{name}", "account.requested_follow": "{name} har anmodet om at følge dig", @@ -378,14 +377,13 @@ "collections.description_length_hint": "Begrænset til 100 tegn", "collections.detail.accept_inclusion": "Okay", "collections.detail.accounts_heading": "Konti", - "collections.detail.author_added_you": "{author} tilføjede dig til denne samling", - "collections.detail.curated_by_author": "Kurateret af {author}", - "collections.detail.curated_by_you": "Kurateret af dig", "collections.detail.loading": "Indlæser samling…", - "collections.detail.other_accounts_in_collection": "Andre i denne samling:", + "collections.detail.other_accounts_count": "{count, plural, one {# andre konto} other {# andre konti}}", "collections.detail.revoke_inclusion": "Fjern mig", + "collections.detail.sensitive_content": "Følsomt indhold", "collections.detail.sensitive_note": "Denne samling indeholder konti og indhold, der kan være følsomt for nogle brugere.", "collections.detail.share": "Del denne samling", + "collections.detail.you_were_added_to_this_collection": "Du er blevet føjet til denne samling", "collections.edit_details": "Rediger detaljer", "collections.error_loading_collections": "Der opstod en fejl under indlæsning af dine samlinger.", "collections.hints.accounts_counter": "{count} / {max} konti", @@ -541,6 +539,7 @@ "content_warning.hide": "Skjul indlæg", "content_warning.show": "Vis alligevel", "content_warning.show_more": "Vis mere", + "content_warning.show_short": "Vis", "conversation.delete": "Slet samtale", "conversation.mark_as_read": "Markér som læst", "conversation.open": "Vis samtale", @@ -581,6 +580,15 @@ "domain_pill.your_server": "Dit digitale hjem, hvor alle dine indlæg lever. Synes ikke om den her server? Du kan til enhver tid rykke over på en anden server og beholde dine følgere.", "domain_pill.your_username": "Din unikke identifikator på denne server. Det er muligt at finde brugere med samme brugernavn på forskellige servere.", "dropdown.empty": "Vælg en indstilling", + "email_subscriptions.email": "E-mailadresse", + "email_subscriptions.form.action": "Abonnér", + "email_subscriptions.form.disclaimer": "Du kan til enhver tid afmelde dig. For yderligere oplysninger henvises til privatlivspolitikken.", + "email_subscriptions.form.lead": "Få indlæg i din indbakke uden at oprette en Mastodon-konto.", + "email_subscriptions.form.title": "Tilmeld dig e-mailopdateringer fra {name}", + "email_subscriptions.submitted.lead": "Kig i din indbakke efter en e-mail, hvor du kan afslutte tilmeldingen til e-mailopdateringer.", + "email_subscriptions.submitted.title": "Et trin mere", + "email_subscriptions.validation.email.blocked": "Blokeret e-mail-udbyder", + "email_subscriptions.validation.email.invalid": "Ugyldig e-mailadresse", "embed.instructions": "Indlejr dette indlæg på din hjemmeside ved at kopiere nedenstående kode.", "embed.preview": "Sådan kommer det til at se ud:", "emoji_button.activity": "Aktivitet", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index 36bd1a76d3..161138483e 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -122,7 +122,6 @@ "account.note.title": "Persönliche Notiz (nur für dich sichtbar)", "account.open_original_page": "Originalseite öffnen", "account.posts": "Beiträge", - "account.posts_with_replies": "Beiträge & Antworten", "account.remove_from_followers": "@{name} als Follower entfernen", "account.report": "@{name} melden", "account.requested_follow": "{name} möchte dir folgen", @@ -378,14 +377,13 @@ "collections.description_length_hint": "Maximal 100 Zeichen", "collections.detail.accept_inclusion": "Einverstanden", "collections.detail.accounts_heading": "Konten", - "collections.detail.author_added_you": "{author} hat dich zur Sammlung hinzugefügt", - "collections.detail.curated_by_author": "Kuratiert von {author}", - "collections.detail.curated_by_you": "Kuratiert von dir", "collections.detail.loading": "Sammlung wird geladen …", - "collections.detail.other_accounts_in_collection": "Weitere Profile in dieser Sammlung:", + "collections.detail.other_accounts_count": "{count, plural, one {# weiteres Konto} other {# weitere Konten}}", "collections.detail.revoke_inclusion": "Mich entfernen", + "collections.detail.sensitive_content": "Inhaltswarnung", "collections.detail.sensitive_note": "Diese Sammlung enthält Profile und Inhalte, die manche als anstößig empfinden.", "collections.detail.share": "Sammlung teilen", + "collections.detail.you_were_added_to_this_collection": "Du wurdest dieser Sammlung hinzugefügt", "collections.edit_details": "Details bearbeiten", "collections.error_loading_collections": "Beim Laden deiner Sammlungen ist ein Fehler aufgetreten.", "collections.hints.accounts_counter": "{count}/{max} Konten", @@ -541,6 +539,7 @@ "content_warning.hide": "Beitrag ausblenden", "content_warning.show": "Trotzdem anzeigen", "content_warning.show_more": "Beitrag anzeigen", + "content_warning.show_short": "Anzeigen", "conversation.delete": "Unterhaltung löschen", "conversation.mark_as_read": "Als gelesen markieren", "conversation.open": "Unterhaltung anzeigen", @@ -581,6 +580,15 @@ "domain_pill.your_server": "Deine digitale Heimat. Hier „leben“ alle Beiträge von dir. Falls es dir hier nicht gefällt, kannst du jederzeit den Server wechseln und ebenso deine Follower übertragen.", "domain_pill.your_username": "Deine eindeutige Identität auf diesem Server. Es ist möglich, Profile mit dem gleichen Profilnamen auf verschiedenen Servern zu finden.", "dropdown.empty": "Option auswählen", + "email_subscriptions.email": "E-Mail-Adresse", + "email_subscriptions.form.action": "Abonnieren", + "email_subscriptions.form.disclaimer": "Du kannst die Benachrichtigungen jederzeit abbestellen. In der Datenschutzerklärung erfährst du mehr dazu.", + "email_subscriptions.form.lead": "Lass dir Beiträge in dein Postfach senden, ohne ein Mastodon-Konto zu erstellen.", + "email_subscriptions.form.title": "Erhalte eine E-Mail bei Neuigkeiten von {name}", + "email_subscriptions.submitted.lead": "Überprüfe dein Postfach, um die Benachrichtigungen per E-Mail zu aktivieren.", + "email_subscriptions.submitted.title": "Ein weiterer Schritt", + "email_subscriptions.validation.email.blocked": "Gesperrter E-Mail-Provider", + "email_subscriptions.validation.email.invalid": "Ungültige E-Mail-Adresse", "embed.instructions": "Du kannst diesen Beitrag außerhalb des Fediverse (z. B. in deine Website) einbetten, indem du diesen Code kopierst und dort einfügst.", "embed.preview": "Vorschau:", "emoji_button.activity": "Aktivitäten", diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json index 0842a8ea7d..6ac8c8fbff 100644 --- a/app/javascript/mastodon/locales/el.json +++ b/app/javascript/mastodon/locales/el.json @@ -122,7 +122,6 @@ "account.note.title": "Προσωπική σημείωση (ορατή μόνο σε εσάς)", "account.open_original_page": "Άνοιγμα πρωτότυπης σελίδας", "account.posts": "Αναρτήσεις", - "account.posts_with_replies": "Αναρτήσεις και απαντήσεις", "account.remove_from_followers": "Κατάργηση {name} από τους ακόλουθους", "account.report": "Αναφορά @{name}", "account.requested_follow": "Ο/Η {name} αιτήθηκε να σε ακολουθήσει", @@ -378,14 +377,13 @@ "collections.description_length_hint": "Όριο 100 χαρακτήρων", "collections.detail.accept_inclusion": "Εντάξει", "collections.detail.accounts_heading": "Λογαριασμοί", - "collections.detail.author_added_you": "Ο/Η {author} σας πρόσθεσε σε αυτήν τη συλλογή", - "collections.detail.curated_by_author": "Επιμέλεια από {author}", - "collections.detail.curated_by_you": "Επιμέλεια από εσάς", "collections.detail.loading": "Γίνεται φόρτωση της συλλογής…", - "collections.detail.other_accounts_in_collection": "Άλλοι σε αυτήν τη συλλογή:", + "collections.detail.other_accounts_count": "{count, plural, one {# άλλος λογαριασμός} other {# άλλοι λογαριασμοί}}", "collections.detail.revoke_inclusion": "Αφαίρεσε με", + "collections.detail.sensitive_content": "Ευαίσθητο περιεχόμενο", "collections.detail.sensitive_note": "Αυτή η συλλογή περιέχει λογαριασμούς και περιεχόμενο που μπορεί να είναι ευαίσθητα σε ορισμένους χρήστες.", "collections.detail.share": "Κοινοποιήστε αυτήν τη συλλογή", + "collections.detail.you_were_added_to_this_collection": "Έχετε προστεθεί σε αυτήν τη συλλογή", "collections.edit_details": "Επεξεργασία λεπτομερειών", "collections.error_loading_collections": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια φόρτωσης των συλλογών σας.", "collections.hints.accounts_counter": "{count} / {max} λογαριασμοί", @@ -541,6 +539,7 @@ "content_warning.hide": "Απόκρυψη ανάρτησης", "content_warning.show": "Εμφάνιση ούτως ή άλλως", "content_warning.show_more": "Εμφάνιση περισσότερων", + "content_warning.show_short": "Εμφάνιση", "conversation.delete": "Διαγραφή συνομιλίας", "conversation.mark_as_read": "Σήμανση ως αναγνωσμένη", "conversation.open": "Προβολή συνομιλίας", @@ -581,6 +580,15 @@ "domain_pill.your_server": "Το ψηφιακό σου σπίτι, όπου ζουν όλες σου οι αναρτήσεις. Δε σ' αρέσει αυτός; Μετακινήσου σε διακομιστές ανά πάσα στιγμή και πάρε και τους ακόλουθούς σου μαζί.", "domain_pill.your_username": "Το μοναδικό σου αναγνωριστικό σε τούτο τον διακομιστή. Είναι πιθανό να βρεις χρήστες με το ίδιο όνομα χρήστη σε διαφορετικούς διακομιστές.", "dropdown.empty": "Διαλέξτε μια επιλογή", + "email_subscriptions.email": "Διεύθυνση email", + "email_subscriptions.form.action": "Εγγραφή", + "email_subscriptions.form.disclaimer": "Μπορείτε να απεγγραφείτε οποιαδήποτε στιγμή. Για περισσότερες πληροφορίες, ανατρέξτε στην Πολιτική Απορρήτου.", + "email_subscriptions.form.lead": "Λάβετε αναρτήσεις στα εισερχόμενά σας χωρίς να δημιουργήσετε λογαριασμό Mastodon.", + "email_subscriptions.form.title": "Εγγραφείτε για ενημερώσεις μέσω email από {name}", + "email_subscriptions.submitted.lead": "Ελέγξτε τα εισερχόμενά σας για να ολοκληρωθεί η εγγραφή για ενημερώσεις μέσω email.", + "email_subscriptions.submitted.title": "Ένα βήμα ακόμα", + "email_subscriptions.validation.email.blocked": "Αποκλεισμένος πάροχος email", + "email_subscriptions.validation.email.invalid": "Μη έγκυρη διεύθυνση email", "embed.instructions": "Ενσωμάτωσε αυτή την ανάρτηση στην ιστοσελίδα σου αντιγράφοντας τον παρακάτω κώδικα.", "embed.preview": "Ορίστε πως θα φαίνεται:", "emoji_button.activity": "Δραστηριότητα", diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json index 4bb7898415..8636fdef27 100644 --- a/app/javascript/mastodon/locales/en-GB.json +++ b/app/javascript/mastodon/locales/en-GB.json @@ -122,7 +122,6 @@ "account.note.title": "Personal note (visible only to you)", "account.open_original_page": "Open original page", "account.posts": "Posts", - "account.posts_with_replies": "Posts and replies", "account.remove_from_followers": "Remove {name} from followers", "account.report": "Report @{name}", "account.requested_follow": "{name} has requested to follow you", @@ -353,11 +352,7 @@ "collections.description_length_hint": "100 characters limit", "collections.detail.accept_inclusion": "OK", "collections.detail.accounts_heading": "Accounts", - "collections.detail.author_added_you": "{author} added you to this collection", - "collections.detail.curated_by_author": "Curated by {author}", - "collections.detail.curated_by_you": "Curated by you", "collections.detail.loading": "Loading collection…", - "collections.detail.other_accounts_in_collection": "Others in this collection:", "collections.detail.revoke_inclusion": "Remove me", "collections.detail.sensitive_note": "This collection contains accounts and content that may be sensitive to some users.", "collections.detail.share": "Share this collection", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index 81d280f382..1a67aabf83 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -74,7 +74,6 @@ "account.node_modal.field_label": "Persona noto", "account.open_original_page": "Malfermi la originalan paĝon", "account.posts": "Afiŝoj", - "account.posts_with_replies": "Afiŝoj kaj respondoj", "account.remove_from_followers": "Forigi {name}-n de sekvantoj", "account.report": "Raporti @{name}", "account.requested_follow": "{name} petis sekvi vin", diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json index ac3dbb0d2e..15a1c7df59 100644 --- a/app/javascript/mastodon/locales/es-AR.json +++ b/app/javascript/mastodon/locales/es-AR.json @@ -122,7 +122,6 @@ "account.note.title": "Nota personal (visible solo para vos)", "account.open_original_page": "Abrir página original", "account.posts": "Mensajes", - "account.posts_with_replies": "Mnsjs y resp. públicas", "account.remove_from_followers": "Quitar a {name} de tus seguidores", "account.report": "Denunciar a @{name}", "account.requested_follow": "{name} solicitó seguirte", @@ -378,14 +377,13 @@ "collections.description_length_hint": "Límite de 100 caracteres", "collections.detail.accept_inclusion": "Aceptar", "collections.detail.accounts_heading": "Cuentas", - "collections.detail.author_added_you": "{author} te agregó a esta colección", - "collections.detail.curated_by_author": "Curado por {author}", - "collections.detail.curated_by_you": "Curado por vos", "collections.detail.loading": "Cargando colección…", - "collections.detail.other_accounts_in_collection": "Otras cuentas en esta colección:", + "collections.detail.other_accounts_count": "{count, plural, one {# hora} other {# horas}}", "collections.detail.revoke_inclusion": "Quitarme", + "collections.detail.sensitive_content": "Contenido sensible", "collections.detail.sensitive_note": "Esta colección contiene cuentas y contenido que pueden ser sensibles a algunos usuarios.", "collections.detail.share": "Compartir esta colección", + "collections.detail.you_were_added_to_this_collection": "Te agregaron a esta colección", "collections.edit_details": "Editar detalles", "collections.error_loading_collections": "Hubo un error al intentar cargar tus colecciones.", "collections.hints.accounts_counter": "{count} / {max} cuentas", @@ -541,6 +539,7 @@ "content_warning.hide": "Ocultar mensaje", "content_warning.show": "Mostrar de todos modos", "content_warning.show_more": "Mostrar más", + "content_warning.show_short": "Mostrar", "conversation.delete": "Eliminar conversación", "conversation.mark_as_read": "Marcar como leída", "conversation.open": "Ver conversación", @@ -581,6 +580,15 @@ "domain_pill.your_server": "Tu hogar digital, donde residen todos tus mensajes. ¿No te gusta este sitio? Mudate a otro servidor en cualquier momento y llevate a tus seguidores.", "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar cuentas con el mismo nombre de usuario en diferentes servidores.", "dropdown.empty": "Seleccioná una opción", + "email_subscriptions.email": "Dirección de correo electrónico", + "email_subscriptions.form.action": "Suscribite", + "email_subscriptions.form.disclaimer": "Podés desuscribirte en cualquier momento. Para más información, consultá la Política de privacidad.", + "email_subscriptions.form.lead": "Obtené mensajes en tu bandeja de entrada sin crear una cuenta de Mastodon.", + "email_subscriptions.form.title": "Suscribite para recibir actualizaciones por correo electrónico de {name}", + "email_subscriptions.submitted.lead": "Revisá tu bandeja de entrada para confirmar tu suscripción, así podés recibir actualizaciones por correo electrónico.", + "email_subscriptions.submitted.title": "Un paso más", + "email_subscriptions.validation.email.blocked": "Proveedor de correo bloqueado", + "email_subscriptions.validation.email.invalid": "Dirección de correo electrónico no válida", "embed.instructions": "Insertá este mensaje a tu sitio web copiando el código de abajo.", "embed.preview": "Así es cómo se verá:", "emoji_button.activity": "Actividad", diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json index de58210b17..8acc320358 100644 --- a/app/javascript/mastodon/locales/es-MX.json +++ b/app/javascript/mastodon/locales/es-MX.json @@ -122,7 +122,6 @@ "account.note.title": "Nota personal (visible solo para ti)", "account.open_original_page": "Abrir página original", "account.posts": "Publicaciones", - "account.posts_with_replies": "Publicaciones y respuestas", "account.remove_from_followers": "Eliminar {name} de tus seguidores", "account.report": "Denunciar a @{name}", "account.requested_follow": "{name} ha solicitado seguirte", @@ -378,14 +377,13 @@ "collections.description_length_hint": "Limitado a 100 caracteres", "collections.detail.accept_inclusion": "Aceptar", "collections.detail.accounts_heading": "Cuentas", - "collections.detail.author_added_you": "{author} te ha añadido a esta colección", - "collections.detail.curated_by_author": "Seleccionado por {author}", - "collections.detail.curated_by_you": "Seleccionado por ti", "collections.detail.loading": "Cargando colección…", - "collections.detail.other_accounts_in_collection": "Otros en esta colección:", + "collections.detail.other_accounts_count": "{count, plural,one {# otra cuenta} other {# otras cuentas}}", "collections.detail.revoke_inclusion": "Excluirme", + "collections.detail.sensitive_content": "Contenido sensible", "collections.detail.sensitive_note": "Esta colección contiene cuentas y contenido que pueden resultar sensibles para algunos usuarios.", "collections.detail.share": "Compartir esta colección", + "collections.detail.you_were_added_to_this_collection": "Se te ha añadido a esta colección", "collections.edit_details": "Editar detalles", "collections.error_loading_collections": "Se produjo un error al intentar cargar tus colecciones.", "collections.hints.accounts_counter": "{count} / {max} cuentas", @@ -541,6 +539,7 @@ "content_warning.hide": "Ocultar publicación", "content_warning.show": "Mostrar de todos modos", "content_warning.show_more": "Mostrar más", + "content_warning.show_short": "Mostrar", "conversation.delete": "Eliminar conversación", "conversation.mark_as_read": "Marcar como leído", "conversation.open": "Ver conversación", @@ -581,6 +580,15 @@ "domain_pill.your_server": "Tu hogar digital, donde residen todas tus publicaciones. ¿No te gusta este sitio? Muévete a otro servidor en cualquier momento y llévate a tus seguidores.", "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.", "dropdown.empty": "Elige una opción", + "email_subscriptions.email": "Dirección de correo electrónico", + "email_subscriptions.form.action": "Suscribirse", + "email_subscriptions.form.disclaimer": "Puedes darte de baja en cualquier momento. Para obtener más información, consulta la Política de Privacidad.", + "email_subscriptions.form.lead": "Obtén mensajes en tu bandeja de entrada sin crear una cuenta de Mastodon.", + "email_subscriptions.form.title": "Suscríbete para recibir actualizaciones por correo electrónico de {name}", + "email_subscriptions.submitted.lead": "Revisa tu bandeja de entrada para terminar de susbcribirte y recibir actualizaciones por correo electrónico.", + "email_subscriptions.submitted.title": "Un paso más", + "email_subscriptions.validation.email.blocked": "Proveedor de correo bloqueado", + "email_subscriptions.validation.email.invalid": "Dirección de correo electrónico no válida", "embed.instructions": "Añade esta publicación a tu sitio web con el siguiente código.", "embed.preview": "Así es como se verá:", "emoji_button.activity": "Actividad", diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index 8e2ba946d8..9581142c86 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -122,7 +122,6 @@ "account.note.title": "Nota personal (visible solo para ti)", "account.open_original_page": "Abrir página original", "account.posts": "Publicaciones", - "account.posts_with_replies": "Publicaciones y respuestas", "account.remove_from_followers": "Eliminar {name} de tus seguidores", "account.report": "Reportar a @{name}", "account.requested_follow": "{name} ha solicitado seguirte", @@ -378,14 +377,13 @@ "collections.description_length_hint": "Limitado a 100 caracteres", "collections.detail.accept_inclusion": "De acuerdo", "collections.detail.accounts_heading": "Cuentas", - "collections.detail.author_added_you": "{author} te añadió a esta colección", - "collections.detail.curated_by_author": "Seleccionado por {author}", - "collections.detail.curated_by_you": "Seleccionado por ti", "collections.detail.loading": "Cargando colección…", - "collections.detail.other_accounts_in_collection": "Otros en esta colección:", + "collections.detail.other_accounts_count": "{count, plural, one {# otra cuenta} other {# otras cuentas}}", "collections.detail.revoke_inclusion": "Sácame de aquí", + "collections.detail.sensitive_content": "Contenido sensible", "collections.detail.sensitive_note": "Esta colección contiene cuentas y contenido que puede ser sensible para algunos usuarios.", "collections.detail.share": "Compartir esta colección", + "collections.detail.you_were_added_to_this_collection": "Has sido añadido a esta colección", "collections.edit_details": "Editar detalles", "collections.error_loading_collections": "Se ha producido un error al intentar cargar tus colecciones.", "collections.hints.accounts_counter": "{count} / {max} cuentas", @@ -541,6 +539,7 @@ "content_warning.hide": "Ocultar publicación", "content_warning.show": "Mostrar de todos modos", "content_warning.show_more": "Mostrar más", + "content_warning.show_short": "Mostrar", "conversation.delete": "Borrar conversación", "conversation.mark_as_read": "Marcar como leído", "conversation.open": "Ver conversación", @@ -581,6 +580,15 @@ "domain_pill.your_server": "Tu hogar digital, donde residen todas tus publicaciones. ¿No te gusta este sitio? Muévete a otro servidor en cualquier momento y llévate a tus seguidores.", "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.", "dropdown.empty": "Selecciona una opción", + "email_subscriptions.email": "Dirección de correo electrónico", + "email_subscriptions.form.action": "Suscribirse", + "email_subscriptions.form.disclaimer": "Puedes darte de baja en cualquier momento. Para obtener más información, consulta la Política de Privacidad.", + "email_subscriptions.form.lead": "Obtén mensajes en tu bandeja de entrada sin crear una cuenta de Mastodon.", + "email_subscriptions.form.title": "Suscríbete para recibir actualizaciones por correo electrónico de {name}", + "email_subscriptions.submitted.lead": "Revisa tu bandeja de entrada para terminar de susbcribirte y recibir actualizaciones por correo electrónico.", + "email_subscriptions.submitted.title": "Un paso más", + "email_subscriptions.validation.email.blocked": "Proveedor de correo bloqueado", + "email_subscriptions.validation.email.invalid": "Dirección de correo electrónico no válida", "embed.instructions": "Añade esta publicación a tu sitio web con el siguiente código.", "embed.preview": "Así es como se verá:", "emoji_button.activity": "Actividad", diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json index 13ba8bd303..9348f06aaf 100644 --- a/app/javascript/mastodon/locales/et.json +++ b/app/javascript/mastodon/locales/et.json @@ -122,7 +122,6 @@ "account.note.title": "Isiklikud märked (nähtavad vaid sulle)", "account.open_original_page": "Ava algne leht", "account.posts": "Postitused", - "account.posts_with_replies": "Postitused ja vastused", "account.remove_from_followers": "Eemalda {name} jälgijate seast", "account.report": "Teata kasutajast {name}", "account.requested_follow": "{name} on soovinud sinu jälgimist", diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json index 778207fc85..fdc27f5f34 100644 --- a/app/javascript/mastodon/locales/eu.json +++ b/app/javascript/mastodon/locales/eu.json @@ -73,7 +73,6 @@ "account.no_bio": "Ez da deskribapenik eman.", "account.open_original_page": "Ireki jatorrizko orria", "account.posts": "Bidalketa", - "account.posts_with_replies": "Bidalketak eta erantzunak", "account.remove_from_followers": "Kendu {name} zure jarraitzaileengandik", "account.report": "Salatu @{name}", "account.requested_follow": "{name}-(e)k zu jarraitzeko eskaera egin du", diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index 3cd7bfaf80..448b0b0de7 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -73,7 +73,6 @@ "account.no_bio": "شرحی فراهم نشده.", "account.open_original_page": "گشودن صفحهٔ اصلی", "account.posts": "فرسته", - "account.posts_with_replies": "فرسته‌ها و پاسخ‌ها", "account.remove_from_followers": "برداشتن {name} از پی‌گیران", "account.report": "گزارش ‎@{name}", "account.requested_follow": "{name} درخواست پی‌گیریتان را داد", diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json index 95c36e0aa4..c11404f0ca 100644 --- a/app/javascript/mastodon/locales/fi.json +++ b/app/javascript/mastodon/locales/fi.json @@ -122,7 +122,6 @@ "account.note.title": "Henkilökohtainen muistiinpano (näkyy vain sinulle)", "account.open_original_page": "Avaa alkuperäinen sivu", "account.posts": "Julkaisut", - "account.posts_with_replies": "Julkaisut ja vastaukset", "account.remove_from_followers": "Poista {name} seuraajista", "account.report": "Raportoi @{name}", "account.requested_follow": "{name} on pyytänyt lupaa seurata sinua", @@ -378,14 +377,13 @@ "collections.description_length_hint": "100 merkin rajoitus", "collections.detail.accept_inclusion": "Selvä", "collections.detail.accounts_heading": "Tilit", - "collections.detail.author_added_you": "{author} lisäsi sinut tähän kokoelmaan", - "collections.detail.curated_by_author": "Koonnut {author}", - "collections.detail.curated_by_you": "Itse kokoamasi", "collections.detail.loading": "Ladataan kokoelmaa…", - "collections.detail.other_accounts_in_collection": "Muut tässä kokoelmassa:", + "collections.detail.other_accounts_count": "{count, plural, one {# muu tili} other {# muuta tiliä}}", "collections.detail.revoke_inclusion": "Poista minut", + "collections.detail.sensitive_content": "Arkaluonteista sisältöä", "collections.detail.sensitive_note": "Tämä kokoelma sisältää tilejä ja sisältöä, jotka saattavat olla arkaluonteisia joillekin käyttäjille.", "collections.detail.share": "Jaa tämä kokoelma", + "collections.detail.you_were_added_to_this_collection": "Sinut lisättiin tähän kokoelmaan", "collections.edit_details": "Muokkaa tietoja", "collections.error_loading_collections": "Kokoelmien latauksessa tapahtui virhe.", "collections.hints.accounts_counter": "{count} / {max} tiliä", @@ -541,6 +539,7 @@ "content_warning.hide": "Piilota julkaisu", "content_warning.show": "Näytä kuitenkin", "content_warning.show_more": "Näytä lisää", + "content_warning.show_short": "Näytä", "conversation.delete": "Poista keskustelu", "conversation.mark_as_read": "Merkitse luetuksi", "conversation.open": "Näytä keskustelu", @@ -581,6 +580,15 @@ "domain_pill.your_server": "Digitaalinen kotisi, jossa kaikki julkaisusi sijaitsevat. Etkö pidä tästä? Siirry palvelimelta toiselle milloin tahansa ja tuo myös seuraajasi mukanasi.", "domain_pill.your_username": "Yksilöllinen tunnisteesi tällä palvelimella. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.", "dropdown.empty": "Valitse vaihtoehto", + "email_subscriptions.email": "Sähköpostiosoite", + "email_subscriptions.form.action": "Tilaa", + "email_subscriptions.form.disclaimer": "Voit peruuttaa tilauksen milloin tahansa. Jos haluat lisätietoja, katso tietosuojakäytäntö.", + "email_subscriptions.form.lead": "Hanki julkaisut sähköpostilaatikkoosi luomatta Mastodon-tiliä.", + "email_subscriptions.form.title": "Tilaa sähköpostipäivitykset käyttäjältä {name}", + "email_subscriptions.submitted.lead": "Viimeistele sähköpostipäivitysten tilaus tarkistamalla Saapuneet-kansiosi.", + "email_subscriptions.submitted.title": "Vielä yksi vaihe", + "email_subscriptions.validation.email.blocked": "Estetty sähköpostipalveluntarjoaja", + "email_subscriptions.validation.email.invalid": "Virheellinen sähköpostiosoite", "embed.instructions": "Upota julkaisu verkkosivullesi kopioimalla alla oleva koodi.", "embed.preview": "Tältä se näyttää:", "emoji_button.activity": "Aktiviteetit", diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json index c31f8c7681..688fe4140b 100644 --- a/app/javascript/mastodon/locales/fil.json +++ b/app/javascript/mastodon/locales/fil.json @@ -73,7 +73,6 @@ "account.no_bio": "Walang nakalaan na paglalarawan.", "account.open_original_page": "Buksan ang pinagmulang pahina", "account.posts": "Mga post", - "account.posts_with_replies": "Mga Post at Reply", "account.remove_from_followers": "Alisin si {name} sa mga follower", "account.report": "I-ulat si/ang @{name}", "account.requested_follow": "Hinihiling ni {name} na sundan ka", diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json index 5b46131729..8e921c58bf 100644 --- a/app/javascript/mastodon/locales/fo.json +++ b/app/javascript/mastodon/locales/fo.json @@ -122,7 +122,6 @@ "account.note.title": "Persónlig nota (einans sjónlig fyri teg)", "account.open_original_page": "Opna upprunasíðuna", "account.posts": "Uppsløg", - "account.posts_with_replies": "Uppsløg og svar", "account.remove_from_followers": "Strika {name} av fylgjaralista", "account.report": "Melda @{name}", "account.requested_follow": "{name} hevur biðið um at fylgja tær", @@ -301,8 +300,6 @@ "collections.delete_collection": "Strika savn", "collections.description_length_hint": "Í mesta lagi 100 tekn", "collections.detail.accounts_heading": "Kontur", - "collections.detail.curated_by_author": "Snikkað til av {author}", - "collections.detail.curated_by_you": "Snikkað til av tær", "collections.detail.loading": "Innlesi savn…", "collections.detail.share": "Deil hetta savnið", "collections.edit_details": "Rætta smálutir", diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json index c26309a227..a220f4af49 100644 --- a/app/javascript/mastodon/locales/fr-CA.json +++ b/app/javascript/mastodon/locales/fr-CA.json @@ -122,7 +122,6 @@ "account.note.title": "Note personnelle (visible uniquement pour vous)", "account.open_original_page": "Ouvrir la page d'origine", "account.posts": "Publications", - "account.posts_with_replies": "Publications et réponses", "account.remove_from_followers": "Retirer {name} des abonnés", "account.report": "Signaler @{name}", "account.requested_follow": "{name} a demandé à vous suivre", @@ -378,11 +377,7 @@ "collections.description_length_hint": "Maximum 100 caractères", "collections.detail.accept_inclusion": "D'accord", "collections.detail.accounts_heading": "Comptes", - "collections.detail.author_added_you": "{author} vous a ajouté·e à cette collection", - "collections.detail.curated_by_author": "Organisée par {author}", - "collections.detail.curated_by_you": "Organisée par vous", "collections.detail.loading": "Chargement de la collection…", - "collections.detail.other_accounts_in_collection": "Autres comptes dans cette collection :", "collections.detail.revoke_inclusion": "Me retirer", "collections.detail.sensitive_note": "Cette collection contient des comptes et du contenu qui peut être sensibles.", "collections.detail.share": "Partager la collection", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index 7987b77d00..f7efa068b2 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -122,7 +122,6 @@ "account.note.title": "Note personnelle (visible uniquement pour vous)", "account.open_original_page": "Ouvrir la page d'origine", "account.posts": "Messages", - "account.posts_with_replies": "Messages et réponses", "account.remove_from_followers": "Retirer {name} des abonnés", "account.report": "Signaler @{name}", "account.requested_follow": "{name} a demandé à vous suivre", @@ -378,11 +377,7 @@ "collections.description_length_hint": "Maximum 100 caractères", "collections.detail.accept_inclusion": "D'accord", "collections.detail.accounts_heading": "Comptes", - "collections.detail.author_added_you": "{author} vous a ajouté·e à cette collection", - "collections.detail.curated_by_author": "Organisée par {author}", - "collections.detail.curated_by_you": "Organisée par vous", "collections.detail.loading": "Chargement de la collection…", - "collections.detail.other_accounts_in_collection": "Autres comptes dans cette collection :", "collections.detail.revoke_inclusion": "Me retirer", "collections.detail.sensitive_note": "Cette collection contient des comptes et du contenu qui peut être sensibles.", "collections.detail.share": "Partager la collection", diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json index 9592886fa6..edc972afbc 100644 --- a/app/javascript/mastodon/locales/fy.json +++ b/app/javascript/mastodon/locales/fy.json @@ -67,7 +67,6 @@ "account.no_bio": "Gjin omskriuwing opjûn.", "account.open_original_page": "Orizjinele side iepenje", "account.posts": "Berjochten", - "account.posts_with_replies": "Berjochten en reaksjes", "account.remove_from_followers": "{name} as folger fuortsmite", "account.report": "@{name} rapportearje", "account.requested_follow": "{name} hat dy in folchfersyk stjoerd", diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json index 35c35265a8..2b4132f8dd 100644 --- a/app/javascript/mastodon/locales/ga.json +++ b/app/javascript/mastodon/locales/ga.json @@ -122,7 +122,6 @@ "account.note.title": "Nóta pearsanta (le feiceáil agatsa amháin)", "account.open_original_page": "Oscail an leathanach bunaidh", "account.posts": "Postálacha", - "account.posts_with_replies": "Postálacha agus freagraí", "account.remove_from_followers": "Bain {name} de na leantóirí", "account.report": "Tuairiscigh @{name}", "account.requested_follow": "D'iarr {name} ort do chuntas a leanúint", @@ -378,14 +377,13 @@ "collections.description_length_hint": "Teorainn 100 carachtar", "collections.detail.accept_inclusion": "Ceart go leor", "collections.detail.accounts_heading": "Cuntais", - "collections.detail.author_added_you": "Chuir {author} leis an mbailiúchán seo thú", - "collections.detail.curated_by_author": "Curtha i dtoll a chéile ag {author}", - "collections.detail.curated_by_you": "Curtha i dtoll a chéile agatsa", "collections.detail.loading": "Ag lódáil an bhailiúcháin…", - "collections.detail.other_accounts_in_collection": "Daoine eile sa bhailiúchán seo:", + "collections.detail.other_accounts_count": "{count, plural, one {# cuntas eile} two {# cuntais eile} few {# cuntais eile} many {# cuntais eile} other {# cuntais eile}}", "collections.detail.revoke_inclusion": "Bain mé", + "collections.detail.sensitive_content": "Ábhar íogair", "collections.detail.sensitive_note": "Tá cuntais agus ábhar sa bhailiúchán seo a d'fhéadfadh a bheith íogair do roinnt úsáideoirí.", "collections.detail.share": "Comhroinn an bailiúchán seo", + "collections.detail.you_were_added_to_this_collection": "Cuireadh leis an mbailiúchán seo thú", "collections.edit_details": "Cuir sonraí in eagar", "collections.error_loading_collections": "Tharla earráid agus iarracht á déanamh do bhailiúcháin a luchtú.", "collections.hints.accounts_counter": "{count} / {max} cuntais", @@ -541,6 +539,7 @@ "content_warning.hide": "Folaigh postáil", "content_warning.show": "Taispeáin ar aon nós", "content_warning.show_more": "Taispeáin níos mó", + "content_warning.show_short": "Taispeáin", "conversation.delete": "Scrios comhrá", "conversation.mark_as_read": "Marcáil mar léite", "conversation.open": "Féach ar comhrá", diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json index 597476735f..db3325c3ad 100644 --- a/app/javascript/mastodon/locales/gd.json +++ b/app/javascript/mastodon/locales/gd.json @@ -122,7 +122,6 @@ "account.note.title": "Nòta pearsanta (chan fhaic ach thu fhèin e)", "account.open_original_page": "Fosgail an duilleag thùsail", "account.posts": "Postaichean", - "account.posts_with_replies": "Postaichean ’s freagairtean", "account.remove_from_followers": "Thoir {name} air falbh on luchd-leantainn", "account.report": "Dèan gearan mu @{name}", "account.requested_follow": "Dh’iarr {name} ’gad leantainn", @@ -378,11 +377,7 @@ "collections.description_length_hint": "Crìoch de 100 caractar", "collections.detail.accept_inclusion": "Taghta", "collections.detail.accounts_heading": "Cunntasan", - "collections.detail.author_added_you": "Chuir {author} ris a’ chruinneachadh seo thu", - "collections.detail.curated_by_author": "’Ga thasgadh le {author}", - "collections.detail.curated_by_you": "’Ga thasgadh leatsa ", "collections.detail.loading": "A’ luchdadh a’ chruinneachaidh…", - "collections.detail.other_accounts_in_collection": "Daoine eile sa chruinneachadh seo:", "collections.detail.revoke_inclusion": "Thoir air falbh mi", "collections.detail.sensitive_note": "Tha cunntasan is susbaint sa chruinneachadh seo a dh’fhaodadh a bhith frionasach do chuid.", "collections.detail.share": "Co-roinn an cruinneachadh seo", diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json index e0acb88828..dc76fc3364 100644 --- a/app/javascript/mastodon/locales/gl.json +++ b/app/javascript/mastodon/locales/gl.json @@ -122,7 +122,6 @@ "account.note.title": "Nota persoal (só ti podes vela)", "account.open_original_page": "Abrir páxina orixinal", "account.posts": "Publicacións", - "account.posts_with_replies": "Publicacións e respostas", "account.remove_from_followers": "Retirar a {name} das seguidoras", "account.report": "Informar sobre @{name}", "account.requested_follow": "{name} solicitou seguirte", @@ -378,11 +377,7 @@ "collections.description_length_hint": "Límite de 100 caracteres", "collections.detail.accept_inclusion": "Vale", "collections.detail.accounts_heading": "Contas", - "collections.detail.author_added_you": "{author} engadíute a esta colección", - "collections.detail.curated_by_author": "Seleccionadas por {author}", - "collections.detail.curated_by_you": "Seleccionadas por ti", "collections.detail.loading": "Cargando colección…", - "collections.detail.other_accounts_in_collection": "Outras contas na colección:", "collections.detail.revoke_inclusion": "Non quero", "collections.detail.sensitive_note": "Esta colección presenta contas e contido que poderían ser sensibles para algunhas persoas.", "collections.detail.share": "Compartir esta colección", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index 70749b8bd9..0c0c91eac9 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -122,7 +122,6 @@ "account.note.title": "הערה פרטית (זמין רק לך)", "account.open_original_page": "לפתיחת העמוד המקורי", "account.posts": "פוסטים", - "account.posts_with_replies": "הודעות ותגובות", "account.remove_from_followers": "הסרת {name} מעוקבי", "account.report": "דווח על @{name}", "account.requested_follow": "{name} ביקשו לעקוב אחריך", @@ -378,11 +377,7 @@ "collections.description_length_hint": "מגבלה של 100 תווים", "collections.detail.accept_inclusion": "אישור", "collections.detail.accounts_heading": "חשבונות", - "collections.detail.author_added_you": "{author} הוסיפו אותך לאוסף", - "collections.detail.curated_by_author": "נאצר על ידי {author}", - "collections.detail.curated_by_you": "נאצר על ידיך", "collections.detail.loading": "טוען אוסף…", - "collections.detail.other_accounts_in_collection": "אחרים באוסף:", "collections.detail.revoke_inclusion": "הסירוני", "collections.detail.sensitive_note": "האוסף מכיל חשבונות ותכנים שאולי יחשבו רגישים לחלק מהמשתמשים.", "collections.detail.share": "שיתוף אוסף", diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json index 472dff9de3..b07b319a97 100644 --- a/app/javascript/mastodon/locales/hi.json +++ b/app/javascript/mastodon/locales/hi.json @@ -67,7 +67,6 @@ "account.no_bio": "कोई विवरण नहि दिया गया हे", "account.open_original_page": "ओरिजिनल पोस्ट खोलें", "account.posts": "टूट्स", - "account.posts_with_replies": "टूट्स एवं जवाब", "account.report": "रिपोर्ट @{name}", "account.requested_follow": "{name} ने आपको फॉलो करने के लिए अनुरोध किया है", "account.share": "@{name} की प्रोफाइल शेयर करे", diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json index 29b658cccb..21f4057fea 100644 --- a/app/javascript/mastodon/locales/hr.json +++ b/app/javascript/mastodon/locales/hr.json @@ -64,7 +64,6 @@ "account.note.edit_button": "Uredi", "account.open_original_page": "Otvori originalnu stranicu", "account.posts": "Objave", - "account.posts_with_replies": "Objave i odgovori", "account.report": "Prijavi @{name}", "account.requested_follow": "{name} zatražio/la je praćenje", "account.share": "Podijeli profil @{name}", diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index d7dda6b918..80a9776f8d 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -122,7 +122,6 @@ "account.note.title": "Személyes megjegyzés (csak te látod)", "account.open_original_page": "Eredeti oldal megnyitása", "account.posts": "Bejegyzések", - "account.posts_with_replies": "Bejegyzések és válaszok", "account.remove_from_followers": "{name} eltávolítása a követők közül", "account.report": "@{name} jelentése", "account.requested_follow": "{name} kérte, hogy követhessen", @@ -173,6 +172,7 @@ "account_edit.field_edit_modal.discard_confirm": "Elvetés", "account_edit.field_edit_modal.discard_message": "Nem mentett módosításaid vannak. Biztos, hogy elveted?", "account_edit.field_edit_modal.edit_title": "Egyéni mező szerkesztése", + "account_edit.field_edit_modal.length_warning": "Javasolt karakterkorlát túllépve. A mobilos felhasználók lehet, hogy nem fogják látni a teljes mezőt.", "account_edit.field_edit_modal.link_emoji_warning": "Nem javasoljuk az egyéni emodzsik és webcímek együttes használatát. A mindkettőt tartalmazó egyéni mezők a felhasználók megzavarásának elkerülése érdekében csak szövegként jelennek meg, nem hivatkozásként.", "account_edit.field_edit_modal.name_hint": "Például „Személyes webhely”", "account_edit.field_edit_modal.name_label": "Címke", @@ -377,14 +377,13 @@ "collections.description_length_hint": "100 karakteres korlát", "collections.detail.accept_inclusion": "Rendben", "collections.detail.accounts_heading": "Fiókok", - "collections.detail.author_added_you": "{author} hozzáadott ehhez a gyűjteményhez", - "collections.detail.curated_by_author": "Válogatta: {author}", - "collections.detail.curated_by_you": "Te válogattad", "collections.detail.loading": "Gyűjtemény betöltése…", - "collections.detail.other_accounts_in_collection": "Mások ebben a gyűjteményben:", + "collections.detail.other_accounts_count": "{count, plural, one {# egyéb fiók} other {# egyéb fiók}}", "collections.detail.revoke_inclusion": "Saját magam eltávolítása", + "collections.detail.sensitive_content": "Kényes tartalom", "collections.detail.sensitive_note": "Ebben a gyűjteményben egyesek számára érzékeny fiókok és tartalmak vannak.", "collections.detail.share": "Gyűjtemény megosztása", + "collections.detail.you_were_added_to_this_collection": "Hozzáadtak ehhez a gyűjteményhez", "collections.edit_details": "Részletek szerkesztése", "collections.error_loading_collections": "Hiba történt a gyűjtemények betöltése során.", "collections.hints.accounts_counter": "{count} / {max} fiók", @@ -540,6 +539,7 @@ "content_warning.hide": "Bejegyzés elrejtése", "content_warning.show": "Megjelenítés mindenképp", "content_warning.show_more": "Több megjelenítése", + "content_warning.show_short": "Megjelenítés", "conversation.delete": "Beszélgetés törlése", "conversation.mark_as_read": "Megjelölés olvasottként", "conversation.open": "Beszélgetés megtekintése", @@ -580,6 +580,15 @@ "domain_pill.your_server": "A digitális otthonod, ahol a bejegyzéseid találhatók. Nem tetszik a mostani? Válts kiszolgálót bármikor, és vidd magaddal a követőidet is.", "domain_pill.your_username": "Az egyedi azonosítód ezen a kiszolgálón. Lehet, hogy ugyanazon felhasználónév különböző kiszolgálókon is megtalálható.", "dropdown.empty": "Válassz egy lehetőséget", + "email_subscriptions.email": "E-mail-cím", + "email_subscriptions.form.action": "Feliratkozás", + "email_subscriptions.form.disclaimer": "Bármikor leiratkozhatsz. További információkért lásd az Adatvédelmi szabályzatot.", + "email_subscriptions.form.lead": "Kapj bejegyzéseket a postaládádba, Mastodon-fiók létrehozása nélkül.", + "email_subscriptions.form.title": "Regisztrálj {name} e-mailben küldött híreiért", + "email_subscriptions.submitted.lead": "Ellenőrizd a postaládádat az e-mailes hírek regisztrációs folyamatának befejezéséhez.", + "email_subscriptions.submitted.title": "Csak még egy lépés", + "email_subscriptions.validation.email.blocked": "E-mail-szolgáltató blokkolva", + "email_subscriptions.validation.email.invalid": "Érvénytelen e-mail-cím", "embed.instructions": "Ágyazd be ezt a bejegyzést a weboldaladba az alábbi kód kimásolásával.", "embed.preview": "Így fog kinézni:", "emoji_button.activity": "Tevékenység", @@ -699,6 +708,7 @@ "footer.source_code": "Forráskód megtekintése", "footer.status": "Állapot", "footer.terms_of_service": "Felhasználási feltételek", + "form_error.blank": "A mező nem lehet üres.", "form_field.optional": "(nem kötelező)", "generic.saved": "Elmentve", "getting_started.heading": "Első lépések", diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json index df43d46894..e00183810b 100644 --- a/app/javascript/mastodon/locales/hy.json +++ b/app/javascript/mastodon/locales/hy.json @@ -41,7 +41,6 @@ "account.no_bio": "Նկարագրութիւն չկայ:", "account.open_original_page": "Բացել իրական էջը", "account.posts": "Գրառումներ", - "account.posts_with_replies": "Գրառումներ եւ պատասխաններ", "account.report": "Բողոքել @{name}֊ի մասին", "account.requested_follow": "{name}-ը ցանկանում է հետեւել քեզ", "account.share": "Կիսուել @{name}֊ի էջով", diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json index 3f65776b91..3cb1a01004 100644 --- a/app/javascript/mastodon/locales/ia.json +++ b/app/javascript/mastodon/locales/ia.json @@ -73,7 +73,6 @@ "account.no_bio": "Nulle description fornite.", "account.open_original_page": "Aperir le pagina original", "account.posts": "Messages", - "account.posts_with_replies": "Messages e responsas", "account.remove_from_followers": "Remover {name} del sequitores", "account.report": "Reportar @{name}", "account.requested_follow": "{name} ha requestate de sequer te", diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json index 48c8f85fa5..e181713862 100644 --- a/app/javascript/mastodon/locales/id.json +++ b/app/javascript/mastodon/locales/id.json @@ -62,7 +62,6 @@ "account.no_bio": "Tidak ada deskripsi yang diberikan.", "account.open_original_page": "Buka halaman asli", "account.posts": "Kiriman", - "account.posts_with_replies": "Kiriman dan balasan", "account.report": "Laporkan @{name}", "account.requested_follow": "{name} ingin mengikuti Anda", "account.share": "Bagikan profil @{name}", diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json index 77097b05c6..9fa27dd5a8 100644 --- a/app/javascript/mastodon/locales/ie.json +++ b/app/javascript/mastodon/locales/ie.json @@ -50,7 +50,6 @@ "account.no_bio": "Null descrition providet.", "account.open_original_page": "Aperter li págine original", "account.posts": "Postas", - "account.posts_with_replies": "Postas e replicas", "account.report": "Raportar @{name}", "account.requested_follow": "{name} ha petit sequer te", "account.share": "Distribuer li profil de @{name}", diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json index 0120d52c83..176cb0cfa9 100644 --- a/app/javascript/mastodon/locales/ig.json +++ b/app/javascript/mastodon/locales/ig.json @@ -9,7 +9,6 @@ "account.go_to_profile": "Jee na profaịlụ", "account.mute": "Mee ogbi @{name}", "account.posts": "Edemede", - "account.posts_with_replies": "Edemede na nzaghachị", "account.unfollow": "Kwụsị iso", "account_note.placeholder": "Click to add a note", "admin.dashboard.retention.cohort_size": "Ojiarụ ọhụrụ", diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json index 031a45819e..18e3dda8d9 100644 --- a/app/javascript/mastodon/locales/io.json +++ b/app/javascript/mastodon/locales/io.json @@ -98,7 +98,6 @@ "account.no_bio": "Deskriptajo ne provizesis.", "account.open_original_page": "Apertez originala pagino", "account.posts": "Mesaji", - "account.posts_with_replies": "Afishi e respondi", "account.report": "Denuncar @{name}", "account.requested_follow": "{name} demandis sequar tu", "account.share": "Partigez profilo di @{name}", diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json index 77f4c43ba4..f1e4eca49f 100644 --- a/app/javascript/mastodon/locales/is.json +++ b/app/javascript/mastodon/locales/is.json @@ -122,7 +122,6 @@ "account.note.title": "Einkaminnispunktur (einungis sýnilegur þér)", "account.open_original_page": "Opna upprunalega síðu", "account.posts": "Færslur", - "account.posts_with_replies": "Færslur og svör", "account.remove_from_followers": "Fjarlægja {name} úr fylgjendum", "account.report": "Kæra @{name}", "account.requested_follow": "{name} hefur beðið um að fylgjast með þér", @@ -378,14 +377,13 @@ "collections.description_length_hint": "100 stafa takmörk", "collections.detail.accept_inclusion": "Í lagi", "collections.detail.accounts_heading": "Aðgangar", - "collections.detail.author_added_you": "{author} bætti þér í þetta safn", - "collections.detail.curated_by_author": "Safnað saman af {author}", - "collections.detail.curated_by_you": "Safnað saman af þér", "collections.detail.loading": "Hleð inn safni…", - "collections.detail.other_accounts_in_collection": "Aðrir í þessu safni:", + "collections.detail.other_accounts_count": "{count, plural, one {# annar aðgangur} other {# aðrir aðgangar}}", "collections.detail.revoke_inclusion": "Fjarlægja mig", + "collections.detail.sensitive_content": "Viðkvæmt efni", "collections.detail.sensitive_note": "Þetta safn inniheldur aðganga og efni sem sumir notendur gætu verið viðkvæmir fyrir.", "collections.detail.share": "Deila þessu safni", + "collections.detail.you_were_added_to_this_collection": "Þér var bætt í þetta safn", "collections.edit_details": "Breyta ítarupplýsingum", "collections.error_loading_collections": "Villa kom upp þegar reynt var að hlaða inn söfnunum þínum.", "collections.hints.accounts_counter": "{count} / {max} aðgangar", @@ -541,6 +539,7 @@ "content_warning.hide": "Fela færslu", "content_warning.show": "Birta samt", "content_warning.show_more": "Sýna meira", + "content_warning.show_short": "Sýna", "conversation.delete": "Eyða samtali", "conversation.mark_as_read": "Merkja sem lesið", "conversation.open": "Skoða samtal", @@ -581,6 +580,15 @@ "domain_pill.your_server": "Stafrænt heimili þitt, þar sem allar færslur þínar eru hýstar. Kanntu ekki við þennan netþjón? Þú getur flutt þig á milli netþjóna hvenær sem er og tekið með þér alla fylgjendurna þína.", "domain_pill.your_username": "Sértækt auðkenni þitt á þessum netþjóni. Það er mögulegt að finna notendur með sama notandanafn á mismunandi netþjónum.", "dropdown.empty": "Veldu valkost", + "email_subscriptions.email": "Tölvupóstfang", + "email_subscriptions.form.action": "Gerast áskrifandi", + "email_subscriptions.form.disclaimer": "Þú getur hætt í áskrift hvenær sem er. Til að sjá nánari upplýsingar geturðu skoðað Meðferð persónuupplýsinga.", + "email_subscriptions.form.lead": "Fáðu færslur í pósthólfið þitt án þess að skrá þig með Mastodon-aðgang.", + "email_subscriptions.form.title": "Skráðu þig í áskrift í tölvupósti að færslum frá {name}", + "email_subscriptions.submitted.lead": "Athugaðu hvort þér hafi borist tölvupóstur til að ljúka áskriftarferlinu.", + "email_subscriptions.submitted.title": "Eitt skref í viðbót", + "email_subscriptions.validation.email.blocked": "Útilokuð póstþjónusta", + "email_subscriptions.validation.email.invalid": "Ógilt tölvupóstfang", "embed.instructions": "Felldu þessa færslu inn í vefsvæðið þitt með því að afrita kóðann hér fyrir neðan.", "embed.preview": "Svona mun þetta líta út:", "emoji_button.activity": "Athafnir", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index 6c01695859..efca1c9740 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -122,7 +122,6 @@ "account.note.title": "Nota personale (visibile solo per te)", "account.open_original_page": "Apri la pagina originale", "account.posts": "Post", - "account.posts_with_replies": "Post e risposte", "account.remove_from_followers": "Rimuovi {name} dai follower", "account.report": "Segnala @{name}", "account.requested_follow": "{name} ha richiesto di seguirti", @@ -378,14 +377,13 @@ "collections.description_length_hint": "Limite di 100 caratteri", "collections.detail.accept_inclusion": "Va bene", "collections.detail.accounts_heading": "Account", - "collections.detail.author_added_you": "{author} ti ha aggiunto a questa collezione", - "collections.detail.curated_by_author": "Curata da {author}", - "collections.detail.curated_by_you": "Curata da te", "collections.detail.loading": "Caricamento della collezione…", - "collections.detail.other_accounts_in_collection": "Altri in questa collezione:", + "collections.detail.other_accounts_count": "{count, plural, one {# altro account} other {# altri account}}", "collections.detail.revoke_inclusion": "Rimuovimi", + "collections.detail.sensitive_content": "Contenuto sensibile", "collections.detail.sensitive_note": "Questa collezione contiene account e contenuto che potrebbero essere sensibili ad alcuni utenti.", "collections.detail.share": "Condividi questa collezione", + "collections.detail.you_were_added_to_this_collection": "Sei stato/a aggiunto/a a questa collezione", "collections.edit_details": "Modifica i dettagli", "collections.error_loading_collections": "Si è verificato un errore durante il tentativo di caricare le tue collezioni.", "collections.hints.accounts_counter": "{count} / {max} account", @@ -541,6 +539,7 @@ "content_warning.hide": "Nascondi post", "content_warning.show": "Mostra comunque", "content_warning.show_more": "Mostra di più", + "content_warning.show_short": "Mostra", "conversation.delete": "Elimina conversazione", "conversation.mark_as_read": "Segna come letto", "conversation.open": "Visualizza conversazione", @@ -581,6 +580,15 @@ "domain_pill.your_server": "La tua casa digitale, dove vivono tutti i tuoi post. Non ti piace questa? Cambia server in qualsiasi momento e porta con te anche i tuoi follower.", "domain_pill.your_username": "Il tuo identificatore univoco su questo server. È possibile trovare utenti con lo stesso nome utente su server diversi.", "dropdown.empty": "Seleziona un'opzione", + "email_subscriptions.email": "Indirizzo email", + "email_subscriptions.form.action": "Iscriviti", + "email_subscriptions.form.disclaimer": "Puoi annullare l'iscrizione in qualsiasi momento. Per ulteriori informazioni, consulta l'Informativa sulla privacy.", + "email_subscriptions.form.lead": "Ricevi i post nella tua casella di posta elettronica senza creare un account Mastodon.", + "email_subscriptions.form.title": "Iscriviti per ricevere aggiornamenti via email da {name}", + "email_subscriptions.submitted.lead": "Controlla la tua casella di posta elettronica per completare l'iscrizione agli aggiornamenti via email.", + "email_subscriptions.submitted.title": "Ancora un passaggio", + "email_subscriptions.validation.email.blocked": "Provider di posta elettronica bloccato", + "email_subscriptions.validation.email.invalid": "Indirizzo email non valido", "embed.instructions": "Incorpora questo post sul tuo sito web, copiando il seguente codice.", "embed.preview": "Ecco come apparirà:", "emoji_button.activity": "Attività", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 9b2689f09d..f555369b41 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -71,6 +71,13 @@ "account.locked_info": "このアカウントは承認制アカウントです。相手が承認するまでフォローは完了しません。", "account.media": "メディア", "account.mention": "@{name}さんにメンション", + "account.menu.copy": "リンクをコピーする", + "account.menu.direct": "非公開でメンションする", + "account.menu.hide_reblogs": "タイムラインでブーストを隠す", + "account.menu.mention": "メンションする", + "account.menu.mute": "アカウントをミュートする", + "account.menu.note.description": "あなただけが見られます", + "account.menu.open_original_page": "{domain} で表示する", "account.moved_to": "{name}さんはこちらのアカウントに引っ越しました:", "account.mute": "@{name}さんをミュート", "account.mute_notifications_short": "通知をオフにする", @@ -79,9 +86,10 @@ "account.muting": "ミュート中", "account.mutual": "相互フォロー中", "account.no_bio": "説明が提供されていません。", + "account.node_modal.callout": "個人的なメモはあなただけが見られます。", + "account.note.title": "個人的なメモ (あなただけが見られます)", "account.open_original_page": "元のページを開く", "account.posts": "投稿", - "account.posts_with_replies": "投稿と返信", "account.remove_from_followers": "{name}さんをフォロワーから削除", "account.report": "@{name}さんを通報", "account.requested_follow": "{name}さんがあなたにフォローリクエストしました", diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json index 12acb715e2..9337bbb71c 100644 --- a/app/javascript/mastodon/locales/ka.json +++ b/app/javascript/mastodon/locales/ka.json @@ -19,7 +19,6 @@ "account.mute": "გააჩუმე @{name}", "account.muted": "დადუმებულია", "account.posts": "პოსტები", - "account.posts_with_replies": "ტუტები და პასუხები", "account.report": "დაარეპორტე @{name}", "account.share": "გააზიარე @{name}-ის პროფილი", "account.show_reblogs": "აჩვენე ბუსტები @{name}-სგან", diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json index a3f09b7320..28cdb9c615 100644 --- a/app/javascript/mastodon/locales/kab.json +++ b/app/javascript/mastodon/locales/kab.json @@ -92,7 +92,6 @@ "account.note.title": "Tazmilt tudmawant (tettbin-d i kečč·mm kan)", "account.open_original_page": "Ldi asebter anasli", "account.posts": "Tisuffaɣ", - "account.posts_with_replies": "Tisuffaɣ d tririyin", "account.remove_from_followers": "Kkes {name} seg ineḍfaren", "account.report": "Cetki ɣef @{name}", "account.requested_follow": "{name} yessuter ad k·m-yeḍfer", diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json index 9fab41c3d1..9f6b0f4ca8 100644 --- a/app/javascript/mastodon/locales/kk.json +++ b/app/javascript/mastodon/locales/kk.json @@ -65,7 +65,6 @@ "account.no_bio": "Сипаттама берілмеген.", "account.open_original_page": "Бастапқы бетті ашу", "account.posts": "Пост", - "account.posts_with_replies": "Постар мен жауаптар", "account.remove_from_followers": "{name} жазылушылардан жою", "account.report": "Шағымдану @{name}", "account.requested_follow": "{name} сізге жазылуға сұраныс жіберді", diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json index 41dcecc509..b1332fd5a4 100644 --- a/app/javascript/mastodon/locales/kn.json +++ b/app/javascript/mastodon/locales/kn.json @@ -12,7 +12,6 @@ "account.follow": "ಹಿಂಬಾಲಿಸಿ", "account.followers": "ಹಿಂಬಾಲಕರು", "account.posts": "ಟೂಟ್‌ಗಳು", - "account.posts_with_replies": "Toots and replies", "account.unblock_domain": "Unhide {domain}", "account_note.placeholder": "Click to add a note", "alert.unexpected.title": "ಅಯ್ಯೋ!", diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index 297ed3068e..fe55d4195e 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -103,7 +103,6 @@ "account.note.edit_button": "편집", "account.open_original_page": "원본 페이지 열기", "account.posts": "게시물", - "account.posts_with_replies": "게시물과 답장", "account.remove_from_followers": "팔로워에서 {name} 제거", "account.report": "@{name} 신고", "account.requested_follow": "{name} 님이 팔로우 요청을 보냈습니다", diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json index c0033379ad..6ed46d102b 100644 --- a/app/javascript/mastodon/locales/ku.json +++ b/app/javascript/mastodon/locales/ku.json @@ -66,7 +66,6 @@ "account.no_bio": "Ti danasîn nehatiye tevlîkirin.", "account.open_original_page": "Rûpela resen veke", "account.posts": "Şandî", - "account.posts_with_replies": "Şandî û bersiv", "account.report": "@{name} ragihîne", "account.requested_follow": "{name} dixwaze te bişopîne", "account.share": "Profîla @{name} parve bike", diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json index ecf16bc4de..7bf8af9fc9 100644 --- a/app/javascript/mastodon/locales/kw.json +++ b/app/javascript/mastodon/locales/kw.json @@ -23,7 +23,6 @@ "account.mute": "Tawhe @{name}", "account.muted": "Tawhes", "account.posts": "Postow", - "account.posts_with_replies": "Postow ha gorthebow", "account.report": "Reportya @{name}", "account.share": "Kevrenna profil @{name}", "account.show_reblogs": "Diskwedhes kenerthow a @{name}", diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json index f53292c751..2b787555f2 100644 --- a/app/javascript/mastodon/locales/lad.json +++ b/app/javascript/mastodon/locales/lad.json @@ -72,7 +72,6 @@ "account.no_bio": "No ay deskripsion.", "account.open_original_page": "Avre pajina orijnala", "account.posts": "Publikasyones", - "account.posts_with_replies": "Kon repuestas", "account.report": "Raporta @{name}", "account.requested_follow": "{name} tiene solisitado segirte", "account.requests_to_follow_you": "Solisita segirte", diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json index 82a7eb9858..4f9f218543 100644 --- a/app/javascript/mastodon/locales/lt.json +++ b/app/javascript/mastodon/locales/lt.json @@ -93,7 +93,6 @@ "account.note.title": "Asmeninės pastabos (matomos tik jums)", "account.open_original_page": "Atidaryti originalų puslapį", "account.posts": "Įrašai", - "account.posts_with_replies": "Įrašai ir atsakymai", "account.remove_from_followers": "Šalinti {name} iš sekėjų", "account.report": "Pranešti apie @{name}", "account.requested_follow": "{name} paprašė tave sekti", diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json index 83e436c756..c93f2706e3 100644 --- a/app/javascript/mastodon/locales/lv.json +++ b/app/javascript/mastodon/locales/lv.json @@ -73,7 +73,6 @@ "account.no_bio": "Apraksts nav sniegts.", "account.open_original_page": "Atvērt pirmavota lapu", "account.posts": "Ieraksti", - "account.posts_with_replies": "Ieraksti un atbildes", "account.remove_from_followers": "Dzēst sekotāju {name}", "account.report": "Ziņot par @{name}", "account.requested_follow": "{name} nosūtīja Tev sekošanas pieprasījumu", diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json index 5dae604d07..05f0b979fc 100644 --- a/app/javascript/mastodon/locales/mk.json +++ b/app/javascript/mastodon/locales/mk.json @@ -31,7 +31,6 @@ "account.mute": "Зачути го @{name}", "account.muted": "Зачутено", "account.posts": "Тутови", - "account.posts_with_replies": "Тутови и реплики", "account.report": "Пријави @{name}", "account.share": "Сподели @{name} профил", "account.show_reblogs": "Прикажи бустови од @{name}", diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json index d8f4a977ec..75bdff6d4f 100644 --- a/app/javascript/mastodon/locales/ml.json +++ b/app/javascript/mastodon/locales/ml.json @@ -42,7 +42,6 @@ "account.no_bio": "വിവരണം നല്കുിയിട്ടില്ല.", "account.open_original_page": "ആദ്യത്തു് താൾ തുറക്കുക", "account.posts": "പോസ്റ്റുകൾ", - "account.posts_with_replies": "പോസ്റ്റുകളും മറുപടികളും", "account.report": "റിപ്പോർട്ട് ചെയ്യുക @{name}", "account.share": "@{name} ന്റെ പ്രൊഫൈൽ പങ്കിടുക", "account.show_reblogs": "@{name} ൽ നിന്നുള്ള ബൂസ്റ്റുകൾ കാണിക്കുക", diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json index b38b138bcc..b64e56e4e2 100644 --- a/app/javascript/mastodon/locales/mr.json +++ b/app/javascript/mastodon/locales/mr.json @@ -47,7 +47,6 @@ "account.muted": "मौन", "account.open_original_page": "मूळ पृष्ठ उघडा", "account.posts": "Toots", - "account.posts_with_replies": "Toots and replies", "account.report": "@{name} ची तक्रार करा", "account.requested_follow": "{name} ने आपल्याला फॉलो करण्याची रिक्वेस्ट केली आहे", "account.share": "@{name} चे प्रोफाइल शेअर करा", diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json index 49a54815d8..75e95de17c 100644 --- a/app/javascript/mastodon/locales/ms.json +++ b/app/javascript/mastodon/locales/ms.json @@ -59,7 +59,6 @@ "account.no_bio": "Tiada penerangan diberikan.", "account.open_original_page": "Buka halaman asal", "account.posts": "Hantaran", - "account.posts_with_replies": "Hantaran dan balasan", "account.report": "Laporkan @{name}", "account.requested_follow": "{name} has requested to follow you", "account.share": "Kongsi profil @{name}", diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json index ba1e90e5b9..909b0b611a 100644 --- a/app/javascript/mastodon/locales/my.json +++ b/app/javascript/mastodon/locales/my.json @@ -49,7 +49,6 @@ "account.no_bio": "ဖော်ပြချက် မပေးထားပါ။", "account.open_original_page": "မူလစာမျက်နှာကိုဖွင့်ပါ", "account.posts": "ပို့စ်များ", - "account.posts_with_replies": "ပို့စ်နှင့် ရီပလိုင်းများ", "account.report": "တိုင်ကြားမည်{name}", "account.requested_follow": "{name} က သင့်ကို စောင့်ကြည့်ရန် တောင်းဆိုထားသည်", "account.share": "{name}၏ပရိုဖိုင်ကိုမျှဝေပါ", diff --git a/app/javascript/mastodon/locales/nan-TW.json b/app/javascript/mastodon/locales/nan-TW.json index f5198b7306..db3ac5c0e2 100644 --- a/app/javascript/mastodon/locales/nan-TW.json +++ b/app/javascript/mastodon/locales/nan-TW.json @@ -122,7 +122,6 @@ "account.note.title": "私人ê筆記（kan-ta lí ē當看）", "account.open_original_page": "開原來ê頁", "account.posts": "PO文", - "account.posts_with_replies": "PO文kap回應", "account.remove_from_followers": "Kā {name} tuì跟tuè lí ê ê內底suá掉", "account.report": "檢舉 @{name}", "account.requested_follow": "{name} 請求跟tuè lí", @@ -378,11 +377,7 @@ "collections.description_length_hint": "限制 100 字", "collections.detail.accept_inclusion": "OK", "collections.detail.accounts_heading": "口座", - "collections.detail.author_added_you": "{author} kā lí加kàu tsit ê收藏", - "collections.detail.curated_by_author": "{author} 揀ê", - "collections.detail.curated_by_you": "Lí揀ê", "collections.detail.loading": "載入收藏……", - "collections.detail.other_accounts_in_collection": "Tsit ê收藏內ê別lâng：", "collections.detail.revoke_inclusion": "Kā我suá掉", "collections.detail.sensitive_note": "Tsit ê收藏包含對一寡用者敏感ê口座kap內容。", "collections.detail.share": "分享tsit ê收藏", diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json index 2d861e470b..49233a9ef8 100644 --- a/app/javascript/mastodon/locales/ne.json +++ b/app/javascript/mastodon/locales/ne.json @@ -54,7 +54,6 @@ "account.mutual": "तपाईंहरु एकअर्कालाई फलो गर्नुहुन्छ", "account.no_bio": "कुनै विवरण प्रदान गरिएको छैन।", "account.posts": "पोस्टहरू", - "account.posts_with_replies": "पोस्ट र जवाफहरू", "account.remove_from_followers": "{name}लाई फलोअरहरूबाट हटाउनुहोस्", "account.report": "@{name}लाई रिपोर्ट गर्नुहोस्", "account.requested_follow": "{name} ले तपाईंलाई फलो गर्न अनुरोध गर्नुभएको छ", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index 2a20a096f6..b14465f4e2 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -122,7 +122,6 @@ "account.note.title": "Persoonlijke opmerking (alleen zichtbaar voor jou)", "account.open_original_page": "Originele pagina openen", "account.posts": "Berichten", - "account.posts_with_replies": "Reacties", "account.remove_from_followers": "{name} als volger verwijderen", "account.report": "@{name} rapporteren", "account.requested_follow": "{name} wil jou graag volgen", @@ -173,7 +172,7 @@ "account_edit.field_edit_modal.discard_confirm": "Weggooien", "account_edit.field_edit_modal.discard_message": "Je hebt niet-opgeslagen wijzigingen. Weet je zeker dat je ze wilt weggooien?", "account_edit.field_edit_modal.edit_title": "Aangepast veld bewerken", - "account_edit.field_edit_modal.length_warning": "Aanbevolen tekenlimiet overschreden. Mobiele gebruikers zien mogelijk je veld niet volledig.", + "account_edit.field_edit_modal.length_warning": "Aanbevolen tekenlimiet overschreden. Mobiele gebruikers zien mogelijk niet volledig je veld.", "account_edit.field_edit_modal.link_emoji_warning": "We raden aan om geen lokale emoji in combinatie met URL's te gebruiken. Aangepaste velden die beide bevatten worden alleen als tekst weergegeven, in plaats van als een link. Dit om verwarring voor de gebruiker te voorkomen.", "account_edit.field_edit_modal.name_hint": "Bijv. \"Persoonlijke website\"", "account_edit.field_edit_modal.name_label": "Label", @@ -378,14 +377,13 @@ "collections.description_length_hint": "Maximaal 100 karakters", "collections.detail.accept_inclusion": "Oké", "collections.detail.accounts_heading": "Accounts", - "collections.detail.author_added_you": "{author} heeft je aan deze verzameling toegevoegd", - "collections.detail.curated_by_author": "Samengesteld door {author}", - "collections.detail.curated_by_you": "Samengesteld door jou", "collections.detail.loading": "Verzameling laden…", - "collections.detail.other_accounts_in_collection": "Anderen in deze verzameling:", + "collections.detail.other_accounts_count": "{count, plural, one {# ander account} other {# andere accounts}}", "collections.detail.revoke_inclusion": "Verwijder mij", + "collections.detail.sensitive_content": "Gevoelige inhoud", "collections.detail.sensitive_note": "Deze verzameling bevat accounts en inhoud die mogelijk gevoelig zijn voor sommige gebruikers.", "collections.detail.share": "Deze verzameling delen", + "collections.detail.you_were_added_to_this_collection": "Je bent aan deze verzameling toegevoegd", "collections.edit_details": "Gegevens bewerken", "collections.error_loading_collections": "Er is een fout opgetreden bij het laden van je verzamelingen.", "collections.hints.accounts_counter": "{count} / {max} accounts", @@ -541,6 +539,7 @@ "content_warning.hide": "Bericht verbergen", "content_warning.show": "Alsnog tonen", "content_warning.show_more": "Meer tonen", + "content_warning.show_short": "Tonen", "conversation.delete": "Gesprek verwijderen", "conversation.mark_as_read": "Als gelezen markeren", "conversation.open": "Gesprek tonen", @@ -581,6 +580,15 @@ "domain_pill.your_server": "Jouw digitale thuis, waar al jouw berichten zich bevinden. Is deze server toch niet naar jouw wens? Dan kun je op elk moment naar een andere server verhuizen en ook jouw volgers overbrengen.", "domain_pill.your_username": "Jouw unieke identificatie-adres op deze server. Het is mogelijk dat er gebruikers met dezelfde gebruikersnaam op verschillende servers te vinden zijn.", "dropdown.empty": "Selecteer een optie", + "email_subscriptions.email": "E-mailadres", + "email_subscriptions.form.action": "Abonneren", + "email_subscriptions.form.disclaimer": "Je kunt je op elk gewenst moment afmelden. Raadpleeg het Privacybeleid voor meer informatie.", + "email_subscriptions.form.lead": "Krijg berichten in je inbox zonder een Mastodonaccount aan te hoeven maken.", + "email_subscriptions.form.title": "Op e-mailupdates van {name} abonneren", + "email_subscriptions.submitted.lead": "Kijk in je inbox voor een e-mail waarmee je het abbonement op de e-mailupdates kunt bevestigen.", + "email_subscriptions.submitted.title": "Nog één stap", + "email_subscriptions.validation.email.blocked": "Geblokkeerde e-mailprovider", + "email_subscriptions.validation.email.invalid": "Ongeldig e-mailadres", "embed.instructions": "Embed dit bericht op jouw website door de onderstaande code te kopiëren.", "embed.preview": "Zo komt het eruit te zien:", "emoji_button.activity": "Activiteiten", diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json index ccbe737040..e199d6ebe4 100644 --- a/app/javascript/mastodon/locales/nn.json +++ b/app/javascript/mastodon/locales/nn.json @@ -122,7 +122,6 @@ "account.note.title": "Personleg notat (berre synleg for deg)", "account.open_original_page": "Opne originalsida", "account.posts": "Tut", - "account.posts_with_replies": "Tut og svar", "account.remove_from_followers": "Fjern {name} frå fylgjarane dine", "account.report": "Rapporter @{name}", "account.requested_follow": "{name} har bedt om å få fylgja deg", @@ -354,11 +353,7 @@ "collections.description_length_hint": "Maks 100 teikn", "collections.detail.accept_inclusion": "Ok", "collections.detail.accounts_heading": "Kontoar", - "collections.detail.author_added_you": "{author} la deg til i denne samlinga", - "collections.detail.curated_by_author": "Kuratert av {author}", - "collections.detail.curated_by_you": "Kuratert av deg", "collections.detail.loading": "Lastar inn samling…", - "collections.detail.other_accounts_in_collection": "Andre i denne samlinga:", "collections.detail.revoke_inclusion": "Fjern meg", "collections.detail.sensitive_note": "Denne samlinga inneheld kontoar og innhald som kan vera ømtolige for nokre menneske.", "collections.detail.share": "Del denne samlinga", diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json index 7177317f32..9b40cf2084 100644 --- a/app/javascript/mastodon/locales/no.json +++ b/app/javascript/mastodon/locales/no.json @@ -119,7 +119,6 @@ "account.note.title": "Personlig notat (bare synlig for deg)", "account.open_original_page": "Gå til originalsiden", "account.posts": "Innlegg", - "account.posts_with_replies": "Innlegg med svar", "account.remove_from_followers": "Fjern {name} fra følgere", "account.report": "Rapporter @{name}", "account.requested_follow": "{name} har bedt om å få følge deg", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index d8a861bc37..530fb3999a 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -72,7 +72,6 @@ "account.note.edit_button": "Modificar", "account.open_original_page": "Dobrir la pagina d’origina", "account.posts": "Tuts", - "account.posts_with_replies": "Tuts e responsas", "account.remove_from_followers": "Tirar {name} dels seguidors", "account.report": "Senhalar @{name}", "account.requested_follow": "{name} a demandat a vos sègre", diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json index 68dd9d6f68..e77782cae2 100644 --- a/app/javascript/mastodon/locales/pa.json +++ b/app/javascript/mastodon/locales/pa.json @@ -91,7 +91,6 @@ "account.note.title": "ਨਿੱਜੀ ਨੋਟ (ਸਿਰਫ਼ ਤੁਹਾਨੂੰ ਹੀ ਦਿਖਾਈ ਦਿੰਦਾ ਹੈ)", "account.open_original_page": "ਅਸਲ ਸਫ਼ੇ ਨੂੰ ਖੋਲ੍ਹੋ", "account.posts": "ਪੋਸਟਾਂ", - "account.posts_with_replies": "ਪੋਸਟਾਂ ਅਤੇ ਜਵਾਬ", "account.remove_from_followers": "{name} ਨੂੰ ਫ਼ਾਲੋਅਰ ਵਿੱਚੋਂ ਹਟਾਓ", "account.report": "{name} ਬਾਰੇ ਰਿਪੋਰਟ ਕਰੋ", "account.requested_follow": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ", diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index 16c5ac240b..35868e9c08 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -104,10 +104,18 @@ "account.muted": "Wyciszony", "account.muting": "Wyciszanie", "account.mutual": "Obserwujecie się wzajemnie", + "account.name_info": "Co to oznacza?", "account.no_bio": "Brak opisu.", + "account.node_modal.callout": "Osobiste notatki są widoczne tylko dla Ciebie.", + "account.node_modal.edit_title": "Edytuj osobistą notkę", + "account.node_modal.error_unknown": "Nie można zapisać notatki", + "account.node_modal.field_label": "Notatka osobista", + "account.node_modal.save": "Zapisz", + "account.node_modal.title": "Dodaj osobistą notkę", + "account.note.edit_button": "Edytuj", + "account.note.title": "Osobista notatka (widoczna tylko dla Ciebie)", "account.open_original_page": "Otwórz stronę oryginalną", "account.posts": "Wpisy", - "account.posts_with_replies": "Wpisy i odpowiedzi", "account.remove_from_followers": "Usuń {name} z obserwujących", "account.report": "Zgłoś @{name}", "account.requested_follow": "{name} chce cię obserwować", @@ -115,6 +123,8 @@ "account.share": "Udostępnij profil @{name}", "account.show_reblogs": "Pokazuj podbicia od @{name}", "account.statuses_counter": "{count, plural, one {{counter} wpis} few {{counter} wpisy} many {{counter} wpisów} other {{counter} wpisów}}", + "account.timeline.pinned": "Przypięte", + "account.timeline.pinned.view_all": "Zobacz wszystkie przypięte posty", "account.unblock": "Odblokuj @{name}", "account.unblock_domain": "Odblokuj domenę {domain}", "account.unblock_domain_short": "Odblokuj", @@ -124,6 +134,10 @@ "account.unmute": "Nie wyciszaj @{name}", "account.unmute_notifications_short": "Nie wyciszaj powiadomień", "account.unmute_short": "Nie wyciszaj", + "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ę.", + "account_edit.bio.title": "Opis", "account_edit.bio_modal.add_title": "Szczegóły profilu", "account_edit.bio_modal.edit_title": "Edytuj szczegóły profilu", "account_edit.column_button": "Gotowe", @@ -152,6 +166,23 @@ "account_edit.field_edit_modal.discard_confirm": "Odrzuć", "account_edit.field_edit_modal.discard_message": "Masz niezapisane zmiany. Czy na pewno chcesz je odrzucić?", "account_edit.field_edit_modal.edit_title": "Edytuj dodatkowe pole", + "account_edit.field_edit_modal.name_label": "Etykieta", + "account_edit.field_edit_modal.value_label": "Wartość", + "account_edit.image_alt_modal.add_title": "Dodaj tekst alternatywny", + "account_edit.image_alt_modal.text_label": "Tekst alternatywny", + "account_edit.image_delete_modal.delete_button": "Usuń", + "account_edit.image_delete_modal.title": "Usunąć obraz?", + "account_edit.image_edit.add_button": "Dodaj obraz", + "account_edit.image_edit.alt_add_button": "Dodaj tekst alternatywny", + "account_edit.image_edit.alt_edit_button": "Dodaj tekst alternatywny", + "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.save": "Zapisz", + "account_edit.upload_modal.back": "Wstecz", + "account_edit.upload_modal.done": "Gotowe", + "account_edit.upload_modal.next": "Następne", + "account_edit.upload_modal.step_crop.zoom": "Powiększenie", "account_note.placeholder": "Kliknij, aby dodać notatkę", "admin.dashboard.daily_retention": "Wskaźnik utrzymania użytkowników według dni od rejestracji", "admin.dashboard.monthly_retention": "Wskaźnik utrzymania użytkowników według miesięcy od rejestracji", diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index 213866229c..211319b673 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -122,7 +122,6 @@ "account.note.title": "Nota pessoal (visível apenas para você)", "account.open_original_page": "Abrir a página original", "account.posts": "Publicações", - "account.posts_with_replies": "Com respostas", "account.remove_from_followers": "Remover {name} dos seguidores", "account.report": "Denunciar @{name}", "account.requested_follow": "{name} quer te seguir", @@ -378,11 +377,7 @@ "collections.description_length_hint": "Limite de 100 caracteres", "collections.detail.accept_inclusion": "OK", "collections.detail.accounts_heading": "Contas", - "collections.detail.author_added_you": "{author} adicionou você a esta coleção", - "collections.detail.curated_by_author": "Curadoria de {author}", - "collections.detail.curated_by_you": "Curadoria por você", "collections.detail.loading": "Carregando coleção…", - "collections.detail.other_accounts_in_collection": "Outros nesta coleção:", "collections.detail.revoke_inclusion": "Remover-me", "collections.detail.sensitive_note": "Esta coleção contém contas e conteúdo que podem ser sensíveis a alguns usuários.", "collections.detail.share": "Compartilhar esta coleção", diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json index b31772b7af..c0fcb6237c 100644 --- a/app/javascript/mastodon/locales/pt-PT.json +++ b/app/javascript/mastodon/locales/pt-PT.json @@ -122,7 +122,6 @@ "account.note.title": "Nota pessoal (visível apenas por si)", "account.open_original_page": "Abrir a página original", "account.posts": "Publicações", - "account.posts_with_replies": "Publicações e respostas", "account.remove_from_followers": "Remover {name} dos seguidores", "account.report": "Denunciar @{name}", "account.requested_follow": "{name} pediu para seguir-te", @@ -356,11 +355,7 @@ "collections.description_length_hint": "Limite de 100 caracteres", "collections.detail.accept_inclusion": "OK / Aceitar", "collections.detail.accounts_heading": "Contas", - "collections.detail.author_added_you": "{author} adicionou-o a esta coleção", - "collections.detail.curated_by_author": "Curado por {author}", - "collections.detail.curated_by_you": "Curado por si", "collections.detail.loading": "A carregar a coleção…", - "collections.detail.other_accounts_in_collection": "Outros nesta coleção:", "collections.detail.revoke_inclusion": "Remover-me", "collections.detail.sensitive_note": "Esta coleção contém contas e conteúdos que podem ser sensíveis para alguns utilizadores.", "collections.detail.share": "Partilhar esta coleção", diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json index fd7dfcc569..92036df1da 100644 --- a/app/javascript/mastodon/locales/ro.json +++ b/app/javascript/mastodon/locales/ro.json @@ -65,7 +65,6 @@ "account.no_bio": "Nicio descriere furnizată.", "account.open_original_page": "Deschide pagina originală", "account.posts": "Postări", - "account.posts_with_replies": "Postări și răspunsuri", "account.report": "Raportează pe @{name}", "account.requested_follow": "{name} A cerut să vă urmărească", "account.share": "Distribuie profilul lui @{name}", diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json index 165ecf2266..d6208e79f9 100644 --- a/app/javascript/mastodon/locales/ru.json +++ b/app/javascript/mastodon/locales/ru.json @@ -122,7 +122,6 @@ "account.note.title": "Заметка для себя (никто, кроме вас, её не увидит)", "account.open_original_page": "Открыть исходную страницу", "account.posts": "Посты", - "account.posts_with_replies": "Посты и ответы", "account.remove_from_followers": "Убрать {name} из подписчиков", "account.report": "Пожаловаться на @{name}", "account.requested_follow": "{name} отправил(а) вам запрос на подписку", diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json index 9426a9c5c0..40a83f6fb7 100644 --- a/app/javascript/mastodon/locales/ry.json +++ b/app/javascript/mastodon/locales/ry.json @@ -49,7 +49,6 @@ "account.no_bio": "Описа ниє.", "account.open_original_page": "Удоперти ориґіналну сторунку", "account.posts": "Публикації", - "account.posts_with_replies": "Публикації тай удповіді", "account.report": "Скарговати ся на {name}", "account.requested_follow": "Хосновач {name} просит ся пудписати ся на вас", "account.share": "Пошырити профіл хосновача {name}", diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json index 129f1cd3e5..3e23ac76b5 100644 --- a/app/javascript/mastodon/locales/sa.json +++ b/app/javascript/mastodon/locales/sa.json @@ -44,7 +44,6 @@ "account.muted": "निःशब्दम्", "account.open_original_page": "मूलपृष्ठमुट्घाटय", "account.posts": "पत्राणि", - "account.posts_with_replies": "पत्राणि प्रत्युत्तराणि च", "account.report": "आविद्यताम् @{name}", "account.requested_follow": "{name} त्वामनुसर्तुमयाचीत्", "account.share": "@{name} मित्रस्य विवरणं विभाज्यताम्", diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json index d05c906d68..74317c1378 100644 --- a/app/javascript/mastodon/locales/sc.json +++ b/app/javascript/mastodon/locales/sc.json @@ -66,7 +66,6 @@ "account.no_bio": "Peruna descritzione frunida.", "account.open_original_page": "Aberi sa pàgina originale", "account.posts": "Publicatziones", - "account.posts_with_replies": "Publicatziones e rispostas", "account.remove_from_followers": "Cantzella a {name} dae is sighiduras", "account.report": "Signala @{name}", "account.requested_follow": "{name} at dimandadu de ti sighire", diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json index fe01061b4d..e5f8c58613 100644 --- a/app/javascript/mastodon/locales/sco.json +++ b/app/javascript/mastodon/locales/sco.json @@ -42,7 +42,6 @@ "account.muted": "Whesht", "account.open_original_page": "Open the furst page", "account.posts": "Posts", - "account.posts_with_replies": "Posts an repones", "account.report": "Clype @{name}", "account.share": "Share @{name}'s profile", "account.show_reblogs": "Shaw heezes frae @{name}", diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json index 126fc4d072..8f50cffb90 100644 --- a/app/javascript/mastodon/locales/si.json +++ b/app/javascript/mastodon/locales/si.json @@ -65,7 +65,6 @@ "account.no_bio": "විස්තරයක් සපයා නැත.", "account.open_original_page": "මුල් පිටුව අරින්න", "account.posts": "ලිපි", - "account.posts_with_replies": "ලිපි සහ පිළිතුරු", "account.remove_from_followers": "අනුගාමිකයින්ගෙන් {name} ඉවත් කරන්න", "account.report": "@{name} වාර්තා කරන්න", "account.requested_follow": "{name} ඔබව අනුගමනය කිරීමට ඉල්ලා ඇත.", diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index 0d073db623..882913222d 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -76,7 +76,6 @@ "account.no_bio": "Nie je uvedený žiadny popis.", "account.open_original_page": "Otvoriť pôvodnú stránku", "account.posts": "Príspevky", - "account.posts_with_replies": "Príspevky a odpovede", "account.remove_from_followers": "Zrušiť sledovanie od {name}", "account.report": "Nahlásiť @{name}", "account.requested_follow": "{name} vás chce sledovať", diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json index b13ae55d10..063e30b939 100644 --- a/app/javascript/mastodon/locales/sl.json +++ b/app/javascript/mastodon/locales/sl.json @@ -71,7 +71,6 @@ "account.no_bio": "Ni opisa.", "account.open_original_page": "Odpri izvirno stran", "account.posts": "Objave", - "account.posts_with_replies": "Objave in odgovori", "account.remove_from_followers": "Odstrani {name} iz sledilcev", "account.report": "Prijavi @{name}", "account.requested_follow": "{name} vam želi slediti", diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json index d4076cddee..84fb10a696 100644 --- a/app/javascript/mastodon/locales/sq.json +++ b/app/javascript/mastodon/locales/sq.json @@ -122,7 +122,6 @@ "account.note.title": "Shënim personal (i dukshëm vetëm për ju)", "account.open_original_page": "Hap faqen origjinale", "account.posts": "Mesazhe", - "account.posts_with_replies": "Mesazhe dhe përgjigje", "account.remove_from_followers": "Hiqe {name} nga ndjekësit", "account.report": "Raportojeni @{name}", "account.requested_follow": "{name} ka kërkuar t’ju ndjekë", @@ -372,14 +371,13 @@ "collections.delete_collection": "Fshije koleksionin", "collections.description_length_hint": "Kufi prej 100 shenjash", "collections.detail.accounts_heading": "Llogari", - "collections.detail.author_added_you": "{author} ju shtoi te ky koleksion", - "collections.detail.curated_by_author": "Në kujdesin e {author}", - "collections.detail.curated_by_you": "Nën kujdesin tuaj", "collections.detail.loading": "Po ngarkohet koleksion…", - "collections.detail.other_accounts_in_collection": "Të tjerë në këtë koleksion:", + "collections.detail.other_accounts_count": "{count, plural, one {# llogari tjetër} other {# llogari të tjera}}", "collections.detail.revoke_inclusion": "Hiqmëni", + "collections.detail.sensitive_content": "Lëndë rezervat", "collections.detail.sensitive_note": "Ky koleksion përmban llogari dhe lëndë që mund të jetë me spec për disa përdorues.", "collections.detail.share": "Ndajeni këtë koleksion me të tjerë", + "collections.detail.you_were_added_to_this_collection": "U shtuat te ky koleksion", "collections.edit_details": "Përpunoni hollësi", "collections.error_loading_collections": "Pati një gabim teksa provohej të ngarkoheshin koleksionet tuaj.", "collections.hints.accounts_counter": "{count} / {max} llogari", @@ -535,6 +533,7 @@ "content_warning.hide": "Fshihe postimin", "content_warning.show": "Shfaqe, sido qoftë", "content_warning.show_more": "Shfaq më tepër", + "content_warning.show_short": "Shfaqe", "conversation.delete": "Fshije bisedën", "conversation.mark_as_read": "Vëri shenjë si të lexuar", "conversation.open": "Shfaq bisedën", @@ -575,6 +574,15 @@ "domain_pill.your_server": "Shtëpia juaj dixhitale, kur gjenden krejt postimet tuaja. S’ju pëlqen kjo këtu? Shpërngulni shërbyes kur të doni dhe sillni edhe ndjekësit tuaj.", "domain_pill.your_username": "Identifikuesi juja unik në këtë shërbyes. Është e mundur të gjenden përdorues me të njëjtin emër përdoruesi në shërbyes të ndryshëm.", "dropdown.empty": "Përzgjidhni një mundësi", + "email_subscriptions.email": "Adresë email", + "email_subscriptions.form.action": "Pajtohuni", + "email_subscriptions.form.disclaimer": "S’mund të shpajtoheni, në çfarëdo kohe. Për më tepër informacion, shihni te Rregulla Privatësie.", + "email_subscriptions.form.lead": "Merrni postime në email-in tuaj, pa krijuar një llogari Mastodon.", + "email_subscriptions.form.title": "Regjistrohuni për përditësime me email nga {name}", + "email_subscriptions.submitted.lead": "Shihni te mesazhet tuaj të marrë për një email, që të përfundoni regjistrimin për përditësime me email.", + "email_subscriptions.submitted.title": "Edhe një hap", + "email_subscriptions.validation.email.blocked": "Shërbim email i bllokuar", + "email_subscriptions.validation.email.invalid": "Adresë email e pavlefshme", "embed.instructions": "Trupëzojeni këtë gjendje në sajtin tuaj duke kopjuar kodin më poshtë.", "embed.preview": "Ja si do të duket:", "emoji_button.activity": "Veprimtari", diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json index 56371dddc8..d556f9f1d3 100644 --- a/app/javascript/mastodon/locales/sr-Latn.json +++ b/app/javascript/mastodon/locales/sr-Latn.json @@ -75,7 +75,6 @@ "account.no_bio": "Nema opisa.", "account.open_original_page": "Otvori originalnu stranicu", "account.posts": "Objave", - "account.posts_with_replies": "Objave i odgovori", "account.report": "Prijavi @{name}", "account.requested_follow": "{name} je zatražio da vas prati", "account.share": "Podeli profil korisnika @{name}", diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json index 7313eaca46..2c36aca885 100644 --- a/app/javascript/mastodon/locales/sr.json +++ b/app/javascript/mastodon/locales/sr.json @@ -52,7 +52,6 @@ "account.no_bio": "Нема описа.", "account.open_original_page": "Отвори оригиналну страницу", "account.posts": "Објаве", - "account.posts_with_replies": "Објаве и одговори", "account.report": "Пријави @{name}", "account.requested_follow": "{name} је затражио да вас прати", "account.share": "Подели профил корисника @{name}", diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json index ec8a80039e..d2439656c5 100644 --- a/app/javascript/mastodon/locales/sv.json +++ b/app/javascript/mastodon/locales/sv.json @@ -115,7 +115,6 @@ "account.note.title": "Personlig anteckning (endast synlig för dig)", "account.open_original_page": "Öppna den ursprungliga sidan", "account.posts": "Inlägg", - "account.posts_with_replies": "Inlägg och svar", "account.remove_from_followers": "Ta bort {name} från följare", "account.report": "Rapportera @{name}", "account.requested_follow": "{name} har begärt att följa dig", @@ -281,7 +280,9 @@ "collections.delete_collection": "Radera samling", "collections.detail.accept_inclusion": "Okej", "collections.detail.accounts_heading": "Konton", + "collections.detail.other_accounts_count": "{count, plural, one {# annat konto} other {# andra konton}}", "collections.detail.revoke_inclusion": "Ta bort mig", + "collections.detail.sensitive_content": "Känsligt innehåll", "collections.error_loading_collections": "Det uppstod ett fel när dina samlingar skulle laddas.", "collections.hints.accounts_counter": "{count} / {max} konton", "collections.no_collections_yet": "Inga samlingar än.", @@ -404,6 +405,7 @@ "content_warning.hide": "Dölj inlägg", "content_warning.show": "Visa ändå", "content_warning.show_more": "Visa mer", + "content_warning.show_short": "Visa", "conversation.delete": "Radera konversation", "conversation.mark_as_read": "Markera som läst", "conversation.open": "Visa konversation", @@ -443,6 +445,12 @@ "domain_pill.your_server": "Ditt digitala hem, där alla dina inlägg bor. Gillar du inte just denna? Byt server när som helst och ta med dina anhängare också.", "domain_pill.your_username": "Din unika identifierare på denna server. Det är möjligt att hitta användare med samma användarnamn på olika servrar.", "dropdown.empty": "Välj ett alternativ", + "email_subscriptions.email": "E-postadress", + "email_subscriptions.form.action": "Prenumerera", + "email_subscriptions.form.lead": "Få inlägg i din inkorg utan att skapa ett Mastodon-konto.", + "email_subscriptions.submitted.title": "Ett steg kvar", + "email_subscriptions.validation.email.blocked": "Blockerad e-postleverantör", + "email_subscriptions.validation.email.invalid": "Ogiltig epostadress", "embed.instructions": "Bädda in detta inlägg på din webbplats genom att kopiera koden nedan.", "embed.preview": "Så här kommer det att se ut:", "emoji_button.activity": "Aktivitet", diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json index 9f03864932..d699a97721 100644 --- a/app/javascript/mastodon/locales/szl.json +++ b/app/javascript/mastodon/locales/szl.json @@ -18,7 +18,6 @@ "account.media": "Media", "account.mute": "Wycisz @{name}", "account.posts": "Posty", - "account.posts_with_replies": "Posty i ôdpowiedzi", "account_note.placeholder": "Wybier, żeby przidac notka", "column.bookmarks": "Zokłodki", "column.direct": "Prywatne spōmniynia", diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json index d6fa60aa6e..1cc392d000 100644 --- a/app/javascript/mastodon/locales/ta.json +++ b/app/javascript/mastodon/locales/ta.json @@ -35,7 +35,6 @@ "account.muted": "முடக்கியது", "account.no_bio": "விளக்கம் எதுவும் வழங்கப்படவில்லை.", "account.posts": "டூட்டுகள்", - "account.posts_with_replies": "Toots மற்றும் பதில்கள்", "account.report": "@{name} -ஐப் புகாரளி", "account.share": "@{name} உடைய விவரத்தை பகிர்", "account.show_reblogs": "காட்டு boosts இருந்து @{name}", diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json index 09e7450067..8a4399e271 100644 --- a/app/javascript/mastodon/locales/tai.json +++ b/app/javascript/mastodon/locales/tai.json @@ -7,7 +7,6 @@ "account.media": "Mûi-thé", "account.mention": "Thê-khí @{name}", "account.posts": "Huah-siann", - "account.posts_with_replies": "Huah-siann kah huê-ìng", "account_note.placeholder": "Tiám tsi̍t-ē ka-thiam pī-tsù", "column.pins": "Tah thâu-tsîng ê huah-siann", "community.column_settings.media_only": "Kan-na muî-thé", diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json index c8039ecd3a..479b30f532 100644 --- a/app/javascript/mastodon/locales/te.json +++ b/app/javascript/mastodon/locales/te.json @@ -22,7 +22,6 @@ "account.mute": "@{name}ను మ్యూట్ చెయ్యి", "account.muted": "మ్యూట్ అయినవి", "account.posts": "టూట్లు", - "account.posts_with_replies": "టూట్లు మరియు ప్రత్యుత్తరములు", "account.report": "@{name}పై ఫిర్యాదుచేయు", "account.share": "@{name} యొక్క ప్రొఫైల్ను పంచుకోండి", "account.show_reblogs": "@{name}నుంచి బూస్ట్ లను చూపించు", diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json index 0377c38240..13891ac18e 100644 --- a/app/javascript/mastodon/locales/th.json +++ b/app/javascript/mastodon/locales/th.json @@ -81,7 +81,6 @@ "account.no_bio": "ไม่ได้ให้คำอธิบาย", "account.open_original_page": "เปิดหน้าดั้งเดิม", "account.posts": "โพสต์", - "account.posts_with_replies": "โพสต์และการตอบกลับ", "account.remove_from_followers": "เอา {name} ออกจากผู้ติดตาม", "account.report": "รายงาน @{name}", "account.requested_follow": "{name} ได้ขอติดตามคุณ", diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json index 941097c900..83d2b5cc94 100644 --- a/app/javascript/mastodon/locales/tok.json +++ b/app/javascript/mastodon/locales/tok.json @@ -72,7 +72,6 @@ "account.no_bio": "lipu li weka.", "account.open_original_page": "o open e lipu open", "account.posts": "toki suli", - "account.posts_with_replies": "toki ale", "account.remove_from_followers": "sijelo kute la o weka e sijelo \"{name}\".", "account.report": "@{name} la o toki e jaki tawa lawa", "account.requested_follow": "{name} li wile kute e sina", diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json index afc1244435..f77840489f 100644 --- a/app/javascript/mastodon/locales/tr.json +++ b/app/javascript/mastodon/locales/tr.json @@ -122,7 +122,6 @@ "account.note.title": "Kişisel not (sadece siz görüntüleyebilirsiniz)", "account.open_original_page": "Asıl sayfayı aç", "account.posts": "Gönderiler", - "account.posts_with_replies": "Gönderiler ve yanıtlar", "account.remove_from_followers": "{name} takipçilerinden kaldır", "account.report": "@{name} adlı kişiyi bildir", "account.requested_follow": "{name} size takip isteği gönderdi", @@ -378,14 +377,13 @@ "collections.description_length_hint": "100 karakterle sınırlı", "collections.detail.accept_inclusion": "Tamam", "collections.detail.accounts_heading": "Hesaplar", - "collections.detail.author_added_you": "{author} sizi koleksiyonuna ekledi", - "collections.detail.curated_by_author": "{author} tarafından derlenen", - "collections.detail.curated_by_you": "Sizin derledikleriniz", "collections.detail.loading": "Koleksiyon yükleniyor…", - "collections.detail.other_accounts_in_collection": "Bu koleksiyondaki diğer kişiler:", + "collections.detail.other_accounts_count": "{count, plural, one {# diğer hesap} other {# diğer hesap}}", "collections.detail.revoke_inclusion": "Beni çıkar", + "collections.detail.sensitive_content": "Hassas içerik", "collections.detail.sensitive_note": "Bu koleksiyon bazı kullanıcılar için hassas olabilecek hesap ve içerik içerebilir.", "collections.detail.share": "Bu koleksiyonu paylaş", + "collections.detail.you_were_added_to_this_collection": "Bu koleksiyona eklendiniz", "collections.edit_details": "Ayrıntıları düzenle", "collections.error_loading_collections": "Koleksiyonlarınızı yüklemeye çalışırken bir hata oluştu.", "collections.hints.accounts_counter": "{count} / {max} hesap", @@ -541,6 +539,7 @@ "content_warning.hide": "Gönderiyi gizle", "content_warning.show": "Yine de göster", "content_warning.show_more": "Daha fazla göster", + "content_warning.show_short": "Göster", "conversation.delete": "Sohbeti sil", "conversation.mark_as_read": "Okundu olarak işaretle", "conversation.open": "Sohbeti görüntüle", diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json index 1554f46cc7..0930bce3c6 100644 --- a/app/javascript/mastodon/locales/tt.json +++ b/app/javascript/mastodon/locales/tt.json @@ -66,7 +66,6 @@ "account.muted": "Әһәмият бирмәнгән", "account.open_original_page": "Чыганак битен ачу", "account.posts": "Язма", - "account.posts_with_replies": "Язма һәм җавап", "account.report": "@{name} кулланучыга шикаять итү", "account.requested_follow": "{name} Сезгә язылу соравын җиберде", "account.share": "@{name} профиле белән уртаклашу", diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json index 20706b0943..2fb7241537 100644 --- a/app/javascript/mastodon/locales/ug.json +++ b/app/javascript/mastodon/locales/ug.json @@ -28,7 +28,6 @@ "account.follows_you": "سىزگە ئەگەشتى", "account.go_to_profile": "تەرجىمىھالغا يۆتكەل", "account.posts": "يازما", - "account.posts_with_replies": "يازما ۋە ئىنكاس", "account.report": "@{name} نى پاش قىل", "account_note.placeholder": "چېكىلسە ئىزاھات قوشىدۇ", "column.pins": "چوققىلانغان يازما", diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json index 67fe49725a..ce8faeb2d0 100644 --- a/app/javascript/mastodon/locales/uk.json +++ b/app/javascript/mastodon/locales/uk.json @@ -98,7 +98,6 @@ "account.node_modal.save": "Зберегти", "account.open_original_page": "Відкрити оригінальну сторінку", "account.posts": "Дописи", - "account.posts_with_replies": "Дописи й відповіді", "account.remove_from_followers": "Вилучити {name} із підписників", "account.report": "Поскаржитися на @{name}", "account.requested_follow": "{name} надсилає запит на стеження", diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json index 3e589dc80b..77c0f8b80a 100644 --- a/app/javascript/mastodon/locales/ur.json +++ b/app/javascript/mastodon/locales/ur.json @@ -44,7 +44,6 @@ "account.no_bio": "کوئی تفصیل نہیں دی گئی۔", "account.open_original_page": "اصل صفحہ کھولیں", "account.posts": "ٹوٹ", - "account.posts_with_replies": "ٹوٹ اور جوابات", "account.report": "@{name} اطلاع کریں", "account.requested_follow": "{name} آپ کو فالو کرنا چھاتا ہے۔", "account.share": "@{name} کے مشخص کو بانٹیں", diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json index 94b83f30ac..5751b82ab5 100644 --- a/app/javascript/mastodon/locales/uz.json +++ b/app/javascript/mastodon/locales/uz.json @@ -42,7 +42,6 @@ "account.muted": "Ovozsiz", "account.open_original_page": "Original post sahifasi", "account.posts": "Postlar", - "account.posts_with_replies": "Xabarlar va javoblar", "account.report": "@{name} xabar berish", "account.requested_follow": "{name} sizni kuzatishni soʻradi", "account.share": "@{name} profilini ulashing", diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json index b106d92362..58f4e786d0 100644 --- a/app/javascript/mastodon/locales/vi.json +++ b/app/javascript/mastodon/locales/vi.json @@ -122,7 +122,6 @@ "account.note.title": "Ghi chú (chỉ hiển thị với bạn)", "account.open_original_page": "Mở liên kết gốc", "account.posts": "Tút", - "account.posts_with_replies": "Trả lời", "account.remove_from_followers": "Xóa người theo dõi {name}", "account.report": "Báo cáo @{name}", "account.requested_follow": "{name} yêu cầu theo dõi bạn", @@ -378,14 +377,13 @@ "collections.description_length_hint": "Giới hạn 100 ký tự", "collections.detail.accept_inclusion": "Okay", "collections.detail.accounts_heading": "Tài khoản", - "collections.detail.author_added_you": "{author} đã thêm bạn vào gói khởi đầu này", - "collections.detail.curated_by_author": "Tuyển chọn bởi {author}", - "collections.detail.curated_by_you": "Tuyển chọn bởi bạn", "collections.detail.loading": "Đang tải gói khởi đầu…", - "collections.detail.other_accounts_in_collection": "Những người khác trong gói khởi đầu này:", + "collections.detail.other_accounts_count": "{count, plural, other {# tài khoản khác}}", "collections.detail.revoke_inclusion": "Xóa tôi", + "collections.detail.sensitive_content": "Nội dung nhạy cảm", "collections.detail.sensitive_note": "Gói khởi đầu này chứa các tài khoản và nội dung có thể nhạy cảm đối với một số người.", "collections.detail.share": "Chia sẻ gói khởi đầu này", + "collections.detail.you_were_added_to_this_collection": "Bạn đã được thêm vào gói khởi đầu này", "collections.edit_details": "Sửa chi tiết", "collections.error_loading_collections": "Đã xảy ra lỗi khi tải những gói khởi đầu của bạn.", "collections.hints.accounts_counter": "{count} / {max} tài khoản", @@ -541,6 +539,7 @@ "content_warning.hide": "Thu gọn", "content_warning.show": "Vẫn xem", "content_warning.show_more": "Mở rộng", + "content_warning.show_short": "Hiện", "conversation.delete": "Xóa tin nhắn này", "conversation.mark_as_read": "Đánh dấu là đã đọc", "conversation.open": "Xem toàn bộ tin nhắn", @@ -581,6 +580,15 @@ "domain_pill.your_server": "Nơi lưu trữ tút của bạn. Không thích ở đây? Chuyển sang máy chủ khác và giữ nguyên người theo dõi của bạn.", "domain_pill.your_username": "Chỉ riêng bạn trên máy chủ này. Những máy chủ khác có thể cũng có tên người dùng giống vậy.", "dropdown.empty": "Chọn một lựa chọn", + "email_subscriptions.email": "Địa chỉ email", + "email_subscriptions.form.action": "Đăng ký", + "email_subscriptions.form.disclaimer": "Bạn có thể hủy đăng ký bất cứ lúc nào. Để biết thêm thông tin, vui lòng tham khảo Chính sách bảo mật.", + "email_subscriptions.form.lead": "Nhận tút trực tiếp vào hộp thư đến mà không cần tạo tài khoản Mastodon.", + "email_subscriptions.form.title": "Đăng ký nhận cập nhật qua email từ {name}", + "email_subscriptions.submitted.lead": "Kiểm tra hộp thư đến của bạn để tìm email hoàn tất đăng ký nhận thông báo qua email.", + "email_subscriptions.submitted.title": "Một bước nữa", + "email_subscriptions.validation.email.blocked": "Dịch vụ email đã bị chặn", + "email_subscriptions.validation.email.invalid": "Địa chỉ email không hợp lệ", "embed.instructions": "Sao chép đoạn mã dưới đây và chèn vào trang web của bạn.", "embed.preview": "Nó sẽ hiển thị như vầy:", "emoji_button.activity": "Hoạt động", diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json index fa8e101fa0..0d14451b49 100644 --- a/app/javascript/mastodon/locales/zgh.json +++ b/app/javascript/mastodon/locales/zgh.json @@ -13,7 +13,6 @@ "account.mute": "ⵥⵥⵉⵥⵏ @{name}", "account.muted": "ⵉⵜⵜⵓⵥⵉⵥⵏ", "account.posts": "Toots", - "account.posts_with_replies": "Toots and replies", "account.share": "ⴱⴹⵓ ⵉⴼⵔⵙ ⵏ @{name}", "account.unfollow": "ⴽⴽⵙ ⴰⴹⴼⴼⵓⵕ", "account_note.placeholder": "Click to add a note", diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index 83045f0a1b..7a2b9ed700 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -122,7 +122,6 @@ "account.note.title": "个人备注（仅对你可见）", "account.open_original_page": "打开原始页面", "account.posts": "嘟文", - "account.posts_with_replies": "嘟文和回复", "account.remove_from_followers": "从关注者中移除 {name}", "account.report": "举报 @{name}", "account.requested_follow": "{name} 向你发送了关注请求", @@ -378,14 +377,13 @@ "collections.description_length_hint": "100字限制", "collections.detail.accept_inclusion": "确定", "collections.detail.accounts_heading": "账号", - "collections.detail.author_added_you": "{author} 将你添加到了此收藏列表", - "collections.detail.curated_by_author": "由 {author} 精心挑选", - "collections.detail.curated_by_you": "由你精心挑选", "collections.detail.loading": "正在加载收藏列表…", - "collections.detail.other_accounts_in_collection": "此收藏列表中的其他人：", + "collections.detail.other_accounts_count": "{count, plural, other {其他 # 个账号}}", "collections.detail.revoke_inclusion": "移除我", + "collections.detail.sensitive_content": "敏感内容", "collections.detail.sensitive_note": "此收藏列表可能包含某些对部分用户而言为敏感内容的账号或内容。", "collections.detail.share": "分享此收藏列表", + "collections.detail.you_were_added_to_this_collection": "你被添加到了此收藏列表", "collections.edit_details": "编辑详情", "collections.error_loading_collections": "加载你的收藏列表时发生错误。", "collections.hints.accounts_counter": "{count} / {max} 个账号", @@ -541,6 +539,7 @@ "content_warning.hide": "隐藏嘟文", "content_warning.show": "仍要显示", "content_warning.show_more": "展开", + "content_warning.show_short": "显示", "conversation.delete": "删除对话", "conversation.mark_as_read": "标记为已读", "conversation.open": "查看对话", diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json index e7e449a239..ce8e51f0ee 100644 --- a/app/javascript/mastodon/locales/zh-HK.json +++ b/app/javascript/mastodon/locales/zh-HK.json @@ -72,7 +72,6 @@ "account.no_bio": "未提供描述。", "account.open_original_page": "打開原始頁面", "account.posts": "帖文", - "account.posts_with_replies": "帖文與回覆", "account.remove_from_followers": "移除追蹤者{name}", "account.report": "檢舉 @{name}", "account.requested_follow": "{name} 要求追蹤你", diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json index b515f5ba1c..f5e31418c9 100644 --- a/app/javascript/mastodon/locales/zh-TW.json +++ b/app/javascript/mastodon/locales/zh-TW.json @@ -122,7 +122,6 @@ "account.note.title": "個人備註（僅有您可見）", "account.open_original_page": "檢視原始頁面", "account.posts": "嘟文", - "account.posts_with_replies": "嘟文與回覆", "account.remove_from_followers": "自跟隨者中移除 {name}", "account.report": "檢舉 @{name}", "account.requested_follow": "{name} 要求跟隨您", @@ -378,14 +377,13 @@ "collections.description_length_hint": "100 字限制", "collections.detail.accept_inclusion": "Okay", "collections.detail.accounts_heading": "帳號", - "collections.detail.author_added_you": "{author} 將您加入至此收藏名單", - "collections.detail.curated_by_author": "由 {author} 精選", - "collections.detail.curated_by_you": "由您精選", "collections.detail.loading": "讀取收藏名單中...", - "collections.detail.other_accounts_in_collection": "此收藏名單中其他人：", + "collections.detail.other_accounts_count": "{count, plural, other {# 個其他帳號}}", "collections.detail.revoke_inclusion": "移除我", + "collections.detail.sensitive_content": "敏感內容", "collections.detail.sensitive_note": "此收藏名單可能包含對某些使用者敏感之帳號或內容。", "collections.detail.share": "分享此收藏名單", + "collections.detail.you_were_added_to_this_collection": "您已被加入至此收藏名單", "collections.edit_details": "編輯詳細資料", "collections.error_loading_collections": "讀取您的收藏名單時發生錯誤。", "collections.hints.accounts_counter": "{count} / {max} 個帳號", @@ -541,6 +539,7 @@ "content_warning.hide": "隱藏嘟文", "content_warning.show": "仍要顯示", "content_warning.show_more": "顯示更多", + "content_warning.show_short": "顯示", "conversation.delete": "刪除對話", "conversation.mark_as_read": "標記為已讀", "conversation.open": "檢視對話", @@ -581,6 +580,15 @@ "domain_pill.your_server": "您數位世界的家，您所有的嘟文都在這裡。不喜歡這台伺服器嗎？您能隨時搬家至其他伺服器並且仍保有您的跟隨者。", "domain_pill.your_username": "您於您的伺服器中獨一無二的識別。於不同的伺服器上可能找到具有相同帳號的使用者。", "dropdown.empty": "請選擇一個選項", + "email_subscriptions.email": "電子郵件地址", + "email_subscriptions.form.action": "訂閱", + "email_subscriptions.form.disclaimer": "您可以任何時候取消訂閱。欲了解更多資訊，請參考隱私權政策。", + "email_subscriptions.form.lead": "於不建立 Mastodon 帳號的情況下，將透過電子郵件取得嘟文。", + "email_subscriptions.form.title": "訂閱 {name} 之電子郵件通訊", + "email_subscriptions.submitted.lead": "請檢查您的收件夾以完成訂閱電子郵件通訊。", + "email_subscriptions.submitted.title": "最後一步", + "email_subscriptions.validation.email.blocked": "已封鎖之電子郵件提供商", + "email_subscriptions.validation.email.invalid": "無效的電子郵件地址", "embed.instructions": "請複製以下程式碼以於您的網站嵌入此嘟文。", "embed.preview": "它將顯示成這樣：", "emoji_button.activity": "活動", diff --git a/app/services/activitypub/fetch_remote_key_service.rb b/app/services/activitypub/fetch_remote_key_service.rb index e6f691b288..9b61ac6086 100644 --- a/app/services/activitypub/fetch_remote_key_service.rb +++ b/app/services/activitypub/fetch_remote_key_service.rb @@ -6,6 +6,8 @@ class ActivityPub::FetchRemoteKeyService < BaseService class Error < StandardError; end # Returns actor that owns the key + # This is to be used when we know a key URI but don't know the associated account URI, + # otherwise use `ActivityPub::FetchRemoteActorService`. def call(uri, suppress_errors: true) raise Error, 'No key URI given' if uri.blank? @@ -44,9 +46,14 @@ class ActivityPub::FetchRemoteKeyService < BaseService end def find_actor(uri, prefetched_body) - actor = ActivityPub::TagManager.instance.uri_to_actor(uri) - actor ||= ActivityPub::FetchRemoteActorService.new.call(uri, prefetched_body: prefetched_body, suppress_errors: @suppress_errors) - actor + # `FetchRemoteKeyService` is called when we don't know of a key. + # This is most likely because we don't know of an account yet, but it could also be because we have stale data. + # Return the actor if it is known and has been updated recently, otherwise, process it in full. + + actor = ActivityPub::TagManager.instance.uri_to_actor(uri) + return actor if actor.present? && !actor.possibly_stale? + + ActivityPub::FetchRemoteActorService.new.call(uri, prefetched_body: prefetched_body, suppress_errors: @suppress_errors) end def expected_type? diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb index 65b1d03897..6254539327 100644 --- a/app/services/activitypub/process_account_service.rb +++ b/app/services/activitypub/process_account_service.rb @@ -32,8 +32,15 @@ class ActivityPub::ProcessAccountService < BaseService @options[:request_id] ||= "#{Time.now.utc.to_i}-#{username}@#{domain}" with_redis_lock("process_account:#{@uri}") do - @account = Account.remote.find_by(uri: @uri) if @options[:only_key] - @account ||= Account.find_remote(@username, @domain) + if @options[:only_key] + # `only_key` is used to update an existing account known by its `uri`. + # Lookup by handle and new account creation do not make sense in this case. + @account = Account.remote.find_by(uri: @uri) + return if @account.nil? + else + @account = Account.find_remote(@username, @domain) + end + @old_public_keys = @account.present? ? (@account.keypairs.pluck(:public_key) + [@account.public_key.presence].compact) : [] @old_protocol = @account&.protocol @suspension_changed = false diff --git a/config/locales/be.yml b/config/locales/be.yml index 9c3c944c34..49424ed3ad 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -1484,15 +1484,11 @@ be: one: Узаемадзейнічайце з гэтым допісам і знайдзіце іншыя, падобныя да яго. other: Узаемадзейнічайце з гэтымі допісамі і знайдзіце іншыя, падобныя да іх. subject: - few: Новыя допісы ад %{name} - many: Новыя допісы ад %{name} - one: 'Новы допіс: "%{excerpt}"' - other: Новыя допісы ад %{name} + plural: Новыя допісы ад %{name} + singular: 'Новы допіс: "%{excerpt}"' title: - few: Новыя допісы ад %{name} - many: Новыя допісы ад %{name} - one: 'Новы допіс: "%{excerpt}"' - other: Новыя допісы ад %{name} + plural: Новыя допісы ад %{name} + singular: 'Новы допіс: "%{excerpt}"' email_subscriptions: active: Актыўная confirmations: diff --git a/config/locales/da.yml b/config/locales/da.yml index 35ca8a88e7..7bf224e099 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -1327,7 +1327,7 @@ da: view_strikes: Se tidligere anmeldelser af din konto too_fast: Formularen indsendt for hurtigt, forsøg igen. use_security_key: Brug sikkerhedsnøgle - user_agreement_html: Jeg accepterer Tjenestevilkår og Fortrolighedspolitik + user_agreement_html: Jeg accepterer Tjenestevilkår og Privatlivspolitik user_privacy_agreement_html: Jeg accepterer fortrolighedspolitikken author_attribution: example_title: Eksempeltekst @@ -1384,7 +1384,7 @@ da: email_contact_html: Hvis den stadig ikke modtages, send en e-mail til %{email} for hjælp email_reconfirmation_html: Modtages bekræftelsesmailen ikke, kan man anmode om en ny irreversible: Du vil ikke kunne gendanne eller genaktivere din konto - more_details_html: For yderligere oplysningerer, tjek privatlivspolitikken. + more_details_html: For yderligere oplysninger, tjek privatlivspolitikken. username_available: Dit brugernavn vil blive tilgængeligt igen username_unavailable: Dit brugernavn vil forblive utilgængeligt disputes: @@ -1440,11 +1440,11 @@ da: one: Interagér med dette indlæg, og find flere lignende indlæg. other: Interagér med disse indlæg, og find flere. subject: - one: 'Nyt indlæg: "%{excerpt}"' - other: Nye indlæg fra %{name} + plural: Nye indlæg fra %{name} + singular: 'Nyt indlæg: "%{excerpt}"' title: - one: 'Nyt indlæg: "%{excerpt}"' - other: Nye indlæg fra %{name} + plural: Nye indlæg fra %{name} + singular: 'Nyt indlæg: "%{excerpt}"' email_subscriptions: active: Aktive confirmations: diff --git a/config/locales/de.yml b/config/locales/de.yml index ac2d10c18c..0fbf8ecad7 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1431,11 +1431,11 @@ de: notification: create_account: Mastodon-Konto erstellen subject: - one: 'Neuer Beitrag: „%{excerpt}“' - other: Neue Beiträge von %{name} + plural: Neue Beiträge von %{name} + singular: 'Neuer Beitrag: „%{excerpt}“' title: - one: 'Neuer Beitrag: „%{excerpt}“' - other: Neue Beiträge von %{name} + plural: Neue Beiträge von %{name} + singular: 'Neuer Beitrag: „%{excerpt}“' email_subscriptions: active: Aktiviert confirmations: diff --git a/config/locales/el.yml b/config/locales/el.yml index 41fa094dfa..0e27d5b255 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -1440,11 +1440,11 @@ el: one: Αλληλεπιδράστε με αυτήν την ανάρτηση και ανακαλύψτε περισσότερες σαν αυτήν. other: Αλληλεπιδράστε με αυτές τις αναρτήσεις και ανακαλύψτε περισσότερες. subject: - one: 'Νέα ανάρτηση: "%{excerpt}"' - other: Νέες αναρτήσεις από %{name} + plural: Νέες αναρτήσεις από %{name} + singular: 'Νέα ανάρτηση: "%{excerpt}"' title: - one: 'Νέα ανάρτηση: "%{excerpt}"' - other: Νέες αναρτήσεις από %{name} + plural: Νέες αναρτήσεις από %{name} + singular: 'Νέα ανάρτηση: "%{excerpt}"' email_subscriptions: active: Ενεργή confirmations: diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml index fccc9df481..d027f882ad 100644 --- a/config/locales/es-AR.yml +++ b/config/locales/es-AR.yml @@ -1440,11 +1440,11 @@ es-AR: one: Interactuá con esta publicación y descubrí otras similares. other: Interactuá con estas publicaciones y descubrí otras similares. subject: - one: 'Nueva publicación: «%{excerpt}»' - other: Nuevos publicaciones de %{name} + plural: Nuevos mensajes de %{name} + singular: 'Nueva publicación: «%{excerpt}»' title: - one: 'Nueva publicación: «%{excerpt}»' - other: Nuevos mensajes de %{name} + plural: Nuevos mensajes de %{name} + singular: 'Nueva publicación: «%{excerpt}»' email_subscriptions: active: Activa confirmations: diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml index b677d444f0..4021f36727 100644 --- a/config/locales/es-MX.yml +++ b/config/locales/es-MX.yml @@ -1,8 +1,8 @@ --- es-MX: about: - about_mastodon_html: 'La red social del futuro: ¡Sin anuncios, sin vigilancia corporativa, diseño ético, y descentralización! ¡Sé dueño de tu información con Mastodon!' - contact_missing: No especificado + about_mastodon_html: 'La red social del futuro: ¡Sin anuncios, sin vigilancia corporativa, con un diseño ético y descentralizada! ¡Sé dueño de tus datos con Mastodon!' + contact_missing: No establecido contact_unavailable: No disponible hosted_on: Mastodon alojado en %{domain} title: Acerca de @@ -16,8 +16,8 @@ es-MX: one: Siguiendo other: Siguiendo instance_actor_flash: Esta cuenta es un actor virtual utilizado para representar al servidor en sí mismo y no a ningún usuario individual. Se utiliza para propósitos de la federación y no se debe suspender. - last_active: última conexión - link_verified_on: La propiedad de este vínculo fue verificada el %{date} + last_active: última actividad + link_verified_on: Se ha comprobado la propiedad de este enlace el %{date} nothing_here: "¡No hay nada aquí!" pin_errors: following: Debes estar siguiendo a la persona a la que quieres aprobar @@ -1440,11 +1440,11 @@ es-MX: one: Interactúa con esta publicación y descubre otras similares. other: Interactúa con estas publicaciones y descubre más. subject: - one: 'Nueva publicación: "%{excerpt}"' - other: Nuevas publicaciones de %{name} + plural: Nuevas publicaciones de %{name} + singular: 'Nueva publicación: "%{excerpt}"' title: - one: 'Nueva publicación: "%{excerpt}"' - other: Nuevas publicaciones de %{name} + plural: Nuevas publicaciones de %{name} + singular: 'Nueva publicación: "%{excerpt}"' email_subscriptions: active: Activa confirmations: diff --git a/config/locales/es.yml b/config/locales/es.yml index 95ab07709d..52746858b2 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1440,11 +1440,11 @@ es: one: Interactúa con esta publicación y descubre otras similares. other: Interactúa con estas publicaciones y descubre otras similares. subject: - one: 'Nueva publicación: "%{excerpt}"' - other: Nuevas publicaciones de %{name} + plural: Nuevas publicaciones de %{name} + singular: 'Nueva publicación: "%{excerpt}"' title: - one: 'Nueva publicación: "%{excerpt}"' - other: Nuevas publicaciones de %{name} + plural: Nuevas publicaciones de %{name} + singular: 'Nueva publicación: "%{excerpt}"' email_subscriptions: active: Activa confirmations: diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 5408495f55..46683cccd6 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -169,7 +169,7 @@ fi: undo_silenced: Kumoa rajoitus undo_suspension: Kumoa jäädytys unsilenced_msg: Tilin %{username} rajoitus kumottiin onnistuneesti - unsubscribe: Lopeta tilaus + unsubscribe: Peruuta tilaus unsuspended_msg: Tilin %{username} jäädytys kumottiin onnistuneesti username: Käyttäjänimi view_domain: Näytä verkkotunnuksen yhteenveto @@ -1234,7 +1234,7 @@ fi: application_mailer: notification_preferences: Muuta sähköpostiasetuksia salutation: "%{name}" - unsubscribe: Lopeta tilaus + unsubscribe: Peruuta tilaus view: 'Näytä:' view_profile: Näytä profiili view_status: Näytä julkaisu @@ -1435,16 +1435,16 @@ fi: create_account: Luo Mastodon-tili footer: privacy_html: Sähköposti lähetetään verkkotunnuksesta %{domain}, Mastodonin tarjoamalta palvelimelta. Jos haluat ymmärtää, miten tämä palvelin käsittelee henkilötietojasi, katso tietosuojakäytäntö. - reason_for_email_html: Saat tämän sähköpostiviestin, koska olet tilannut sähköpostipäivitykset käyttäjältä %{name}. Etkö halua näitä sähköpostiviestejä? Lopeta tilaus + reason_for_email_html: Saat tämän sähköpostiviestin, koska olet tilannut sähköpostipäivitykset käyttäjältä %{name}. Etkö halua näitä sähköpostiviestejä? Peruuta tilaus interact_with_this_post: one: Ole vuorovaikutuksessa tämän julkaisun kanssa ja löydä lisää sen kaltaista. other: Olet vuorovaikutuksessa näiden julkaisujen kanssa ja löydä lisää. subject: - one: 'Uusi julkaisu: ”%{excerpt}”' - other: Uusia julkaisuja käyttäjältä %{name} + plural: Uusia julkaisuja käyttäjältä %{name} + singular: 'Uusi julkaisu: ”%{excerpt}”' title: - one: 'Uusi julkaisu: ”%{excerpt}”' - other: Uusia julkaisuja käyttäjältä %{name} + plural: Uusia julkaisuja käyttäjältä %{name} + singular: 'Uusi julkaisu: ”%{excerpt}”' email_subscriptions: active: Ota käyttöön confirmations: @@ -1452,7 +1452,7 @@ fi: changed_your_mind: Muutitko mieltäsi? success_html: Alat nyt saada sähköpostia, kun %{name} julkaisee uutta. Lisää %{sender} yhteystietoihisi, jotta nämä julkaisut eivät joudu roskapostikansioon. title: Olet aloittanut tilauksen - unsubscribe: Lopeta tilaus + unsubscribe: Peruuta tilaus inactive: Poissa käytöstä status: Tila subscribers: Tilaajia @@ -2097,7 +2097,7 @@ fi: action: Siirry palvelimen etusivulle email_subscription: confirmation_html: Et saa enää sähköpostia käyttäjältä %{name}. - title: Olet lopettanut tilauksen + title: Olet peruuttanut tilauksen user: confirmation_html: Et saa enää %{type} Mastodon-palvelimelta %{domain}. notification_emails: @@ -2107,13 +2107,13 @@ fi: mention: sähköposti-ilmoituksia maininnoista reblog: sähköposti-ilmoituksia tehostuksista show: - action: Lopeta tilaus + action: Peruuta tilaus email_subscription: confirmation_html: Lakkaat saamasta sähköpostia, kun tämä tili julkaisee uutta. - title: Lopetetaanko käyttäjän %{name} tilaus? + title: Peruutetaanko käyttäjän %{name} tilaus? user: confirmation_html: Lakkaat saamasta %{type} Mastodon-palvelimelta %{domain}. - title: Lopetetaanko tilaus aiheesta %{type}? + title: Peruutetaanko tilaus aiheesta %{type}? user_mailer: announcement_published: description: 'Palvelimen %{domain} ylläpito tiedottaa:' diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml index cbbd9a8a4e..e64c6dc875 100644 --- a/config/locales/fr-CA.yml +++ b/config/locales/fr-CA.yml @@ -1439,12 +1439,6 @@ fr-CA: interact_with_this_post: one: Interagissez avec ce message pour en découvrir d'autres. other: Interagissez avec ces messages pour en découvrir plus. - subject: - one: 'Nouveau message : « %{excerpt} »' - other: Nouveaux messages de %{name} - title: - one: 'Nouveau message : « %{excerpt} »' - other: Nouveaux messages de %{name} email_subscriptions: active: Actif confirmations: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 3014b8ed1d..c491cb0ae9 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1439,12 +1439,6 @@ fr: interact_with_this_post: one: Interagissez avec ce message pour en découvrir d'autres. other: Interagissez avec ces messages pour en découvrir plus. - subject: - one: 'Nouveau message : « %{excerpt} »' - other: Nouveaux messages de %{name} - title: - one: 'Nouveau message : « %{excerpt} »' - other: Nouveaux messages de %{name} email_subscriptions: active: Actif confirmations: diff --git a/config/locales/ga.yml b/config/locales/ga.yml index ce1ab3b97d..9c2c012543 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -1508,17 +1508,11 @@ ga: other: Idirghníomhaigh leis na poist seo agus faigh amach tuilleadh. two: Idirghníomhaigh leis na poist seo agus faigh amach tuilleadh. subject: - few: Poist nua ó %{name} - many: Poist nua ó %{name} - one: 'Post nua: "%{excerpt}"' - other: Poist nua ó %{name} - two: Poist nua ó %{name} + plural: Poist nua ó %{name} + singular: 'Post nua: "%{excerpt}"' title: - few: Poist nua ó %{name} - many: Poist nua ó %{name} - one: 'Post nua: "%{excerpt}"' - other: Poist nua ó %{name} - two: Poist nua ó %{name} + plural: Poist nua ó %{name} + singular: 'Post nua: "%{excerpt}"' email_subscriptions: active: Gníomhach confirmations: diff --git a/config/locales/gd.yml b/config/locales/gd.yml index f5223b25fd..b1edcdbd8b 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -798,7 +798,7 @@ gd: special: Sònraichte delete: Sguab às description_html: Le dreuchdan chleachdaichean, ’s urrainn dhut gnàthachadh dè na gleusan is raointean de Mhastodon as urrainn dha na cleachdaichean agad inntrigeadh. - edit: Deasaich an dreuchd aig “%{name}“ + edit: Deasaich an dreuchd “%{name}“ everyone: Na ceadan bunaiteach everyone_full_description_html: Seo an dreuchd bhunaiteach a bheir buaidh air gach cleachdaiche, fiù an fheadhainn nach deach dreuchd iomruineadh dhaibh. Gheibh a h-uile dreuch ceadan uaipe mar dhìleab. permissions_count: diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 73e2b244d7..a0bc348a87 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -1439,12 +1439,6 @@ gl: interact_with_this_post: one: Interactúa con esta publicación e descubre máis coma ela. other: Interactúa con estas publicacións e descubre máis coma elas. - subject: - one: 'Nova publicación: «%{excerpt}»' - other: Novas publicacións desde %{name} - title: - one: 'Nova publicación: «%{excerpt}»' - other: Novas publicacións desde %{name} email_subscriptions: active: Activa confirmations: diff --git a/config/locales/he.yml b/config/locales/he.yml index 2a53fc759f..595b2b63a4 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -1483,16 +1483,6 @@ he: one: תקשרו עם ההודעה הזו כדי לגלות עוד כמוה. other: תקשרו עם ההודעות הללו כדי לגלות עוד כמוהן. two: תקשרו עם ההודעות הללו כדי לגלות עוד כמוהן. - subject: - many: הודעות חדשות מאת %{name} - one: 'הודעה חדשה: "%{excerpt}"' - other: הודעות חדשות מאת %{name} - two: הודעות חדשות מאת %{name} - title: - many: הודעות חדשות מאת %{name} - one: 'הודעה חדשה: "%{excerpt}"' - other: הודעות חדשות מאת %{name} - two: הודעות חדשות מאת %{name} email_subscriptions: active: פעילים confirmations: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 47c9884bd6..fe89c3eb58 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -1427,19 +1427,30 @@ hu: email_subscription_mailer: confirmation: action: E-mail-cím megerősítése + instructions_to_confirm: Erősítsd meg, hogy e-mailt szeretnél kapni %{name} (@%{acct}) új bejegyzéseiről. + instructions_to_ignore: Ha nem tudod, hogy miért kaptad ezt az e-mailt, akkor törölheted. Ha nem kattint a fenti hivatkozásra, akkor nem lesz automatikusan feliratkoztatva. subject: E-mail-cím megerősítése + title: Fogadod %{name} e-mailes híreit? notification: + create_account: Mastodon-fiók létrehozása + footer: + privacy_html: 'Az e-mailek innen lesznek küldve: %{domain}, egy Mastodon-kiszolgálóról. Hogy megértsd, hogy ez a kiszolgáló hogyan dolgozza fel a személyes adataidat, nézd meg az Adatvédelmi szabályzatot.' + reason_for_email_html: Azért kapod ezt az e-mailt, mert kérted, hogy e-mailben megkapd %{name} bejegyzéseit. Nem akarod megkapni ezeket a leveleket? Leiratkozás + interact_with_this_post: + one: Interakció ezzel a bejegyzéssel, és hasonlóak felfedezése. + other: Interakció ezekkel a bejegyzéssel, és hasonlóak felfedezése. subject: - one: 'Új bejegyzés: „%{excerpt}”' - other: 'Új bejegyzések tőle: %{name}' + plural: 'Új bejegyzések tőle: %{name}' + singular: 'Új bejegyzés: „%{excerpt}”' title: - one: 'Új bejegyzés: „%{excerpt}”' - other: 'Új bejegyzések tőle: %{name}' + plural: 'Új bejegyzések tőle: %{name}' + singular: 'Új bejegyzés: „%{excerpt}”' email_subscriptions: active: Aktív confirmations: show: changed_your_mind: Meggondoltad magad? + success_html: Mostantól levelet fogsz kapni, ha %{name} új bejegyzést tesz közzé. Add hozzá a feladót (%{sender}) a névjegyeidhez, hogy ne kerüljön a Levélszemét mappádba. title: Feliratkoztál unsubscribe: Leiratkozás inactive: Inaktív @@ -2086,8 +2097,22 @@ hu: email_subscription: confirmation_html: 'Már nem fogsz leveleket kapni róla: %{name}.' title: Leiratkoztál + user: + confirmation_html: 'Már nem fogsz %{type}et kapni a Mastodontól innnen: %{domain}.' + notification_emails: + favourite: kedvencnek jelölésről szóló értesítő levelek + follow: követésről szóló értesítő levelek + follow_request: követési kérésekről szóló értesítő levelek + mention: megemlítésről szóló értesítő levelek + reblog: megtolásról szóló értesítő levelek show: action: Leiratkozás + email_subscription: + confirmation_html: Nem fogsz többé leveleket kapni, ha ez a fiók új bejegyzéseket tesz közzé. + title: 'Leiratkozol róla: %{name}?' + user: + confirmation_html: 'Már nem fogsz %{type}et kapni a Mastodontól innnen: %{domain}.' + title: Leiratkozol a %{type}ről? user_mailer: announcement_published: description: 'A(z) %{domain} adminisztrátorai a következő bejelentést teszik:' diff --git a/config/locales/is.yml b/config/locales/is.yml index 56156c40d7..50d0a213f3 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -1444,11 +1444,11 @@ is: one: Eigðu í samskiptum við þessa færslu og finndu fleiri í sama dúr. other: Eigðu í samskiptum við þessar færslur og finndu fleiri í sama dúr. subject: - one: 'Ný færsla: "%{excerpt}"' - other: Nýjar færslur frá %{name} + plural: Nýjar færslur frá %{name} + singular: 'Ný færsla: "%{excerpt}"' title: - one: 'Ný færsla: "%{excerpt}"' - other: Nýjar færslur frá %{name} + plural: Nýjar færslur frá %{name} + singular: 'Ný færsla: "%{excerpt}"' email_subscriptions: active: Virkur confirmations: diff --git a/config/locales/it.yml b/config/locales/it.yml index 5f3073737c..709e9758e3 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -1440,11 +1440,11 @@ it: one: Interagisci con questo post e scopri altri contenuti simili. other: Interagisci con questi post e scopri di più. subject: - one: 'Nuovo post: "%{excerpt}"' - other: Nuovi post da %{name} + plural: Nuovi post da %{name} + singular: 'Un nuovo post: "%{excerpt}"' title: - one: 'Nuovo post: "%{excerpt}"' - other: Nuovi post da %{name} + plural: Nuovi post da %{name} + singular: 'Un nuovo post: "%{excerpt}"' email_subscriptions: active: Attiva confirmations: diff --git a/config/locales/nan-TW.yml b/config/locales/nan-TW.yml index 6d50e517ad..21832ee8f2 100644 --- a/config/locales/nan-TW.yml +++ b/config/locales/nan-TW.yml @@ -1417,10 +1417,6 @@ nan-TW: reason_for_email_html: 因為lí選擇收著對 %{name} 來ê電子phue更新，所以lí teh收著tsit張電子批。Kám無beh收著tsiah ê電子phue？取消訂 interact_with_this_post: other: Kap tsit（tsiah）ê PO文互動，發現其他相siâng ê PO文。 - subject: - other: 對 %{name} 來ê新ê PO文 - title: - other: 對 %{name} 來ê新ê PO文 email_subscriptions: active: 有效ê confirmations: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 9f02e12b6f..377e915ad1 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -169,7 +169,7 @@ nl: undo_silenced: Niet langer beperken undo_suspension: Niet langer opschorten unsilenced_msg: Het opheffen van de beperkingen van %{username} zijn geslaagd - unsubscribe: Opzeggen + unsubscribe: Afmelden unsuspended_msg: Het niet langer opschorten van %{username} is geslaagd username: Gebruikersnaam view_domain: Samenvatting voor domein bekijken @@ -1434,25 +1434,25 @@ nl: notification: create_account: Een Mastodon-account registreren footer: - privacy_html: E-mails worden verzonden van %{domain}, een server aangedreven door Mastodon. Raadpleeg het Privacybeleid om te begrijpen hoe deze server jouw persoonsgegevens verwerkt. - reason_for_email_html: Je ontvangt deze e-mail omdat je hebt gekozen voor e-mail updates van %{name}. Wil je deze e-mails niet ontvangen? Afmelden + privacy_html: E-mails worden verzonden van %{domain}, een door Mastodon mogelijk gemaakte server. Raadpleeg het Privacybeleid om te begrijpen hoe deze server jouw persoonsgegevens verwerkt. + reason_for_email_html: Je ontvangt deze e-mail omdat je hebt gekozen voor e-mailupdates van %{name}. Wil je deze e-mails niet ontvangen? Afmelden interact_with_this_post: - one: Reageer op dit bericht en ontdek meer zoals dit. - other: Reageer op deze berichten en ontdek meer soortgelijks. + one: Reageer op dit bericht en ontdek vergelijkbare inhoud. + other: Reageer op deze berichten en ontdek vergelijkbare inhoud. subject: - one: 'Nieuw bericht: "%{excerpt}"' - other: Nieuwe berichten van %{name} + plural: Nieuwe berichten van %{name} + singular: 'Nieuw bericht: "%{excerpt}"' title: - one: 'Nieuw bericht: "%{excerpt}"' - other: Nieuwe berichten van %{name} + plural: Nieuwe berichten van %{name} + singular: 'Nieuw bericht: "%{excerpt}"' email_subscriptions: active: Actief confirmations: show: changed_your_mind: Van mening veranderd? - success_html: Je ontvangt nu e-mails wanneer %{name} nieuwe berichten publiceert. Voeg %{sender} toe aan je contactpersonen, zodat deze berichten niet in je spam-map terechtkomen. + success_html: Je ontvangt nu e-mails wanneer %{name} nieuwe berichten publiceert. Voeg %{sender} toe aan je contactpersonen, zodat deze berichten niet in je spam terechtkomen. title: Je bent ingeschreven - unsubscribe: Uitschrijven + unsubscribe: Afmelden inactive: Inactief status: Status subscribers: Abonnees @@ -1828,7 +1828,7 @@ nl: public_timelines: Openbare tijdlijnen privacy: email_subscriptions: Berichten per e-mail verzenden - email_subscriptions_hint_html: Voeg een e-mailaanmeldformulier toe aan je profiel dat verschijnt voor uitgelogde gebruikers. Wanneer bezoekers hun e-mailadres opgeven en zich aanmelden, zal Mastodon e-mail updates voor jouw openbare berichten verzenden. + email_subscriptions_hint_html: Voeg een e-mailaanmeldformulier toe aan je profiel dat verschijnt voor uitgelogde gebruikers. Wanneer bezoekers hun e-mailadres opgeven en zich abonneren, zal Mastodon e-mailupdates voor jouw openbare berichten verzenden. hint_html: "Hoe wil je dat jouw profiel en berichten kunnen worden gevonden? Een verscheidenheid aan functies in Mastodon kunnen je helpen om een groter publiek te bereiken als ze zijn ingeschakeld. Neem rustig de tijd om deze instellingen te bekijken, om er zo zeker van te zijn dat ze aan jouw wensen voldoen." privacy: Privacy privacy_hint_html: Hoeveel informatie wil je aan andere gebruikers kwijt? Mensen ontdekken interessante accounts en coole apps door te bekijken welke accounts jij volgt en door te bekijken welke app jij gebruikt voor het plaatsen van berichten. Het kan achter zo zijn dat je dit liever verborgen houdt. @@ -2094,12 +2094,12 @@ nl: webauthn: Beveiligingssleutels unsubscriptions: create: - action: Ga naar de serverhomepage + action: Ga naar de startpagina van de server email_subscription: - confirmation_html: Je zult geen e-mails meer ontvangen van %{name}. - title: Je bent uitgeschreven + confirmation_html: Je zult geen e-mails meer van %{name} ontvangen. + title: Je bent afgemeld user: - confirmation_html: Je zult geen %{type} meer ontvangen van Mastodon op %{domain}. + confirmation_html: Je zult geen %{type} meer van Mastodon op %{domain} ontvangen. notification_emails: favourite: e-mailmeldingen favorieten follow: e-mailmeldingen volgers @@ -2107,13 +2107,13 @@ nl: mention: e-mailmeldingen vermeldingen reblog: e-mailmeldingen boosts show: - action: Uitschrijven + action: Afmelden email_subscription: confirmation_html: Je zult geen e-mails meer ontvangen wanneer dit account nieuwe berichten publiceert. - title: Afmelden van %{name}? + title: Van %{name} afmelden? user: - confirmation_html: Je zult geen %{type} meer ontvangen van Mastodon op %{domain}. - title: Afmelden van %{type}? + confirmation_html: Je zult geen %{type} meer van Mastodon op %{domain} ontvangen. + title: Van %{type} afmelden? user_mailer: announcement_published: description: 'De beheerders van %{domain} doen een mededeling:' diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index d2a628b52a..e54fa6d761 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -1439,12 +1439,6 @@ pt-BR: interact_with_this_post: one: Interaja com essa publicação e descubra mais como essa. other: Interaja com essas publicações e descubra mais. - subject: - one: Nova publicação "%{excerpt}" - other: Novas publicações do %{name} - title: - one: 'Nova publicação: "%{excerpt}"' - other: Novas publicações do %{name} email_subscriptions: active: Ativo confirmations: diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml index 32a3a54f8d..379cc24e6d 100644 --- a/config/locales/simple_form.da.yml +++ b/config/locales/simple_form.da.yml @@ -104,7 +104,7 @@ da: site_contact_username: Hvordan folk kan kontakte dig på Mastodon. site_extended_description: Evt. yderligere oplysninger, som kan være nyttige for både besøgende og brugere. Kan struktureres vha. Markdown-syntaks. site_short_description: En kort beskrivelse mhp. entydigt at kunne identificere denne server. Hvem kører den, hvem er den for? - site_terms: Brug egen fortrolighedspolitik eller lad stå tomt for standardpolitikken. Kan struktureres med Markdown-syntaks. + site_terms: Brug din egen privatlivspolitik, eller lad feltet være tomt for at bruge standardversionen. Teksten kan formateres med Markdown-syntaks. site_title: Hvordan folk kan henvise til serveren udover domænenavnet. status_page_url: URL'en til en side, hvor status for denne server kan ses under en afbrydelse theme: Tema, som udloggede besøgende og nye brugere ser. @@ -311,7 +311,7 @@ da: site_contact_username: Kontakt brugernavn site_extended_description: Udvidet beskrivelse site_short_description: Serverbeskrivelse - site_terms: Fortrolighedspolitik + site_terms: Privatlivspolitik site_title: Servernavn status_page_url: Statusside-URL theme: Standardtema diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml index d21fa41b99..711a902972 100644 --- a/config/locales/simple_form.hu.yml +++ b/config/locales/simple_form.hu.yml @@ -134,6 +134,7 @@ hu: otp: 'Add meg a telefonodon generált kétlépcsős azonosító kódodat vagy használd az egyik tartalék bejelentkező kódot:' webauthn: Ha ez egy USB kulcs, ellenőrizd, hogy csatlakoztattad és ha szükséges, aktiváltad is. settings: + email_subscriptions: A kikapcsolás megtartja az eddigi feliratkozókat, de leállítja a levelek küldését. indexable: A profiloldalad megjelenhet a Google, a Bing és más keresőmotorok keresési eredményei között. show_application: Ettől függetlenül mindig láthatod, melyik alkalmazás tette közzé a bejegyzésedet. tag: @@ -356,6 +357,7 @@ hu: hint: További információk text: Szabály settings: + email_subscriptions: E-mailes regisztráció bekapcsolása indexable: A profiloldal szerepeltetése a keresőmotorokban show_application: A bejegyzést küldő alkalmazás megjelenítése tag: diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index 34c1bcc8e4..94ec7307fd 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -58,6 +58,8 @@ ja: setting_aggregate_reblogs: 最近ブーストされた投稿が新たにブーストされても表示しません (設定後受信したものにのみ影響) setting_always_send_emails: 通常、Mastodon からメール通知は行われません。 setting_boost_modal: 有効にすると、ブーストによって、まず、ブーストの公開範囲を設定できる確認ダイアログが表示されます。 + setting_default_quote_policy_private: Mastodon で作成されたフォロワーのみの投稿は他人から引用できません。 + setting_default_quote_policy_unlisted: 誰かがあなたを引用すると、その投稿もトレンドから非表示になります。 setting_default_sensitive: 閲覧注意状態のメディアはデフォルトでは内容が伏せられ、クリックして初めて閲覧できるようになります setting_display_media_default: 閲覧注意としてマークされたメディアは隠す setting_display_media_hide_all: メディアを常に隠す @@ -77,6 +79,7 @@ ja: featured_tag: name: 最近使用したハッシュタグ filters: + action: 投稿がフィルタに一致したときの動作を選択します actions: blur: メディアは警告して非表示にするが、テキストは表示する hide: フィルタに一致した投稿を完全に非表示にします @@ -210,6 +213,7 @@ ja: email: メールアドレス expires_in: 有効期限 fields: プロフィール補足情報 + filter_action: フィルターの動作 header: ヘッダー honeypot: "%{label} (入力しない)" inbox_url: リレーサーバーの inbox URL @@ -355,7 +359,9 @@ ja: jurisdiction: 裁判管轄 min_age: 登録可能な最低年齢 user: + date_of_birth_1i: 年 date_of_birth_2i: 月 + date_of_birth_3i: 日 role: ロール time_zone: タイムゾーン user_role: diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 405b3c3b27..3d15e9b241 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -1429,11 +1429,11 @@ sq: one: Ndërveproni me këtë postim dhe zbuloni më tepër si ai. other: Ndërveproni me këto postime dhe zbuloni më tepër. subject: - one: 'Postim i ri: “%{excerpt}”' - other: Postime të reja nga %{name} + plural: Postime të reja nga %{name} + singular: 'Postim i ri: “%{excerpt}”' title: - one: 'Postim i ri: “%{excerpt}”' - other: Postime të reja nga %{name} + plural: Postime të reja nga %{name} + singular: 'Postim i ri: “%{excerpt}”' email_subscriptions: active: Aktiv confirmations: diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 0a26249b7d..53510e2dcc 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -1415,6 +1415,14 @@ sv: basic_information: Allmän information hint_html: "Anpassa vad folk ser på din offentliga profil och bredvid dina inlägg. Andra personer är mer benägna att följa dig och interagera med dig när du har en ifylld profil och en profilbild." other: Övrigt + email_subscription_mailer: + notification: + subject: + plural: Nya inlägg från %{name} + singular: 'Nytt inlägg: "%{excerpt}"' + title: + plural: Nya inlägg från %{name} + singular: 'Nytt inlägg: "%{excerpt}"' emoji_styles: auto: Automatiskt native: Ursprunglig diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 4cedbfd741..e6b3d1d155 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -1440,11 +1440,11 @@ tr: one: Bu gönderiyle etkileşim kurun ve benzer içerikleri keşfedin. other: Bu gönderilerle etkileşim kurun ve benzer içerikleri keşfedin. subject: - one: 'Yeni gönderi: "%{excerpt}"' - other: "%{name} kişisinden yeni gönderiler" + plural: "%{name} kişisinden yeni gönderiler" + singular: 'Yeni gönderi: "%{excerpt}"' title: - one: 'Yeni gönderi: "%{excerpt}"' - other: "%{name} kişisinden yeni gönderiler" + plural: "%{name} kişisinden yeni gönderiler" + singular: 'Yeni gönderi: "%{excerpt}"' email_subscriptions: active: Etkin confirmations: diff --git a/config/locales/vi.yml b/config/locales/vi.yml index db912b94c7..e8b5b5b1b5 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -1418,9 +1418,11 @@ vi: interact_with_this_post: other: Hãy tương tác với những tút này và khám phá thêm nhiều điều thú vị. subject: - other: Tút mới từ %{name} + plural: Những tút mới từ %{name} + singular: 'Tút mới: "%{excerpt}"' title: - other: Những tút mới từ %{name} + plural: Những tút mới từ %{name} + singular: 'Tút mới: "%{excerpt}"' email_subscriptions: active: Hoạt động confirmations: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index c7b958b2e5..1e7d32b7e3 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -1418,9 +1418,11 @@ zh-CN: interact_with_this_post: other: 和嘟文互动，发现更多类似嘟文。 subject: - other: 来自 %{name} 的新嘟文 + plural: 来自 %{name} 的新嘟文 + singular: 新嘟文：“%{excerpt}” title: - other: 来自 %{name} 的新嘟文 + plural: 来自 %{name} 的新嘟文 + singular: 新嘟文：“%{excerpt}” email_subscriptions: active: 已生效 confirmations: diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 26fc2fc640..41a45cd7a9 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1420,9 +1420,11 @@ zh-TW: interact_with_this_post: other: 與此嘟文互動並且發現更多類似嘟文。 subject: - other: 來自 %{name} 之新嘟文 + plural: 來自 %{name} 之新嘟文 + singular: 新嘟文：「%{excerpt}」 title: - other: 來自 %{name} 之新嘟文 + plural: 來自 %{name} 之新嘟文 + singular: 新嘟文：「%{excerpt}」 email_subscriptions: active: 生效中 confirmations: diff --git a/spec/requests/signature_verification_spec.rb b/spec/requests/signature_verification_spec.rb index 1391aeb750..7b863e6897 100644 --- a/spec/requests/signature_verification_spec.rb +++ b/spec/requests/signature_verification_spec.rb @@ -71,7 +71,25 @@ RSpec.describe 'signature verification concern' do context 'with an HTTP Signature (draft version)' do context 'with a known account' do - let!(:actor) { Fabricate(:account, username: 'bob', domain: 'remote.domain', uri: 'https://remote.domain/users/bob', private_key: nil, public_key: actor_keypair.public_key.to_pem) } + let!(:actor) { Fabricate(:account, username: 'bob', domain: 'remote.domain', uri: 'https://remote.domain/users/bob', private_key: nil, public_key: actor_keypair.public_key.to_pem, protocol: :activitypub) } + + let(:actor_json) do + { + '@context': [ + 'https://www.w3.org/ns/activitystreams', + 'https://w3id.org/security/v1', + ], + id: ActivityPub::TagManager.instance.uri_for(actor), + type: 'Person', + preferredUsername: 'bob', + inbox: 'https://remote.domain/inbox', + publicKey: { + id: 'https://remote.domain/users/bob#main-key', + owner: 'https://remote.domain/users/bob', + publicKeyPem: actor_keypair.public_key.to_pem, + }, + } + end context 'with an acct key ID' do let(:signature_header) do @@ -115,6 +133,30 @@ RSpec.describe 'signature verification concern' do signature_actor_id: actor.id.to_s ) end + + context 'when the key material has changed' do + # Let the user be known with the default test keys + let!(:actor) { Fabricate(:account, username: 'bob', domain: 'remote.domain', uri: 'https://remote.domain/users/bob', private_key: nil, protocol: :activitypub) } + + # Needed to update the keypair + before { stub_key_requests } + + it 'successfuly verifies signature after refreshing the account', :aggregate_failures do + expect(signature_header).to eq build_signature_string(actor_keypair, 'https://remote.domain/users/bob#main-key', 'get /activitypub/success', { 'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT', 'Host' => 'www.example.com' }) + + get '/activitypub/success', headers: { + 'Host' => 'www.example.com', + 'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT', + 'Signature' => signature_header, + } + + expect(response).to have_http_status(200) + expect(response.parsed_body).to match( + signed_request: true, + signature_actor_id: actor.id.to_s + ) + end + end end context 'with a valid signature on a GET request that has a query string' do @@ -166,6 +208,9 @@ RSpec.describe 'signature verification concern' do 'keyId="https://remote.domain/users/bob#main-key",algorithm="rsa-sha256",headers="date host (request-target)",signature="SDMa4r/DQYMXYxVgYO2yEqGWWUXugKjVuz0I8dniQAk+aunzBaF2aPu+4grBfawAshlx1Xytl8lhb0H2MllEz16/tKY7rUrb70MK0w8ohXgpb0qs3YvQgdj4X24L1x2MnkFfKHR/J+7TBlnivq0HZqXm8EIkPWLv+eQxu8fbowLwHIVvRd/3t6FzvcfsE0UZKkoMEX02542MhwSif6cu7Ec/clsY9qgKahb9JVGOGS1op9Lvg/9y1mc8KCgD83U5IxVygYeYXaVQ6gixA9NgZiTCwEWzHM5ELm7w5hpdLFYxYOHg/3G3fiqJzpzNQAcCD4S4JxfE7hMI0IzVlNLT6A=="' # rubocop:disable Layout/LineLength end + # Signature verification will fail, so the key will be refetched + before { stub_key_requests } + it 'fails to verify signature', :aggregate_failures do expect(signature_header).to eq build_signature_string(actor_keypair, 'https://remote.domain/users/bob#main-key', 'get /activitypub/success?foo=42', { 'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT', 'Host' => 'www.example.com' }) @@ -184,6 +229,9 @@ RSpec.describe 'signature verification concern' do end context 'with a mismatching path' do + # Signature verification will fail, so the key will be refetched + before { stub_key_requests } + it 'fails to verify signature', :aggregate_failures do get '/activitypub/alternative-path', headers: { 'Host' => 'www.example.com', @@ -335,6 +383,9 @@ RSpec.describe 'signature verification concern' do end context 'with a tampered path in a POST request' do + # Signature verification will fail, so the key will be refetched + before { stub_key_requests } + it 'fails to verify signature', :aggregate_failures do post '/activitypub/alternative-path', params: 'Hello world', headers: { 'Host' => 'www.example.com', @@ -685,6 +736,11 @@ RSpec.describe 'signature verification concern' do end end + def stub_key_requests + stub_request(:get, 'https://remote.domain/users/bob').to_return(status: 200, body: actor_json.to_json, headers: { 'Content-Type': 'application/activity+json' }) + stub_request(:get, 'https://remote.domain/users/bob#main-key').to_return(status: 200, body: actor_json.to_json, headers: { 'Content-Type': 'application/activity+json' }) + end + def activitypub_tests_controller Class.new(ApplicationController) do include SignatureVerification diff --git a/yarn.lock b/yarn.lock index f837d4b507..a22df04265 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2524,20 +2524,15 @@ __metadata: languageName: node linkType: hard -"@formatjs/intl@npm:4.1.4": - version: 4.1.4 - resolution: "@formatjs/intl@npm:4.1.4" +"@formatjs/intl@npm:4.1.5": + version: 4.1.5 + resolution: "@formatjs/intl@npm:4.1.5" dependencies: "@formatjs/ecma402-abstract": "npm:3.2.0" "@formatjs/fast-memoize": "npm:3.1.1" "@formatjs/icu-messageformat-parser": "npm:3.5.3" intl-messageformat: "npm:11.2.0" - peerDependencies: - typescript: ^5.6.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 10c0/2591b86cdec44b91761757edd3433e751b28ed7ed4a6e1a7f240356db2c32a5732565374c9d9b645f83d3558bc9a19231af7ef0ea555524abe4001b7c43f1754 + checksum: 10c0/2fd7c6211b38fd6178093e7358f015dc461bc80d428372064a0c144b1a32fce4050c34fa58b77af715b8dbf77909d408b59c7e714b0c612d1b573defe70828b2 languageName: node linkType: hard @@ -2558,12 +2553,29 @@ __metadata: languageName: node linkType: hard -"@formatjs/unplugin@npm:^1.1.5": - version: 1.1.5 - resolution: "@formatjs/unplugin@npm:1.1.5" +"@formatjs/ts-transformer@npm:4.4.3": + version: 4.4.3 + resolution: "@formatjs/ts-transformer@npm:4.4.3" dependencies: "@formatjs/icu-messageformat-parser": "npm:3.5.3" - "@formatjs/ts-transformer": "npm:4.4.2" + "@types/node": "npm:22 || 24" + json-stable-stringify: "npm:^1.3.0" + typescript: "npm:^5.6 || 6" + peerDependencies: + ts-jest: ^29 + peerDependenciesMeta: + ts-jest: + optional: true + checksum: 10c0/f5a4b32098e2c37c7ab7b40a798b6fa8e24e23516384579a698175ab214e2052e45256cc39880891de8db583c326a2e9f8581e1d4f7a0dc5d4aaa2291dec058d + languageName: node + linkType: hard + +"@formatjs/unplugin@npm:^1.1.5": + version: 1.1.6 + resolution: "@formatjs/unplugin@npm:1.1.6" + dependencies: + "@formatjs/icu-messageformat-parser": "npm:3.5.3" + "@formatjs/ts-transformer": "npm:4.4.3" magic-string: "npm:^0.30.0" oxc-parser: "npm:^0.120.0" unplugin: "npm:^3.0.0" @@ -2584,7 +2596,7 @@ __metadata: optional: true webpack: optional: true - checksum: 10c0/39ca0c669906a699e4a7bfc650cfdeba5d0c5c3a6cd2e5ebe5ed04e432b6d0091aa47d85d69ad3a67f65688f7421611f2d1ae33058e8a611c0075620abd2bd93 + checksum: 10c0/9371206edfb7d0197a04fc64b6095eea759b04a135fc766a9fe49b9252a65c7fae1c487f40952e3ae6e82ca77ee0aae456c46e42ecc7753f1990bc95e673f064 languageName: node linkType: hard @@ -12059,21 +12071,17 @@ __metadata: linkType: hard "react-intl@npm:^10.0.0": - version: 10.1.0 - resolution: "react-intl@npm:10.1.0" + version: 10.1.1 + resolution: "react-intl@npm:10.1.1" dependencies: "@formatjs/ecma402-abstract": "npm:3.2.0" "@formatjs/icu-messageformat-parser": "npm:3.5.3" - "@formatjs/intl": "npm:4.1.4" + "@formatjs/intl": "npm:4.1.5" intl-messageformat: "npm:11.2.0" peerDependencies: "@types/react": 19 react: 19 - typescript: ^5.6.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 10c0/94002b767b9d8b28f368f203a7debdea617c320b83154fa1edf9d1b6586ddffa4a763a1063a9dd1a148e393f2ffc8d5954ba983a4e86b26750d9312dfe3cd3fd + checksum: 10c0/97ac04e5813d22bb0f7cbc7332c41a683b61deddd9f1e2720c72536bc74abb23713b02602bf69c1fbd99ab1d087ff1b334a1ef89b2332c867b9030187d128dd9 languageName: node linkType: hard @@ -14328,6 +14336,16 @@ __metadata: languageName: node linkType: hard +"typescript@npm:^5.6 || 6, typescript@npm:~6.0.0": + version: 6.0.2 + resolution: "typescript@npm:6.0.2" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 10c0/4b860b0bf87cc0fee0f66d8ef2640b5a8a8a8c74d1129adb82e389e5f97124383823c47946bef8a73ede371461143a3aa8544399d2133c7b2e4f07e81860af7f + languageName: node + linkType: hard + "typescript@npm:^5.6.0": version: 5.9.3 resolution: "typescript@npm:5.9.3" @@ -14338,13 +14356,13 @@ __metadata: languageName: node linkType: hard -"typescript@npm:~6.0.0": +"typescript@patch:typescript@npm%3A^5.6 || 6#optional!builtin, typescript@patch:typescript@npm%3A~6.0.0#optional!builtin": version: 6.0.2 - resolution: "typescript@npm:6.0.2" + resolution: "typescript@patch:typescript@npm%3A6.0.2#optional!builtin::version=6.0.2&hash=5786d5" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/4b860b0bf87cc0fee0f66d8ef2640b5a8a8a8c74d1129adb82e389e5f97124383823c47946bef8a73ede371461143a3aa8544399d2133c7b2e4f07e81860af7f + checksum: 10c0/49f0b84fc6ca55653e77752b8a61beabc09ee3dae5d965c31596225aa6ef213c5727b1d2e895b900416dc603854ba0872ac4a812c2a4ed6793a601f9c675de02 languageName: node linkType: hard @@ -14358,16 +14376,6 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A~6.0.0#optional!builtin": - version: 6.0.2 - resolution: "typescript@patch:typescript@npm%3A6.0.2#optional!builtin::version=6.0.2&hash=5786d5" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10c0/49f0b84fc6ca55653e77752b8a61beabc09ee3dae5d965c31596225aa6ef213c5727b1d2e895b900416dc603854ba0872ac4a812c2a4ed6793a601f9c675de02 - languageName: node - linkType: hard - "unbox-primitive@npm:^1.1.0": version: 1.1.0 resolution: "unbox-primitive@npm:1.1.0"