Merge commit 'ffcf87e0234a5529652295d2386a8c9c8e43a7ff' into glitch-soc/merge-upstream

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
 

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)

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

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;

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 <hr className={classes.noTabs} />;
   }
 
   const { acct, show_featured, show_media } = account;
+  if (!show_featured && !show_media) {
+    return <hr className={classes.noTabs} />;
+  }
 
   return (
     <div className={classes.tabs}>

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",

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}",

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} متابعتك",

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}",

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",

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": "Вы можаце адпісацца ў любы момант. Каб даведацца болей, звярніцеся да <a>Палітыкі прыватнасці</a>.",
+  "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": "Актыўнасць",

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} поиска да ви последва",

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} র প্রোফাইল অন্যদের দেখান",

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ñ",

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",

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} هاوبەش بکە",

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}",

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í",

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",

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 <a>privatlivspolitikken</a>.",
+  "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",

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 <a>Datenschutzerklärung</a> 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",

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": "Μπορείτε να απεγγραφείτε οποιαδήποτε στιγμή. Για περισσότερες πληροφορίες, ανατρέξτε στην <a>Πολιτική Απορρήτου</a>.",
+  "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": "Δραστηριότητα",

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",

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",

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 <a>Política de privacidad</a>.",
+  "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",

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 <a>Política de Privacidad</a>.",
+  "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",

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 <a>Política de Privacidad</a>.",
+  "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",

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",

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",

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} درخواست پی‌گیریتان را داد",

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 <a>tietosuojakäytäntö</a>.",
+  "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",

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",

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",

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",

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",

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",

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á",

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",

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",

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": "שיתוף אוסף",

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} की प्रोफाइल शेयर करे",

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}",

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 <a>Adatvédelmi szabályzatot</a>.",
+  "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",

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}֊ի էջով",

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",

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}",

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}",

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ụ",

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}",

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ð <a>Meðferð persónuupplýsinga</a>.",
+  "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",

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'<a>Informativa sulla privacy</a>.",
+  "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à",

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}さんがあなたにフォローリクエストしました",

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}-სგან",

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",

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} сізге жазылуға сұраныс жіберді",

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": "ಅಯ್ಯೋ!",

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} 님이 팔로우 요청을 보냈습니다",

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",

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}",

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",

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",

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",

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}",

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} ൽ നിന്നുള്ള ബൂസ്റ്റുകൾ കാണിക്കുക",

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} चे प्रोफाइल शेअर करा",

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}",

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}၏ပရိုဖိုင်ကိုမျှဝေပါ",

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 ê收藏",

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} ले तपाईंलाई फलो गर्न अनुरोध गर्नुभएको छ",

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 <a>Privacybeleid</a> 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",

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",

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",

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",

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} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ",

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",

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",

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",

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}",

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} отправил(а) вам запрос на подписку",

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}",

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} मित्रस्य विवरणं विभाज्यताम्",

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",

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}",

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} ඔබව අනුගමනය කිරීමට ඉල්ලා ඇත.",

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ť",

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",

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 <a>Rregulla Privatësie</a>.",
+  "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",

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}",

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}",

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",

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",

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}",

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é",

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}నుంచి బూస్ట్ లను చూపించు",

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} ได้ขอติดตามคุณ",

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",

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",

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} профиле белән уртаклашу",

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": "چوققىلانغان يازما",

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} надсилає запит на стеження",