diff --git a/Gemfile b/Gemfile
index 4c808fa48006b7..4cce095ec595bc 100644
--- a/Gemfile
+++ b/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
diff --git a/Gemfile.lock b/Gemfile.lock
index 206178a530f847..19e66659bf7879 100644
--- a/Gemfile.lock
+++ b/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-common (~> 0.20)
+ opentelemetry-helpers-sql-obfuscation (0.2.0)
+ 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)
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 893882fe7a3a8d..fcd30804219961 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 0dbeb0a1902dad..dc89dc6e399ecb 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/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": "رُد على الخيط",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 507703023c2bb7..008dc6a663fee6 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 412eae14818f80..a0900b84e67f7c 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/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": "Фільтраваць гэты допіс",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index b89b539dcfb039..2a435c20743d2f 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/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": "Филтриране на публ.",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index df97abdff5109b..9512f6a92b3400 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/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": "মিডিয়া লুকানো আছে",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 226ff756ffe9d3..18616fcef2cc29 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 91f28bd1514d97..d0ee437af9f919 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 61b81c9f312595..2a3a391eab4885 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 180616b782ec08..37eb945615a192 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 8dd8f31fa82686..134e683fa16343 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 7f058d8912faf2..a5855929557093 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index dea313ffed4ce3..97d82155353e4f 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 46bb08d7cb5938..03be4487895bb2 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 64a603923ecc36..d832fa101401e4 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/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": "Φιλτράρισμα αυτής της ανάρτησης",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index c727b8e49faf3d..a40353a73937c7 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index d8ec27748e94f4..ce7201dacfbe98 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index dfba0fe5d97f20..65eab7f437b996 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 63f3d53812ca67..ae9658cd907655 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index b01eb68222a294..61a958ed38d0a6 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index ca37a152fe593c..93c2cefb4795b7 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 15dd63486b603b..2248ffbf9d0aa0 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index d2b520e1d2e8c3..4221859fea4409 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/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} و {count, plural, one {# نفر دیگر} other {# نفر دیگر}} فرستهتان را برگزیدند",
"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} و {count, plural, one {# نفر دیگر} other {# نفر دیگر}} فرستهتان را تقویت کردند",
"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": "پاسخ به رشته",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index d8c5b7204050d6..e1a411e52eee08 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 6e7eb3b7c28459..73c64b1b826fc6 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 9f51aaaa7d5315..96ae81c58aedc2 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 5bcc1c946b6e23..fb0bfac29dd05a 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index badd6a1c216d9e..0a51db36a4953b 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 95bb2938549168..794a433cd2aaaa 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index e2f67bc296accc..3f1b353e75aee6 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index b0b530e88f09bd..1293d96bbd8742 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/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.preview": "Así será mostrado:",
+ "embed.instructions": "Inclúe esta publicación no teu sitio web copiando o seguinte código.",
+ "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",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 80d9f054ccee81..532c11d17cd829 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/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": "סנן הודעה זו",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 9f5782767b6ff0..26c527f2fed48b 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 1e4e02cb9de9a3..587f58f2486b1e 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index d1475338fd81a1..a81abb82f014a1 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 9d7e3ff2c7c5cc..e301363f272344 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 3e2cc03145872c..687c32c1b155cf 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 7a176dfbb621ee..322680101922a1 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index d0ccb923bae205..bb0a86ac2bbec9 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 83932f1b4ba251..ba362afc8a450a 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 1c8cff5490166b..daa135afeab1f5 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 60dd8b12ea7cd4..7ea1694f1ecd57 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/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": "この投稿をフィルターする",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 0bd86a24760564..fc0ed0730d78cf 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index ae783b6c246138..5ccfbecf815616 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index eace5d95b8c010..f146fc652d54d2 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 4c78f4332e8cbe..751e5790e141fb 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/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": "이 게시물을 필터",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index d69f4b0d05e1a8..dd10000d1813c8 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 046910daf8e29c..60b8321d53be76 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index e63c22ec696f3d..f956abfb1e28ee 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index cc905e3a21ca15..86e8d092b84d4e 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/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šą",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 37dc1d06dbfe97..77dc5c497cf90b 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 48ea29f9836ca1..5ed6f219db5ae0 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/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} സൂചിപ്പിക്കുക",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index c6bc630bfefa55..44403ec959486e 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 2127d69baa8022..e93b47fd542f14 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/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} က ဖန်တီးခဲ့သည်",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index e5d8e8d2ebc263..d4c6b727f76a18 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index d21ebffe226eb2..3d0634ef612595 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index b805b9852886bb..1222f404241e9f 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 1d9008dbd1fa0a..22193f82aa41e5 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index a71c01b3c14cff..5da88ff08f7e4d 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/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} ਨੂੰ ਸੋਧਿਆ",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 2ef437ef04df5e..34154fe5a3be39 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 9978bf7644d520..235cec145d48ec 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 24f59931128e58..1dc4bc5109f522 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 18380928b34be2..73b8140de65845 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index ab8974346786ed..e335bff299f371 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index ac715e718e88bb..85bd9aa9ddc79e 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 0e055716e1af82..ecf5141eb50563 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index b1b17b57db2d6c..269e29a86ff6ff 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index a9288fd104945a..93ce9dd7e27113 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index f89e8cf5ab0ab4..d21dc5e1ab4fa9 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 4e83b150892cb1..183636a653a0b6 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 1904c186f7af81..745bba179f4c54 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 02be70f5bf2e6c..de30ca280fae12 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index dfd10579e6b65e..255215a1671f72 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/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": "Филтрирај ову објаву",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 61cad916cae7f1..14fac1ec8daf0a 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 4f209b7e3ebb03..87d6660f053a8d 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index a6dc74b290dcf5..40fbd7f7bdec1d 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/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}ను ప్రస్తావించు",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 81424a9490fbd9..b8c942f99966d4 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/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": "กรองโพสต์นี้",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index 0ca30c57da552c..6c21026bdbd0e4 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 6577737bf11c09..5e875ff64f425a 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 1439e2ef5830b0..01429f9431b132 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/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": "Күбрәк йөкләү",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 638a84b64f59c4..a9fd44ee6ce3b4 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/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": "Фільтрувати цей допис",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 09f288469dc8b0..449435847e926b 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/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",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 9a6076f23fb675..dd86b92ccea469 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/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": "过滤此嘟文",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 2a55e6fc20a5d2..6fc1b9d2673a3d 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/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": "篩選此帖文",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index cdc6c977b71aca..a2168c42a40046 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/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": "過濾此嘟文",
diff --git a/app/models/account.rb b/app/models/account.rb
index 6063b3e0dd2f6b..cda8dfb393dbfb 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -259,6 +259,10 @@ def suspended?
suspended_at.present? && !instance_actor?
end
+ def suspended_locally?
+ suspended? && suspension_origin_local?
+ end
+
def suspended_permanently?
suspended? && deletion_request.nil?
end
diff --git a/app/models/account_migration.rb b/app/models/account_migration.rb
index dc22e329421df6..7a01e250e2c213 100644
--- a/app/models/account_migration.rb
+++ b/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)
diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb
index 4be58ba85306bf..7c66b6e64625f7 100644
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@@ -74,7 +74,7 @@ def types_for_account(account)
end
def disabled_types_for_account(account)
- if account.suspended?
+ if account.suspended_locally?
%w(silence suspend)
elsif account.silenced?
%w(silence)
diff --git a/app/models/concerns/account/attribution_domains.rb b/app/models/concerns/account/attribution_domains.rb
index 37a498a150dfdc..163c2291fea770 100644
--- a/app/models/concerns/account/attribution_domains.rb
+++ b/app/models/concerns/account/attribution_domains.rb
@@ -13,7 +13,11 @@ def attribution_domains_as_text
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
diff --git a/app/models/list_account.rb b/app/models/list_account.rb
index e7016f2714a43f..2ff86057171e5c 100644
--- a/app/models/list_account.rb
+++ b/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 @@ def validate_relationship
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
diff --git a/app/views/admin/account_actions/new.html.haml b/app/views/admin/account_actions/new.html.haml
index 5b98582d8c769a..c4311eba963cde 100644
--- a/app/views/admin/account_actions/new.html.haml
+++ b/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?
diff --git a/app/views/admin/reports/_actions.html.haml b/app/views/admin/reports/_actions.html.haml
index 7317d401e766ca..ef016e949bddf0 100644
--- a/app/views/admin/reports/_actions.html.haml
+++ b/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?,
- title: report.target_account.suspended? ? t('admin.account_actions.already_suspended') : ''
+ disabled: report.target_account.suspended_locally?,
+ 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
diff --git a/config/locales/activerecord.es-MX.yml b/config/locales/activerecord.es-MX.yml
index 882c40ae8de618..4d2cba3a277dc6 100644
--- a/config/locales/activerecord.es-MX.yml
+++ b/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:
diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml
index 569b783103c96a..16e2c66cbef671 100644
--- a/config/locales/activerecord.es.yml
+++ b/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:
diff --git a/config/locales/activerecord.fr-CA.yml b/config/locales/activerecord.fr-CA.yml
index 1a83a0e9e26a55..b6f005d2202bd7 100644
--- a/config/locales/activerecord.fr-CA.yml
+++ b/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:
diff --git a/config/locales/activerecord.fr.yml b/config/locales/activerecord.fr.yml
index 24bb39502bd4c9..05eb7ce67b4299 100644
--- a/config/locales/activerecord.fr.yml
+++ b/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:
diff --git a/config/locales/activerecord.lv.yml b/config/locales/activerecord.lv.yml
index 5e41f4630e46f1..b7e2db65e88e58 100644
--- a/config/locales/activerecord.lv.yml
+++ b/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:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 480feeba2d1ac5..7512e03fd50f18 100644
--- a/config/locales/ar.yml
+++ b/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: "توصية: لن نطلب منك ثانية كلمتك السرية في غضون الساعة اللاحقة."
@@ -1971,6 +1977,7 @@ ar:
instructions_html: قم بنسخ ولصق التعليمة البرمجية أدناه في شفرة HTML لموقعك الخاص على الويب. ثم أضف عنوان موقع الويب الخاص بك إلى أحد الحقول الإضافية في ملفك التعريفي عبر لسان "تعديل الملف التعريفي" ثم احفظ التغييرات.
verification: التحقق
verified_links: روابطك التي تم التحقق منها
+ website_verification: التحقق من موقع الويب
webauthn_credentials:
add: إضافة مفتاح أمان جديد
create:
diff --git a/config/locales/doorkeeper.lv.yml b/config/locales/doorkeeper.lv.yml
index 11c50203050e4c..0f05adf1486c1b 100644
--- a/config/locales/doorkeeper.lv.yml
+++ b/config/locales/doorkeeper.lv.yml
@@ -83,6 +83,7 @@ lv:
access_denied: Resursa īpašnieks vai autorizācijas serveris pieprasījumu noraidīja.
credential_flow_not_configured: Resursa īpašnieka paroles akreditācijas datu plūsma neizdevās, jo Doorkeeper.configure.resource_owner_from_credentials nebija konfigurēts.
invalid_client: Klienta autentifikācija neizdevās nezināma klienta, klienta autentifikācijas vai neatbalstītas autentifikācijas metodes dēļ.
+ invalid_code_challenge_method: Koda izaicinājuma veidam jābūt S256, vienkāršs netiek atbalstīts.
invalid_grant: Sniegtā autorizācijas piekrišana nav derīga, tai ir beidzies derīguma termiņš, tā ir atsaukta, tā neatbilst autorizācijas pieprasījumā izmantotajam novirzīšanas URI vai tika izsniegta citam klientam.
invalid_redirect_uri: Iekļauts novirzīšanas uri nav derīgs.
invalid_request:
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 050388c180ae66..7916e27f3acc39 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -24,6 +24,8 @@ es-MX:
admin:
account_actions:
action: Realizar acción
+ already_silenced: Esta cuenta ya ha sido limitada.
+ already_suspended: Esta cuenta ya ha sido suspendida.
title: Moderar %{acct}
account_moderation_notes:
create: Crear
@@ -45,6 +47,7 @@ es-MX:
title: Cambiar el correo electrónico de %{username}
change_role:
changed_msg: Rol cambiado exitosamente!
+ edit_roles: Administrar roles de usuario
label: Cambiar de rol
no_role: Sin rol
title: Cambiar el rol para %{username}
@@ -601,6 +604,7 @@ es-MX:
suspend_description_html: La cuenta y todos sus contenidos serán inaccesibles y eventualmente eliminados, e interactuar con ella será imposible. Reversible durante 30 días. Cierra todos los reportes contra esta cuenta.
actions_description_html: Decide qué medidas tomar para resolver esta denuncia. Si tomas una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría Spam.
actions_description_remote_html: Decide qué medidas tomar para resolver este reporte. Esto solo afectará a la forma en que tu servidor se comunica con esta cuenta remota y gestiona su contenido.
+ actions_no_posts: Este informe no incluye ninguna publicación asociada a eliminar
add_to_report: Añadir más al reporte
already_suspended_badges:
local: Ya suspendido en este servidor
@@ -1156,6 +1160,12 @@ es-MX:
view_strikes: Ver amonestaciones pasadas contra tu cuenta
too_fast: Formulario enviado demasiado rápido, inténtelo de nuevo.
use_security_key: Usar la clave de seguridad
+ author_attribution:
+ example_title: Texto de ejemplo
+ hint_html: Controla cómo se te dará atribución cuando se compartan enlaces en Mastodon.
+ more_from_html: Más de %{name}
+ s_blog: Blog de %{name}
+ title: Atribución del autor
challenge:
confirm: Continuar
hint_html: "Tip: No volveremos a preguntarte por la contraseña durante la siguiente hora."
@@ -1933,6 +1943,7 @@ es-MX:
instructions_html: Copia y pega el siguiente código en el HTML de tu sitio web. A continuación, añade la dirección de su sitio web en uno de los campos extra de tu perfil desde la pestaña "Editar perfil" y guarda los cambios.
verification: Verificación
verified_links: Tus links verificados
+ website_verification: Verificación del sitio web
webauthn_credentials:
add: Agregar nueva clave de seguridad
create:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 81a547ad88fc47..16716641f97582 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -24,6 +24,8 @@ es:
admin:
account_actions:
action: Realizar acción
+ already_silenced: Esta cuenta ya ha sido limitada.
+ already_suspended: Esta cuenta ya ha sido suspendida.
title: Moderar %{acct}
account_moderation_notes:
create: Crear
@@ -45,6 +47,7 @@ es:
title: Cambiar el correo electrónico de %{username}
change_role:
changed_msg: "¡Rol cambiado con éxito!"
+ edit_roles: Administrar roles de usuario
label: Cambiar rol
no_role: Sin rol
title: Cambiar rol para %{username}
@@ -601,6 +604,7 @@ es:
suspend_description_html: La cuenta y todos sus contenidos serán inaccesibles y finalmente eliminados, e interactuar con ella será imposible. Reversible durante 30 días. Cierra todos los informes contra esta cuenta.
actions_description_html: Decide qué medidas tomar para resolver esta denuncia. Si tomas una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría Spam.
actions_description_remote_html: Decide qué medidas tomar para resolver este informe. Esto solo afectará a la forma en que tu servidor se comunica con esta cuenta remota y gestiona su contenido.
+ actions_no_posts: Este informe no incluye ninguna publicación asociada a eliminar
add_to_report: Añadir más al reporte
already_suspended_badges:
local: Ya suspendido en este servidor
@@ -1156,6 +1160,12 @@ es:
view_strikes: Ver amonestaciones pasadas contra tu cuenta
too_fast: Formulario enviado demasiado rápido, inténtelo de nuevo.
use_security_key: Usar la clave de seguridad
+ author_attribution:
+ example_title: Texto de ejemplo
+ hint_html: Controla cómo se te dará atribución cuando se compartan enlaces en Mastodon.
+ more_from_html: Más de %{name}
+ s_blog: Blog de %{name}
+ title: Atribución del autor
challenge:
confirm: Continuar
hint_html: "Tip: No volveremos a preguntarte por la contraseña durante la siguiente hora."
@@ -1933,6 +1943,7 @@ es:
instructions_html: Copia y pega el siguiente código en el HTML de tu sitio web. A continuación, añade la dirección de su sitio web en uno de los campos extra de tu perfil desde la pestaña "Editar perfil" y guarda los cambios.
verification: Verificación
verified_links: Tus enlaces verificados
+ website_verification: Verificación del sitio web
webauthn_credentials:
add: Agregar nueva clave de seguridad
create:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index f2fe134e325f23..996c8d6cd2abdf 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -24,12 +24,15 @@ fa:
admin:
account_actions:
action: انجامِ کنش
+ already_silenced: این جساب از پیش محدود شده.
+ already_suspended: این جساب از پیش معلّق شده.
title: انجام کنش مدیریتی روی %{acct}
account_moderation_notes:
create: افزودن یادداشت
created_msg: یادداشت مدیر با موفقیت ساخته شد!
destroyed_msg: یادداشت نظارتی با موفقیت نابود شد!
accounts:
+ add_email_domain_block: انسداد دامنهٔ رایانامه
approve: پذیرفتن
approved_msg: کارهٔ ثبتنام %{username} با موفقیت تأیید شد
are_you_sure: مطمئنید؟
@@ -44,6 +47,7 @@ fa:
title: تغییر رایانامه برای %{username}
change_role:
changed_msg: نقش با موفقیت تغییر کرد!
+ edit_roles: مدیریت نقشهای کاربر
label: تغییر نقش
no_role: بدون نقش
title: تغییر نقش برای %{username}
@@ -56,6 +60,7 @@ fa:
demote: تنزلدادن
destroyed_msg: دادههای %{username} در صف حدف قرار گرفتند
disable: از کار انداختن
+ disable_sign_in_token_auth: از کار انداختن تأیید هویت ژتون رایانامهای
disable_two_factor_authentication: از کار انداختن ورود دومرحلهای
disabled: از کار افتاده
display_name: نام نمایشی
@@ -64,6 +69,7 @@ fa:
email: رایانامه
email_status: وضعیت رایانامه
enable: به کار انداختن
+ enable_sign_in_token_auth: به کار انداختن تأیید هویت ژتون رایانامهای
enabled: به کار افتاده
enabled_msg: حساب %{username} با موفقیت به کار انداخته شد
followers: پیگیران
@@ -128,6 +134,7 @@ fa:
resubscribe: اشتراک دوباره
role: نقش
search: جستوجو
+ search_same_email_domain: دیگر کاربران با دامنهٔ رایانامهٔ یکسان
search_same_ip: دیگر کاربران با IP یکسان
security: امنیت
security_measures:
@@ -168,13 +175,16 @@ fa:
approve_appeal: پذیرش درخواست تجدیدنظر
approve_user: تایید کاربر
assigned_to_self_report: واگذاری گزارش
+ change_email_user: تغییر رایانامه برای کاربر
change_role_user: تغیر نقش کاربر
confirm_user: تأیید کاربر
create_account_warning: ایجاد هشدار
create_announcement: ایجاد اعلامیه
+ create_canonical_email_block: ایجاد انسداد رایانامه
create_custom_emoji: ایجاد اموجی سفارشی
create_domain_allow: ایجاد اجازهٔ دامنه
create_domain_block: ایجاد انسداد دامنه
+ create_email_domain_block: ایجاد انسداد دامنهٔ رایانامه
create_ip_block: ایجاد قاعدهٔ آیپی
create_unavailable_domain: ایجاد دامنهٔ ناموجود
create_user_role: ایجاد نقش
@@ -214,6 +224,7 @@ fa:
update_custom_emoji: بهروز رسانی اموجی سفارشی
update_domain_block: بهروزرسانی مسدودسازی دامنه
update_ip_block: بروزرسانی قاعدهٔ آیپی
+ update_report: بهروز رسانی گزارش
update_status: بهروز رسانی وضعیت
update_user_role: به روزرسانی نقش
actions:
@@ -250,6 +261,7 @@ fa:
reject_user_html: "%{name} ثبت نام %{target} را رد کرد"
remove_avatar_user_html: "%{name} تصویر نمایهٔ %{target} را حذف کرد"
reopen_report_html: "%{name} گزارش %{target} را دوباره به جریان انداخت"
+ resend_user_html: "%{name} رایانامهٔ تأیید برای %{target} را دوباره فرستاد"
reset_password_user_html: "%{name} گذرواژه کاربر %{target} را بازنشاند"
resolve_report_html: "%{name} گزارش %{target} را رفع کرد"
sensitive_account_html: "%{name} رسانهٔ %{target} را به عنوان حساس علامتگذاری کرد"
@@ -264,6 +276,7 @@ fa:
update_custom_emoji_html: "%{name} شکلک %{target} را بهروز کرد"
update_domain_block_html: "%{name} مسدودسازی دامنه را برای %{target} بهروزرسانی کرد"
update_ip_block_html: "%{name} قانون آیپی %{target} را تغییر داد"
+ update_report_html: "%{name} گزارش %{target} را بهروز کرد"
update_status_html: "%{name} نوشتهٔ %{target} را بهروز کرد"
update_user_role_html: "%{name} نقش %{target} را تغییر داد"
deleted_account: حساب حذف شد
@@ -271,6 +284,7 @@ fa:
filter_by_action: پالایش بر اساس کنش
filter_by_user: پالایش بر اساس کاربر
title: سیاههٔ بازرسی
+ unavailable_instance: "(نام دامنه ناموجود)"
announcements:
destroyed_msg: اعلامیه با موفقیت حذف شد!
edit:
@@ -405,6 +419,7 @@ fa:
attempts_over_week:
one: "%{count} تلاش در هفتهٔ گذشته"
other: "%{count} تلاش ورود در هفتهٔ گذشته"
+ created_msg: دامنهٔ رایانامه با موفقیت مسدود شد
delete: پاککردن
dns:
types:
@@ -413,7 +428,10 @@ fa:
new:
create: ساختن مسدودسازی
resolve: حل و فصل دامنه
+ title: مسدودسازی دامنهٔ رایانامهٔ جدید
+ no_email_domain_block_selected: هیچ انسداد دامنهٔ رایانامهای تغییر نکرد زیرا هیچکدامشان انتخاب نشده بودند
not_permitted: مجاز نیست
+ title: دامنههای رایانامهٔ مسدود شده
export_domain_allows:
new:
title: درونریزی اجازههای دامنه
@@ -586,6 +604,7 @@ fa:
target_origin: خاستگاه حساب گزارششده
title: گزارشها
unassign: پسگرفتن مسئولیت
+ unknown_action_msg: 'کنش ناشناخته: %{action}'
unresolved: حلنشده
updated_at: بهروز شد
view_profile: دیدن نمایه
@@ -625,6 +644,7 @@ fa:
manage_taxonomies: مدیریت طیقهبندیها
manage_user_access: مدیریت دسترسی کاربران
manage_users: مدیریت کاربران
+ manage_webhooks: مدیریت قلّابهای وب
view_dashboard: دیدن داشبورد
view_dashboard_description: اجازه به کاربران برای دسترسی به داشتبورد و سنجههای مختلف
view_devops: دواپس
@@ -643,6 +663,8 @@ fa:
appearance:
preamble: سفارشیسازی رابطس وب ماستودون.
title: ظاهر
+ branding:
+ title: ویژندگی
default_noindex:
title: درخواست خروج از اندیسگذاری پیشگزیدهٔ موتور جستوجو
discovery:
@@ -743,6 +765,16 @@ fa:
action: برای اطّلاعات بیشتر اینجا را بررسی کنید
message_html: "ذخیرهسازتان بد پیکربندی شده. محرمانگی کاربرانتان در خطر است."
tags:
+ moderation:
+ not_trendable: غیر قابل داغ شدن
+ not_usable: غير قابل استفاده
+ pending_review: بازبینی منتظر
+ review_requested: بازبینی درخواست شده
+ reviewed: بازبینی شده
+ title: وضعیت
+ trendable: قابل داغ شدن
+ unreviewed: بررسی نشده
+ usable: قابل استفاده
review: وضعیت بازبینی
updated_msg: تنظیمات برچسبها با موفقیت بهروز شد
title: مدیریت
@@ -753,15 +785,25 @@ fa:
links:
allow: اجازه به پیوند
allow_provider: اجازه به ناشر
+ confirm_disallow: مطمئنید که می خواهید پیوندهای گزیده را ممنوع کنید؟
+ confirm_disallow_provider: مطمئنید که می خواهید فراهم کنندههای گزیده را ممنوع کنید؟
disallow: اجازه ندادن به پیوند
disallow_provider: اجازه ندادن به ناشر
no_link_selected: هیچ پیوندی تغییر نکرد زیرا هیچکدام از آنها انتخاب نشده بودند
+ publishers:
+ no_publisher_selected: هیچ ناشری تغییر نکرد زیرا هیچکدام از آنها انتخاب نشده بودند
title: پیوندهای داغ
+ not_allowed_to_trend: اجازهٔ داغ شدن ندارد
pending_review: بازبینی منتظر
preview_card_providers:
title: ناشران
rejected: رد شده
statuses:
+ allow: اجازه به فرسته
+ allow_account: اجازه به نگارنده
+ disallow: ممنوع کردن فرسته
+ disallow_account: ممنوع کردن نگارنده
+ no_status_selected: هیچ فرستهٔ داغی تغییری نکرد زیرا هیچکدام از آنها انتخاب نشده بودند
title: فرستههای داغ
tags:
current_score: امتیاز کنونی %{score}
@@ -845,7 +887,9 @@ fa:
guide_link_text: همه میتوانند کمک کنند.
sensitive_content: محتوای حساس
application_mailer:
+ notification_preferences: تغییر ترجیحات رایانامه
salutation: "%{name}،"
+ settings: 'تغییر ترجیحات رایانامه: %{link}'
unsubscribe: لغو اشتراک
view: 'نمایش:'
view_profile: دیدن نمایه
@@ -863,6 +907,7 @@ fa:
captcha_confirmation:
title: بررسی های امنیتی
confirmations:
+ awaiting_review_title: ثبتنامتان دارد بررسی میشود
login_link: ورود
welcome_title: خوش آمدید، %{name}!
delete_account: پاککردن حساب
@@ -914,6 +959,10 @@ fa:
view_strikes: دیدن شکایتهای گذشته از حسابتان
too_fast: فرم با سرعت بسیار زیادی فرستاده شد، دوباره تلاش کنید.
use_security_key: استفاده از کلید امنیتی
+ author_attribution:
+ example_title: متن نمونه
+ more_from_html: بیشتر از %{name}
+ s_blog: بلاگ %{name}
challenge:
confirm: ادامه
hint_html: "نکته: ما در یک ساعت آینده گذرواژهتان را از شما نخواهیم پرسید."
@@ -1079,6 +1128,9 @@ fa:
none: هیچکدام
order_by: مرتبسازی
save_changes: ذخیرهٔ تغییرات
+ select_all_matching_items:
+ one: گزینش %{count} مورد مطابق با جستوجویتان.
+ other: گزینش %{count} مورد مطابق با جستوجویتان.
today: امروز
validation_errors:
one: یک چیزی هنوز درست نیست! لطفاً خطاهای زیر را ببینید
@@ -1087,6 +1139,7 @@ fa:
errors:
over_rows_processing_limit: دارای بیش از %{count} ردیف
too_large: حجم فایل خیلی بزرگ است
+ failures: شکستها
imported: وارد شد
modes:
merge: ادغام
@@ -1103,11 +1156,23 @@ fa:
status: وضعیت
success: دادههای شما با موفقیت بارگذاری شد و به زودی پردازش میشود
time_started: آغاز شده در
+ titles:
+ blocking: درون ریختن حسابهای مسدود
+ bookmarks: درون ریختن نشانکها
+ domain_blocking: درون ریختن دامنههای مسدود
+ following: درون ریختن حسابهای پیگرفته
+ lists: درون ریختن سیاههها
+ muting: درون ریختن حسابهای خموش
+ type: گونهٔ درونریزی
+ type_groups:
+ constructive: پیگیریها و نشانکها
+ destructive: انسدادها و خموشیها
types:
blocking: سیاههٔ انسداد
bookmarks: نشانکها
domain_blocking: سیاههٔ انسداد دامنه
following: سیاههٔ پیگیری
+ lists: سیاههها
muting: سیاههٔ خموشی
upload: بارگذاری
invites:
@@ -1140,6 +1205,7 @@ fa:
authentication_methods:
otp: کارهٔ تأیید هویت دوعاملی
password: گذرواژه
+ sign_in_token: کد امنیتی رایانامهای
webauthn: کلیدهای امنیتی
description_html: اگر فعالیتی میبینید که تشخیصش نمیدهید، تغییر گذرواژه و به کار انداختن تأیید هویت دوعاملی را در نظر داشته باشید.
empty: هیچ تاریخچهای از تأییدهویت موجود نیست
@@ -1315,6 +1381,8 @@ fa:
over_daily_limit: شما از حد مجاز %{limit} فرسته زمانبندیشده در آن روز فراتر رفتهاید
over_total_limit: شما از حد مجاز %{limit} فرسته زمانبندیشده فراتر رفتهاید
too_soon: زمان تعیینشده باید در آینده باشد
+ self_destruct:
+ title: این کارساز دارد بسته میشود
sessions:
activity: آخرین فعالیت
browser: مرورگر
@@ -1339,6 +1407,7 @@ fa:
unknown_browser: مرورگر ناشناخته
weibo: وبیو
current_session: نشست فعلی
+ date: تاریخ
description: "%{browser} روی %{platform}"
explanation: مرورگرهای زیر هماینک به حساب شما وارد شدهاند.
ip: آیپی
@@ -1375,6 +1444,7 @@ fa:
import: درونریزی
import_and_export: درونریزی و برونبری
migrate: انتقال حساب
+ notifications: آگاهیهای رایانامهای
preferences: ترجیحات
profile: نمایه
relationships: پیگیریها و پیگیران
@@ -1382,6 +1452,9 @@ fa:
strikes: شکایتهای مدیریتی
two_factor_authentication: ورود دومرحلهای
webauthn_authentication: کلیدهای امنیتی
+ severed_relationships:
+ download: بارگیری (%{count})
+ type: رویداد
statuses:
attached:
audio:
@@ -1520,7 +1593,16 @@ fa:
silence: حساب محدود شده است
suspend: حساب معلق شده است
welcome:
+ apps_android_action: گرفتن از پلی گوگل
+ apps_ios_action: بارگیری روی فروشگاه کاره
+ apps_step: بارگیری کارهٔ رسمیمان.
+ apps_title: کارههای ماستودون
+ edit_profile_action: شخصی سازی
explanation: نکتههایی که برای آغاز کار به شما کمک میکنند
+ follow_action: پیگیری
+ post_action: ایجاد
+ share_action: همرسانی
+ sign_in_action: ورود
subject: به ماستودون خوش آمدید
title: خوش آمدید، کاربر %{name}!
users:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 30837b6003ca50..b48b499bbe463a 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1162,8 +1162,10 @@ fi:
use_security_key: Käytä suojausavainta
author_attribution:
example_title: Esimerkkiteksti
+ hint_html: Määrää, kuinka tulet tunnustetuksi, kun Mastodonissa jaetaan linkkejä.
more_from_html: Lisää tekijältä %{name}
s_blog: Käyttäjän %{name} blogi
+ title: Tekijän tunnustus
challenge:
confirm: Jatka
hint_html: "Vihje: Emme pyydä sinulta salasanaa uudelleen seuraavan tunnin aikana."
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index d5127b4ad3838f..266b73bb10aa1d 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1913,6 +1913,9 @@ fo:
follows_subtitle: Fylg vælkendar kontur
follows_title: Hvørji tú átti at fylgt
follows_view_more: Sí fleiri fólk at fylgja
+ hashtags_recent_count:
+ one: "%{people} fólk seinastu 2 dagarnar"
+ other: "%{people} fólk seinastu 2 dagarnar"
hashtags_subtitle: Kanna rákið seinastu 2 dagarnar
hashtags_title: Vælumtókt frámerki
hashtags_view_more: Sí fleiri vælumtókt frámerki
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index a47d7447a12b45..5290ff53745315 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -1147,6 +1147,12 @@ fr-CA:
view_strikes: Voir les sanctions précédemment appliquées à votre compte
too_fast: Formulaire envoyé trop rapidement, veuillez réessayer.
use_security_key: Utiliser la clé de sécurité
+ author_attribution:
+ example_title: Exemple de texte
+ hint_html: Déterminez la façon dont vous êtes crédité lorsque des liens sont partagés sur Mastodon.
+ more_from_html: Plus via %{name}
+ s_blog: Blog de %{name}
+ title: Attribution de l'auteur·e
challenge:
confirm: Continuer
hint_html: "Astuce : Nous ne vous demanderons plus votre mot de passe pour la prochaine heure."
@@ -1914,6 +1920,7 @@ fr-CA:
instructions_html: Copiez et collez le code ci-dessous dans le code HTML de votre site web. Ajoutez ensuite l’adresse de votre site dans l’un des champs supplémentaires de votre profil à partir de l‘onglet "Modifier le profil" et enregistrez les modifications.
verification: Vérification
verified_links: Vos liens vérifiés
+ website_verification: Vérification du site web
webauthn_credentials:
add: Ajouter une nouvelle clé de sécurité
create:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index b2c692ea6ffe87..8ee4e35acc608c 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1147,6 +1147,12 @@ fr:
view_strikes: Voir les sanctions précédemment appliquées à votre compte
too_fast: Formulaire envoyé trop rapidement, veuillez réessayer.
use_security_key: Utiliser la clé de sécurité
+ author_attribution:
+ example_title: Exemple de texte
+ hint_html: Déterminez la façon dont vous êtes crédité lorsque des liens sont partagés sur Mastodon.
+ more_from_html: Plus via %{name}
+ s_blog: Blog de %{name}
+ title: Attribution de l'auteur·e
challenge:
confirm: Continuer
hint_html: "Astuce : Nous ne vous demanderons plus votre mot de passe pour la prochaine heure."
@@ -1914,6 +1920,7 @@ fr:
instructions_html: Copiez et collez le code ci-dessous dans le code HTML de votre site web. Ajoutez ensuite l’adresse de votre site dans l’un des champs supplémentaires de votre profil à partir de l‘onglet « Modifier le profil » et enregistrez les modifications.
verification: Vérification
verified_links: Vos liens vérifiés
+ website_verification: Vérification du site web
webauthn_credentials:
add: Ajouter une nouvelle clé de sécurité
create:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 09e6b9ba0e1a5f..c902625eaa03bc 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -26,6 +26,8 @@ lv:
admin:
account_actions:
action: Veikt darbību
+ already_silenced: Šis konts jau ir ierobežots.
+ already_suspended: Šis konts jau ir aizturēts.
title: Veikt moderācijas darbību %{acct}
account_moderation_notes:
create: Atstāt piezīmi
@@ -46,6 +48,7 @@ lv:
title: Mainīt e-pastu %{username}
change_role:
changed_msg: Loma veiksmīgi nomainīta!
+ edit_roles: Pārvaldīt lietotāju lomas
label: Mainīt lomu
no_role: Nav lomas
title: Mainīt lomu %{username}
@@ -131,6 +134,7 @@ lv:
resubscribe: Pieteikties vēlreiz
role: Loma
search: Meklēt
+ search_same_email_domain: Citi lietotāji ar tādu pašu e-pasta domēnu
search_same_ip: Citi lietotāji ar tādu pašu IP
security: Drošība
security_measures:
@@ -171,6 +175,7 @@ lv:
approve_appeal: Apstiprināt Apelāciju
approve_user: Apstiprināt lietotāju
assigned_to_self_report: Piešķirt Pārskatu
+ change_email_user: Mainīt lietotāja e-pasta adresi
change_role_user: Mainīt lietotāja lomu
confirm_user: Apstiprināt lietotāju
create_account_warning: Izveidot Brīdinājumu
@@ -217,13 +222,16 @@ lv:
update_custom_emoji: Atjaunināt pielāgoto emocijzīmi
update_domain_block: Atjaunināt Domēna Bloku
update_ip_block: Atjaunināt IP noteikumu
+ update_report: Atjaunināt atskaiti
update_status: Atjaunināt ziņu
update_user_role: Atjaunināt lomu
actions:
approve_appeal_html: "%{name} apstiprināja moderācijas lēmuma apelāciju no %{target}"
approve_user_html: "%{name} apstiprināja reģistrēšanos no %{target}"
assigned_to_self_report_html: "%{name} piešķīra pārskatu %{target} sev"
+ change_email_user_html: "%{name} nomainīja lietotāja %{target} e-pasta adresi"
change_role_user_html: "%{name} nomainīja lomu uz %{target}"
+ confirm_user_html: "%{name} apstiprināja lietotāja %{target} e-pasta adresi"
create_account_warning_html: "%{name} nosūtīja brīdinājumu %{target}"
create_announcement_html: "%{name} izveidoja jaunu paziņojumu %{target}"
create_custom_emoji_html: "%{name} augšupielādēja jaunu emocijzīmi %{target}"
@@ -253,6 +261,7 @@ lv:
reject_user_html: "%{name} noraidīja reģistrēšanos no %{target}"
remove_avatar_user_html: "%{name} noņēma %{target} profila attēlu"
reopen_report_html: "%{name} atkārtoti atvēra ziņojumu %{target}"
+ resend_user_html: "%{name} atkārtoti nosūtīja %{target} apstiprinājuma e-pasta ziņojumu"
reset_password_user_html: "%{name} atiestatīja paroli lietotājam %{target}"
resolve_report_html: "%{name} atrisināja ziņojumu %{target}"
sensitive_account_html: "%{name} atzīmēja %{target} multividi kā sensitīvu"
@@ -267,6 +276,7 @@ lv:
update_custom_emoji_html: "%{name} atjaunināja emocijzīmi %{target}"
update_domain_block_html: "%{name} atjaunināja domēna bloku %{target}"
update_ip_block_html: "%{name} mainīja nosacījumu priekš IP %{target}"
+ update_report_html: "%{name} atjaunināja %{target} pārskatu"
update_status_html: "%{name} atjaunināja ziņu %{target}"
update_user_role_html: "%{name} nomainīja %{target} lomu"
deleted_account: dzēsts konts
@@ -274,6 +284,7 @@ lv:
filter_by_action: Filtrēt pēc darbības
filter_by_user: Filtrēt pēc lietotāja
title: Auditācijas pieraksti
+ unavailable_instance: "(domēna vārds nav pieejams)"
announcements:
destroyed_msg: Paziņojums ir veiksmīgi izdzēsts!
edit:
@@ -855,7 +866,13 @@ lv:
action: Pārbaudi šeit, lai iegūtu plašāku informāciju
message_html: "Tava objektu krātuve ir nepareizi konfigurēta. Tavu lietotāju privātums ir apdraudēts."
tags:
+ moderation:
+ not_usable: Nav izmantojams
+ pending_review: Gaida pārskatīšanu
+ review_requested: Pieprasīta pārskatīšana
+ reviewed: Pārskatīts
review: Pārskatīt stāvokli
+ title: Tēmturi
updated_msg: Tēmtura iestatījumi ir veiksmīgi atjaunināti
title: Administrēšana
trends:
@@ -929,6 +946,7 @@ lv:
delete: Dzēst
edit_preset: Labot iepriekš iestatītus brīdinājumus
empty: Tu vēl neesi definējis iepriekš iestatītos brīdinājumus.
+ title: Brīdinājumu priekšiestatījums
webhooks:
add_new: Pievienot galapunktu
delete: Dzēst
@@ -1004,7 +1022,9 @@ lv:
guide_link_text: Ikviens var piedalīties.
sensitive_content: Sensitīvs saturs
application_mailer:
+ notification_preferences: Mainīt e-pasta uztādījumus
salutation: "%{name},"
+ settings: 'Mainīt e-pasta uztādījumus: %{link}'
unsubscribe: Atcelt abonēšanu
view: 'Skatīt:'
view_profile: Skatīt profilu
@@ -1024,6 +1044,7 @@ lv:
hint_html: Vēl tikai viena lieta! Mums ir jāapstiprina, ka tu esi cilvēks (tas ir tāpēc, lai mēs varētu nepieļaut surogātpasta izsūtīšanu!). Atrisini tālāk norādīto CAPTCHA un noklikšķini uz "Turpināt".
title: Drošības pārbaude
confirmations:
+ awaiting_review: E-pasta adrese ir apstiprināta. %{domain} darbinieki tagad pārskata reģistrāciju. Tiks saņemts e-pasta ziņojums, ja viņi apstiprinās kontu.
awaiting_review_title: Tava reģistrācija tiek izskatīta
clicking_this_link: klikšķinot šo saiti
login_link: pieteikties
@@ -1031,6 +1052,7 @@ lv:
redirect_to_app_html: Tev vajadzētu būt novirzītam uz lietotni %{app_name}. Ja tas nenotika, mēģini %{clicking_this_link} vai manuāli atgriezieties lietotnē.
registration_complete: Tava reģistrācija domēnā %{domain} tagad ir pabeigta!
welcome_title: Laipni lūdzam, %{name}!
+ wrong_email_hint: Ja šī e-pasta adrese nav pareiza, to var mainīt konta iestatījumos.
delete_account: Dzēst kontu
delete_account_html: Ja vēlies dzēst savu kontu, tu vari turpināt šeit. Tev tiks lūgts apstiprinājums.
description:
@@ -1051,6 +1073,7 @@ lv:
or_log_in_with: Vai piesakies ar
privacy_policy_agreement_html: Esmu izlasījis un piekrītu privātuma politikai
progress:
+ confirm: Apstiprināt e-pasta adresi
details: Tavi dati
review: Mūsu apskats
rules: Pieņemt noteikumus
@@ -1072,8 +1095,10 @@ lv:
security: Drošība
set_new_password: Iestatīt jaunu paroli
setup:
+ email_below_hint_html: Jāpārbauda sava surogātpasta mape vai jāpieprasa vēl vienu! Savu e-pasta adresi var labot, ja tā ir nepareiza.
email_settings_hint_html: Noklikšķini uz saites, kuru mēs tev nosūtījām, lai apstiprinātu %{email}. Mēs tepat pagaidīsim.
link_not_received: Vai nesaņēmi sati?
+ new_confirmation_instructions_sent: Pēc dažām minūtēm saņemsi jaunu e-pasta ziņojumu ar apstiprinājuma saiti.
title: Pārbaudi savu iesūtni
sign_in:
preamble_html: Jāpiesakās ar saviem %{domain} piekļuves datiem. Ja Tavs konts tiek mitināts citā serverī, Tu nevarēsi šeit pieteikties.
@@ -1084,6 +1109,7 @@ lv:
title: Atļauj tevi iestatīt %{domain}.
status:
account_status: Konta statuss
+ confirming: Gaida e-pasta adreses apstiprināšanas pabeigšanu.
functional: Tavs konts ir pilnā darba kārtībā.
redirecting_to: Tavs konts ir neaktīvs, jo pašlaik tas tiek novirzīts uz %{acct}.
self_destruct: Tā kā %{domain} tiek slēgts, tu iegūsi tikai ierobežotu piekļuvi savam kontam.
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 0a665fb784d415..b591cdca5754eb 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -3,6 +3,7 @@ ar:
simple_form:
hints:
account:
+ attribution_domains_as_text: يحمي من الإسناد الزائف.
discoverable: يمكن عرض مشاركاتك العامة وملفك الشخصي أو التوصية به في مختلف مناطق ماستدون ويمكن اقتراح ملفك الشخصي على مستخدمين آخرين.
display_name: اسمك الكامل أو اسمك المرح.
fields: صفحتك الرئيسية، ضمائرك، عمرك، أي شيء تريده.
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index ff66bcb59e081c..2a2d06ce9b2974 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -3,6 +3,7 @@ es-MX:
simple_form:
hints:
account:
+ attribution_domains_as_text: Protege frente atribuciones fraudulentas.
discoverable: Tu perfil y las publicaciones públicas pueden ser destacadas o recomendadas en varias áreas de Mastodon y tu perfil puede ser sugerido a otros usuarios.
display_name: Tu nombre completo o tu nick.
fields: Tu página de inicio, pronombres, edad, todo lo que quieras.
@@ -130,6 +131,7 @@ es-MX:
name: Sólo se puede cambiar el cajón de las letras, por ejemplo, para que sea más legible
user:
chosen_languages: Cuando se marca, solo se mostrarán los toots en los idiomas seleccionados en los timelines públicos
+ role: El rol controla qué permisos tiene el usuario.
user_role:
color: Color que se utilizará para el rol a lo largo de la interfaz de usuario, como RGB en formato hexadecimal
highlighted: Esto hace que el rol sea públicamente visible
@@ -142,6 +144,7 @@ es-MX:
url: Donde los eventos serán enviados
labels:
account:
+ attribution_domains_as_text: Solo permitir sitios web específicos
discoverable: Destacar el perfil y las publicaciones en el algoritmo de descubrimiento
fields:
name: Etiqueta
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 143c5d80756f9e..b22701aae7b0b8 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -3,6 +3,7 @@ es:
simple_form:
hints:
account:
+ attribution_domains_as_text: Protege frente atribuciones fraudulentas.
discoverable: Tu perfil y publicaciones públicas pueden ser destacadas o recomendadas en varias áreas de Mastodon y tu perfil puede ser sugerido a otros usuarios.
display_name: Tu nombre completo o tu apodo.
fields: Tu carta de presentación, pronombres, edad, lo que quieras.
@@ -130,6 +131,7 @@ es:
name: Sólo se puede cambiar el cajón de las letras, por ejemplo, para que sea más legible
user:
chosen_languages: Cuando se marca, solo se mostrarán las publicaciones en los idiomas seleccionados en las líneas de tiempo públicas
+ role: El rol controla qué permisos tiene el usuario.
user_role:
color: Color que se utilizará para el rol a lo largo de la interfaz de usuario, como RGB en formato hexadecimal
highlighted: Esto hace que el rol sea públicamente visible
@@ -142,6 +144,7 @@ es:
url: Donde los eventos serán enviados
labels:
account:
+ attribution_domains_as_text: Solo permitir sitios web específicos
discoverable: Destacar perfil y publicaciones en algoritmos de descubrimiento
fields:
name: Etiqueta
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index a2b29566f62b62..5c85367dbb7906 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -3,6 +3,7 @@ fi:
simple_form:
hints:
account:
+ attribution_domains_as_text: Suojaa vääriltä tunnustuksilta.
discoverable: Julkisia julkaisujasi ja profiiliasi voidaan pitää esillä tai suositella Mastodonin eri alueilla ja profiiliasi voidaan ehdottaa toisille käyttäjille.
display_name: Koko nimesi tai lempinimesi.
fields: Verkkosivustosi, pronominisi, ikäsi ja mitä ikinä haluatkaan ilmoittaa.
diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml
index 1128335f11c41d..794c3f4533178c 100644
--- a/config/locales/simple_form.fr-CA.yml
+++ b/config/locales/simple_form.fr-CA.yml
@@ -3,6 +3,7 @@ fr-CA:
simple_form:
hints:
account:
+ attribution_domains_as_text: Protège contre les fausses attributions.
discoverable: Vos messages publics et votre profil peuvent être mis en avant ou recommandés dans diverses parties de Mastodon et votre profil peut être suggéré à d’autres utilisateurs.
display_name: Votre nom complet ou votre nom cool.
fields: Votre page d'accueil, pronoms, âge, tout ce que vous voulez.
@@ -141,6 +142,7 @@ fr-CA:
url: Là où les événements seront envoyés
labels:
account:
+ attribution_domains_as_text: Autoriser uniquement des sites Web spécifiques
discoverable: Autoriser des algorithmes de découverte à mettre en avant votre profil et vos messages
fields:
name: Étiquette
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index c06453298468b7..e29d9f0a944d09 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -3,6 +3,7 @@ fr:
simple_form:
hints:
account:
+ attribution_domains_as_text: Protège contre les fausses attributions.
discoverable: Vos messages publics et votre profil peuvent être mis en avant ou recommandés dans diverses parties de Mastodon et votre profil peut être suggéré à d’autres utilisateurs.
display_name: Votre nom complet ou votre nom rigolo.
fields: Votre page personnelle, vos pronoms, votre âge, ce que vous voulez.
@@ -141,6 +142,7 @@ fr:
url: Là où les événements seront envoyés
labels:
account:
+ attribution_domains_as_text: Autoriser uniquement des sites Web spécifiques
discoverable: Autoriser des algorithmes de découverte à mettre en avant votre profil et vos messages
fields:
name: Étiquette
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 2ec7aafc510432..a8f6ed74937af4 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -10,10 +10,39 @@
let(:bob) { Fabricate(:account, username: 'bob') }
+ describe '#suspended_locally?' do
+ context 'when the account is not suspended' do
+ it 'returns false' do
+ expect(subject.suspended_locally?).to be false
+ end
+ end
+
+ context 'when the account is suspended locally' do
+ before do
+ subject.update!(suspended_at: 1.day.ago, suspension_origin: :local)
+ end
+
+ it 'returns true' do
+ expect(subject.suspended_locally?).to be true
+ end
+ end
+
+ context 'when the account is suspended remotely' do
+ before do
+ subject.update!(suspended_at: 1.day.ago, suspension_origin: :remote)
+ end
+
+ it 'returns false' do
+ expect(subject.suspended_locally?).to be false
+ end
+ end
+ end
+
describe '#suspend!' do
it 'marks the account as suspended and creates a deletion request' do
expect { subject.suspend! }
.to change(subject, :suspended?).from(false).to(true)
+ .and change(subject, :suspended_locally?).from(false).to(true)
.and(change { AccountDeletionRequest.exists?(account: subject) }.from(false).to(true))
end
@@ -763,6 +792,34 @@
end
end
+ describe '#attribution_domains_as_text=' do
+ subject { Fabricate(:account) }
+
+ it 'sets attribution_domains accordingly' do
+ subject.attribution_domains_as_text = "hoge.com\nexample.com"
+
+ expect(subject.attribution_domains).to contain_exactly('hoge.com', 'example.com')
+ end
+
+ it 'strips leading "*."' do
+ subject.attribution_domains_as_text = "hoge.com\n*.example.com"
+
+ expect(subject.attribution_domains).to contain_exactly('hoge.com', 'example.com')
+ end
+
+ it 'strips the protocol if present' do
+ subject.attribution_domains_as_text = "http://hoge.com\nhttps://example.com"
+
+ expect(subject.attribution_domains).to contain_exactly('hoge.com', 'example.com')
+ end
+
+ it 'strips a combination of leading "*." and protocol' do
+ subject.attribution_domains_as_text = "http://*.hoge.com\nhttps://*.example.com"
+
+ expect(subject.attribution_domains).to contain_exactly('hoge.com', 'example.com')
+ end
+ end
+
describe 'Normalizations' do
describe 'username' do
it { is_expected.to normalize(:username).from(" \u3000bob \t \u00a0 \n ").to('bob') }
diff --git a/spec/models/list_account_spec.rb b/spec/models/list_account_spec.rb
new file mode 100644
index 00000000000000..e5aad2affa9dce
--- /dev/null
+++ b/spec/models/list_account_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ListAccount do
+ describe 'Callbacks to set follows' do
+ context 'when list owner follows account' do
+ let!(:follow) { Fabricate :follow }
+ let(:list) { Fabricate :list, account: follow.account }
+
+ it 'finds and sets the follow with the list account' do
+ list_account = described_class.create list: list, account: follow.target_account
+ expect(list_account)
+ .to have_attributes(
+ follow: eq(follow),
+ follow_request: be_nil
+ )
+ end
+ end
+
+ context 'when list owner has a follow request for account' do
+ let!(:follow_request) { Fabricate :follow_request }
+ let(:list) { Fabricate :list, account: follow_request.account }
+
+ it 'finds and sets the follow request with the list account' do
+ list_account = described_class.create list: list, account: follow_request.target_account
+ expect(list_account)
+ .to have_attributes(
+ follow: be_nil,
+ follow_request: eq(follow_request)
+ )
+ end
+ end
+
+ context 'when list owner is the account' do
+ let(:list) { Fabricate :list }
+
+ it 'does not set follow or follow request' do
+ list_account = described_class.create list: list, account: list.account
+ expect(list_account)
+ .to have_attributes(
+ follow: be_nil,
+ follow_request: be_nil
+ )
+ end
+ end
+ end
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 0b24f68f736267..ee03b49bc6aa16 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -21,6 +21,7 @@
add_group 'Libraries', 'lib'
add_group 'Policies', 'app/policies'
add_group 'Presenters', 'app/presenters'
+ add_group 'Search', 'app/chewy'
add_group 'Serializers', 'app/serializers'
add_group 'Services', 'app/services'
add_group 'Validators', 'app/validators'