Merge pull request #2845 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 5ba3405be4

Gemfile

@@ -111,7 +111,7 @@ group :opentelemetry do
   gem 'opentelemetry-instrumentation-http', '~> 0.23.2', require: false
   gem 'opentelemetry-instrumentation-http_client', '~> 0.22.3', require: false
   gem 'opentelemetry-instrumentation-net_http', '~> 0.22.4', require: false
-  gem 'opentelemetry-instrumentation-pg', '~> 0.28.0', require: false
+  gem 'opentelemetry-instrumentation-pg', '~> 0.29.0', require: false
   gem 'opentelemetry-instrumentation-rack', '~> 0.24.1', require: false
   gem 'opentelemetry-instrumentation-rails', '~> 0.31.0', require: false
   gem 'opentelemetry-instrumentation-redis', '~> 0.25.3', require: false

Gemfile.lock

@@ -502,8 +502,8 @@ GEM
       opentelemetry-common (~> 0.20)
       opentelemetry-sdk (~> 1.2)
       opentelemetry-semantic_conventions
-    opentelemetry-helpers-sql-obfuscation (0.1.0)
+    opentelemetry-helpers-sql-obfuscation (0.2.0)
-      opentelemetry-common (~> 0.20)
+      opentelemetry-common (~> 0.21)
     opentelemetry-instrumentation-action_mailer (0.1.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-active_support (~> 0.1)
@@ -528,8 +528,9 @@ GEM
     opentelemetry-instrumentation-active_support (0.6.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-base (0.22.3)
+    opentelemetry-instrumentation-base (0.22.6)
       opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.21)
       opentelemetry-registry (~> 0.1)
     opentelemetry-instrumentation-concurrent_ruby (0.21.4)
       opentelemetry-api (~> 1.0)
@@ -549,7 +550,7 @@ GEM
     opentelemetry-instrumentation-net_http (0.22.7)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-pg (0.28.0)
+    opentelemetry-instrumentation-pg (0.29.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-helpers-sql-obfuscation
       opentelemetry-instrumentation-base (~> 0.22.1)
@@ -991,7 +992,7 @@ DEPENDENCIES
   opentelemetry-instrumentation-http (~> 0.23.2)
   opentelemetry-instrumentation-http_client (~> 0.22.3)
   opentelemetry-instrumentation-net_http (~> 0.22.4)
-  opentelemetry-instrumentation-pg (~> 0.28.0)
+  opentelemetry-instrumentation-pg (~> 0.29.0)
   opentelemetry-instrumentation-rack (~> 0.24.1)
   opentelemetry-instrumentation-rails (~> 0.31.0)
   opentelemetry-instrumentation-redis (~> 0.25.3)

app/javascript/mastodon/locales/an.json

@@ -480,7 +480,6 @@
   "status.detailed_status": "Vista de conversación detallada",
   "status.edit": "Editar",
   "status.edited_x_times": "Editau {count, plural, one {{count} vez} other {{count} veces}}",
-  "status.embed": "Incrustado",
   "status.filter": "Filtrar esta publicación",
   "status.history.created": "{name} creyó {date}",
   "status.history.edited": "{name} editó {date}",

app/javascript/mastodon/locales/ar.json

@@ -3,7 +3,7 @@
   "about.contact": "للاتصال:",
   "about.disclaimer": "ماستدون برنامج حر ومفتوح المصدر وعلامة تجارية لـ Mastodon GmbH.",
   "about.domain_blocks.no_reason_available": "السبب غير متوفر",
-  "about.domain_blocks.preamble": "يسمح لك ماستدون عموماً بعرض المحتوى من المستخدمين من أي خادم آخر في الفدرالية والتفاعل معهم. وهذه هي الاستثناءات التي وضعت على هذا الخادم بالذات.",
+  "about.domain_blocks.preamble": "يتيح مَستُدون عمومًا لمستخدميه مطالعة المحتوى من المستخدمين من الخواديم الأخرى في الفدرالية والتفاعل معهم. وهذه هي الاستثناءات التي وضعت على هذا الخادوم.",
   "about.domain_blocks.silenced.explanation": "لن تظهر لك ملفات التعريف الشخصية والمحتوى من هذا الخادوم، إلا إن بحثت عنه عمدًا أو تابعته.",
   "about.domain_blocks.silenced.title": "محدود",
   "about.domain_blocks.suspended.explanation": "لن يتم معالجة أي بيانات من هذا الخادم أو تخزينها أو تبادلها، مما يجعل أي تفاعل أو اتصال مع المستخدمين من هذا الخادم مستحيلا.",
@@ -34,7 +34,7 @@
   "account.follow_back": "تابعه بالمثل",
   "account.followers": "مُتابِعون",
   "account.followers.empty": "لا أحدَ يُتابع هذا المُستخدم إلى حد الآن.",
-  "account.followers_counter": "{count, plural, zero {}one {{counter} متابع} two {{counter} متابعين} few {{counter} متابعين} many {{counter} متابعين} other {{counter} متابعين}}",
+  "account.followers_counter": "{count, plural, zero{لا مُتابع} one {مُتابعٌ واحِد} two {مُتابعانِ اِثنان} few {{counter} مُتابِعين} many {{counter} مُتابِعًا} other {{counter} مُتابع}}",
   "account.following": "الاشتراكات",
   "account.follows.empty": "لا يُتابع هذا المُستخدمُ أيَّ أحدٍ حتى الآن.",
   "account.go_to_profile": "اذهب إلى الملف الشخصي",
@@ -43,7 +43,7 @@
   "account.joined_short": "انضم في",
   "account.languages": "تغيير اللغات المشترَك فيها",
   "account.link_verified_on": "تمَّ التَّحقق مِن مِلْكيّة هذا الرابط بتاريخ {date}",
-  "account.locked_info": "تمَّ تعيين حالة خصوصية هذا الحساب إلى مُقفَل. يُراجع المالك يدويًا من يمكنه متابعته.",
+  "account.locked_info": "تم ضبط حالة خصوصية هذا الحساب على أنه مؤمّن. إذ يراجع صاحبه يدويًا من يُسمح له بالمتابعة.",
   "account.media": "وسائط",
   "account.mention": "أذكُر @{name}",
   "account.moved_to": "أشار {name} إلى أن حسابه الجديد الآن:",
@@ -443,6 +443,7 @@
   "lists.subheading": "قوائمك",
   "load_pending": "{count, plural, one {# عنصر جديد} other {# عناصر جديدة}}",
   "loading_indicator.label": "جاري التحميل…",
+  "media_gallery.hide": "إخفاء",
   "moved_to_account_banner.text": "حسابك {disabledAccount} معطل حاليًا لأنك انتقلت إلى {movedToAccount}.",
   "mute_modal.hide_from_notifications": "إخفاء من قائمة الإشعارات",
   "mute_modal.hide_options": "إخفاء الخيارات",
@@ -744,6 +745,7 @@
   "status.bookmark": "أضفه إلى الفواصل المرجعية",
   "status.cancel_reblog_private": "إلغاء إعادة النشر",
   "status.cannot_reblog": "لا يمكن إعادة نشر هذا المنشور",
+  "status.continued_thread": "تكملة للخيط",
   "status.copy": "انسخ رابط الرسالة",
   "status.delete": "احذف",
   "status.detailed_status": "تفاصيل المحادثة",
@@ -752,7 +754,7 @@
   "status.edit": "تعديل",
   "status.edited": "آخر تعديل يوم {date}",
   "status.edited_x_times": "عُدّل {count, plural, zero {} one {مرةً واحدة} two {مرّتان} few {{count} مرات} many {{count} مرة} other {{count} مرة}}",
-  "status.embed": "إدماج",
+  "status.embed": "الحصول على شفرة الإدماج",
   "status.favourite": "فضّل",
   "status.favourites": "{count, plural, zero {}one {مفضلة واحدة} two {مفضلتان} few {# مفضلات} many {# مفضلات} other {# مفضلات}}",
   "status.filter": "تصفية هذا المنشور",
@@ -777,6 +779,7 @@
   "status.reblogs.empty": "لم يقم أي أحد بمشاركة هذا المنشور بعد. عندما يقوم أحدهم بذلك سوف يظهر هنا.",
   "status.redraft": "إزالة وإعادة الصياغة",
   "status.remove_bookmark": "احذفه مِن الفواصل المرجعية",
+  "status.replied_in_thread": "رد في خيط",
   "status.replied_to": "رَدًا على {name}",
   "status.reply": "ردّ",
   "status.replyAll": "رُد على الخيط",

app/javascript/mastodon/locales/ast.json

@@ -419,7 +419,6 @@
   "status.direct": "Mentar a @{name} per privao",
   "status.direct_indicator": "Mención privada",
   "status.edited_x_times": "Editóse {count, plural, one {{count} vegada} other {{count} vegaes}}",
-  "status.embed": "Empotrar",
   "status.filter": "Peñerar esti artículu",
   "status.history.created": "{name} creó {date}",
   "status.history.edited": "{name} editó {date}",

app/javascript/mastodon/locales/be.json

@@ -748,7 +748,6 @@
   "status.edit": "Рэдагаваць",
   "status.edited": "Апошняе рэдагаванне {date}",
   "status.edited_x_times": "Рэдагавана {count, plural, one {{count} раз} few {{count} разы} many {{count} разоў} other {{count} разу}}",
-  "status.embed": "Убудаваць",
   "status.favourite": "Упадабанае",
   "status.favourites": "{count, plural, one {# упадабанае} few {# упадабаныя} many {# упадабаных} other {# упадабанага}}",
   "status.filter": "Фільтраваць гэты допіс",

app/javascript/mastodon/locales/bg.json

@@ -766,7 +766,6 @@
   "status.edit": "Редактиране",
   "status.edited": "Последно редактирано на {date}",
   "status.edited_x_times": "Редактирано {count, plural,one {{count} път} other {{count} пъти}}",
-  "status.embed": "Вграждане",
   "status.favourite": "Любимо",
   "status.favourites": "{count, plural, one {любимо} other {любими}}",
   "status.filter": "Филтриране на публ.",

app/javascript/mastodon/locales/bn.json

@@ -408,7 +408,6 @@
   "status.detailed_status": "বিস্তারিত কথোপকথনের হিসেবে দেখতে",
   "status.edit": "সম্পাদন",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "এমবেড করতে",
   "status.favourite": "পছন্দ",
   "status.load_more": "আরো দেখুন",
   "status.media_hidden": "মিডিয়া লুকানো আছে",

app/javascript/mastodon/locales/br.json

@@ -575,7 +575,6 @@
   "status.edit": "Kemmañ",
   "status.edited": "Kemmet da ziwezhañ d'an {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "Enframmañ",
   "status.favourite": "Muiañ-karet",
   "status.filter": "Silañ ar c'hannad-mañ",
   "status.history.created": "Krouet gant {name} {date}",

app/javascript/mastodon/locales/ca.json

@@ -789,7 +789,6 @@
   "status.edit": "Edita",
   "status.edited": "Darrera edició {date}",
   "status.edited_x_times": "Editat {count, plural, one {{count} vegada} other {{count} vegades}}",
-  "status.embed": "Incrusta",
   "status.favourite": "Favorit",
   "status.favourites": "{count, plural, one {favorit} other {favorits}}",
   "status.filter": "Filtra aquest tut",

app/javascript/mastodon/locales/ckb.json

@@ -539,7 +539,6 @@
   "status.direct_indicator": "ئاماژەی تایبەت",
   "status.edit": "دەستکاری",
   "status.edited_x_times": "دەستکاریکراوە {count, plural, one {{count} کات} other {{count} کات}}",
-  "status.embed": "نیشتەجێ بکە",
   "status.filter": "ئەم پۆستە فلتەر بکە",
   "status.history.created": "{name} دروستکراوە لە{date}",
   "status.history.edited": "{name} دروستکاریکراوە لە{date}",

app/javascript/mastodon/locales/co.json

@@ -319,7 +319,6 @@
   "status.delete": "Toglie",
   "status.detailed_status": "Vista in ditagliu di a cunversazione",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "Integrà",
   "status.load_more": "Vede di più",
   "status.media_hidden": "Media piattata",
   "status.mention": "Mintuvà @{name}",

app/javascript/mastodon/locales/cs.json

@@ -729,7 +729,6 @@
   "status.edit": "Upravit",
   "status.edited": "Naposledy upraveno {date}",
   "status.edited_x_times": "Upraveno {count, plural, one {{count}krát} few {{count}krát} many {{count}krát} other {{count}krát}}",
-  "status.embed": "Vložit na web",
   "status.favourite": "Oblíbit",
   "status.favourites": "{count, plural, one {oblíbený} few {oblíbené} many {oblíbených} other {oblíbených}}",
   "status.filter": "Filtrovat tento příspěvek",

app/javascript/mastodon/locales/cy.json

@@ -789,7 +789,6 @@
   "status.edit": "Golygu",
   "status.edited": "Golygwyd ddiwethaf {date}",
   "status.edited_x_times": "Golygwyd {count, plural, one {count} two {count} other {{count} gwaith}}",
-  "status.embed": "Mewnblannu",
   "status.favourite": "Ffafrio",
   "status.favourites": "{count, plural, one {ffefryn} other {ffefryn}}",
   "status.filter": "Hidlo'r postiad hwn",

app/javascript/mastodon/locales/da.json

@@ -789,7 +789,7 @@
   "status.edit": "Redigér",
   "status.edited": "Senest redigeret {date}",
   "status.edited_x_times": "Redigeret {count, plural, one {{count} gang} other {{count} gange}}",
-  "status.embed": "Indlejr",
+  "status.embed": "Hent indlejringskode",
   "status.favourite": "Favorit",
   "status.favourites": "{count, plural, one {# favorit} other {# favoritter}}",
   "status.filter": "Filtrér dette indlæg",

app/javascript/mastodon/locales/de.json

@@ -236,7 +236,7 @@
   "domain_pill.your_handle": "Deine Adresse:",
   "domain_pill.your_server": "Dein digitales Zuhause. Hier „leben“ alle Beiträge von dir. Dir gefällt es hier nicht? Du kannst 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.",
-  "embed.instructions": "Du kannst diesen Beitrag außerhalb des Fediverse (z. B. auf deiner Website) einbetten, indem du diesen iFrame-Code einfügst.",
+  "embed.instructions": "Du kannst diesen Beitrag auf deiner Website einbetten, indem du den nachfolgenden Code kopierst.",
   "embed.preview": "Vorschau:",
   "emoji_button.activity": "Aktivitäten",
   "emoji_button.clear": "Leeren",
@@ -789,7 +789,7 @@
   "status.edit": "Beitrag bearbeiten",
   "status.edited": "Zuletzt am {date} bearbeitet",
   "status.edited_x_times": "{count, plural, one {{count}-mal} other {{count}-mal}} bearbeitet",
-  "status.embed": "Beitrag per iFrame einbetten",
+  "status.embed": "Code zum Einbetten",
   "status.favourite": "Favorisieren",
   "status.favourites": "{count, plural, one {Mal favorisiert} other {Mal favorisiert}}",
   "status.filter": "Beitrag filtern",

app/javascript/mastodon/locales/el.json

@@ -780,7 +780,6 @@
   "status.edit": "Επεξεργασία",
   "status.edited": "Τελευταία επεξεργασία {date}",
   "status.edited_x_times": "Επεξεργάστηκε {count, plural, one {{count} φορά} other {{count} φορές}}",
-  "status.embed": "Ενσωμάτωσε",
   "status.favourite": "Αγαπημένα",
   "status.favourites": "{count, plural, one {# αγαπημένο} other {# αγαπημένα}}",
   "status.filter": "Φιλτράρισμα αυτής της ανάρτησης",

app/javascript/mastodon/locales/en-GB.json

@@ -789,7 +789,6 @@
   "status.edit": "Edit",
   "status.edited": "Last edited {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
-  "status.embed": "Embed",
   "status.favourite": "Favourite",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filter this post",

app/javascript/mastodon/locales/eo.json

@@ -628,7 +628,6 @@
   "status.direct_indicator": "Privata mencio",
   "status.edit": "Redakti",
   "status.edited_x_times": "Redactita {count, plural, one {{count} fojon} other {{count} fojojn}}",
-  "status.embed": "Enkorpigi",
   "status.favourite": "Ŝatata",
   "status.filter": "Filtri ĉi tiun afiŝon",
   "status.history.created": "{name} kreis {date}",

app/javascript/mastodon/locales/es-AR.json

@@ -789,7 +789,6 @@
   "status.edit": "Editar",
   "status.edited": "Última edición: {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
-  "status.embed": "Insertar",
   "status.favourite": "Marcar como favorito",
   "status.favourites": "{count, plural, one {# voto} other {# votos}}",
   "status.filter": "Filtrar este mensaje",

app/javascript/mastodon/locales/es-MX.json

@@ -457,6 +457,7 @@
   "lists.subheading": "Tus listas",
   "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
   "loading_indicator.label": "Cargando…",
+  "media_gallery.hide": "Ocultar",
   "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
   "mute_modal.hide_options": "Ocultar opciones",
@@ -779,6 +780,7 @@
   "status.bookmark": "Añadir marcador",
   "status.cancel_reblog_private": "Eliminar retoot",
   "status.cannot_reblog": "Este toot no puede retootearse",
+  "status.continued_thread": "Continuó el hilo",
   "status.copy": "Copiar enlace al estado",
   "status.delete": "Borrar",
   "status.detailed_status": "Vista de conversación detallada",
@@ -787,7 +789,6 @@
   "status.edit": "Editar",
   "status.edited": "Última edición {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} time} other {{count} veces}}",
-  "status.embed": "Incrustado",
   "status.favourite": "Favorito",
   "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicación",
@@ -812,6 +813,7 @@
   "status.reblogs.empty": "Nadie retooteó este toot todavía. Cuando alguien lo haga, aparecerá aquí.",
   "status.redraft": "Borrar y volver a borrador",
   "status.remove_bookmark": "Eliminar marcador",
+  "status.replied_in_thread": "Respondió en el hilo",
   "status.replied_to": "Respondió a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al hilo",

app/javascript/mastodon/locales/es.json

@@ -457,6 +457,7 @@
   "lists.subheading": "Tus listas",
   "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
   "loading_indicator.label": "Cargando…",
+  "media_gallery.hide": "Ocultar",
   "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
   "mute_modal.hide_options": "Ocultar opciones",
@@ -779,6 +780,7 @@
   "status.bookmark": "Añadir marcador",
   "status.cancel_reblog_private": "Deshacer impulso",
   "status.cannot_reblog": "Esta publicación no se puede impulsar",
+  "status.continued_thread": "Continuó el hilo",
   "status.copy": "Copiar enlace a la publicación",
   "status.delete": "Borrar",
   "status.detailed_status": "Vista de conversación detallada",
@@ -787,7 +789,6 @@
   "status.edit": "Editar",
   "status.edited": "Última edición {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
-  "status.embed": "Incrustado",
   "status.favourite": "Favorito",
   "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicación",
@@ -812,6 +813,7 @@
   "status.reblogs.empty": "Nadie ha impulsado esta publicación todavía. Cuando alguien lo haga, aparecerá aquí.",
   "status.redraft": "Borrar y volver a borrador",
   "status.remove_bookmark": "Eliminar marcador",
+  "status.replied_in_thread": "Respondió en el hilo",
   "status.replied_to": "Respondió a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al hilo",

app/javascript/mastodon/locales/et.json

@@ -787,7 +787,6 @@
   "status.edit": "Muuda",
   "status.edited": "Viimati muudetud {date}",
   "status.edited_x_times": "Muudetud {count, plural, one{{count} kord} other {{count} korda}}",
-  "status.embed": "Manustamine",
   "status.favourite": "Lemmik",
   "status.favourites": "{count, plural, one {lemmik} other {lemmikud}}",
   "status.filter": "Filtreeri seda postitust",

app/javascript/mastodon/locales/eu.json

@@ -783,7 +783,6 @@
   "status.edit": "Editatu",
   "status.edited": "Azken edizioa: {date}",
   "status.edited_x_times": "{count, plural, one {behin} other {{count} aldiz}} editatua",
-  "status.embed": "Txertatu",
   "status.favourite": "Gogokoa",
   "status.favourites": "{count, plural, one {gogoko} other {gogoko}}",
   "status.filter": "Iragazi bidalketa hau",

app/javascript/mastodon/locales/fa.json

@@ -447,6 +447,7 @@
   "lists.subheading": "سیاهه‌هایتان",
   "load_pending": "{count, plural, one {# مورد جدید} other {# مورد جدید}}",
   "loading_indicator.label": "در حال بارگذاری…",
+  "media_gallery.hide": "نهفتن",
   "moved_to_account_banner.text": "حسابتان {disabledAccount} اکنون از کار افتاده؛ چرا که به {movedToAccount} منتقل شدید.",
   "mute_modal.hide_from_notifications": "نهفتن از آگاهی‌ها",
   "mute_modal.hide_options": "گزینه‌های نهفتن",
@@ -487,9 +488,13 @@
   "notification.admin.report": "{name}، {target} را گزارش داد",
   "notification.admin.report_statuses_other": "{name}، {target} را گزارش داد",
   "notification.admin.sign_up": "{name} ثبت نام کرد",
+  "notification.admin.sign_up.name_and_others": "{name} و {count, plural, one {# نفر دیگر} other {# نفر دیگر}} ثبت‌نام کردند",
   "notification.favourite": "{name} فرسته‌تان را برگزید",
+  "notification.favourite.name_and_others_with_link": "{name} و <a>{count, plural, one {# نفر دیگر} other {# نفر دیگر}}</a> فرسته‌تان را برگزیدند",
   "notification.follow": "‫{name}‬ پی‌گیرتان شد",
+  "notification.follow.name_and_others": "{name} و {count, plural, one {# نفر دیگر} other {# نفر دیگر}} پیتان گرفتند",
   "notification.follow_request": "{name} درخواست پی‌گیریتان را داد",
+  "notification.follow_request.name_and_others": "{name} و {count, plural, one {# نفر دیگر} other {# نفر دیگر}} درخواست پی‌گیریتان را دادند",
   "notification.label.mention": "اشاره",
   "notification.label.private_mention": "اشارهٔ خصوصی",
   "notification.label.private_reply": "پاسخ خصوصی",
@@ -507,6 +512,7 @@
   "notification.own_poll": "نظرسنجیتان پایان یافت",
   "notification.poll": "نظرسنجی‌ای که در آن رأی دادید به پایان رسید",
   "notification.reblog": "‫{name}‬ فرسته‌تان را تقویت کرد",
+  "notification.reblog.name_and_others_with_link": "{name} و <a>{count, plural, one {# نفر دیگر} other {# نفر دیگر}}</a> فرسته‌تان را تقویت کردند",
   "notification.relationships_severance_event": "قطع ارتباط با {name}",
   "notification.relationships_severance_event.learn_more": "بیشتر بدانید",
   "notification.status": "{name} چیزی فرستاد",
@@ -742,6 +748,7 @@
   "status.bookmark": "نشانک",
   "status.cancel_reblog_private": "ناتقویت",
   "status.cannot_reblog": "این فرسته قابل تقویت نیست",
+  "status.continued_thread": "رشتهٔ دنباله دار",
   "status.copy": "رونوشت از پیوند فرسته",
   "status.delete": "حذف",
   "status.detailed_status": "نمایش کامل گفتگو",
@@ -750,7 +757,6 @@
   "status.edit": "ویرایش",
   "status.edited": "آخرین ویرایش {date}",
   "status.edited_x_times": "{count, plural, one {{count} مرتبه} other {{count} مرتبه}} ویرایش شد",
-  "status.embed": "جاسازی",
   "status.favourite": "برگزیده‌",
   "status.favourites": "{count, plural, one {برگزیده} other {برگزیده}}",
   "status.filter": "پالایش این فرسته",
@@ -775,6 +781,7 @@
   "status.reblogs.empty": "هنوز هیچ کسی این فرسته را تقویت نکرده است. وقتی کسی چنین کاری کند، این‌جا نمایش داده خواهد شد.",
   "status.redraft": "حذف و بازنویسی",
   "status.remove_bookmark": "برداشتن نشانک",
+  "status.replied_in_thread": "در رشته پاسخ داده",
   "status.replied_to": "به {name} پاسخ داد",
   "status.reply": "پاسخ",
   "status.replyAll": "پاسخ به رشته",

app/javascript/mastodon/locales/fi.json

@@ -789,7 +789,7 @@
   "status.edit": "Muokkaa",
   "status.edited": "Viimeksi muokattu {date}",
   "status.edited_x_times": "Muokattu {count, plural, one {{count} kerran} other {{count} kertaa}}",
-  "status.embed": "Upota",
+  "status.embed": "Hanki upotuskoodi",
   "status.favourite": "Suosikki",
   "status.favourites": "{count, plural, one {suosikki} other {suosikkia}}",
   "status.filter": "Suodata tämä julkaisu",

app/javascript/mastodon/locales/fo.json

@@ -789,7 +789,6 @@
   "status.edit": "Rætta",
   "status.edited": "Seinast broytt {date}",
   "status.edited_x_times": "Rættað {count, plural, one {{count} ferð} other {{count} ferð}}",
-  "status.embed": "Legg inní",
   "status.favourite": "Dámdur postur",
   "status.favourites": "{count, plural, one {yndispostur} other {yndispostar}}",
   "status.filter": "Filtrera hendan postin",

app/javascript/mastodon/locales/fr-CA.json

@@ -456,6 +456,7 @@
   "lists.subheading": "Vos listes",
   "load_pending": "{count, plural, one {# nouvel élément} other {# nouveaux éléments}}",
   "loading_indicator.label": "Chargement…",
+  "media_gallery.hide": "Masquer",
   "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous avez déménagé sur {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Cacher des notifications",
   "mute_modal.hide_options": "Masquer les options",
@@ -778,6 +779,7 @@
   "status.bookmark": "Ajouter aux signets",
   "status.cancel_reblog_private": "Débooster",
   "status.cannot_reblog": "Cette publication ne peut pas être boostée",
+  "status.continued_thread": "Suite du fil",
   "status.copy": "Copier un lien vers cette publication",
   "status.delete": "Supprimer",
   "status.detailed_status": "Vue détaillée de la conversation",
@@ -786,7 +788,6 @@
   "status.edit": "Modifier",
   "status.edited": "Dernière modification le {date}",
   "status.edited_x_times": "Modifiée {count, plural, one {{count} fois} other {{count} fois}}",
-  "status.embed": "Intégrer",
   "status.favourite": "Ajouter aux favoris",
   "status.favourites": "{count, plural, one {favori} other {favoris}}",
   "status.filter": "Filtrer cette publication",

app/javascript/mastodon/locales/fr.json

@@ -456,6 +456,7 @@
   "lists.subheading": "Vos listes",
   "load_pending": "{count, plural, one {# nouvel élément} other {# nouveaux éléments}}",
   "loading_indicator.label": "Chargement…",
+  "media_gallery.hide": "Masquer",
   "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous l'avez déplacé à {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Cacher des notifications",
   "mute_modal.hide_options": "Masquer les options",
@@ -778,6 +779,7 @@
   "status.bookmark": "Ajouter aux marque-pages",
   "status.cancel_reblog_private": "Annuler le partage",
   "status.cannot_reblog": "Ce message ne peut pas être partagé",
+  "status.continued_thread": "Suite du fil",
   "status.copy": "Copier le lien vers le message",
   "status.delete": "Supprimer",
   "status.detailed_status": "Vue détaillée de la conversation",
@@ -786,7 +788,6 @@
   "status.edit": "Modifier",
   "status.edited": "Dernière modification le {date}",
   "status.edited_x_times": "Modifié {count, plural, one {{count} fois} other {{count} fois}}",
-  "status.embed": "Intégrer",
   "status.favourite": "Ajouter aux favoris",
   "status.favourites": "{count, plural, one {favori} other {favoris}}",
   "status.filter": "Filtrer ce message",
@@ -794,7 +795,7 @@
   "status.history.edited": "modifié par {name} {date}",
   "status.load_more": "Charger plus",
   "status.media.open": "Cliquez pour ouvrir",
-  "status.media.show": "Cliquez pour voir",
+  "status.media.show": "Cliquer pour afficher",
   "status.media_hidden": "Média caché",
   "status.mention": "Mentionner @{name}",
   "status.more": "Plus",

app/javascript/mastodon/locales/fy.json

@@ -787,7 +787,6 @@
   "status.edit": "Bewurkje",
   "status.edited": "Lêst bywurke op {date}",
   "status.edited_x_times": "{count, plural, one {{count} kear} other {{count} kearen}} bewurke",
-  "status.embed": "Ynslute",
   "status.favourite": "Favoryt",
   "status.favourites": "{count, plural, one {favoryt} other {favoriten}}",
   "status.filter": "Dit berjocht filterje",

app/javascript/mastodon/locales/ga.json

@@ -787,7 +787,6 @@
   "status.edit": "Cuir in eagar",
   "status.edited": "Arna chuir in eagar anuas {date}",
   "status.edited_x_times": "Curtha in eagar {count, plural, one {{count} uair amháin} two {{count} uair} few {{count} uair} many {{count} uair} other {{count} uair}}",
-  "status.embed": "Leabaigh",
   "status.favourite": "Is fearr leat",
   "status.favourites": "{count, plural, one {a bhfuil grá agat do} two {gráite} few {gráite} many {gráite} other {gráite}}",
   "status.filter": "Déan scagadh ar an bpostáil seo",

app/javascript/mastodon/locales/gd.json

@@ -787,7 +787,6 @@
   "status.edit": "Deasaich",
   "status.edited": "An deasachadh mu dheireadh {date}",
   "status.edited_x_times": "Chaidh a dheasachadh {count, plural, one {{count} turas} two {{count} thuras} few {{count} tursan} other {{count} turas}}",
-  "status.embed": "Leabaich",
   "status.favourite": "Cuir ris na h-annsachdan",
   "status.favourites": "{count, plural, one {annsachd} two {annsachd} few {annsachdan} other {annsachd}}",
   "status.filter": "Criathraich am post seo",

app/javascript/mastodon/locales/gl.json

@@ -236,8 +236,8 @@
   "domain_pill.your_handle": "O teu alcume:",
   "domain_pill.your_server": "O teu fogar dixital, onde están as túas publicacións. Non é do teu agrado? Podes cambiar de servidor cando queiras levando as túas seguidoras contigo.",
   "domain_pill.your_username": "O teu identificador único neste servidor. É posible que atopes usuarias co mesmo nome de usuaria en outros servidores.",
-  "embed.instructions": "Engade esta publicación ó teu sitio web copiando o seguinte código.",
+  "embed.instructions": "Inclúe esta publicación no teu sitio web copiando o seguinte código.",
-  "embed.preview": "Así será mostrado:",
+  "embed.preview": "Vaise ver así:",
   "emoji_button.activity": "Actividade",
   "emoji_button.clear": "Limpar",
   "emoji_button.custom": "Personalizado",
@@ -789,7 +789,7 @@
   "status.edit": "Editar",
   "status.edited": "Última edición {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
-  "status.embed": "Incrustar",
+  "status.embed": "O código a incluír",
   "status.favourite": "Favorecer",
   "status.favourites": "{count, plural, one {favorecemento} other {favorecementos}}",
   "status.filter": "Filtrar esta publicación",

app/javascript/mastodon/locales/he.json

@@ -789,7 +789,6 @@
   "status.edit": "עריכה",
   "status.edited": "נערך לאחרונה {date}",
   "status.edited_x_times": "נערך {count, plural, one {פעם {count}} other {{count} פעמים}}",
-  "status.embed": "הטמעה",
   "status.favourite": "חיבוב",
   "status.favourites": "{count, plural, one {חיבוב אחד} two {זוג חיבובים} other {# חיבובים}}",
   "status.filter": "סנן הודעה זו",

app/javascript/mastodon/locales/hr.json

@@ -457,7 +457,6 @@
   "status.delete": "Obriši",
   "status.edit": "Uredi",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "Umetni",
   "status.filter": "Filtriraj ovu objavu",
   "status.history.created": "Kreirao/la {name} prije {date}",
   "status.history.edited": "Uredio/la {name} prije {date}",

app/javascript/mastodon/locales/hu.json

@@ -789,7 +789,7 @@
   "status.edit": "Szerkesztés",
   "status.edited": "Utoljára szerkesztve {date}",
   "status.edited_x_times": "{count, plural, one {{count} alkalommal} other {{count} alkalommal}} szerkesztve",
-  "status.embed": "Beágyazás",
+  "status.embed": "Beágyazási kód lekérése",
   "status.favourite": "Kedvenc",
   "status.favourites": "{count, plural, one {kedvenc} other {kedvenc}}",
   "status.filter": "E bejegyzés szűrése",

app/javascript/mastodon/locales/hy.json

@@ -448,7 +448,6 @@
   "status.direct_indicator": "Մասնաւոր յիշատակում",
   "status.edit": "Խմբագրել",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "Ներդնել",
   "status.favourite": "Հավանել",
   "status.filter": "Զտել այս գրառումը",
   "status.history.created": "{name}-ը ստեղծել է՝ {date}",

app/javascript/mastodon/locales/ia.json

@@ -759,7 +759,6 @@
   "status.edit": "Modificar",
   "status.edited": "Ultime modification le {date}",
   "status.edited_x_times": "Modificate {count, plural, one {{count} vice} other {{count} vices}}",
-  "status.embed": "Incastrar",
   "status.favourite": "Adder al favorites",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filtrar iste message",

app/javascript/mastodon/locales/id.json

@@ -583,7 +583,6 @@
   "status.detailed_status": "Tampilan detail percakapan",
   "status.edit": "Edit",
   "status.edited_x_times": "Diedit {count, plural, other {{count} kali}}",
-  "status.embed": "Tanam",
   "status.filter": "Saring kiriman ini",
   "status.history.created": "{name} membuat {date}",
   "status.history.edited": "{name} mengedit {date}",

app/javascript/mastodon/locales/ie.json

@@ -698,7 +698,6 @@
   "status.edit": "Modificar",
   "status.edited": "Ultimmen actualisat ye {date}",
   "status.edited_x_times": "Modificat {count, plural, one {{count} vez} other {{count} vezes}}",
-  "status.embed": "Inbedar",
   "status.favourite": "Favoritisar",
   "status.favourites": "{count, plural, one {favorit} other {favorites}}",
   "status.filter": "Filtrar ti-ci posta",

app/javascript/mastodon/locales/io.json

@@ -589,7 +589,6 @@
   "status.direct_indicator": "Privata menciono",
   "status.edit": "Modifikez",
   "status.edited_x_times": "Modifikesis {count, plural, one {{count} foyo} other {{count} foyi}}",
-  "status.embed": "Eninsertez",
   "status.favourite": "Favorizar",
   "status.filter": "Filtragez ca posto",
   "status.history.created": "{name} kreis ye {date}",

app/javascript/mastodon/locales/is.json

@@ -789,7 +789,6 @@
   "status.edit": "Breyta",
   "status.edited": "Síðast breytt {date}",
   "status.edited_x_times": "Breytt {count, plural, one {{count} sinni} other {{count} sinnum}}",
-  "status.embed": "Ívefja",
   "status.favourite": "Eftirlæti",
   "status.favourites": "{count, plural, one {eftirlæti} other {eftirlæti}}",
   "status.filter": "Sía þessa færslu",

app/javascript/mastodon/locales/it.json

@@ -780,6 +780,7 @@
   "status.bookmark": "Aggiungi segnalibro",
   "status.cancel_reblog_private": "Annulla reblog",
   "status.cannot_reblog": "Questo post non può essere condiviso",
+  "status.continued_thread": "Discussione continua",
   "status.copy": "Copia link al post",
   "status.delete": "Elimina",
   "status.detailed_status": "Vista conversazione dettagliata",
@@ -788,7 +789,7 @@
   "status.edit": "Modifica",
   "status.edited": "Ultima modifica {date}",
   "status.edited_x_times": "Modificato {count, plural, one {{count} volta} other {{count} volte}}",
-  "status.embed": "Incorpora",
+  "status.embed": "Ottieni codice incorporato",
   "status.favourite": "Preferito",
   "status.favourites": "{count, plural, one {preferito} other {preferiti}}",
   "status.filter": "Filtra questo post",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "Ancora nessuno ha rebloggato questo post. Quando qualcuno lo farà, apparirà qui.",
   "status.redraft": "Elimina e riscrivi",
   "status.remove_bookmark": "Rimuovi segnalibro",
+  "status.replied_in_thread": "Ha risposto nella discussione",
   "status.replied_to": "Risposta a {name}",
   "status.reply": "Rispondi",
   "status.replyAll": "Rispondi alla conversazione",

app/javascript/mastodon/locales/ja.json

@@ -787,7 +787,6 @@
   "status.edit": "編集",
   "status.edited": "最終更新日 {date}",
   "status.edited_x_times": "{count}回編集",
-  "status.embed": "埋め込み",
   "status.favourite": "お気に入り",
   "status.favourites": "{count, plural, one {お気に入り} other {お気に入り}}",
   "status.filter": "この投稿をフィルターする",

app/javascript/mastodon/locales/ka.json

@@ -222,7 +222,6 @@
   "status.copy": "Copy link to status",
   "status.delete": "წაშლა",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "ჩართვა",
   "status.load_more": "მეტის ჩატვირთვა",
   "status.media_hidden": "მედია დამალულია",
   "status.mention": "ასახელე @{name}",

app/javascript/mastodon/locales/kab.json

@@ -584,7 +584,6 @@
   "status.direct_indicator": "Abdar uslig",
   "status.edit": "Ẓreg",
   "status.edited_x_times": "Tettwaẓreg {count, plural, one {{count} n tikkelt} other {{count} n tikkal}}",
-  "status.embed": "Seddu",
   "status.favourite": "Amenyaf",
   "status.favourites": "{count, plural, one {n usmenyaf} other {n ismenyafen}}",
   "status.filter": "Sizdeg tassufeɣt-a",

app/javascript/mastodon/locales/kk.json

@@ -315,7 +315,6 @@
   "status.delete": "Өшіру",
   "status.detailed_status": "Толық пікірталас көрінісі",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "Embеd",
   "status.load_more": "Тағы әкел",
   "status.media_hidden": "Жабық медиа",
   "status.mention": "Аталым @{name}",

app/javascript/mastodon/locales/ko.json

@@ -788,7 +788,6 @@
   "status.edit": "수정",
   "status.edited": "{date}에 마지막으로 편집됨",
   "status.edited_x_times": "{count, plural, other {{count}}} 번 수정됨",
-  "status.embed": "임베드",
   "status.favourite": "좋아요",
   "status.favourites": "{count, plural, other {좋아요}}",
   "status.filter": "이 게시물을 필터",

app/javascript/mastodon/locales/ku.json

@@ -498,7 +498,6 @@
   "status.direct_indicator": "Qalkirinê taybet",
   "status.edit": "Serrast bike",
   "status.edited_x_times": "{count, plural, one {{count} car} other {{count} car}} hate serrastkirin",
-  "status.embed": "Bi cih bike",
   "status.filter": "Vê şandiyê parzûn bike",
   "status.history.created": "{name} {date} afirand",
   "status.history.edited": "{name} {date} serrast kir",

app/javascript/mastodon/locales/kw.json

@@ -317,7 +317,6 @@
   "status.delete": "Dilea",
   "status.detailed_status": "Gwel kesklapp a-vanyl",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "Staga",
   "status.load_more": "Karga moy",
   "status.media_hidden": "Myski kudhys",
   "status.mention": "Meneges @{name}",

app/javascript/mastodon/locales/lad.json

@@ -707,7 +707,6 @@
   "status.edit": "Edita",
   "status.edited": "Ultima edisyon: {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} vezes}}",
-  "status.embed": "Inkrusta",
   "status.favourite": "Te plaze",
   "status.filter": "Filtra esta publikasyon",
   "status.history.created": "{name} kriyo {date}",

app/javascript/mastodon/locales/lt.json

@@ -779,7 +779,6 @@
   "status.edit": "Redaguoti",
   "status.edited": "Paskutinį kartą redaguota {date}",
   "status.edited_x_times": "Redaguota {count, plural, one {{count} kartą} few {{count} kartus} many {{count} karto} other {{count} kartų}}",
-  "status.embed": "Įterpti",
   "status.favourite": "Pamėgti",
   "status.favourites": "{count, plural, one {mėgstamas} few {mėgstamai} many {mėgstamų} other {mėgstamų}}",
   "status.filter": "Filtruoti šį įrašą",

app/javascript/mastodon/locales/lv.json

@@ -11,6 +11,7 @@
   "about.not_available": "Šī informācija nav padarīta pieejama šajā serverī.",
   "about.powered_by": "Decentralizētu sociālo tīklu nodrošina {mastodon}",
   "about.rules": "Servera noteikumi",
+  "account.account_note_header": "Personīga piezīme",
   "account.add_or_remove_from_list": "Pievienot vai Noņemt no sarakstiem",
   "account.badges.bot": "Automatizēts",
   "account.badges.group": "Grupa",
@@ -91,6 +92,8 @@
   "block_modal.they_cant_mention": "Nevar Tevi pieminēt vai sekot Tev.",
   "block_modal.they_cant_see_posts": "Nevar redzēt Tavus ierakstus, un Tu neredzēsi lietotāja.",
   "boost_modal.combo": "Nospied {combo}, lai nākamreiz šo izlaistu",
+  "boost_modal.reblog": "Pastiprināt ierakstu?",
+  "boost_modal.undo_reblog": "Atcelt ieraksta pastiprināšanu?",
   "bundle_column_error.copy_stacktrace": "Kopēt kļūdu ziņojumu",
   "bundle_column_error.error.body": "Pieprasīto lapu nevarēja atveidot. Tas varētu būt saistīts ar kļūdu mūsu kodā, vai tā ir pārlūkprogrammas saderības problēma.",
   "bundle_column_error.error.title": "Ak vai!",
@@ -163,21 +166,29 @@
   "confirmations.block.confirm": "Bloķēt",
   "confirmations.delete.confirm": "Dzēst",
   "confirmations.delete.message": "Vai tiešām vēlies dzēst šo ierakstu?",
+  "confirmations.delete.title": "Izdzēst ierakstu?",
   "confirmations.delete_list.confirm": "Dzēst",
   "confirmations.delete_list.message": "Vai tiešām neatgriezeniski izdzēst šo sarakstu?",
+  "confirmations.delete_list.title": "Izdzēst sarakstu?",
   "confirmations.discard_edit_media.confirm": "Atmest",
   "confirmations.discard_edit_media.message": "Ir nesaglabātas izmaiņas informācijas nesēja aprakstā vai priekšskatījumā. Vēlies tās atmest tik un tā?",
   "confirmations.edit.confirm": "Labot",
   "confirmations.edit.message": "Labošana pārrakstīs ziņojumu, kas šobrīd tiek sastādīts. Vai tiešām turpināt?",
+  "confirmations.edit.title": "Pārrakstīt ierakstu?",
   "confirmations.logout.confirm": "Iziet",
   "confirmations.logout.message": "Vai tiešām vēlies izrakstīties?",
+  "confirmations.logout.title": "Atteikties?",
   "confirmations.mute.confirm": "Apklusināt",
   "confirmations.redraft.confirm": "Dzēst un pārrakstīt",
   "confirmations.redraft.message": "Vai tiešām vēlies dzēst šo ziņu un no jauna noformēt to? Izlase un pastiprinājumi tiks zaudēti, un atbildes uz sākotnējo ziņu tiks atstātas bez autoratlīdzības.",
   "confirmations.reply.confirm": "Atbildēt",
   "confirmations.reply.message": "Tūlītēja atbildēšana pārrakstīs pašlaik sastādīto ziņu. Vai tiešām turpināt?",
+  "confirmations.reply.title": "Pārrakstīt ierakstu?",
   "confirmations.unfollow.confirm": "Pārstāt sekot",
   "confirmations.unfollow.message": "Vai tiešam vairs nevēlies sekot lietotājam {name}?",
+  "confirmations.unfollow.title": "Pārtraukt sekošanu lietotājam?",
+  "content_warning.hide": "Paslēpt ierakstu",
+  "content_warning.show": "Tomēr rādīt",
   "conversation.delete": "Dzēst sarunu",
   "conversation.mark_as_read": "Atzīmēt kā izlasītu",
   "conversation.open": "Skatīt sarunu",
@@ -649,7 +660,6 @@
   "status.edit": "Labot",
   "status.edited": "Pēdējoreiz labots {date}",
   "status.edited_x_times": "Labots {count, plural, zero {{count} reižu} one {{count} reizi} other {{count} reizes}}",
-  "status.embed": "Iegult",
   "status.favourite": "Izlasē",
   "status.favourites": "{count, plural, zero {izlasēs} one {izlasē} other {izlasēs}}",
   "status.filter": "Filtrē šo ziņu",

app/javascript/mastodon/locales/ml.json

@@ -308,7 +308,6 @@
   "status.delete": "മായ്ക്കുക",
   "status.detailed_status": "വിശദമായ സംഭാഷണ കാഴ്‌ച",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "ഉൾച്ചേർക്കുക",
   "status.load_more": "കൂടുതൽ ലോഡു ചെയ്യുക",
   "status.media_hidden": "മീഡിയ മറച്ചു",
   "status.mention": "@{name} സൂചിപ്പിക്കുക",

app/javascript/mastodon/locales/ms.json

@@ -613,7 +613,6 @@
   "status.direct_indicator": "Sebutan peribadi",
   "status.edit": "Sunting",
   "status.edited_x_times": "Disunting {count, plural, other {{count} kali}}",
-  "status.embed": "Benaman",
   "status.favourite": "Kegemaran",
   "status.filter": "Tapiskan hantaran ini",
   "status.history.created": "{name} mencipta pada {date}",

app/javascript/mastodon/locales/my.json

@@ -589,7 +589,6 @@
   "status.direct_indicator": "သီးသန့်ဖော်ပြခြင်း။",
   "status.edit": "ပြင်ဆင်ရန်",
   "status.edited_x_times": "{count, plural, one {{count} time} other {{count} times}} ပြင်ဆင်ခဲ့သည်",
-  "status.embed": "Embed",
   "status.favourite": "Favorite",
   "status.filter": "ဤပို့စ်ကို စစ်ထုတ်ပါ",
   "status.history.created": "{name} က {date} က ဖန်တီးခဲ့သည်",

app/javascript/mastodon/locales/nl.json

@@ -789,7 +789,7 @@
   "status.edit": "Bewerken",
   "status.edited": "Laatste bewerking op {date}",
   "status.edited_x_times": "{count, plural, one {{count} keer} other {{count} keer}} bewerkt",
-  "status.embed": "Embedden",
+  "status.embed": "Embed-code verkrijgen",
   "status.favourite": "Favoriet",
   "status.favourites": "{count, plural, one {favoriet} other {favorieten}}",
   "status.filter": "Dit bericht filteren",

app/javascript/mastodon/locales/nn.json

@@ -789,7 +789,7 @@
   "status.edit": "Rediger",
   "status.edited": "Sist endra {date}",
   "status.edited_x_times": "Redigert {count, plural, one {{count} gong} other {{count} gonger}}",
-  "status.embed": "Bygg inn",
+  "status.embed": "Få innbyggingskode",
   "status.favourite": "Favoritt",
   "status.favourites": "{count, plural, one {favoritt} other {favorittar}}",
   "status.filter": "Filtrer dette innlegget",

app/javascript/mastodon/locales/no.json

@@ -727,7 +727,6 @@
   "status.direct_indicator": "Privat omtale",
   "status.edit": "Rediger",
   "status.edited_x_times": "Redigert {count, plural,one {{count} gang} other {{count} ganger}}",
-  "status.embed": "Bygge inn",
   "status.favourite": "Favoritt",
   "status.filter": "Filtrer dette innlegget",
   "status.history.created": "{name} opprettet {date}",

app/javascript/mastodon/locales/oc.json

@@ -505,7 +505,6 @@
   "status.direct_indicator": "Mencion privada",
   "status.edit": "Modificar",
   "status.edited_x_times": "Modificat {count, plural, un {{count} còp} other {{count} còps}}",
-  "status.embed": "Embarcar",
   "status.favourite": "Apondre als favorits",
   "status.filter": "Filtrar aquesta publicacion",
   "status.history.created": "{name} o creèt lo {date}",

app/javascript/mastodon/locales/pa.json

@@ -320,7 +320,6 @@
   "status.delete": "ਹਟਾਓ",
   "status.edit": "ਸੋਧ",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "ਮੜ੍ਹੋ",
   "status.favourite": "ਪਸੰਦ",
   "status.history.created": "{name} ਨੇ {date} ਨੂੰ ਬਣਾਇਆ",
   "status.history.edited": "{name} ਨੇ {date} ਨੂੰ ਸੋਧਿਆ",

app/javascript/mastodon/locales/pl.json

@@ -789,7 +789,7 @@
   "status.edit": "Edytuj",
   "status.edited": "Ostatnio edytowane {date}",
   "status.edited_x_times": "Edytowano {count, plural, one {{count} raz} other {{count} razy}}",
-  "status.embed": "Osadź",
+  "status.embed": "Kod osadzenia",
   "status.favourite": "Dodaj do ulubionych",
   "status.favourites": "{count, plural, one {polubienie} few {polubienia} other {polubień}}",
   "status.filter": "Filtruj ten wpis",

app/javascript/mastodon/locales/pt-BR.json

@@ -789,7 +789,7 @@
   "status.edit": "Editar",
   "status.edited": "Última edição em {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} hora} other {{count} vezes}}",
-  "status.embed": "Incorporar",
+  "status.embed": "Obter código de incorporação",
   "status.favourite": "Favorita",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filtrar esta publicação",

app/javascript/mastodon/locales/pt-PT.json

@@ -359,6 +359,8 @@
   "hints.profiles.see_more_followers": "Ver mais seguidores no {domain}",
   "hints.profiles.see_more_follows": "Veja mais perfis seguidos em {domain}",
   "hints.profiles.see_more_posts": "Ver mais publicações em {domain}",
+  "hints.threads.replies_may_be_missing": "As respostas de outros servidores podem estar a faltar.",
+  "hints.threads.see_more": "Veja mais respostas em {domain}",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respostas",
   "home.hide_announcements": "Ocultar comunicações",
@@ -366,6 +368,9 @@
   "home.pending_critical_update.link": "Ver atualizações",
   "home.pending_critical_update.title": "Atualização de segurança crítica disponível!",
   "home.show_announcements": "Exibir comunicações",
+  "ignore_notifications_modal.disclaimer": "O Mastodon não pode informar utilizadores que ignoraste as notificações deles. Ignorar notificações não irá parar as mensagens serem enviadas.",
+  "ignore_notifications_modal.filter_instead": "Filtrar em vez disso",
+  "ignore_notifications_modal.filter_to_act_users": "Ainda poderá aceitar, rejeitar, ou reportar utilizadores",
   "interaction_modal.description.favourite": "Com uma conta no Mastodon, pode adicionar assinalar esta publicação como favorita para que o autor saiba que gostou e guardá-la para mais tarde.",
   "interaction_modal.description.follow": "Com uma conta no Mastodon, pode seguir {name} para receber as suas publicações na sua página inicial.",
   "interaction_modal.description.reblog": "Com uma conta no Mastodon, pode impulsionar esta publicação para compartilhá-lo com os seus seguidores.",
@@ -749,7 +754,6 @@
   "status.edit": "Editar",
   "status.edited": "Última edição em {date}",
   "status.edited_x_times": "Editado {count, plural,one {{count} vez} other {{count} vezes}}",
-  "status.embed": "Embutir",
   "status.favourite": "Assinalar como favorito",
   "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicação",

app/javascript/mastodon/locales/ro.json

@@ -556,7 +556,6 @@
   "status.direct_indicator": "Mențiune privată",
   "status.edit": "Modifică",
   "status.edited_x_times": "Modificată {count, plural, one {o dată} few {de {count} ori} other {de {count} de ori}}",
-  "status.embed": "Înglobează",
   "status.filter": "Filtrează această postare",
   "status.history.created": "creată de {name} pe {date}",
   "status.history.edited": "modificată de {name} pe {date}",

app/javascript/mastodon/locales/ru.json

@@ -716,7 +716,6 @@
   "status.edit": "Изменить",
   "status.edited": "Дата последнего изменения: {date}",
   "status.edited_x_times": "{count, plural, one {{count} изменение} many {{count} изменений} other {{count} изменения}}",
-  "status.embed": "Встроить на свой сайт",
   "status.favourite": "Избранное",
   "status.filter": "Фильтровать этот пост",
   "status.history.created": "{name} создал {date}",

app/javascript/mastodon/locales/sa.json

@@ -503,7 +503,6 @@
   "status.detailed_status": "विस्तृतसंभाषणदृश्यम्",
   "status.edit": "सम्पादय",
   "status.edited_x_times": "Edited {count, plural, one {{count} वारम्} other {{count} वारम्}}",
-  "status.embed": "निहितम्",
   "status.filter": "पत्रमिदं फिल्तरं कुरु",
   "status.history.created": "{name} असृजत् {date}",
   "status.history.edited": "{name} समपादयत् {date}",

app/javascript/mastodon/locales/sc.json

@@ -545,7 +545,6 @@
   "status.detailed_status": "Visualizatzione de detàlliu de arresonada",
   "status.edit": "Modìfica",
   "status.edited_x_times": "Modificadu {count, plural, one {{count} # borta} other {{count} bortas}}",
-  "status.embed": "Afissa",
   "status.favourites": "{count, plural, one {preferidu} other {preferidos}}",
   "status.load_more": "Càrriga·nde àteros",
   "status.media_hidden": "Elementos multimediales cuados",

app/javascript/mastodon/locales/sco.json

@@ -474,7 +474,6 @@
   "status.detailed_status": "Detailt conversation view",
   "status.edit": "Edit",
   "status.edited_x_times": "Editit {count, plural, one {{count} time} other {{count} times}}",
-  "status.embed": "Embed",
   "status.filter": "Filter this post",
   "status.history.created": "{name} creatit {date}",
   "status.history.edited": "{name} editit {date}",

app/javascript/mastodon/locales/si.json

@@ -415,7 +415,6 @@
   "status.detailed_status": "විස්තරාත්මක සංවාද දැක්ම",
   "status.edit": "සංස්කරණය",
   "status.edited_x_times": "සංශෝධිතයි {count, plural, one {වාර {count}} other {වාර {count}}}",
-  "status.embed": "කාවැද්දූ",
   "status.filter": "මෙම ලිපිය පෙරන්න",
   "status.history.created": "{name} නිර්මාණය {date}",
   "status.history.edited": "{name} සංස්කරණය {date}",

app/javascript/mastodon/locales/sk.json

@@ -702,7 +702,6 @@
   "status.edit": "Upraviť",
   "status.edited": "Naposledy upravený {date}",
   "status.edited_x_times": "Upravený {count, plural, other {{count}×}}",
-  "status.embed": "Vložiť",
   "status.favourite": "Ohviezdičkované",
   "status.filter": "Filtrovanie tohto príspevku",
   "status.history.created": "Vytvorené účtom {name} {date}",

app/javascript/mastodon/locales/sl.json

@@ -746,7 +746,6 @@
   "status.edit": "Uredi",
   "status.edited": "Zadnje urejanje {date}",
   "status.edited_x_times": "Urejeno {count, plural, one {#-krat} two {#-krat} few {#-krat} other {#-krat}}",
-  "status.embed": "Vdelaj",
   "status.favourite": "Priljubljen_a",
   "status.favourites": "{count, plural, one {priljubitev} two {priljubitvi} few {priljubitve} other {priljubitev}}",
   "status.filter": "Filtriraj to objavo",

app/javascript/mastodon/locales/sq.json

@@ -789,7 +789,7 @@
   "status.edit": "Përpunojeni",
   "status.edited": "Përpunuar së fundi më {date}",
   "status.edited_x_times": "Përpunuar {count, plural, one {{count} herë} other {{count} herë}}",
-  "status.embed": "Trupëzim",
+  "status.embed": "Merrni kod trupëzimi",
   "status.favourite": "I vini shenjë si të parapëlqyer",
   "status.favourites": "{count, plural, one {i parapëlqyer} other {të parapëlqyer}}",
   "status.filter": "Filtroje këtë postim",

app/javascript/mastodon/locales/sr-Latn.json

@@ -706,7 +706,6 @@
   "status.edit": "Uredi",
   "status.edited": "Poslednje uređivanje {date}",
   "status.edited_x_times": "Uređeno {count, plural, one {{count} put} other {{count} puta}}",
-  "status.embed": "Ugradi",
   "status.favourite": "Omiljeno",
   "status.favourites": "{count, plural, one {# omiljeno} few {# omiljena} other {# omiljenih}}",
   "status.filter": "Filtriraj ovu objavu",

app/javascript/mastodon/locales/sr.json

@@ -706,7 +706,6 @@
   "status.edit": "Уреди",
   "status.edited": "Последње уређивање {date}",
   "status.edited_x_times": "Уређено {count, plural, one {{count} пут} other {{count} пута}}",
-  "status.embed": "Угради",
   "status.favourite": "Омиљено",
   "status.favourites": "{count, plural, one {# омиљено} few {# омиљена} other {# омиљених}}",
   "status.filter": "Филтрирај ову објаву",

app/javascript/mastodon/locales/sv.json

@@ -783,7 +783,7 @@
   "status.edit": "Redigera",
   "status.edited": "Senast ändrad {date}",
   "status.edited_x_times": "Redigerad {count, plural, one {{count} gång} other {{count} gånger}}",
-  "status.embed": "Bädda in",
+  "status.embed": "Hämta kod för inbäddning",
   "status.favourite": "Favoritmarkera",
   "status.favourites": "{count, plural, one {favorit} other {favoriter}}",
   "status.filter": "Filtrera detta inlägg",

app/javascript/mastodon/locales/ta.json

@@ -345,7 +345,6 @@
   "status.delete": "நீக்கு",
   "status.detailed_status": "விரிவான உரையாடல் காட்சி",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "கிடத்து",
   "status.load_more": "அதிகமாய் ஏற்று",
   "status.media_hidden": "மீடியா மறைக்கப்பட்டது",
   "status.mention": "குறிப்பிடு @{name}",

app/javascript/mastodon/locales/te.json

@@ -245,7 +245,6 @@
   "status.delete": "తొలగించు",
   "status.detailed_status": "వివరణాత్మక సంభాషణ వీక్షణ",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "ఎంబెడ్",
   "status.load_more": "మరిన్ని లోడ్ చేయి",
   "status.media_hidden": "మీడియా దాచబడింది",
   "status.mention": "@{name}ను ప్రస్తావించు",

app/javascript/mastodon/locales/th.json

@@ -787,7 +787,6 @@
   "status.edit": "แก้ไข",
   "status.edited": "แก้ไขล่าสุดเมื่อ {date}",
   "status.edited_x_times": "แก้ไข {count, plural, other {{count} ครั้ง}}",
-  "status.embed": "ฝัง",
   "status.favourite": "ชื่นชอบ",
   "status.favourites": "{count, plural, other {รายการโปรด}}",
   "status.filter": "กรองโพสต์นี้",

app/javascript/mastodon/locales/tok.json

@@ -359,7 +359,6 @@
   "status.cancel_reblog_private": "o pini e pana",
   "status.delete": "o weka",
   "status.edit": "o ante",
-  "status.embed": "ni o lon insa pi lipu ante",
   "status.favourite": "o sitelen pona",
   "status.history.created": "{name} li pali e ni lon {date}",
   "status.history.edited": "{name} li ante lon {date}",

app/javascript/mastodon/locales/tr.json

@@ -789,7 +789,7 @@
   "status.edit": "Düzenle",
   "status.edited": "Son düzenleme {date}",
   "status.edited_x_times": "{count, plural, one {{count} kez} other {{count} kez}} düzenlendi",
-  "status.embed": "Gömülü",
+  "status.embed": "Gömme kodunu al",
   "status.favourite": "Favori",
   "status.favourites": "{count, plural, one {beğeni} other {beğeni}}",
   "status.filter": "Bu gönderiyi süzgeçle",

app/javascript/mastodon/locales/tt.json

@@ -410,7 +410,6 @@
   "status.direct_indicator": "Хосусый искә алу",
   "status.edit": "Үзгәртү",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "Веб-биткә кертү",
   "status.history.created": "{name} ясалды {date}",
   "status.history.edited": "{name} төзәтте {date}",
   "status.load_more": "Күбрәк йөкләү",

app/javascript/mastodon/locales/uk.json

@@ -789,7 +789,7 @@
   "status.edit": "Редагувати",
   "status.edited": "Востаннє змінено {date}",
   "status.edited_x_times": "Відредаговано {count, plural, one {{count} раз} few {{count} рази} many {{counter} разів} other {{counter} разів}}",
-  "status.embed": "Вбудувати",
+  "status.embed": "Отримати код вставки",
   "status.favourite": "Уподобане",
   "status.favourites": "{count, plural, one {вподобання} few {вподобання} many {вподобань} other {вподобання}}",
   "status.filter": "Фільтрувати цей допис",

app/javascript/mastodon/locales/vi.json

@@ -787,7 +787,6 @@
   "status.edit": "Sửa",
   "status.edited": "Sửa lần cuối {date}",
   "status.edited_x_times": "Đã sửa {count, plural, other {{count} lần}}",
-  "status.embed": "Nhúng",
   "status.favourite": "Thích",
   "status.favourites": "{count, plural, other {lượt thích}}",
   "status.filter": "Lọc tút này",

app/javascript/mastodon/locales/zh-CN.json

@@ -789,7 +789,7 @@
   "status.edit": "编辑",
   "status.edited": "最近编辑于 {date}",
   "status.edited_x_times": "共编辑 {count, plural, one {{count} 次} other {{count} 次}}",
-  "status.embed": "嵌入",
+  "status.embed": "获取嵌入代码",
   "status.favourite": "喜欢",
   "status.favourites": "{count, plural, other {次喜欢}}",
   "status.filter": "过滤此嘟文",

app/javascript/mastodon/locales/zh-HK.json

@@ -699,7 +699,6 @@
   "status.edit": "編輯",
   "status.edited": "最後編輯於 {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} 次} other {{count} 次}}",
-  "status.embed": "嵌入",
   "status.favourite": "最愛",
   "status.favourites": "{count, plural, one {則最愛} other {則最愛}}",
   "status.filter": "篩選此帖文",

app/javascript/mastodon/locales/zh-TW.json

@@ -789,7 +789,7 @@
   "status.edit": "編輯",
   "status.edited": "上次編輯於 {date}",
   "status.edited_x_times": "已編輯 {count, plural, one {{count} 次} other {{count} 次}}",
-  "status.embed": "內嵌嘟文",
+  "status.embed": "取得嵌入程式碼",
   "status.favourite": "最愛",
   "status.favourites": "{count, plural, other {# 則最愛}}",
   "status.filter": "過濾此嘟文",

app/models/account.rb

@@ -259,6 +259,10 @@ class Account < ApplicationRecord
     suspended_at.present? && !instance_actor?
   end
 
+  def suspended_locally?
+    suspended? && suspension_origin_local?
+  end
+
   def suspended_permanently?
     suspended? && deletion_request.nil?
   end

app/models/account_migration.rb

@@ -31,10 +31,14 @@ class AccountMigration < ApplicationRecord
   validate :validate_migration_cooldown
   validate :validate_target_account
 
-  scope :within_cooldown, ->(now = Time.now.utc) { where(arel_table[:created_at].gteq(now - COOLDOWN_PERIOD)) }
+  scope :within_cooldown, -> { where(created_at: cooldown_duration_ago..) }
 
   attr_accessor :current_password, :current_username
 
+  def self.cooldown_duration_ago
+    Time.current - COOLDOWN_PERIOD
+  end
+
   def save_with_challenge(current_user)
     if current_user.encrypted_password.present?
       errors.add(:current_password, :invalid) unless current_user.valid_password?(current_password)

app/models/admin/account_action.rb

@@ -74,7 +74,7 @@ class Admin::AccountAction
     end
 
     def disabled_types_for_account(account)
-      if account.suspended?
+      if account.suspended_locally?
         %w(silence suspend)
       elsif account.silenced?
         %w(silence)

app/models/concerns/account/attribution_domains.rb

@@ -13,7 +13,11 @@ module Account::AttributionDomains
 
   def attribution_domains_as_text=(str)
     self[:attribution_domains] = str.split.filter_map do |line|
-      line.strip.delete_prefix('*.')
+      line
+        .strip
+        .delete_prefix('http://')
+        .delete_prefix('https://')
+        .delete_prefix('*.')
     end
   end
 

app/models/list_account.rb

@@ -20,13 +20,11 @@ class ListAccount < ApplicationRecord
   validates :account_id, uniqueness: { scope: :list_id }
   validate :validate_relationship
 
-  before_validation :set_follow
+  before_validation :set_follow, unless: :list_owner_account_is_account?
 
   private
 
   def set_follow
-    return if list.account_id == account.id
-
     self.follow = Follow.find_by!(account_id: list.account_id, target_account_id: account.id)
   rescue ActiveRecord::RecordNotFound
     self.follow_request = FollowRequest.find_by!(account_id: list.account_id, target_account_id: account.id)
@@ -39,4 +37,8 @@ class ListAccount < ApplicationRecord
     errors.add(:follow, 'mismatched accounts') if follow_id.present? && follow.target_account_id != account_id
     errors.add(:follow_request, 'mismatched accounts') if follow_request_id.present? && follow_request.target_account_id != account_id
   end
+
+  def list_owner_account_is_account?
+    list.account_id == account_id
+  end
 end

app/views/admin/account_actions/new.html.haml

@@ -1,7 +1,7 @@
 - content_for :page_title do
   = t('admin.account_actions.title', acct: @account.pretty_acct)
 
-- if @account.suspended?
+- if @account.suspended_locally?
   .flash-message.alert
     = t('admin.account_actions.already_suspended')
 - elsif @account.silenced?

app/views/admin/reports/_actions.html.haml

@@ -27,7 +27,7 @@
         = form.button t('admin.accounts.silence'),
                       name: :silence,
                       class: 'button button--destructive',
-                      disabled: report.target_account.silenced? || report.target_account.suspended?,
+                      disabled: report.target_account.silenced? || report.target_account.suspended_locally?,
                       title: report.target_account.silenced? ? t('admin.account_actions.already_silenced') : ''
       .report-actions__item__description
         = t('admin.reports.actions.silence_description_html')
@@ -36,8 +36,8 @@
         = form.button t('admin.accounts.suspend'),
                       name: :suspend,
                       class: 'button button--destructive',
-                      disabled: report.target_account.suspended?,
+                      disabled: report.target_account.suspended_locally?,
-                      title: report.target_account.suspended? ? t('admin.account_actions.already_suspended') : ''
+                      title: report.target_account.suspended_locally? ? t('admin.account_actions.already_suspended') : ''
       .report-actions__item__description
         = t('admin.reports.actions.suspend_description_html')
     .report-actions__item

config/locales/activerecord.es-MX.yml

@@ -15,6 +15,12 @@ es-MX:
       user/invite_request:
         text: Motivo
     errors:
+      attributes:
+        domain:
+          invalid: no es un nombre de dominio válido
+      messages:
+        invalid_domain_on_line: "%{value} no es un nombre de dominio válido"
+        too_many_lines: excede el límite de %{limit} líneas
       models:
         account:
           attributes:

config/locales/activerecord.es.yml

@@ -15,6 +15,12 @@ es:
       user/invite_request:
         text: Razón
     errors:
+      attributes:
+        domain:
+          invalid: no es un nombre de dominio válido
+      messages:
+        invalid_domain_on_line: "%{value} no es un nombre de dominio válido"
+        too_many_lines: excede el límite de %{limit} líneas
       models:
         account:
           attributes:

config/locales/activerecord.fr-CA.yml

@@ -15,6 +15,9 @@ fr-CA:
       user/invite_request:
         text: Raison
     errors:
+      attributes:
+        domain:
+          invalid: n'est pas un nom de domaine valide
       models:
         account:
           attributes:

config/locales/activerecord.fr.yml

@@ -15,6 +15,9 @@ fr:
       user/invite_request:
         text: Motif
     errors:
+      attributes:
+        domain:
+          invalid: n'est pas un nom de domaine valide
       models:
         account:
           attributes:

config/locales/activerecord.lv.yml

@@ -15,6 +15,12 @@ lv:
       user/invite_request:
         text: Iemesls
     errors:
+      attributes:
+        domain:
+          invalid: nav derīgs domēna nosaukums
+      messages:
+        invalid_domain_on_line: "%{value} nav derīgs domēna nosaukums"
+        too_many_lines: pārsniedz %{limit} līniju ierobežojumu
       models:
         account:
           attributes:

config/locales/ar.yml

@@ -53,6 +53,7 @@ ar:
         title: تعديل عنوان البريد الإلكتروني الخاص بـ %{username}
       change_role:
         changed_msg: تم تغيير بنجاح!
+        edit_roles: إدارة أدوار المستخدمين
         label: تغيير الدور
         no_role: بلا دور
         title: تغيير دور %{username}
@@ -1164,6 +1165,11 @@ ar:
       view_strikes: عرض العقوبات السابقة المُطَبَّقة ضد حسابك
     too_fast: تم إرسال النموذج بسرعة كبيرة، حاول مرة أخرى.
     use_security_key: استخدام مفتاح الأمان
+  author_attribution:
+    example_title: عينة نص
+    more_from_html: المزيد من %{name}
+    s_blog: مدونة %{name}
+    title: إسناد المؤلف
   challenge:
     confirm: واصل
     hint_html: "<strong>توصية:</strong> لن نطلب منك ثانية كلمتك السرية في غضون الساعة اللاحقة."
@@ -1971,6 +1977,7 @@ ar:
     instructions_html: قم بنسخ ولصق التعليمة البرمجية أدناه في شفرة HTML لموقعك الخاص على الويب. ثم أضف عنوان موقع الويب الخاص بك إلى أحد الحقول الإضافية في ملفك التعريفي عبر لسان "تعديل الملف التعريفي" ثم احفظ التغييرات.
     verification: التحقق
     verified_links: روابطك التي تم التحقق منها
+    website_verification: التحقق من موقع الويب
   webauthn_credentials:
     add: إضافة مفتاح أمان جديد
     create: