From 4c84891453378ca9db03657ec42f96684223e85c Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Tue, 19 Mar 2024 12:11:10 -0400 Subject: [PATCH 1/8] Pull out full `li` element into admin/status_edits/status_edit partial (#29499) --- .../admin/status_edits/_status_edit.html.haml | 48 +++++++++++-------- app/views/admin/statuses/show.html.haml | 13 +---- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/app/views/admin/status_edits/_status_edit.html.haml b/app/views/admin/status_edits/_status_edit.html.haml index 19a0e063da..7254777213 100644 --- a/app/views/admin/status_edits/_status_edit.html.haml +++ b/app/views/admin/status_edits/_status_edit.html.haml @@ -1,20 +1,30 @@ -.status - .status__content>< - - if status_edit.spoiler_text.blank? - = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis) - - else - %details< - %summary>< - %strong> Content warning: #{prerender_custom_emojis(h(status_edit.spoiler_text), status_edit.emojis)} - = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis) - - - unless status_edit.ordered_media_attachments.empty? - = render partial: 'admin/reports/media_attachments', locals: { status: status_edit } - - .detailed-status__meta - %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at) - - - if status_edit.sensitive? +%li + .history__entry + %h5 + - if status_edit_iteration.first? + = t('admin.statuses.original_status') + - else + = t('admin.statuses.status_changed') · - = fa_icon('eye-slash fw') - = t('stream_entries.sensitive_content') + %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at) + + .status + .status__content>< + - if status_edit.spoiler_text.blank? + = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis) + - else + %details< + %summary>< + %strong> Content warning: #{prerender_custom_emojis(h(status_edit.spoiler_text), status_edit.emojis)} + = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis) + + - unless status_edit.ordered_media_attachments.empty? + = render partial: 'admin/reports/media_attachments', locals: { status: status_edit } + + .detailed-status__meta + %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at) + + - if status_edit.sensitive? + · + = fa_icon('eye-slash fw') + = t('stream_entries.sensitive_content') diff --git a/app/views/admin/statuses/show.html.haml b/app/views/admin/statuses/show.html.haml index 0e88624def..9cadde2870 100644 --- a/app/views/admin/statuses/show.html.haml +++ b/app/views/admin/statuses/show.html.haml @@ -47,15 +47,4 @@ %h3= t('admin.statuses.history') %ol.history - - batched_ordered_status_edits.with_index do |status_edit, i| - %li - .history__entry - %h5 - - if i.zero? - = t('admin.statuses.original_status') - - else - = t('admin.statuses.status_changed') - · - %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at) - - = render status_edit + = render partial: 'admin/status_edits/status_edit', collection: batched_ordered_status_edits From 5f1380415fc3bc8abe38c5077cb30b6f2ff60f58 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 09:19:08 +0100 Subject: [PATCH 2/8] Update dependency postcss to v8.4.37 (#29656) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8d504c719a..bb2722fba0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13042,13 +13042,13 @@ __metadata: linkType: hard "postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.33": - version: 8.4.36 - resolution: "postcss@npm:8.4.36" + version: 8.4.37 + resolution: "postcss@npm:8.4.37" dependencies: nanoid: "npm:^3.3.7" picocolors: "npm:^1.0.0" - source-map-js: "npm:^1.1.0" - checksum: 10c0/e7c834e31d8f4e8dfd0a427df36fdc7bdc58a16e373551618e2c3ac172019eb816b24f1b4709311ebcade8d3ba31b2d75522d28ef45ecbbeb11eb01f265579fb + source-map-js: "npm:^1.2.0" + checksum: 10c0/0b5730ad0ccbceaf0faaa4a283a144adefd23254f17dbdd63be5e0b37193c7df58003f88742c04c3ae6fd60d1a5158b331a4ce926797fb21e94833ae83c6bf69 languageName: node linkType: hard @@ -14989,10 +14989,10 @@ __metadata: languageName: node linkType: hard -"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.1.0": - version: 1.1.0 - resolution: "source-map-js@npm:1.1.0" - checksum: 10c0/d1f016efe4fcf67fd92e36da0670f2889b13a36cc453329758336450e811c61164376eb451b453b4dd4e89a760f841b0a014942d54f240af31a791829bc0e336 +"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.2.0": + version: 1.2.0 + resolution: "source-map-js@npm:1.2.0" + checksum: 10c0/7e5f896ac10a3a50fe2898e5009c58ff0dc102dcb056ed27a354623a0ece8954d4b2649e1a1b2b52ef2e161d26f8859c7710350930751640e71e374fe2d321a4 languageName: node linkType: hard From 6c0b1a41a1b3ef15288a29ac2d486a822c4cbd14 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 09:39:42 +0100 Subject: [PATCH 3/8] New Crowdin Translations (automated) (#29657) Co-authored-by: GitHub Actions --- app/javascript/mastodon/locales/fo.json | 2 +- app/javascript/mastodon/locales/hu.json | 22 ++++++------ app/javascript/mastodon/locales/ko.json | 9 +++-- app/javascript/mastodon/locales/nn.json | 28 +++++++++++++++- app/javascript/mastodon/locales/pt-PT.json | 39 ++++++++++++++++++++++ app/javascript/mastodon/locales/ry.json | 8 +++++ app/javascript/mastodon/locales/sk.json | 14 ++++++++ config/locales/an.yml | 1 - config/locales/ar.yml | 1 - config/locales/ast.yml | 1 - config/locales/be.yml | 1 - config/locales/bg.yml | 5 ++- config/locales/ca.yml | 5 ++- config/locales/ckb.yml | 1 - config/locales/co.yml | 1 - config/locales/cs.yml | 1 - config/locales/cy.yml | 1 - config/locales/da.yml | 5 ++- config/locales/de.yml | 5 ++- config/locales/el.yml | 1 - config/locales/en-GB.yml | 1 - config/locales/eo.yml | 1 - config/locales/es-AR.yml | 2 +- config/locales/es-MX.yml | 8 ++++- config/locales/es.yml | 2 +- config/locales/et.yml | 1 - config/locales/eu.yml | 5 ++- config/locales/fa.yml | 1 - config/locales/fi.yml | 5 ++- config/locales/fo.yml | 9 +++-- config/locales/fr-CA.yml | 1 - config/locales/fr.yml | 1 - config/locales/fy.yml | 1 - config/locales/ga.yml | 1 - config/locales/gd.yml | 1 - config/locales/gl.yml | 5 ++- config/locales/he.yml | 4 ++- config/locales/hr.yml | 1 - config/locales/hu.yml | 5 ++- config/locales/hy.yml | 1 - config/locales/id.yml | 1 - config/locales/ie.yml | 1 - config/locales/io.yml | 1 - config/locales/is.yml | 4 ++- config/locales/it.yml | 5 ++- config/locales/ja.yml | 1 - config/locales/ka.yml | 1 - config/locales/kab.yml | 1 - config/locales/kk.yml | 1 - config/locales/ko.yml | 7 +++- config/locales/ku.yml | 1 - config/locales/lad.yml | 4 ++- config/locales/lt.yml | 4 ++- config/locales/lv.yml | 1 - config/locales/ml.yml | 2 -- config/locales/ms.yml | 1 - config/locales/my.yml | 1 - config/locales/nl.yml | 5 ++- config/locales/nn.yml | 24 ++++++++----- config/locales/no.yml | 1 - config/locales/oc.yml | 1 - config/locales/pl.yml | 5 ++- config/locales/pt-BR.yml | 1 - config/locales/pt-PT.yml | 8 ++++- config/locales/ru.yml | 1 - config/locales/sc.yml | 1 - config/locales/sco.yml | 1 - config/locales/si.yml | 1 - config/locales/simple_form.nn.yml | 2 +- config/locales/sk.yml | 8 ++++- config/locales/sl.yml | 5 ++- config/locales/sq.yml | 5 ++- config/locales/sr-Latn.yml | 1 - config/locales/sr.yml | 1 - config/locales/sv.yml | 2 +- config/locales/th.yml | 5 ++- config/locales/tr.yml | 5 ++- config/locales/tt.yml | 1 - config/locales/uk.yml | 5 ++- config/locales/vi.yml | 1 - config/locales/zgh.yml | 1 - config/locales/zh-CN.yml | 5 ++- config/locales/zh-HK.yml | 1 - config/locales/zh-TW.yml | 5 ++- 84 files changed, 243 insertions(+), 103 deletions(-) diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json index c3e3f8cc1a..27c0c8548f 100644 --- a/app/javascript/mastodon/locales/fo.json +++ b/app/javascript/mastodon/locales/fo.json @@ -7,7 +7,7 @@ "about.domain_blocks.silenced.explanation": "Yvirhøvur, so sært tú ikki vangar og innihald frá hesum ambætaranum, uttan so at tú skilliga leitar hesi upp ella velur tey við at fylgja teimum.", "about.domain_blocks.silenced.title": "Avmarkað", "about.domain_blocks.suspended.explanation": "Ongar dátur frá hesum ambætara verða viðgjørd, goymd ella deild, tað ger, at samskifti við aðrar ambætarar er iki møguligt.", - "about.domain_blocks.suspended.title": "Koyrdur frá", + "about.domain_blocks.suspended.title": "Gjørt óvirkið", "about.not_available": "Hetta er ikki tøkt á føroyska servaranum enn.", "about.powered_by": "Miðfirra almennur miðil koyrandi á {mastodon}", "about.rules": "Ambætarareglur", diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index c13c8dc220..38e46399d3 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -92,11 +92,11 @@ "block_modal.remote_users_caveat": "Arra kérjük a {domain} kiszolgálót, hogy tartsa tiszteletben a döntésedet. Ugyanakkor az együttműködés nem garantált, mivel néhány kiszolgáló másképp kezelheti a letiltásokat. A nyilvános bejegyzések a be nem jelentkezett felhasználók számára továbbra is látszódhatnak.", "block_modal.show_less": "Kevesebb mutatása", "block_modal.show_more": "Több mutatása", - "block_modal.they_cant_mention": "Nem említhetnek meg vagy követhetnek téged.", - "block_modal.they_cant_see_posts": "Nem láthatják a bejegyzéseidet, és te sem fogod látni az övékét.", - "block_modal.they_will_know": "Láthatják, hogy le vannak tiltva.", + "block_modal.they_cant_mention": "Nem említhet meg és nem követhet téged.", + "block_modal.they_cant_see_posts": "Nem láthatja a bejegyzéseidet, és te sem fogod látni az övéit.", + "block_modal.they_will_know": "Láthatja, hogy le van tiltva.", "block_modal.title": "Letiltsuk a felhasználót?", - "block_modal.you_wont_see_mentions": "Nem látsz majd őket említő bejegyzéseket.", + "block_modal.you_wont_see_mentions": "Nem látsz majd őt említő bejegyzéseket.", "boost_modal.combo": "Hogy átugord ezt következő alkalommal, használd {combo}", "bundle_column_error.copy_stacktrace": "Hibajelentés másolása", "bundle_column_error.error.body": "A kért lap nem jeleníthető meg. Ez lehet, hogy kódhiba, vagy böngészőkompatibitási hiba.", @@ -176,7 +176,7 @@ "confirmations.delete_list.confirm": "Törlés", "confirmations.delete_list.message": "Biztos, hogy véglegesen törölni szeretnéd ezt a listát?", "confirmations.discard_edit_media.confirm": "Elvetés", - "confirmations.discard_edit_media.message": "Elmentetlen változtatásaid vannak a média leírásában vagy előnézetében. Eldobjuk őket?", + "confirmations.discard_edit_media.message": "Mentetlen változtatásaid vannak a média leírásában vagy előnézetében, mindenképp elveted?", "confirmations.domain_block.confirm": "Kiszolgáló letiltása", "confirmations.domain_block.message": "Biztos, hogy le szeretnéd tiltani a teljes {domain} domaint? A legtöbb esetben néhány célzott tiltás vagy némítás elegendő, és kívánatosabb megoldás. Semmilyen tartalmat nem fogsz látni ebből a domainből se az idővonalakon, se az értesítésekben. Az ebben a domainben lévő követőidet is eltávolítjuk.", "confirmations.edit.confirm": "Szerkesztés", @@ -213,7 +213,7 @@ "domain_block_modal.block_account_instead": "Helyette @{name} letiltása", "domain_block_modal.they_can_interact_with_old_posts": "Az ezen a kiszolgálón lévő emberek interaktálhatnak a régi bejegyzéseiddel.", "domain_block_modal.they_cant_follow": "Erről a kiszolgálóról senki sem követhet.", - "domain_block_modal.they_wont_know": "Nem fogják tudni, hogy letiltották őket.", + "domain_block_modal.they_wont_know": "Nem fogja tudni, hogy letiltották.", "domain_block_modal.title": "Letiltsuk a domaint?", "domain_block_modal.you_will_lose_followers": "Az ezen a kiszolgálón lévő összes követődet törölni fogjuk.", "domain_block_modal.you_wont_see_posts": "Nem látsz majd bejegyzéseket vagy értesítéseket ennek a kiszolgálónak a felhasználóitól.", @@ -350,7 +350,7 @@ "home.pending_critical_update.title": "Kritikus biztonsági frissítés érhető el!", "home.show_announcements": "Közlemények megjelenítése", "interaction_modal.description.favourite": "Egy Mastodon fiókkal kedvencnek jelölheted ezt a bejegyzést, tudatva a szerzővel, hogy értékeled és elteszed későbbre.", - "interaction_modal.description.follow": "Egy Mastodon fiókkal bekövetheted {name} fiókot, hogy lásd a bejegyzéseit a saját hírfolyamodban.", + "interaction_modal.description.follow": "Egy Mastodon-fiókkal követheted {name} fiókját, hogy lásd a bejegyzéseit a kezdőlapodon.", "interaction_modal.description.reblog": "Egy Mastodon fiókkal megtolhatod ezt a bejegyzést, hogy megoszd a saját követőiddel.", "interaction_modal.description.reply": "Egy Mastodon fiókkal válaszolhatsz erre a bejegyzésre.", "interaction_modal.login.action": "Vigyen haza", @@ -431,11 +431,11 @@ "mute_modal.hide_options": "Beállítások elrejtése", "mute_modal.indefinite": "Amíg nem oldom fel a némítást", "mute_modal.show_options": "Beállítások megjelenítése", - "mute_modal.they_can_mention_and_follow": "Megemlíthetnek vagy követhetnek téged, de nem fogod őket látni.", - "mute_modal.they_wont_know": "Nem fogják tudni, hogy lenémították őket.", + "mute_modal.they_can_mention_and_follow": "Megemlíthet vagy követhet téged, de te nem fogod ezeket látni.", + "mute_modal.they_wont_know": "Nem fogja tudni, hogy lenémítottad.", "mute_modal.title": "Elnémítsuk a felhasználót?", - "mute_modal.you_wont_see_mentions": "Nem látsz majd őket említő bejegyzéseket.", - "mute_modal.you_wont_see_posts": "Továbbra is látni fogják a bejegyzéseidet, de te nem fogod látni az övékét.", + "mute_modal.you_wont_see_mentions": "Nem látsz majd őt említő bejegyzéseket.", + "mute_modal.you_wont_see_posts": "Továbbra is látni fogja a bejegyzéseidet, de te nem fogod látni az övéit.", "navigation_bar.about": "Névjegy", "navigation_bar.advanced_interface": "Megnyitás a speciális webes felületben", "navigation_bar.blocks": "Letiltott felhasználók", diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index 5fd28cfd81..96407b0020 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -221,10 +221,15 @@ "domain_pill.activitypub_like_language": "액티비티펍은 마스토돈이 다른 소셜 네트워크와 대화할 때 쓰는 언어 같은 것입니다.", "domain_pill.server": "서버", "domain_pill.their_handle": "그의 핸들:", + "domain_pill.their_server": "그의 게시물이 살고 있는 디지털 거처입니다.", + "domain_pill.their_username": "그의 서버에서 유일한 식별자입니다. 다른 서버에서 같은 사용자명을 가진 사용자를 찾을 수도 있습니다.", "domain_pill.username": "사용자명", "domain_pill.whats_in_a_handle": "핸들엔 무엇이 담겨 있나요?", + "domain_pill.who_they_are": "핸들은 어디에 있는 누구인지를 나타내기 때문에 들의 소셜 웹을 넘나들며 사람들과 상호작용 할 수 있습니다.", "domain_pill.who_you_are": "내 핸들은 내가 어디에 있는 누군지 나타내기 때문에 사람들은 을 통해 소셜 웹을 넘나들며 나와 상호작용 할 수 있습니다.", "domain_pill.your_handle": "내 핸들:", + "domain_pill.your_server": "내 게시물들이 살고 있는 나의 디지털 거처입니다. 마음에 들지 않나요? 팔로워를 데리고 언제든지 다른 서버로 거처를 옮길 수도 있습니다.", + "domain_pill.your_username": "이 서버에서 유일한 내 식별자입니다. 다른 서버에서 같은 사용자명을 가진 사용자를 찾을 수도 있습니다.", "embed.instructions": "아래의 코드를 복사하여 대화를 원하는 곳으로 공유하세요.", "embed.preview": "이렇게 표시됩니다:", "emoji_button.activity": "활동", @@ -507,11 +512,11 @@ "notifications.policy.filter_new_accounts_title": "새 계정", "notifications.policy.filter_not_followers_hint": "나를 팔로우 한 지 {days, plural, other {# 일}}이 되지 않은 사람들을 포함", "notifications.policy.filter_not_followers_title": "나를 팔로우하지 않는 사람들", - "notifications.policy.filter_not_following_hint": "내가 수동으로 승인하기 전까지", + "notifications.policy.filter_not_following_hint": "내가 수동으로 승인하지 않는 한", "notifications.policy.filter_not_following_title": "내가 팔로우하지 않는 사람들", "notifications.policy.filter_private_mentions_hint": "내가 한 멘션에 단 답글이거나 내가 발신자를 팔로우 한 것이 아닌 이상 걸러집니다", "notifications.policy.filter_private_mentions_title": "청하지 않은 개인적인 멘션", - "notifications.policy.title": "알림을 거를 사람들…", + "notifications.policy.title": "알림을 제외할 조건들…", "notifications_permission_banner.enable": "데스크탑 알림 활성화", "notifications_permission_banner.how_to_control": "마스토돈이 열려 있지 않을 때에도 알림을 받으려면, 데스크탑 알림을 활성화 하세요. 당신은 어떤 종류의 반응이 데스크탑 알림을 발생할 지를 {icon} 버튼을 통해 세세하게 설정할 수 있습니다.", "notifications_permission_banner.title": "아무것도 놓치지 마세요", diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json index a218cadf8d..aa20207a76 100644 --- a/app/javascript/mastodon/locales/nn.json +++ b/app/javascript/mastodon/locales/nn.json @@ -92,6 +92,11 @@ "block_modal.remote_users_caveat": "Vi vil be tenaren {domain} om å respektere di avgjerd. Det kan ikkje garanterast at det vert etterfølgd, sidan nokre tenarar kan handtere blokkering ulikt. Offentlege innlegg kan framleis vere synlege for ikkje-innlogga brukarar.", "block_modal.show_less": "Vis mindre", "block_modal.show_more": "Vis meir", + "block_modal.they_cant_mention": "Dei kan ikkje nemna eller fylgja deg.", + "block_modal.they_cant_see_posts": "Dei kan ikkje sjå innlegga dine, og du vil ikkje sjå deira.", + "block_modal.they_will_know": "Dei kan sjå at dei er blokkerte.", + "block_modal.title": "Blokker brukaren?", + "block_modal.you_wont_see_mentions": "Du ser ikkje innlegg som nemner dei.", "boost_modal.combo": "Du kan trykkja {combo} for å hoppa over dette neste gong", "bundle_column_error.copy_stacktrace": "Kopier feilrapport", "bundle_column_error.error.body": "Den etterspurde sida kan ikke hentast fram. Det kan skuldast ein feil i koden vår eller eit kompatibilitetsproblem.", @@ -172,6 +177,7 @@ "confirmations.delete_list.message": "Er du sikker på at du vil sletta denne lista for alltid?", "confirmations.discard_edit_media.confirm": "Forkast", "confirmations.discard_edit_media.message": "Du har ulagra endringar i mediaskildringa eller førehandsvisinga. Vil du forkasta dei likevel?", + "confirmations.domain_block.confirm": "Blokker tenaren", "confirmations.domain_block.message": "Er du heilt, heilt sikker på at du vil skjula heile {domain}? I dei fleste tilfelle er det godt nok og føretrekt med nokre få målretta blokkeringar eller målbindingar. Du kjem ikkje til å sjå innhald frå domenet i fødererte tidsliner eller i varsla dine. Fylgjarane dine frå domenet vert fjerna.", "confirmations.edit.confirm": "Rediger", "confirmations.edit.message": "Å redigera no vil overskriva den meldinga du er i ferd med å skriva. Er du sikker på at du vil halda fram?", @@ -203,6 +209,14 @@ "dismissable_banner.explore_statuses": "Dette er innlegg frå det desentraliserte nettverket som er i støytet i dag. Nye statusar som er mykje framheva og merkte som favorittar er rangert høgare.", "dismissable_banner.explore_tags": "Desse emneknaggane er populære blant folk på denne tenaren og andre tenarar i det desentraliserte nettverket nett no.", "dismissable_banner.public_timeline": "Dette er dei nyaste offentlege innlegga frå menneske på det sosiale nettet som folk på {domain} følgjer.", + "domain_block_modal.block": "Blokker tenaren", + "domain_block_modal.block_account_instead": "Blokker @{name} i staden", + "domain_block_modal.they_can_interact_with_old_posts": "Folk på denne tenaren kan samhandla med dei gamle innlegga dine.", + "domain_block_modal.they_cant_follow": "Ingen på denne tenaren kan fylgja deg.", + "domain_block_modal.they_wont_know": "Dei veit ikkje at dei er blokkerte.", + "domain_block_modal.title": "Blokker domenet?", + "domain_block_modal.you_will_lose_followers": "Alle fylgjarane dine frå denne tenaren blir fjerna.", + "domain_block_modal.you_wont_see_posts": "Du vil ikkje sjå innlegg eller varslingar frå brukarar på denne tenaren.", "domain_pill.activitypub_lets_connect": "Den lar deg kople til og samhandle med folk ikkje berre på Mastodon, men òg på tvers av forskjellige sosiale appar.", "domain_pill.activitypub_like_language": "ActivityPub er som språket Mastodon snakkar med andre sosiale nettverk.", "domain_pill.server": "Tenar", @@ -234,7 +248,7 @@ "emoji_button.symbols": "Symbol", "emoji_button.travel": "Reise & stader", "empty_column.account_hides_collections": "Denne brukaren har valt å ikkje gjere denne informasjonen tilgjengeleg", - "empty_column.account_suspended": "Kontoen er suspendert", + "empty_column.account_suspended": "Kontoen er utestengd", "empty_column.account_timeline": "Ingen tut her!", "empty_column.account_unavailable": "Profil ikkje tilgjengeleg", "empty_column.blocks": "Du har ikkje blokkert nokon enno.", @@ -413,6 +427,15 @@ "loading_indicator.label": "Lastar…", "media_gallery.toggle_visible": "{number, plural, one {Skjul bilete} other {Skjul bilete}}", "moved_to_account_banner.text": "Kontoen din, {disabledAccount} er for tida deaktivert fordi du har flytta til {movedToAccount}.", + "mute_modal.hide_from_notifications": "Ikkje vis varslingar", + "mute_modal.hide_options": "Gøym val", + "mute_modal.indefinite": "Til eg avdempar dei", + "mute_modal.show_options": "Vis val", + "mute_modal.they_can_mention_and_follow": "Dei kan nemna og fylgja deg, men du vil ikkje sjå dei.", + "mute_modal.they_wont_know": "Dei veit ikkje at dei er dempa.", + "mute_modal.title": "Demp brukaren?", + "mute_modal.you_wont_see_mentions": "Du vil ikkje sjå innlegg som nemner dei.", + "mute_modal.you_wont_see_posts": "Dei kan framleis sjå innlegga dine, men du vil ikkje sjå deira.", "navigation_bar.about": "Om", "navigation_bar.advanced_interface": "Opne i avansert nettgrensesnitt", "navigation_bar.blocks": "Blokkerte brukarar", @@ -670,9 +693,11 @@ "status.direct": "Nevn @{name} privat", "status.direct_indicator": "Privat omtale", "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.favourite": "Favoritt", + "status.favourites": "{count, plural, one {favoritt} other {favorittar}}", "status.filter": "Filtrer dette innlegget", "status.filtered": "Filtrert", "status.hide": "Skjul innlegget", @@ -693,6 +718,7 @@ "status.reblog": "Framhev", "status.reblog_private": "Framhev til dei originale mottakarane", "status.reblogged_by": "{name} framheva", + "status.reblogs": "{count, plural, one {framheving} other {framhevingar}}", "status.reblogs.empty": "Ingen har framheva dette tutet enno. Om nokon gjer, så dukkar det opp her.", "status.redraft": "Slett & skriv på nytt", "status.remove_bookmark": "Fjern bokmerke", diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json index b1145f64d5..d4b37ffe6d 100644 --- a/app/javascript/mastodon/locales/pt-PT.json +++ b/app/javascript/mastodon/locales/pt-PT.json @@ -89,6 +89,14 @@ "announcement.announcement": "Anúncio", "attachments_list.unprocessed": "(não processado)", "audio.hide": "Ocultar áudio", + "block_modal.remote_users_caveat": "Vamos pedir ao servidor {domain} para respeitar a sua decisão. No entanto, não é garantido o seu cumprimento, uma vez que alguns servidores podem tratar os bloqueios de forma diferente. As mensagens públicas podem continuar a ser visíveis para utilizadores não autenticados.", + "block_modal.show_less": "Mostrar menos", + "block_modal.show_more": "Mostrar mais", + "block_modal.they_cant_mention": "Eles não o podem mencionar ou seguir.", + "block_modal.they_cant_see_posts": "Eles não podem ver as suas publicações e você não verá as deles.", + "block_modal.they_will_know": "Eles podem ver que estão bloqueados.", + "block_modal.title": "Bloquear utilizador?", + "block_modal.you_wont_see_mentions": "Não verá publicações que os mencionem.", "boost_modal.combo": "Pode clicar {combo} para não voltar a ver", "bundle_column_error.copy_stacktrace": "Copiar relatório de erros", "bundle_column_error.error.body": "A página solicitada não pôde ser sintetizada. Isto pode ser devido a uma falha no nosso código ou a um problema de compatibilidade com o navegador.", @@ -169,6 +177,7 @@ "confirmations.delete_list.message": "Tens a certeza de que deseja eliminar permanentemente esta lista?", "confirmations.discard_edit_media.confirm": "Descartar", "confirmations.discard_edit_media.message": "Tem alterações por guardar na descrição ou pré-visualização do conteúdo. Descartar mesmo assim?", + "confirmations.domain_block.confirm": "Bloquear servidor", "confirmations.domain_block.message": "De certeza que queres bloquear completamente o domínio {domain}? Na maioria dos casos, silenciar ou bloquear alguns utilizadores é suficiente e é o recomendado. Não irás ver conteúdo daquele domínio em cronologia alguma nem nas tuas notificações. Os teus seguidores daquele domínio serão removidos.", "confirmations.edit.confirm": "Editar", "confirmations.edit.message": "Editar agora irá sobrescrever a mensagem que está a compor. Tem a certeza de que deseja continuar?", @@ -200,6 +209,27 @@ "dismissable_banner.explore_statuses": "Estas são publicações de toda a rede social que estão a ganhar popularidade atualmente. As mensagens mais recentes com mais partilhas e favoritos obtêm uma classificação mais elevada.", "dismissable_banner.explore_tags": "Estas #etiquetas estão presentemente a ganhar atenção entre as pessoas neste e noutros servidores da rede descentralizada.", "dismissable_banner.public_timeline": "Estas são as publicações públicas mais recentes de pessoas na rede social que as pessoas em {domain} seguem.", + "domain_block_modal.block": "Bloquear servidor", + "domain_block_modal.block_account_instead": "Bloquear @{name} em alternativa", + "domain_block_modal.they_can_interact_with_old_posts": "As pessoas deste servidor podem interagir com as suas publicações antigas.", + "domain_block_modal.they_cant_follow": "Ninguém deste servidor pode segui-lo.", + "domain_block_modal.they_wont_know": "Eles não saberão que foram bloqueados.", + "domain_block_modal.title": "Bloquear domínio?", + "domain_block_modal.you_will_lose_followers": "Todos os seus seguidores deste servidor serão removidos.", + "domain_block_modal.you_wont_see_posts": "Não verá publicações ou notificações de utilizadores neste servidor.", + "domain_pill.activitypub_lets_connect": "Permite-lhe conectar e interagir com pessoas não só no Mastodon, mas também em diferentes aplicações sociais.", + "domain_pill.activitypub_like_language": "O ActivityPub é como a linguagem que o Mastodon fala com outras redes sociais.", + "domain_pill.server": "Servidor", + "domain_pill.their_handle": "O seu identificador:", + "domain_pill.their_server": "A sua casa digital, onde se encontram todas as suas publicações.", + "domain_pill.their_username": "O seu identificador único no seu servidor. É possível encontrar utilizadores com o mesmo nome de utilizador em diferentes servidores.", + "domain_pill.username": "Nome de utilizador", + "domain_pill.whats_in_a_handle": "Em que consiste um identificador?", + "domain_pill.who_they_are": "Uma vez que os identificadores dizem quem é alguém e onde está, pode interagir com as pessoas através da rede social de .", + "domain_pill.who_you_are": "Uma vez que o seu identificador indica quem é e onde está, as pessoas podem interagir consigo através da rede social de .", + "domain_pill.your_handle": "O seu identificador:", + "domain_pill.your_server": "A sua casa digital, onde se encontram todas as suas publicações. Não gosta deste? Mude de servidor a qualquer momento e leve também os seus seguidores.", + "domain_pill.your_username": "O seu identificador único neste servidor. É possível encontrar utilizadores com o mesmo nome de utilizador em diferentes servidores.", "embed.instructions": "Incorpore esta publicação no seu site copiando o código abaixo.", "embed.preview": "Podes ver aqui como irá ficar:", "emoji_button.activity": "Actividade", @@ -397,6 +427,15 @@ "loading_indicator.label": "A carregar…", "media_gallery.toggle_visible": "Alternar visibilidade", "moved_to_account_banner.text": "A sua conta {disabledAccount} está, no momento, desativada, porque você migrou para {movedToAccount}.", + "mute_modal.hide_from_notifications": "Ocultar das notificações", + "mute_modal.hide_options": "Ocultar opções", + "mute_modal.indefinite": "Até que eu os tire do silêncio", + "mute_modal.show_options": "Mostrar opções", + "mute_modal.they_can_mention_and_follow": "Eles podem mencioná-lo e segui-lo, mas você não os verá.", + "mute_modal.they_wont_know": "Eles não saberão que foram silenciados.", + "mute_modal.title": "Silenciar utilizador?", + "mute_modal.you_wont_see_mentions": "Não verá publicações que os mencionem.", + "mute_modal.you_wont_see_posts": "Eles podem continuar a ver as suas publicações, mas você não verá as deles.", "navigation_bar.about": "Sobre", "navigation_bar.advanced_interface": "Abrir na interface web avançada", "navigation_bar.blocks": "Utilizadores bloqueados", diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json index de3d619171..62772f4f22 100644 --- a/app/javascript/mastodon/locales/ry.json +++ b/app/javascript/mastodon/locales/ry.json @@ -6,6 +6,8 @@ "about.domain_blocks.silenced.title": "Обмежено", "about.domain_blocks.suspended.explanation": "Ниякі податкы из сього сервера не будут уброблені, усокочені ци поміняні, што чинит невозможнов хоть-яку інтеракцію ци зязок из хосновачами из сього сервера.", "about.domain_blocks.suspended.title": "Заблоковано", + "about.not_available": "Ися інформація не была доступна на сюм сервері.", + "about.powered_by": "Децентралізована медіа основана на {mastodon}", "about.rules": "Правила сервера", "account.account_note_header": "Примітка", "account.add_or_remove_from_list": "Дати авадь забрати из исписа", @@ -16,18 +18,24 @@ "account.block_short": "Заблоковати", "account.blocked": "Заблоковано", "account.browse_more_on_origin_server": "Позирайте бульше на ориґіналнум профілю", + "account.cancel_follow_request": "Удмінити пудписку", "account.copy": "Зкопіровати удкликованя на профіл", + "account.disable_notifications": "Бульше не сповіщати ми коли {name} пише", "account.domain_blocked": "Домен заблокованый", "account.edit_profile": "Управити профіл", + "account.enable_notifications": "Уповістити ня, кой {name} пише", "account.endorse": "Указовати на профілови", "account.featured_tags.last_status_at": "Датум послідньої публикації {date}", "account.featured_tags.last_status_never": "Ниє публикацій", + "account.featured_tags.title": "Ублюблені гештеґы {name}", "account.follow": "Пудписати ся", + "account.follow_back": "Пудписати ся тоже", "account.followers": "Пудписникы", "account.followers.empty": "У сього хосновача раз ниє пудписникув.", "account.following": "Слідуєте", "account.follows.empty": "Сись хосновач щи никого не слідує.", "account.go_to_profile": "Перейти на профіл", + "account.joined_short": "Датум прикапчованя", "account.languages": "Поміняти убрані языкы", "account.link_verified_on": "Властность сього удкликованя было звірено {date}", "account.media": "Медіа", diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index 8c9238bb9e..c2b1cede94 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -89,6 +89,9 @@ "announcement.announcement": "Oznámenie", "attachments_list.unprocessed": "(nespracované)", "audio.hide": "Skryť zvuk", + "block_modal.show_less": "Zobraziť menej", + "block_modal.show_more": "Zobraziť viac", + "block_modal.title": "Blokovať užívateľa?", "boost_modal.combo": "Nabudúce môžete preskočiť stlačením {combo}", "bundle_column_error.copy_stacktrace": "Kopírovať chybovú hlášku", "bundle_column_error.error.body": "Požadovanú stránku nebolo možné vykresliť. Môže to byť spôsobené chybou v našom kóde alebo problémom s kompatibilitou prehliadača.", @@ -169,6 +172,7 @@ "confirmations.delete_list.message": "Určite chcete tento zoznam trvalo vymazať?", "confirmations.discard_edit_media.confirm": "Zahodiť", "confirmations.discard_edit_media.message": "Máte neuložené zmeny v popise alebo náhľade média, zahodiť ich aj tak?", + "confirmations.domain_block.confirm": "Blokovať server", "confirmations.domain_block.message": "Určite chcete blokovať celú doménu {domain}? Vo väčšine prípadov stačí blokovať alebo ignorovať pár konkrétnych účtov, čo aj odporúčame. Obsah z tejto domény neuvidíte v žiadnej verejnej časovej osi ani v upozorneniach. Vaši sledujúci pochádzajúci z tejto domény budú odstránení.", "confirmations.edit.confirm": "Upraviť", "confirmations.edit.message": "Úpravou prepíšete príspevok, ktorý máte rozpísaný. Určite chcete pokračovať?", @@ -200,6 +204,10 @@ "dismissable_banner.explore_statuses": "Toto sú príspevky z celej sociálnej siete, ktoré sú dnes populárne. Novšie príspevky s viacerými ohviezdičkovaniami a zdieľaniami sú radené vyššie.", "dismissable_banner.explore_tags": "Toto sú hashtagy zo sociálnej siete, ktoré sú dnes populárne. Novšie hashtagy používané viacerými ľuďmi sú radené vyššie.", "dismissable_banner.public_timeline": "Toto sú najnovšie verejné príspevky od účtov na sociálnej sieti, ktoré sú sledované účtami z {domain}.", + "domain_block_modal.block": "Blokovať server", + "domain_block_modal.title": "Blokovať doménu?", + "domain_pill.server": "Server", + "domain_pill.username": "Používateľské meno", "embed.instructions": "Tento príspevok môžete pridať na svoju webovú stránku použitím tohto kódu.", "embed.preview": "Takto bude vyzerať:", "emoji_button.activity": "Aktivita", @@ -267,6 +275,7 @@ "filter_modal.select_filter.title": "Filtrovanie tohto príspevku", "filter_modal.title.status": "Filtrovanie príspevku", "filtered_notifications_banner.pending_requests": "Oboznámenia od {count, plural, =0 {nikoho} one {jedného človeka} other {# ľudí}} čo môžeš poznať", + "filtered_notifications_banner.title": "Filtrované oznámenia", "firehose.all": "Všetko", "firehose.local": "Tento server", "firehose.remote": "Ostatné servery", @@ -395,6 +404,9 @@ "loading_indicator.label": "Načítavanie…", "media_gallery.toggle_visible": "{number, plural, one {Skryť obrázok} other {Skryť obrázky}}", "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálne deaktivovaný, pretože ste sa presunuli na {movedToAccount}.", + "mute_modal.hide_options": "Skryť možnosti", + "mute_modal.show_options": "Zobraziť možnosti", + "mute_modal.title": "Stíšiť užívateľa?", "navigation_bar.about": "O tomto serveri", "navigation_bar.advanced_interface": "Otvoriť v pokročilom webovom rozhraní", "navigation_bar.blocks": "Blokované účty", @@ -433,6 +445,7 @@ "notification.status": "{name} uverejňuje niečo nové", "notification.update": "{name} upravuje príspevok", "notification_requests.accept": "Prijať", + "notification_requests.dismiss": "Zamietnuť", "notification_requests.notifications_from": "Oboznámenia od {name}", "notification_requests.title": "Filtrované oboznámenia", "notifications.clear": "Vyčistiť upozornenia", @@ -469,6 +482,7 @@ "notifications.policy.filter_new_accounts_title": "Nové účty", "notifications.policy.filter_not_followers_title": "Ľudia, ktorí ťa nenasledujú", "notifications.policy.filter_not_following_title": "Ľudia, ktorých nenasleduješ", + "notifications.policy.title": "Filtrovať oznámenia od…", "notifications_permission_banner.enable": "Povoliť upozornenia na ploche", "notifications_permission_banner.how_to_control": "Ak chcete dostávať upozornenia, keď Mastodon nie je otvorený, povoľte upozornenia na ploche. Po ich zapnutí môžete presne kontrolovať, ktoré typy interakcií generujú upozornenia na ploche, a to prostredníctvom tlačidla {icon} vyššie.", "notifications_permission_banner.title": "Nenechajte si nič ujsť", diff --git a/config/locales/an.yml b/config/locales/an.yml index 5ac57f4238..068a20187d 100644 --- a/config/locales/an.yml +++ b/config/locales/an.yml @@ -1423,7 +1423,6 @@ an: import: Importar import_and_export: Importar y exportar migrate: Migración de cuenta - notifications: Notificacions preferences: Preferencias profile: Perfil relationships: Seguindo y seguidores diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 5b932f525c..b0579c6f3f 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -1751,7 +1751,6 @@ ar: import: استيراد import_and_export: استيراد وتصدير migrate: تهجير الحساب - notifications: الإخطارات preferences: التفضيلات profile: الملف التعريفي relationships: المتابِعون والمتابَعون diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 9b9d5510c0..816858d4a0 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -801,7 +801,6 @@ ast: import: Importación import_and_export: Importación ya esportación migrate: Migración de la cuenta - notifications: Avisos preferences: Preferencies profile: Perfil públicu relationships: Perfiles que sigues ya te siguen diff --git a/config/locales/be.yml b/config/locales/be.yml index d04409ca9a..0bdc3bb554 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -1704,7 +1704,6 @@ be: import: Імпарт import_and_export: Імпарт і экспарт migrate: Перамяшчэнне ўліковага запісу - notifications: Апавяшчэнні preferences: Налады profile: Профіль relationships: Падпіскі і падпісчыкі diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 3f05bfa0c0..feb4e74533 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -597,6 +597,9 @@ bg: actions_description_html: Решете какво действие може да се предприеме, за да бъде отхвърлен докладът. Ако предприемете наказателно действие срещу докладвания акаунт, към него ще бъде изпратено известие по имейл, освен ако Спам категорията не е била избрана. actions_description_remote_html: Преценете с какво действие да решите този доклад. Това ще има ефекет върху това как вашият сървър комуникира с този отдалечен акаунт и се справя с неговото съдържание. add_to_report: Добавяне на още към доклада + already_suspended_badges: + local: Вече е спряно на този сървър + remote: Вече е спряно на сървъра им are_you_sure: Сигурни ли сте? assign_to_self: Назначаване на мен assigned: Назначен модератор @@ -1652,7 +1655,7 @@ bg: import: Импортиране import_and_export: Импортиране и експортиране migrate: Миграция на акаунта - notifications: Известия + notifications: Известия по имейла preferences: Предпочитания profile: Профил relationships: Последвания и последователи diff --git a/config/locales/ca.yml b/config/locales/ca.yml index dedf69d7b2..2523db0eb0 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -597,6 +597,9 @@ ca: actions_description_html: Decideix quina acció a prendre per a resoldre aquest informe. Si prens un acció punitiva contra el compte denunciat, se li enviarà una notificació per correu electrònic, excepte quan se selecciona la categoria Spam. actions_description_remote_html: Decideix quina acció prendre per a resoldre aquest informe. Això només afectarà com el teu servidor es comunica amb aquest compte remot i en gestiona el contingut. add_to_report: Afegir més al informe + already_suspended_badges: + local: Ja és suspès en aquest servidor + remote: Ja és suspès al seu servidor are_you_sure: Segur? assign_to_self: Assigna'm assigned: Moderador assignat @@ -1652,7 +1655,7 @@ ca: import: Importació import_and_export: Importació i exportació migrate: Migració del compte - notifications: Notificacions + notifications: Notificacions per correu electrònic preferences: Preferències profile: Perfil relationships: Seguits i seguidors diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml index c1f280a24c..dfa035eca8 100644 --- a/config/locales/ckb.yml +++ b/config/locales/ckb.yml @@ -942,7 +942,6 @@ ckb: import: هاوردن import_and_export: هاوردەکردن و ناردن migrate: گواستنەوەی هەژمارە - notifications: ئاگادارییەکان preferences: پەسەندەکان profile: پرۆفایل relationships: شوێنکەوتوو و شوێنکەوتوان diff --git a/config/locales/co.yml b/config/locales/co.yml index 13c8b74313..7d8abcd112 100644 --- a/config/locales/co.yml +++ b/config/locales/co.yml @@ -926,7 +926,6 @@ co: import: Impurtazione import_and_export: Impurtazione è spurtazione migrate: Migrazione di u contu - notifications: Nutificazione preferences: Priferenze profile: Prufile relationships: Abbunamenti è abbunati diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 7e4e380541..b44b01beee 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -1704,7 +1704,6 @@ cs: import: Import import_and_export: Import a export migrate: Přesun účtu - notifications: Oznámení preferences: Předvolby profile: Profil relationships: Sledovaní a sledující diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 067d939deb..93d249cb50 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -1756,7 +1756,6 @@ cy: import: Mewnforio import_and_export: Mewnforio ac allforio migrate: Mudo cyfrif - notifications: Hysbysiadau preferences: Dewisiadau profile: Proffil cyhoeddus relationships: Yn dilyn a dilynwyr diff --git a/config/locales/da.yml b/config/locales/da.yml index fcb600d7b9..eda22d5b9c 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -597,6 +597,9 @@ da: actions_description_html: Afgør, hvilke foranstaltning, der skal træffes for at løse denne anmeldelse. Træffes en straffende foranstaltning mod den anmeldte konto, fremsendes en e-mailnotifikation, undtagen når kategorien Spam er valgt. actions_description_remote_html: Fastslå en nødvendig handling mhp. at løse denne anmeldelse. Dette vil kun påvirke din servers kommunikation med, og indholdshåndtering for, fjernkontoen. add_to_report: Føj mere til anmeldelse + already_suspended_badges: + local: Allerede suspenderet på denne server + remote: Allerede suspenderet på vedkommendes server are_you_sure: Sikker? assign_to_self: Tildel til mig assigned: Tildelt moderator @@ -1652,7 +1655,7 @@ da: import: Import import_and_export: Import og eksport migrate: Kontomigrering - notifications: Notifikationer + notifications: E-mailnotifikationer preferences: Præferencer profile: Offentlig profil relationships: Følger og følgere diff --git a/config/locales/de.yml b/config/locales/de.yml index 84f10d8e08..62e62c2c0b 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -597,6 +597,9 @@ de: actions_description_html: Entscheide, welche Maßnahmen du zum Klären dieser Meldung ergreifen möchtest. Wenn du eine Strafmaßnahme gegen das gemeldete Konto ergreifst, wird eine E-Mail-Benachrichtigung an dieses gesendet, außer wenn die Spam-Kategorie ausgewählt ist. actions_description_remote_html: Entscheide, welche Maßnahmen du zum Klären dieser Meldung ergreifen möchtest. Dies wirkt sich lediglich darauf aus, wie dein Server mit diesem externen Konto kommuniziert und dessen Inhalt handhabt. add_to_report: Meldung ergänzen + already_suspended_badges: + local: Auf diesem Server bereits gesperrt + remote: Auf dem anderen Server bereits gesperrt are_you_sure: Bist du dir sicher? assign_to_self: Mir zuweisen assigned: Zugewiesene*r Moderator*in @@ -1652,7 +1655,7 @@ de: import: Importieren import_and_export: Importieren und exportieren migrate: Kontoumzug - notifications: Benachrichtigungen + notifications: E-Mail-Benachrichtigungen preferences: Einstellungen profile: Öffentliches Profil relationships: Follower und Folge ich diff --git a/config/locales/el.yml b/config/locales/el.yml index d3d91abc2b..2e7ac87463 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -1524,7 +1524,6 @@ el: import: Εισαγωγή import_and_export: Εισαγωγή και εξαγωγή migrate: Μετακόμιση λογαριασμού - notifications: Ειδοποιήσεις preferences: Προτιμήσεις profile: Προφίλ relationships: Ακολουθείς και σε ακολουθούν diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index b5d92541df..a2f84b0932 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -1647,7 +1647,6 @@ en-GB: import: Import import_and_export: Import and export migrate: Account migration - notifications: Notifications preferences: Preferences profile: Profile relationships: Follows and followers diff --git a/config/locales/eo.yml b/config/locales/eo.yml index cb5654b4c7..d59eadd528 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -1579,7 +1579,6 @@ eo: import: Enporti import_and_export: Importi kaj eksporti migrate: Konta migrado - notifications: Sciigoj preferences: Preferoj profile: Profilo relationships: Sekvatoj kaj sekvantoj diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml index aae437b954..6332911107 100644 --- a/config/locales/es-AR.yml +++ b/config/locales/es-AR.yml @@ -1652,7 +1652,7 @@ es-AR: import: Importar import_and_export: Importación y exportación migrate: Migración de la cuenta - notifications: Notificaciones + notifications: Notificaciones por correo electrónico preferences: Configuración profile: Perfil público relationships: Seguimientos diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml index e7e1a4ff88..24b4af7ecd 100644 --- a/config/locales/es-MX.yml +++ b/config/locales/es-MX.yml @@ -597,6 +597,9 @@ es-MX: 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. add_to_report: Añadir más al reporte + already_suspended_badges: + local: Ya suspendido en este servidor + remote: Ya suspendido en su servidor are_you_sure: "¿Estás seguro?" assign_to_self: Asignármela a mí assigned: Moderador asignado @@ -1652,7 +1655,7 @@ es-MX: import: Importar import_and_export: Importar y exportar migrate: Migración de cuenta - notifications: Notificaciones + notifications: Notificaciones por correo electrónico preferences: Preferencias profile: Perfil relationships: Siguiendo y seguidores @@ -1865,6 +1868,9 @@ es-MX: follows_subtitle: Seguir cuentas conocidas follows_title: A quién seguir follows_view_more: Ver más personas para seguir + hashtags_recent_count: + one: "%{people} personas en los últimos 2 días" + other: "%{people} personas en los últimos 2 días" hashtags_subtitle: Explora las tendencias de los últimos 2 días hashtags_title: Etiquetas en tendencia hashtags_view_more: Ver más etiquetas en tendencia diff --git a/config/locales/es.yml b/config/locales/es.yml index 24822116ca..2f7877afed 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1652,7 +1652,7 @@ es: import: Importar import_and_export: Importar y exportar migrate: Migración de cuenta - notifications: Notificaciones + notifications: Notificaciones por correo electrónico preferences: Preferencias profile: Perfil relationships: Siguiendo y seguidores diff --git a/config/locales/et.yml b/config/locales/et.yml index 80e3d3ef68..889ddfcff1 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -1652,7 +1652,6 @@ et: import: Impordi import_and_export: Import / eksport migrate: Konto kolimine - notifications: Teated preferences: Eelistused profile: Profiil relationships: Jälgitud ja jälgijad diff --git a/config/locales/eu.yml b/config/locales/eu.yml index ac641ab454..4238e71c84 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -599,6 +599,9 @@ eu: actions_description_html: Erabaki txosten hau konpontzeko ze ekintza hartu. Salatutako kontuaren aurka zigor ekintza bat hartzen baduzu, eposta jakinarazpen bat bidaliko zaie, Spam kategoria hautatzean ezik. actions_description_remote_html: Hautatu txosten honi konponbidea aurkitzeko zein neurri hartu. Hau soilik zure zerbitzaria urruneko kontu honekin nola komunikatu eta bere edukia nola maneiatzeko da. add_to_report: Gehitu gehiago txostenera + already_suspended_badges: + local: Dagoeneko kanporatu da zerbitzari honetatik + remote: Dagoeneko kanporatu da bere zerbitzaritik are_you_sure: Ziur zaude? assign_to_self: Esleitu niri assigned: Esleitutako moderatzailea @@ -1656,7 +1659,7 @@ eu: import: Inportazioa import_and_export: Inportatu eta esportatu migrate: Kontuaren migrazioa - notifications: Jakinarazpenak + notifications: Posta bidezko jakinarazpenak preferences: Hobespenak profile: Profila relationships: Jarraitutakoak eta jarraitzaileak diff --git a/config/locales/fa.yml b/config/locales/fa.yml index df9b926276..d93d2e7d5f 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -1416,7 +1416,6 @@ fa: import: درون‌ریزی import_and_export: درون‌ریزی و برون‌بری migrate: انتقال حساب - notifications: آگاهی‌ها preferences: ترجیحات profile: نمایه relationships: پیگیری‌ها و پیگیران diff --git a/config/locales/fi.yml b/config/locales/fi.yml index a92ad4ecb6..0ba5931e5a 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -597,6 +597,9 @@ fi: actions_description_html: Päätä, mihin toimiin ryhdyt tämän raportin ratkaisemiseksi. Jos ryhdyt rangaistustoimeen ilmoitettua tiliä kohtaan, hänelle lähetetään sähköposti-ilmoitus, paitsi jos Roskaposti-luokka on valittuna. actions_description_remote_html: Päätä, mihin toimiin ryhdyt tämän raportin ratkaisemiseksi. Tämä vaikuttaa vain siihen, miten palvelimesi kommunikoi tämän etätilin kanssa ja käsittelee sen sisältöä. add_to_report: Lisää raporttiin + already_suspended_badges: + local: Jäädytetty jo tällä palvelimella + remote: Jäädytetty jo tällä palvelimella are_you_sure: Oletko varma? assign_to_self: Ota tehtäväksi assigned: Määritetty valvoja @@ -1652,7 +1655,7 @@ fi: import: Tuo import_and_export: Tuonti ja vienti migrate: Tilin muutto muualle - notifications: Ilmoitukset + notifications: Sähköposti-ilmoitukset preferences: Ominaisuudet profile: Julkinen profiili relationships: Seuratut ja seuraajat diff --git a/config/locales/fo.yml b/config/locales/fo.yml index 45633d85b3..49d206bbb9 100644 --- a/config/locales/fo.yml +++ b/config/locales/fo.yml @@ -94,7 +94,7 @@ fo: disabled: Óvirkið pending: Í bíðistøðu silenced: Avmarkað - suspended: Avbrotin + suspended: Gjørt óvirkin title: Umsjón moderation_notes: Umsjónarviðmerkingar most_recent_activity: Feskasta virksemi @@ -150,7 +150,7 @@ fo: strikes: Eldri fráboðanir subscribe: Tekna hald suspend: Fyribils ikki í gildi - suspended: Ikki í gildi + suspended: Gjørt óvirkin suspension_irreversible: Dáturnar á hesu kontu er endaliga sletttaðar. Tú kann seta hana í gildi, men dáturnar fáast ikki aftur. suspension_reversible_hint_html: Kontan er sett úr gildi og dáturnar verða endaliga strikaðar tann %{date}. Inntil tá kann kontan endurskapast uttan fylgjur. Ynskir tú at strika allar dátur hjá kontuni beinan vegin, so kanst tú gera tað niðanfyri. title: Kontur @@ -597,6 +597,9 @@ fo: actions_description_html: Ger av hvør atgerð skal takast fyri at avgreiða hesa meldingina. Revsitiltøk móti meldaðu kontuni føra við sær, at ein teldupostfráboðan verður send teimum, undantikið tá Ruskpostur verður valdur. actions_description_remote_html: Tak avgerð um hvat skal gerast fyri at avgreiða hesa rapporteringina. Hetta fer einans at ávirka, hvussu tín ambætari samskiftir við hesa fjarkontuna og hvussu hann handfer tilfar frá henni. add_to_report: Legg meira afturat meldingini + already_suspended_badges: + local: Longu gjørt óvirkin á hesum ambætaranum + remote: Longu gjørt óvirkin á teirra ambætara are_you_sure: Er tú vís/ur? assign_to_self: Tilluta mær assigned: Tilnevnt umsjónarfólk @@ -1652,7 +1655,7 @@ fo: import: Innflyt import_and_export: Innflyt og útflyt migrate: Flyting av kontu - notifications: Fráboðanir + notifications: Teldupostfráboðanir preferences: Stillingar profile: Vangi relationships: Fylging og fylgjarar diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml index 2ed482770c..fa69e36cc0 100644 --- a/config/locales/fr-CA.yml +++ b/config/locales/fr-CA.yml @@ -1652,7 +1652,6 @@ fr-CA: import: Import de données import_and_export: Import et export migrate: Migration de compte - notifications: Notifications preferences: Préférences profile: Profil relationships: Abonnements et abonné·e·s diff --git a/config/locales/fr.yml b/config/locales/fr.yml index ae012c1531..2045760655 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1652,7 +1652,6 @@ fr: import: Import de données import_and_export: Import et export migrate: Migration de compte - notifications: Notifications preferences: Préférences profile: Profil relationships: Abonnements et abonné·e·s diff --git a/config/locales/fy.yml b/config/locales/fy.yml index 742b2903a0..1d62f7c6af 100644 --- a/config/locales/fy.yml +++ b/config/locales/fy.yml @@ -1647,7 +1647,6 @@ fy: import: Ymportearje import_and_export: Ymportearje en eksportearje migrate: Accountmigraasje - notifications: Meldingen preferences: Ynstellingen profile: Profyl relationships: Folgers en folgjenden diff --git a/config/locales/ga.yml b/config/locales/ga.yml index 5c61898ef5..a3ad293e5b 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -461,7 +461,6 @@ ga: development: Forbairt edit_profile: Cuir an phróifíl in eagar import: Iompórtáil - notifications: Fógraí preferences: Sainroghanna pearsanta profile: Próifíl webauthn_authentication: Eochracha slándála diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 79bbbea0f5..381a0a8b40 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -1704,7 +1704,6 @@ gd: import: Ion-phortadh import_and_export: Ion-phortadh ⁊ às-phortadh migrate: Imrich cunntais - notifications: Brathan preferences: Roghainnean profile: Pròifil phoblach relationships: Dàimhean leantainn diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 57249d2ca9..7fbba21b27 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -597,6 +597,9 @@ gl: actions_description_html: Decide que acción tomar respecto desta denuncia. Se tomas accións punitivas contra a conta denunciada, enviaráselles un email coa notificación, excepto se está seleccionada a categoría Spam. actions_description_remote_html: Decide a acción a tomar para resolver a denuncia. Isto só lle afecta ao xeito en que o teu servidor se comunica con esta conta remota e xestiona o seu contido. add_to_report: Engadir máis á denuncia + already_suspended_badges: + local: Xa está suspendida neste servidor + remote: Xa está suspendida no seu servidor are_you_sure: Tes certeza? assign_to_self: Asignarme assigned: Moderador asignado @@ -1652,7 +1655,7 @@ gl: import: Importar import_and_export: Importar e exportar migrate: Migrar conta - notifications: Notificacións + notifications: Notificacións por correo preferences: Preferencias profile: Perfil relationships: Seguindo e seguidoras diff --git a/config/locales/he.yml b/config/locales/he.yml index 1388a71632..2dfb98a2d8 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -621,6 +621,9 @@ he: actions_description_html: בחר/י איזו פעולה לבצע על מנת לפתור את הדו"ח. אם תופעל פעולת ענישה כנגד החשבון המדווח, הודעת דוא"ל תשלח אליהם, אלא אם נבחרה קטגוריית הספאם. actions_description_remote_html: בחרו איזו פעולה לבצע כדי לפתור את הדיווח שהוגש. פעולה זו תשפיע רק על התקשורת מול השרת שלך עם החשבון המרוחק ותוכנו. add_to_report: הוספת פרטים לדיווח + already_suspended_badges: + local: כבר הודח בשרת זה + remote: כבר הודח בשרת שלו are_you_sure: 100% על בטוח? assign_to_self: הקצה אלי assigned: מנחה מוקצה @@ -1704,7 +1707,6 @@ he: import: יבוא import_and_export: יבוא ויצוא migrate: הגירת חשבון - notifications: התראות preferences: העדפות profile: פרופיל relationships: נעקבים ועוקבים diff --git a/config/locales/hr.yml b/config/locales/hr.yml index c5020f6f9f..4ea818b301 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -211,7 +211,6 @@ hr: featured_tags: Istaknuti hashtagovi import: Uvezi import_and_export: Uvezi i izvezi - notifications: Obavijesti preferences: Postavke profile: Profil statuses_cleanup: Automatsko brisanje postova diff --git a/config/locales/hu.yml b/config/locales/hu.yml index f09f7e4285..7b0e72cfcd 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -597,6 +597,9 @@ hu: actions_description_html: Döntsd el, mit csináljunk, hogy megoldjuk ezt a bejelentést. Ha valamilyen büntető intézkedést hozol a bejelentett fiók ellen, küldünk neki egy figyelmeztetést e-mail-ben, kivéve ha a Spam kategóriát választod. actions_description_remote_html: Döntsd el, mit tegyünk a bejelentés lezárásának érdekében. Ez csak azt befolyásolja, hogy a saját kiszolgálód hogyan kommunikál ezzel a távoli fiókkal és hogyan kezeli annak tartalmait. add_to_report: Továbbiak hozzáadása a bejelentéshez + already_suspended_badges: + local: Már felfüggesztették ezen a szerveren + remote: Már felfüggesztették a kiszolgálóján are_you_sure: Biztos vagy benne? assign_to_self: Magamhoz rendelés assigned: Hozzárendelt moderátor @@ -1652,7 +1655,7 @@ hu: import: Importálás import_and_export: Import és export migrate: Fiók átirányítása - notifications: Értesítések + notifications: E-mail értesítések preferences: Beállítások profile: Profil relationships: Követések és követők diff --git a/config/locales/hy.yml b/config/locales/hy.yml index 9d596dd834..5042e3f7f0 100644 --- a/config/locales/hy.yml +++ b/config/locales/hy.yml @@ -778,7 +778,6 @@ hy: import: Ներմուծել import_and_export: Ներմուծել և արտահանել migrate: Հաշուի տեղափոխում - notifications: Ծանուցումներ preferences: Կարգավորումներ profile: Հաշիւ relationships: Հետեւումներ և հետեւորդներ diff --git a/config/locales/id.yml b/config/locales/id.yml index d1c04ad1d4..bee282fa83 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -1389,7 +1389,6 @@ id: import: Impor import_and_export: Impor dan ekspor migrate: Pemindahan akun - notifications: Notifikasi preferences: Pilihan profile: Profil relationships: Ikuti dan pengikut diff --git a/config/locales/ie.yml b/config/locales/ie.yml index 7a0ae6292e..6763a8038a 100644 --- a/config/locales/ie.yml +++ b/config/locales/ie.yml @@ -1652,7 +1652,6 @@ ie: import: Importar import_and_export: Importation e exportation migrate: Migration de conto - notifications: Notificationes preferences: Preferenties profile: Public profil relationships: Sequetes e sequitores diff --git a/config/locales/io.yml b/config/locales/io.yml index 4561a43e8e..ed0d0d6345 100644 --- a/config/locales/io.yml +++ b/config/locales/io.yml @@ -1621,7 +1621,6 @@ io: import: Importacar import_and_export: Importaco e exportaco migrate: Kontomigro - notifications: Avizi preferences: Preferi profile: Profilo relationships: Sequati e sequanti diff --git a/config/locales/is.yml b/config/locales/is.yml index d7a3f8e2cc..710b35fce9 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -597,6 +597,9 @@ is: actions_description_html: Ákveddu til hvaða aðgerða eigi að taka til að leysa þessa kæru. Ef þú ákveður að refsa kærða notandaaðgangnum, verður viðkomandi send tilkynning í tölvupósti, nema ef flokkurinn Ruslpóstur sé valinn. actions_description_remote_html: Ákveddu til hvaða aðgerða eigi að taka til að leysa þessa kæru. Þetta mun aðeins hafa áhrif á hvernig netþjónninn þinn meðhöndlar þennan fjartengda aðgang og efnið á honum. add_to_report: Bæta fleiru í kæru + already_suspended_badges: + local: Þegar frystur á þessum netþjóni + remote: Þegar frystur á hinum netþjóninum are_you_sure: Ertu viss? assign_to_self: Úthluta mér assigned: Úthlutaður umsjónarmaður @@ -1656,7 +1659,6 @@ is: import: Flytja inn import_and_export: Inn- og útflutningur migrate: Yfirfærsla notandaaðgangs - notifications: Tilkynningar preferences: Kjörstillingar profile: Notandasnið relationships: Fylgist með og fylgjendur diff --git a/config/locales/it.yml b/config/locales/it.yml index 6e7f9a7ce1..16a42b0760 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -597,6 +597,9 @@ it: actions_description_html: Decidete quali azioni intraprendere per risolvere la segnalazione. Se si intraprende un'azione punitiva contro l'account segnalato, gli sarà inviata una notifica via e-mail, tranne quando è selezionata la categoria Spam. actions_description_remote_html: Decide quali azioni intraprendere per risolvere la relazione. Questo influenzerà solo come il tuo server comunica con questo account remoto e ne gestisce il contenuto. add_to_report: Aggiungi altro al report + already_suspended_badges: + local: Già sospeso su questo server + remote: Già sospeso sul loro server are_you_sure: Sei sicuro? assign_to_self: Assegna a me assigned: Moderatore assegnato @@ -1654,7 +1657,7 @@ it: import: Importa import_and_export: Importa ed esporta migrate: Migrazione dell'account - notifications: Notifiche + notifications: Notifiche e-mail preferences: Preferenze profile: Profilo relationships: Follows e followers diff --git a/config/locales/ja.yml b/config/locales/ja.yml index f5e874f98d..19b2e94db0 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1626,7 +1626,6 @@ ja: import: データのインポート import_and_export: インポート・エクスポート migrate: アカウントの引っ越し - notifications: 通知 preferences: ユーザー設定 profile: プロフィール relationships: フォロー・フォロワー diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 74b8634600..c92fd98a7c 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -419,7 +419,6 @@ ka: export: მონაცემის ექსპორტი import: იმპორტი migrate: ანგარიშის მიგრაცია - notifications: შეტყობინებები preferences: პრეფერენციები two_factor_authentication: მეორე-ფაქტორის აუტენტიფიკაცია statuses: diff --git a/config/locales/kab.yml b/config/locales/kab.yml index 566ba0dee1..4ba608c9f9 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -784,7 +784,6 @@ kab: import: Kter import_and_export: Taktert d usifeḍ migrate: Tunigin n umiḍan - notifications: Ilɣa preferences: Imenyafen profile: Ameɣnu relationships: Imeḍfaṛen akked wid i teṭṭafaṛeḍ diff --git a/config/locales/kk.yml b/config/locales/kk.yml index 1dcbce97eb..f08d8ead1a 100644 --- a/config/locales/kk.yml +++ b/config/locales/kk.yml @@ -643,7 +643,6 @@ kk: import: Импорт import_and_export: Импорт/экспорт migrate: Аккаунт көшіру - notifications: Ескертпелер preferences: Баптаулар profile: Профиль relationships: Жазылымдар және оқырмандар diff --git a/config/locales/ko.yml b/config/locales/ko.yml index c4dcb5687b..82472788dc 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -587,6 +587,9 @@ ko: actions_description_html: 이 신고를 해결하기 위해 취해야 할 조치를 지정해주세요. 신고된 계정에 대해 처벌 조치를 취하면, 스팸 카테고리가 선택된 경우를 제외하고 해당 계정으로 이메일 알림이 전송됩니다. actions_description_remote_html: 이 신고를 해결하기 위해 실행할 행동을 결정하세요. 이 결정은 이 원격 계정과 그 콘텐츠를 다루는 방식에 대해 이 서버에서만 영향을 끼칩니다 add_to_report: 신고에 더 추가하기 + already_suspended_badges: + local: 이 서버에서 이미 정지되었습니다 + remote: 저 서버에서 이미 정지되었습니다 are_you_sure: 확실합니까? assign_to_self: 나에게 할당하기 assigned: 할당된 중재자 @@ -1628,7 +1631,7 @@ ko: import: 데이터 가져오기 import_and_export: 가져오기 & 내보내기 migrate: 계정 이동 - notifications: 알림 + notifications: 이메일 알림 preferences: 환경설정 profile: 공개 프로필 relationships: 팔로잉과 팔로워 @@ -1823,8 +1826,10 @@ ko: feature_action: 더 알아보기 feature_audience: 마스토돈은 중개자 없이 청중을 관리할 수 있는 특별한 가능성을 제공합니다. 자체 인프라에 배포된 마스토돈을 사용하면 온라인에 있는 다른 마스토돈 서버에도 팔로우하거나 팔로우할 수 있으며, 본인 외에는 누구의 통제도 받지 않습니다. feature_audience_title: 신뢰 있는 청중 구축 + feature_control: 내가 홈 피드에서 무엇을 보고 싶은지는 내가 제일 잘 압니다. 알고리즘이나 시간을 낭비하게 만드는 광고는 없습니다. 계정 하나로 다른 마스토돈 서버에 있는 누구나 팔로우 하여 그들의 게시물을 시간순으로 받아보고 인터넷의 한 구석을 좀 더 나답게 만들어 보세요. feature_control_title: 내 타임라인에 대해 통제권을 유지하세요 feature_creativity: 마스토돈은 오디오, 비디오, 사진, 접근성 설명(alt), 투표, 콘텐츠 주의 (블라인드), 움직이는 아바타, 커스텀 이모티콘, 썸네일 자르기, 그리고 더 많은 것들을 당신이 온라인에서 당신을 더 잘 드러낼 수 있도록 돕기위해 지원합니다. 당신이 그림이나 음악을 올리던, 팟캐스트 같은것을 진행하던 마스토돈이 함께합니다. + feature_creativity_title: 독보적인 창의성 feature_moderation: 마스토돈은 의사 결정권을 사용자에게 돌려줍니다. 각 서버는 기업 소셜 미디어처럼 하향식이 아닌 로컬에서 시행되는 자체 규칙과 규정을 만들 수 있어 다양한 그룹의 요구에 가장 유연하게 대응할 수 있습니다. 동의하는 규칙이 있는 서버에 가입하거나 직접 서버를 호스팅하세요. feature_moderation_title: 올바른 중재 follow_action: 팔로우 diff --git a/config/locales/ku.yml b/config/locales/ku.yml index f8d9cd80d4..74dcd6f8f3 100644 --- a/config/locales/ku.yml +++ b/config/locales/ku.yml @@ -1417,7 +1417,6 @@ ku: import: Têxistin import_and_export: Têxistin û derxistin migrate: Barkirina ajimêrê - notifications: Agahdarî preferences: Hilbijarte profile: Profîl relationships: Şopandin û şopîner diff --git a/config/locales/lad.yml b/config/locales/lad.yml index c0ab028b9c..0f04ce8928 100644 --- a/config/locales/lad.yml +++ b/config/locales/lad.yml @@ -597,6 +597,9 @@ lad: actions_description_html: Dechide kualas mizuras tomar para rezolver esta denunsia. Si tomas una aksion punitiva kontra el kuento denunsiada, se le embiara a dicho kuento un avizo por posta elektronika, ekseptado kuando se eskoja la kategoria Spam. actions_description_remote_html: Dechide ke fazer para rezolver este raporto. Esto solo va afektar komo tu sirvidor komunike kon este kuento remoto i ke faze kon su kontenido. add_to_report: Adjusta mas al raporto + already_suspended_badges: + local: Ya suspendido en este sirvidor + remote: Ya suspendido en sus sirvidor are_you_sure: Estas siguro? assign_to_self: Asinyamela a mi assigned: Moderador asinyado @@ -1652,7 +1655,6 @@ lad: import: Importo import_and_export: Importo i eksporto migrate: Migrasyon de kuento - notifications: Avizos preferences: Preferensyas profile: Profil publiko relationships: Segidos i suivantes diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 610b4437c8..44b5443fc8 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -466,6 +466,9 @@ lt: destroyed_msg: Skundo žinutė sekmingai ištrinta! reports: action_taken_by: Veiksmo ėmėsi + already_suspended_badges: + local: Jau sustabdytas šiame serveryje + remote: Jau sustabdytas jų serveryje are_you_sure: Ar esi įsitikinęs (-usi)? assign_to_self: Paskirti man assigned: Paskirtas moderatorius @@ -755,7 +758,6 @@ lt: featured_tags: Rodomi saitažodžiai(#) import: Importuoti migrate: Paskyros migracija - notifications: Pranešimai preferences: Preferencijos two_factor_authentication: Dviejų veiksnių autentikacija statuses: diff --git a/config/locales/lv.yml b/config/locales/lv.yml index bd2500a912..481cd94f78 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -1667,7 +1667,6 @@ lv: import: Imports import_and_export: Imports un eksports migrate: Konta migrācija - notifications: Paziņojumi preferences: Iestatījumi profile: Profils relationships: Sekojamie un sekotāji diff --git a/config/locales/ml.yml b/config/locales/ml.yml index 5f8de52987..883a400318 100644 --- a/config/locales/ml.yml +++ b/config/locales/ml.yml @@ -87,5 +87,3 @@ ml: subject: "%{name} ഇപ്പോൾ നിങ്ങളെ പിന്തുടരുന്നു" relationships: following: പിന്തുടരുന്നു - settings: - notifications: അറിയിപ്പുകൾ diff --git a/config/locales/ms.yml b/config/locales/ms.yml index bfd6591ddb..f39c26a5c1 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -1595,7 +1595,6 @@ ms: import: Import import_and_export: Import dan eksport migrate: Penghijrahan akaun - notifications: Pemberitahuan preferences: Keutamaan profile: Profil relationships: Ikutan dan pengikut diff --git a/config/locales/my.yml b/config/locales/my.yml index 6898db877c..4ac9ecdd45 100644 --- a/config/locales/my.yml +++ b/config/locales/my.yml @@ -1594,7 +1594,6 @@ my: import: ထည့်သွင်းခြင်း import_and_export: ထည့်သွင်းခြင်းနှင့် ထုတ်ယူခြင်း migrate: အကောင့်ပြောင်းရွှေ့ခြင်း - notifications: အသိပေးချက်များ preferences: သတ်မှတ်ချက်များ profile: ပရိုဖိုင် relationships: စောင့်ကြည့်သူများနှင့် စောင့်ကြည့်စာရင်း diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 3b4c586dc5..561a0f0af8 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -597,6 +597,9 @@ nl: actions_description_html: Beslis welke maatregel moet worden genomen om deze rapportage op te lossen. Wanneer je een (straf)maatregel tegen het gerapporteerde account neemt, krijgt het account een e-mailmelding, behalve wanneer de spam-categorie is gekozen. actions_description_remote_html: Beslis welke actie moet worden ondernomen om deze rapportage op te lossen. Dit is alleen van invloed op hoe jouw server met dit externe account communiceert en de inhoud ervan beheert. add_to_report: Meer aan de rapportage toevoegen + already_suspended_badges: + local: Al geschorst op deze server + remote: Al geschorst op hun server are_you_sure: Weet je het zeker? assign_to_self: Aan mij toewijzen assigned: Toegewezen moderator @@ -1652,7 +1655,7 @@ nl: import: Importeren import_and_export: Importeren en exporteren migrate: Accountmigratie - notifications: Meldingen + notifications: E-mailmeldingen preferences: Voorkeuren profile: Openbaar profiel relationships: Volgers en gevolgde accounts diff --git a/config/locales/nn.yml b/config/locales/nn.yml index f53b67d098..983dd01421 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -152,7 +152,7 @@ nn: suspend: Utvis og slett kontodata for godt suspended: Utvist suspension_irreversible: Data frå denne kontoen har blitt ikkje-reverserbart sletta. Du kan oppheve suspenderinga av kontoen for å bruke den, men det vil ikkje gjenopprette alle data den tidligare har hatt. - suspension_reversible_hint_html: Kontoen har blitt suspendert, og data vil bli fullstendig fjerna den %{date}. Fram til då kan kontoen gjenopprettes uten negative effekter. Om du ynskjer å fjerne kontodata no, kan du gjere det nedanfor. + suspension_reversible_hint_html: Kontoen har vorte stengd, og data vil bli fullstendig fjerna den %{date}. Fram til då kandu gjenoppretta kontoen utan negative konsekvensar. Om du ynskjer å fjerna kontodata no, kan du gjera det nedanfor. title: Kontoar unblock_email: Avblokker e-postadresse unblocked_email_msg: Avblokkerte %{username} si e-postadresse @@ -221,7 +221,7 @@ nn: unblock_email_account: Avblokker e-postadresse unsensitive_account: Angr tving ømtolig konto unsilence_account: Angre avgrensing av konto - unsuspend_account: Opphev suspensjonen av kontoen + unsuspend_account: Opphev utestenginga av kontoen update_announcement: Oppdater kunngjøringen update_custom_emoji: Oppdater tilpassa emoji update_domain_block: Oppdater domene-sperring @@ -385,9 +385,9 @@ nn: add_new: Lag ny confirm_suspension: cancel: Avbryt - confirm: Suspender + confirm: Utvis permanent_action: Å oppheve suspensjonen vil ikkje gjenopprette data eller koplingar. - preamble_html: Du er i ferd med å suspendera %{domain} inkludert underdomener. + preamble_html: Du er i ferd med å utestenga %{domain} inkludert underdomene. remove_all_data: Dette vil fjerna alt innhald, media og profildata for kontoar som tilhøyrer dette domenet frå din tenar. stop_communication: Tenaren din vil slutta å kommunisera med desse tenarane. title: Stadfest domeneblokkering for %{domain} @@ -492,7 +492,7 @@ nn: reject_media: Avvis media reject_reports: Avvis rapporter silence: Begrens - suspend: Suspender + suspend: Utvis policy: Vilkår reason: Offentlig årsak title: Retningslinjer for innhold @@ -597,6 +597,9 @@ nn: actions_description_html: Avgjer kva som skal gjerast med denne rapporteringa. Dersom du utfører straffetiltak mot den rapporterte kontoen, vil dei motta ein e-post – så sant du ikkje har valt kategorien Spam. actions_description_remote_html: Avgjer kva du vil gjera for å løysa denne rapporten. Dette påverkar berre korleis tenaren din kommuniserer med kontoen på ein annan tenar, og korleis tenaren din handterer innhald derifrå. add_to_report: Legg til i rapporten + already_suspended_badges: + local: Allereie utestengd på denne tenaren + remote: Allereie utestengd på tenaren deira are_you_sure: Er du sikker? assign_to_self: Tilegn til meg assigned: Tilsett moderator @@ -979,7 +982,7 @@ nn: none: en advarsel sensitive: å merke kontoen sin som følsom silence: for å begrense deres konto - suspend: for å suspendere kontoen deres + suspend: for å stenga kontoen deira body: "%{target} ankar på ei modereringsavgjerd av %{action_taken_by} den %{date}, som var %{type}. Dei skreiv:" next_steps: Du kan godkjenna anken for å endra modereringsavgjerda, eller du kan oversjå anken. subject: "%{username} ankar ei modereringsavgjer på %{instance}" @@ -1189,7 +1192,7 @@ nn: none: Advarsel sensitive: Markering av konto som ømtolig silence: Begrensning av konto - suspend: Suspensjon av konto + suspend: Utestenging av konto your_appeal_approved: Din klage har blitt godkjent your_appeal_pending: Du har levert en klage your_appeal_rejected: Din klage har blitt avvist @@ -1652,7 +1655,7 @@ nn: import: Hent inn import_and_export: Importer og eksporter migrate: Kontoflytting - notifications: Varsel + notifications: E-postvarslingar preferences: Innstillingar profile: Profil relationships: Fylgjar og fylgjarar @@ -1820,7 +1823,7 @@ nn: mark_statuses_as_sensitive: Nokre av innlegga dine har vorte markerte som ømtolige av moderatorane ved %{instance}. Dette tyder at folk må trykkje på mediane i innlegga for å førehandsvise dei. Du kan markera media som ømtolig sjølv når du legg ut nye innlegg. sensitive: Frå no av vil alle dine opplasta mediefiler bli markert som ømtolig og skjult bak ei klikk-åtvaring. silence: Medan kontoen din er avgrensa, vil berre folk som allereie fylgjer deg sjå dine tutar på denne tenaren, og du kan bli ekskludert fra diverse offentlige oppføringer. Andre kan framleis fylgje deg manuelt. - suspend: Du kan ikkje lenger bruke kontoen din, og profilen og andre data er ikkje lenger tilgjengelege. Du kan framleis logge inn for å be om ein sikkerheitskopi av data før dei blir fullstendig sletta om omtrent 30 dagar, men vi beheld nokre grunnleggjande data for å forhindre deg å omgå suspenderinga. + suspend: Du kan ikkje lenger bruka kontoen din, og profilen og andre data er ikkje lenger tilgjengelege. Du kan framleis logga inn for å be om ein sikkerheitskopi av data før dei blir fullstendig sletta om omtrent 30 dagar, men me vil lagra nokre grunnleggjande data for å syta for at du ikkje omgår utestenginga. reason: 'Årsak:' statuses: 'Innlegg sitert:' subject: @@ -1865,6 +1868,9 @@ nn: follows_subtitle: Fylg kjende folk follows_title: Kven du kan fylgja follows_view_more: Sjå fleire du kan fylgja + hashtags_recent_count: + one: "%{people} person dei siste to dagane" + other: "%{people} personar dei siste to dagane" hashtags_subtitle: Sjå kva som har vore populært dei siste to dagane hashtags_title: Populære emneknaggar hashtags_view_more: Sjå fleire populære emneknaggar diff --git a/config/locales/no.yml b/config/locales/no.yml index 4cdf2ca82a..c71dffc636 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -1649,7 +1649,6 @@ import: Importér import_and_export: Importer og eksporter migrate: Kontomigrering - notifications: Varslinger preferences: Innstillinger profile: Profil relationships: Følginger og følgere diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 569f76715b..0a653ea46c 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -832,7 +832,6 @@ oc: import: Importar de donadas import_and_export: Import e export migrate: Migracion de compte - notifications: Notificacions preferences: Preferéncias profile: Perfil relationships: Abonaments e seguidors diff --git a/config/locales/pl.yml b/config/locales/pl.yml index e43f9a6050..1dc1482e20 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -621,6 +621,9 @@ pl: actions_description_html: Zdecyduj, jakie działania należy podjąć, aby rozstrzygnąć niniejsze zgłoszenie. Jeśli podejmiesz działania karne przeciwko zgłoszonemu kontowi, zostanie do nich wysłane powiadomienie e-mail, chyba że wybrano kategorię Spam. actions_description_remote_html: Zdecyduj, jakie działanie należy podjąć, aby rozwiązać to zgłoszenie. Będzie to miało wpływ jedynie na sposób, w jaki Twój serwer komunikuje się z tym kontem zdalnym i obsługuje jego zawartość. add_to_report: Dodaj więcej do zgłoszenia + already_suspended_badges: + local: Już zawieszono na tym serwerze + remote: Już zawieszono na ich serwerze are_you_sure: Czy na pewno? assign_to_self: Przypisz do siebie assigned: Przypisany moderator @@ -1704,7 +1707,7 @@ pl: import: Importowanie danych import_and_export: Import i eksport migrate: Migracja konta - notifications: Powiadomienia + notifications: Powiadomienia e-mail preferences: Preferencje profile: Profil relationships: Obserwowani i obserwujący diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 194de9a3eb..78a20aed02 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -1652,7 +1652,6 @@ pt-BR: import: Importar import_and_export: Importar e exportar migrate: Migração de conta - notifications: Notificações preferences: Preferências profile: Perfil relationships: Seguindo e seguidores diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index 57a698e1d1..9dde61ff06 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -597,6 +597,9 @@ pt-PT: actions_description_html: Decida a ação a tomar para resolver esta denúncia. Se decidir por uma ação punitiva contra a conta denunciada, um e-mail de notificação será enviado, excetuando quando selecionada a categoria Spam. actions_description_remote_html: Decida quais as medidas a tomar para resolver esta denúncia. Isso apenas afetará como o seu servido comunica com esta conta remota e gere o seu conteúdo. add_to_report: Adicionar mais à denúncia + already_suspended_badges: + local: Já suspenso neste servidor + remote: Já suspenso no servidor deles are_you_sure: Tem a certeza? assign_to_self: Atribuída a mim assigned: Atribuída ao moderador @@ -1652,7 +1655,7 @@ pt-PT: import: Importar import_and_export: Importar e exportar migrate: Migração de conta - notifications: Notificações + notifications: Notificações por e-mail preferences: Preferências profile: Perfil relationships: Seguindo e seguidores @@ -1865,6 +1868,9 @@ pt-PT: follows_subtitle: Siga contas bem conhecidas follows_title: Quem seguir follows_view_more: Veja mais pessoas para seguir + hashtags_recent_count: + one: "%{people} pessoa nos últimos 2 dias" + other: "%{people} pessoas nos últimos 2 dias" hashtags_subtitle: Explore o que está em tendência desde os últimos 2 dias hashtags_title: Trending hashtags hashtags_view_more: Ver mais hashtags em alta diff --git a/config/locales/ru.yml b/config/locales/ru.yml index d2c4609700..05ea31ff81 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1699,7 +1699,6 @@ ru: import: Импорт import_and_export: Импорт и экспорт migrate: Миграция учётной записи - notifications: Уведомления preferences: Настройки profile: Профиль relationships: Подписки и подписчики diff --git a/config/locales/sc.yml b/config/locales/sc.yml index e51ac84eac..01c355794d 100644 --- a/config/locales/sc.yml +++ b/config/locales/sc.yml @@ -985,7 +985,6 @@ sc: import: Importatzione import_and_export: Importatzione e esportatzione migrate: Tràmuda de contu - notifications: Notìficas preferences: Preferèntzias profile: Profilu relationships: Gente chi sighis e sighiduras diff --git a/config/locales/sco.yml b/config/locales/sco.yml index 8382dec76e..2a7b1e3e70 100644 --- a/config/locales/sco.yml +++ b/config/locales/sco.yml @@ -1407,7 +1407,6 @@ sco: import: Import import_and_export: Import an export migrate: Accoont flittin - notifications: Notes preferences: Preferences profile: Profile relationships: Follaes and follaers diff --git a/config/locales/si.yml b/config/locales/si.yml index e0be7ff8e9..f5e65fda8d 100644 --- a/config/locales/si.yml +++ b/config/locales/si.yml @@ -1274,7 +1274,6 @@ si: import: ආයාතය import_and_export: ආයාත හා නිර්යාත migrate: ගිණුම් සංක්‍රමණය - notifications: දැනුම්දීම් preferences: අභිප්‍රේත profile: ප්‍රසිද්ධ පැතිකඩ relationships: අනුගමන හා අනුගාමික diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml index 72525619c7..1edf185c0a 100644 --- a/config/locales/simple_form.nn.yml +++ b/config/locales/simple_form.nn.yml @@ -165,7 +165,7 @@ nn: none: Gjer inkje sensitive: Ømtolig silence: Togn - suspend: Utvis og slett kontodata for godt + suspend: Utvis warning_preset_id: Bruk åtvaringsoppsett announcement: all_day: Heildagshending diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 1d8866645c..6b59677910 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -198,11 +198,14 @@ sk: destroy_ip_block: Vymaž IP pravidlo destroy_status: Vymaž príspevok destroy_unavailable_domain: Vymaž nedostupnú doménu + destroy_user_role: Zničiť rolu disable_2fa_user: Vypni dvoj-faktorové overovanie disable_custom_emoji: Vypni vlastné emotikony + disable_sign_in_token_auth_user: Zakázať používateľom overovanie e-mailovým tokenom disable_user: Deaktivuj užívateľa enable_custom_emoji: Povoľ vlastné emotikony enable_user: Povoľ užívateľa + memorialize_account: Zmena na „in memoriam“ promote_user: Povýš užívateľskú rolu reject_appeal: Zamietni námietku reject_user: Zamietni užívateľa @@ -447,10 +450,13 @@ sk: instance_statuses_measure: uložené príspevky delivery: all: Všetko + clear: Vymazať chyby doručovania failing: Zlyhávajúce + restart: Reštartovať doručovanie stop: Zastav doručenie unavailable: Nedostupné delivery_available: Je v dosahu doručovania + delivery_error_days: Dni chybného doručovania empty: Nenájdené žiadne domény. moderation: all: Všetky @@ -1188,7 +1194,7 @@ sk: import: Importuj import_and_export: Import a export migrate: Presuň účet - notifications: Oboznámenia + notifications: Emailové upozornenia preferences: Voľby profile: Profil relationships: Sledovania a následovatelia diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 3f2b65b76a..9498ca7898 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -621,6 +621,9 @@ sl: actions_description_html: Odločite se, katere ukrepe boste sprejeli za rešitev te prijave. Če sprejmete kazenski ukrep proti prijavljenemu računu, mu bo poslano e-poštno obvestilo, razen če je izbrana kategorija Neželena pošta. actions_description_remote_html: Odločite se za dejanje, ki bo odločilo o tej prijavi. To bo vplivalo le na to, kako vaš strežnik komunicira s tem oddaljenim računom in obravnava njegovo vsebino. add_to_report: Dodaj več v prijavo + already_suspended_badges: + local: Že suspendiran na tem strežniku + remote: Že suspendiran na njihovem strežniku are_you_sure: Ali ste prepričani? assign_to_self: Dodeli meni assigned: Dodeljen moderator @@ -1704,7 +1707,7 @@ sl: import: Uvozi import_and_export: Uvoz in izvoz migrate: Selitev računa - notifications: Obvestila + notifications: Obvestila po e-pošti preferences: Nastavitve profile: Profil relationships: Sledenja in sledilci diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 759f995470..ce2c8b0f99 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -596,6 +596,9 @@ sq: actions_description_html: Vendosni cili veprim të kryhet për të zgjidhur këtë raportim. Nëse ndërmerrni një veprim ndëshkues kundër llogarisë së raportuar, atyre do t’u dërgohet një njoftim me email, hiq rastin kur përzgjidhet kategoria I padëshiruar. actions_description_remote_html: Vendosni cili veprim të ndërmerret për zgjidhjen e këtij raportimi. Kjo do të prekë vetëm mënyrën se si shërbyesi juaj komunikon me këtë llogari të largët dhe se si e trajtojnë lëndën e saj. add_to_report: Shtoni më tepër te raportimi + already_suspended_badges: + local: Tashmë i pezulluar në këtë shërbyes + remote: Tashmë i pezulluar në shërbyesin e vet are_you_sure: A jeni i sigurt? assign_to_self: Caktojani vetes assigned: Iu caktua moderator @@ -1648,7 +1651,7 @@ sq: import: Importo import_and_export: Importim dhe eksportim migrate: Migrim llogarie - notifications: Njoftime + notifications: Njoftime me email preferences: Parapëlqime profile: Profil relationships: Ndjekje dhe ndjekës diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 74a5e0b1c0..4f10fe8649 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -1678,7 +1678,6 @@ sr-Latn: import: Uvoz import_and_export: Uvoz i izvoz migrate: Prebacivanje naloga - notifications: Obaveštenja preferences: Podešavanja profile: Javni profil relationships: Praćenja i pratioci diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 9e7dd9c35c..382f196bd0 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -1678,7 +1678,6 @@ sr: import: Увоз import_and_export: Увоз и извоз migrate: Пребацивање налога - notifications: Обавештења preferences: Подешавања profile: Јавни профил relationships: Праћења и пратиоци diff --git a/config/locales/sv.yml b/config/locales/sv.yml index d282d92222..855fa765f5 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -1652,7 +1652,7 @@ sv: import: Importera import_and_export: Import och export migrate: Kontoflytt - notifications: Aviseringar + notifications: E-postaviseringar preferences: Inställningar profile: Profil relationships: Följer och följare diff --git a/config/locales/th.yml b/config/locales/th.yml index 67d2b94793..558552362f 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -585,6 +585,9 @@ th: actions_description_html: ตัดสินใจว่าการกระทำใดที่จะใช้เพื่อแก้ปัญหารายงานนี้ หากคุณใช้การกระทำที่เป็นการลงโทษต่อบัญชีที่รายงาน จะส่งการแจ้งเตือนอีเมลถึงเขา ยกเว้นเมื่อมีการเลือกหมวดหมู่ สแปม actions_description_remote_html: ตัดสินใจว่าการกระทำใดที่จะใช้เพื่อแก้ปัญหารายงานนี้ นี่จะมีผลต่อวิธีที่เซิร์ฟเวอร์ ของคุณ สื่อสารกับบัญชีระยะไกลนี้และจัดการเนื้อหาของบัญชีเท่านั้น add_to_report: เพิ่มข้อมูลเพิ่มเติมไปยังรายงาน + already_suspended_badges: + local: ระงับในเซิร์ฟเวอร์นี้อยู่แล้ว + remote: ระงับในเซิร์ฟเวอร์ของเขาอยู่แล้ว are_you_sure: คุณแน่ใจหรือไม่? assign_to_self: มอบหมายให้ฉัน assigned: ผู้กลั่นกรองที่ได้รับมอบหมาย @@ -1626,7 +1629,7 @@ th: import: การนำเข้า import_and_export: การนำเข้าและการส่งออก migrate: การโยกย้ายบัญชี - notifications: การแจ้งเตือน + notifications: การแจ้งเตือนทางอีเมล preferences: การกำหนดลักษณะ profile: โปรไฟล์สาธารณะ relationships: การติดตามและผู้ติดตาม diff --git a/config/locales/tr.yml b/config/locales/tr.yml index a942e5b394..bdf002333d 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -597,6 +597,9 @@ tr: actions_description_html: Bu bildirimi çözmek için ne yapılması gerektiğine karar verin. Bildirilen hesap için ceza işlemi yaparsanız, İstenmeyen kategorisi seçilmemişse, onlara bir e-posta duyurusu gönderilecektir. actions_description_remote_html: Bu bildirimi çözmek için hangi eylemi yapmak istediğinize karar verin. Bu yalnızca sizin sunucunuzun bu uzak hesapla nasıl etkileşeğini ve içeriğiyle ne yapacağını etkiler. add_to_report: Bildirime daha fazlasını ekle + already_suspended_badges: + local: Bu sunucuda zaten askıya alınmış + remote: Sunucularında zaten askıya alınmış are_you_sure: Emin misiniz? assign_to_self: Bana ata assigned: Denetleyici atandı @@ -1652,7 +1655,7 @@ tr: import: İçe aktar import_and_export: İçe ve dışa aktar migrate: Hesap taşıma - notifications: Bildirimler + notifications: E-posta bildirimleri preferences: Tercihler profile: Profil relationships: Takip edilenler ve takipçiler diff --git a/config/locales/tt.yml b/config/locales/tt.yml index 845b33a021..c1a22a4ca8 100644 --- a/config/locales/tt.yml +++ b/config/locales/tt.yml @@ -511,7 +511,6 @@ tt: development: Ясаучылар өчен edit_profile: Профильне үзгәртү import: Импортлау - notifications: Искәртүләр preferences: Caylaw profile: Профиль two_factor_authentication: Ике-факторлы авторизация diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 9c343489eb..21ddeb5117 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -621,6 +621,9 @@ uk: actions_description_html: Визначте, які дії слід вжити для розв'язання цієї скарги. Якщо ви оберете каральні дії проти зареєстрованого облікового запису, про них буде надіслано сповіщення електронним листом, крім випадків, коли вибрано категорію Спам. actions_description_remote_html: Визначте, які дії слід вжити для розв'язання цього звіту. Це вплине тільки на те, як ваш сервер з'єднується з цим віддаленим обліковим записом і обробляє його вміст. add_to_report: Додати ще подробиць до скарги + already_suspended_badges: + local: Вже призупинено на цьому сервері + remote: Уже призупинено на їх сервері are_you_sure: Ви впевнені? assign_to_self: Призначити мені assigned: Призначений модератор @@ -1704,7 +1707,7 @@ uk: import: Імпорт import_and_export: Імпорт та експорт migrate: Міграція облікового запису - notifications: Сповіщення + notifications: E-mail сповіщення preferences: Налаштування profile: Загальнодоступний профіль relationships: Підписки та підписники diff --git a/config/locales/vi.yml b/config/locales/vi.yml index b9efeee46e..fc4ec80482 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -1626,7 +1626,6 @@ vi: import: Nhập dữ liệu import_and_export: Dữ liệu migrate: Chuyển tài khoản sang máy chủ khác - notifications: Thông báo preferences: Chung profile: Hồ sơ relationships: Quan hệ diff --git a/config/locales/zgh.yml b/config/locales/zgh.yml index 1db573369a..180fcf2f16 100644 --- a/config/locales/zgh.yml +++ b/config/locales/zgh.yml @@ -110,5 +110,4 @@ zgh: account_settings: ⵜⵉⵙⵖⴰⵍ ⵏ ⵓⵎⵉⴹⴰⵏ back: ⴰⵖⵓⵍ ⵖⵔ ⵎⴰⵙⵜⵓⴷⵓⵏ edit_profile: ⵙⵏⴼⵍ ⵉⴼⵔⵙ - notifications: ⵜⵉⵏⵖⵎⵉⵙⵉⵏ profile: ⵉⴼⵔⵙ diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 2d1d82b306..29f9badb80 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -585,6 +585,9 @@ zh-CN: actions_description_html: 决定采取何种措施处理此举报。如果对被举报账号采取惩罚性措施,将向其发送一封电子邮件通知。但若选中垃圾信息类别则不会发送通知。 actions_description_remote_html: 决定采取何种行动来解决此举报。 这只会影响您的服务器如何与该远程帐户的通信并处理其内容。 add_to_report: 增加更多举报内容 + already_suspended_badges: + local: 已经在此服务器上暂停 + remote: 已在其所属服务器被封禁 are_you_sure: 你确定吗? assign_to_self: 接管 assigned: 已接管的监察员 @@ -1626,7 +1629,7 @@ zh-CN: import: 导入 import_and_export: 导入和导出 migrate: 账户迁移 - notifications: 通知 + notifications: 电子邮件通知 preferences: 首选项 profile: 个人资料 relationships: 关注管理 diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index 0bb362eadf..2a0f802a1f 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -1626,7 +1626,6 @@ zh-HK: import: 匯入 import_and_export: 匯入及匯出 migrate: 帳戶遷移 - notifications: 通知 preferences: 偏好設定 profile: 個人資料 relationships: 關注及追隨者 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 4c450f3c1b..b78c7d3319 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -585,6 +585,9 @@ zh-TW: actions_description_html: 決定應對此報告採取何種行動。若您對檢舉之帳號採取懲罰措施,則將對他們發送 e-mail 通知,如非選擇了 垃圾郵件 類別。 actions_description_remote_html: 決定將對此檢舉報告採取何種動作。這將僅作用於您的伺服器與此遠端帳號及其內容之通訊行為。 add_to_report: 加入更多至報告 + already_suspended_badges: + local: 已自此伺服器停權 + remote: 已自該伺服器停權 are_you_sure: 您確定嗎? assign_to_self: 指派給自己 assigned: 指派站務 @@ -1628,7 +1631,7 @@ zh-TW: import: 匯入 import_and_export: 匯入及匯出 migrate: 帳號搬遷 - notifications: 通知 + notifications: 電子郵件通知 preferences: 偏好設定 profile: 個人檔案 relationships: 跟隨中與跟隨者 From a583317df62acced3cea1f102e5c7981ff1bdbea Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 20 Mar 2024 12:06:44 +0100 Subject: [PATCH 4/8] Fix icon and styling in browser notifications banner (#29658) --- .../notifications/components/column_settings.jsx | 14 ++++++++------ .../components/notifications_permission_banner.jsx | 4 ++-- .../material-icons/400-20px/settings-fill.svg | 1 + .../material-icons/400-20px/settings.svg | 1 + app/javascript/styles/mastodon/components.scss | 6 ++++++ 5 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 app/javascript/material-icons/400-20px/settings-fill.svg create mode 100644 app/javascript/material-icons/400-20px/settings.svg diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx index 2a9425b82b..caa1b757a4 100644 --- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx +++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx @@ -68,16 +68,18 @@ export default class ColumnSettings extends PureComponent { )} - {alertsEnabled && browserSupport && browserPermission === 'default' && ( - - - - )} -
+ {alertsEnabled && browserSupport && browserPermission === 'default' && ( +
+ + + +
+ )} +

diff --git a/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx b/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx index 1cdf5b5dfe..276bcbebad 100644 --- a/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx +++ b/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx @@ -5,8 +5,8 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; +import SettingsIcon from '@/material-icons/400-20px/settings.svg?react'; import CloseIcon from '@/material-icons/400-24px/close.svg?react'; -import TuneIcon from '@/material-icons/400-24px/tune.svg?react'; import { requestBrowserPermission } from 'mastodon/actions/notifications'; import { changeSetting } from 'mastodon/actions/settings'; import { Button } from 'mastodon/components/button'; @@ -42,7 +42,7 @@ class NotificationsPermissionBanner extends PureComponent {

-

}} />

+

}} />

); diff --git a/app/javascript/material-icons/400-20px/settings-fill.svg b/app/javascript/material-icons/400-20px/settings-fill.svg new file mode 100644 index 0000000000..f5de77821d --- /dev/null +++ b/app/javascript/material-icons/400-20px/settings-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-20px/settings.svg b/app/javascript/material-icons/400-20px/settings.svg new file mode 100644 index 0000000000..472569ab6a --- /dev/null +++ b/app/javascript/material-icons/400-20px/settings.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 71f9e0d9d0..ff3b72158c 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -8581,6 +8581,12 @@ noscript { color: $darker-text-color; margin-bottom: 15px; text-align: center; + + .icon { + width: 20px; + height: 20px; + vertical-align: middle; + } } } From e36e7ea2432104d2e72ab71f1aa5d2d4ca5ad3c8 Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 20 Mar 2024 12:06:50 +0100 Subject: [PATCH 5/8] Fix emoji picker dropdown background and borders (#29653) --- app/javascript/styles/mastodon/components.scss | 5 +++++ app/javascript/styles/mastodon/emoji_picker.scss | 15 --------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index ff3b72158c..c2a968aec3 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -4848,6 +4848,11 @@ a.status-card { position: relative; margin-top: 5px; z-index: 2; + background: var(--dropdown-background-color); + backdrop-filter: var(--background-filter); + border: 1px solid var(--dropdown-border-color); + box-shadow: var(--dropdown-shadow); + border-radius: 5px; .emoji-mart-scroll { transition: opacity 200ms ease; diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss index fec0c10ddb..14ce6a14b5 100644 --- a/app/javascript/styles/mastodon/emoji_picker.scss +++ b/app/javascript/styles/mastodon/emoji_picker.scss @@ -14,21 +14,9 @@ } .emoji-mart-bar { - border: 0 solid var(--dropdown-border-color); - &:first-child { - border-bottom-width: 1px; - border-top-left-radius: 5px; - border-top-right-radius: 5px; background: var(--dropdown-border-color); } - - &:last-child { - border-top-width: 1px; - border-bottom-left-radius: 5px; - border-bottom-right-radius: 5px; - display: none; - } } .emoji-mart-anchors { @@ -94,7 +82,6 @@ height: 270px; max-height: 35vh; padding: 0 6px 6px; - background: var(--dropdown-background-color); will-change: transform; &::-webkit-scrollbar-track:hover, @@ -106,7 +93,6 @@ .emoji-mart-search { padding: 10px; padding-inline-end: 45px; - background: var(--dropdown-background-color); position: relative; input { @@ -195,7 +181,6 @@ width: 100%; font-weight: 500; padding: 5px 6px; - background: var(--dropdown-background-color); } } From 94f7ae192b8df4f0a8846249016268f914b730bb Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 20 Mar 2024 12:07:02 +0100 Subject: [PATCH 6/8] Fix emoji picker placement on limited-height viewports (#29651) --- .../compose/components/emoji_picker_dropdown.jsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx index acc3fd0ce5..43795d030f 100644 --- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx +++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx @@ -330,6 +330,7 @@ class EmojiPickerDropdown extends PureComponent { state = { active: false, loading: false, + placement: 'bottom', }; setRef = (c) => { @@ -381,10 +382,14 @@ class EmojiPickerDropdown extends PureComponent { return this.target; }; + handleOverlayEnter = (state) => { + this.setState({ placement: state.placement }); + }; + render () { const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis } = this.props; const title = intl.formatMessage(messages.emoji); - const { active, loading } = this.state; + const { active, loading, placement } = this.state; return (
@@ -397,7 +402,7 @@ class EmojiPickerDropdown extends PureComponent { inverted /> - + {({ props, placement })=> (
From a68dd889feac16cda51a82c3c5ba8a8c82c0a2c8 Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 20 Mar 2024 12:07:10 +0100 Subject: [PATCH 7/8] Add back support for old browsers (#29654) --- .browserslistrc | 4 +- package.json | 1 + postcss.config.js | 1 + yarn.lock | 855 +++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 858 insertions(+), 3 deletions(-) diff --git a/.browserslistrc b/.browserslistrc index 54dd3aaf34..0376af4bcc 100644 --- a/.browserslistrc +++ b/.browserslistrc @@ -1,7 +1,9 @@ [production] defaults -not IE 11 +> 0.2% +ios >= 15.6 not dead +not OperaMini all [development] supports es6-module diff --git a/package.json b/package.json index a42767580e..ed59a68a41 100644 --- a/package.json +++ b/package.json @@ -88,6 +88,7 @@ "path-complete-extname": "^1.0.0", "postcss": "^8.4.24", "postcss-loader": "^4.3.0", + "postcss-preset-env": "^9.5.2", "prop-types": "^15.8.1", "punycode": "^2.3.0", "react": "^18.2.0", diff --git a/postcss.config.js b/postcss.config.js index 5d58d74e34..b6ea8130b5 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,5 +1,6 @@ module.exports = ({ env }) => ({ plugins: [ + 'postcss-preset-env', 'autoprefixer', env === 'production' ? 'cssnano' : '', ], diff --git a/yarn.lock b/yarn.lock index bb2722fba0..1e37fcc029 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1538,6 +1538,46 @@ __metadata: languageName: node linkType: hard +"@csstools/cascade-layer-name-parser@npm:^1.0.9": + version: 1.0.9 + resolution: "@csstools/cascade-layer-name-parser@npm:1.0.9" + peerDependencies: + "@csstools/css-parser-algorithms": ^2.6.1 + "@csstools/css-tokenizer": ^2.2.4 + checksum: 10c0/f6e28c7cdeca44711288400cf20de9ebc4db71eafa39ca9a6b3e9f5d3295ba636dd986aac9fcb9e6171c84d436712d68ced923504d78d5fda0601c880eb352fe + languageName: node + linkType: hard + +"@csstools/color-helpers@npm:^4.0.0": + version: 4.0.0 + resolution: "@csstools/color-helpers@npm:4.0.0" + checksum: 10c0/fc78871253f8c92789ed64a0e5555bd2873c2b62a49c30baced88487561fe09fe897b0d16fcf7bf2a94f78ff37530773a4395ce5efc016810c094041b5bbcd42 + languageName: node + linkType: hard + +"@csstools/css-calc@npm:^1.2.0": + version: 1.2.0 + resolution: "@csstools/css-calc@npm:1.2.0" + peerDependencies: + "@csstools/css-parser-algorithms": ^2.6.1 + "@csstools/css-tokenizer": ^2.2.4 + checksum: 10c0/ef12dc08ccdb9903e5cb24d81b469080b94c79123415f62f707196a85c53420b7729be608930314c7a9404f50c832fe5256f647c0567d1c825079cb77f6a8719 + languageName: node + linkType: hard + +"@csstools/css-color-parser@npm:^1.6.2": + version: 1.6.2 + resolution: "@csstools/css-color-parser@npm:1.6.2" + dependencies: + "@csstools/color-helpers": "npm:^4.0.0" + "@csstools/css-calc": "npm:^1.2.0" + peerDependencies: + "@csstools/css-parser-algorithms": ^2.6.1 + "@csstools/css-tokenizer": ^2.2.4 + checksum: 10c0/f587482fd7a40b6bd4cc790771245477d82203ba08f8f85981908680423476b9733c71fb4f1ba655f4dfb77907b4dfbb654dd7ba89e9edf0ba5229c26830ee8f + languageName: node + linkType: hard + "@csstools/css-parser-algorithms@npm:^2.5.0": version: 2.5.0 resolution: "@csstools/css-parser-algorithms@npm:2.5.0" @@ -1547,6 +1587,15 @@ __metadata: languageName: node linkType: hard +"@csstools/css-parser-algorithms@npm:^2.6.1": + version: 2.6.1 + resolution: "@csstools/css-parser-algorithms@npm:2.6.1" + peerDependencies: + "@csstools/css-tokenizer": ^2.2.4 + checksum: 10c0/2c60377c4ffc96bbeb962cab19c09fccbcc834785928747219ed3bd916a34e52977393935d1d36501403f3f95ff59d358dd741d1dddcdaf9564ab36d73926aa6 + languageName: node + linkType: hard + "@csstools/css-tokenizer@npm:^2.2.3": version: 2.2.3 resolution: "@csstools/css-tokenizer@npm:2.2.3" @@ -1554,6 +1603,13 @@ __metadata: languageName: node linkType: hard +"@csstools/css-tokenizer@npm:^2.2.4": + version: 2.2.4 + resolution: "@csstools/css-tokenizer@npm:2.2.4" + checksum: 10c0/23997db5874514f4b951ebd215e1e6cc8baf03adf9a35fc6fd028b84cb52aa2dc053860722108c09859a9b37b455f62b84181fe15539cd37797ea699b9ff85f0 + languageName: node + linkType: hard + "@csstools/media-query-list-parser@npm:^2.1.7": version: 2.1.7 resolution: "@csstools/media-query-list-parser@npm:2.1.7" @@ -1564,6 +1620,382 @@ __metadata: languageName: node linkType: hard +"@csstools/media-query-list-parser@npm:^2.1.9": + version: 2.1.9 + resolution: "@csstools/media-query-list-parser@npm:2.1.9" + peerDependencies: + "@csstools/css-parser-algorithms": ^2.6.1 + "@csstools/css-tokenizer": ^2.2.4 + checksum: 10c0/602e9b5631928c078e670018df20b959bfb8e42ea11024d5218f1604e5ef94e070a74934a919ccbff3713e506d99096057947fa0c2e4768939f7b22479553534 + languageName: node + linkType: hard + +"@csstools/postcss-cascade-layers@npm:^4.0.3": + version: 4.0.3 + resolution: "@csstools/postcss-cascade-layers@npm:4.0.3" + dependencies: + "@csstools/selector-specificity": "npm:^3.0.2" + postcss-selector-parser: "npm:^6.0.13" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/63f29af21eed000130f6f1268c00188a52eafbdeccc6acf5aa46507e499259631aa89f928b01b4698c41f3f68703db4c6e363c0e6f64b04b20c7e6452a5b259a + languageName: node + linkType: hard + +"@csstools/postcss-color-function@npm:^3.0.12": + version: 3.0.12 + resolution: "@csstools/postcss-color-function@npm:3.0.12" + dependencies: + "@csstools/css-color-parser": "npm:^1.6.2" + "@csstools/css-parser-algorithms": "npm:^2.6.1" + "@csstools/css-tokenizer": "npm:^2.2.4" + "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1" + "@csstools/utilities": "npm:^1.0.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/a270aef93e98efb2b184b84a5de8acc28b10aed229807d1e5b5cf43309b281782895322ec98c0c9486b306ec68915e06689d6959c13ea2ab37fbb773ecd02335 + languageName: node + linkType: hard + +"@csstools/postcss-color-mix-function@npm:^2.0.12": + version: 2.0.12 + resolution: "@csstools/postcss-color-mix-function@npm:2.0.12" + dependencies: + "@csstools/css-color-parser": "npm:^1.6.2" + "@csstools/css-parser-algorithms": "npm:^2.6.1" + "@csstools/css-tokenizer": "npm:^2.2.4" + "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1" + "@csstools/utilities": "npm:^1.0.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/42c7d48eeb1c1e49265505b560b9e034861254c62c5f78d89538255decab67d70f89bf81b269b208aa2103e9f48a51a33bb009eb17774f07c0459929d97f7056 + languageName: node + linkType: hard + +"@csstools/postcss-exponential-functions@npm:^1.0.5": + version: 1.0.5 + resolution: "@csstools/postcss-exponential-functions@npm:1.0.5" + dependencies: + "@csstools/css-calc": "npm:^1.2.0" + "@csstools/css-parser-algorithms": "npm:^2.6.1" + "@csstools/css-tokenizer": "npm:^2.2.4" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/45e18ca9025597da29cbef214cef39fcabef1e169bbb1f5c015de5f677e2927a1c3b8ae18558d815701e8d3e64db1043412a222af35036c92c25011a0e1e027d + languageName: node + linkType: hard + +"@csstools/postcss-font-format-keywords@npm:^3.0.2": + version: 3.0.2 + resolution: "@csstools/postcss-font-format-keywords@npm:3.0.2" + dependencies: + "@csstools/utilities": "npm:^1.0.0" + postcss-value-parser: "npm:^4.2.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/1b9bf031ce1a00fef1fae0b1ad614eddc6bb4c036ecad47e065c99063ba3d2f6ab8e47f9db02a6fbe8b75b0e02a075a7a80480d4296918970ba9e8d36f07a523 + languageName: node + linkType: hard + +"@csstools/postcss-gamut-mapping@npm:^1.0.5": + version: 1.0.5 + resolution: "@csstools/postcss-gamut-mapping@npm:1.0.5" + dependencies: + "@csstools/css-color-parser": "npm:^1.6.2" + "@csstools/css-parser-algorithms": "npm:^2.6.1" + "@csstools/css-tokenizer": "npm:^2.2.4" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/33e2185ae8f8a229476bd5a60c0523aef8cb4de552a6c532514b9d87bff579f36fb7640dd14c9ea56906996d43f4d5ab969a4f704e1b8a94f7802beb3df31d08 + languageName: node + linkType: hard + +"@csstools/postcss-gradients-interpolation-method@npm:^4.0.13": + version: 4.0.13 + resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.13" + dependencies: + "@csstools/css-color-parser": "npm:^1.6.2" + "@csstools/css-parser-algorithms": "npm:^2.6.1" + "@csstools/css-tokenizer": "npm:^2.2.4" + "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1" + "@csstools/utilities": "npm:^1.0.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/af7c2d9c8e2249ea4cc50c9ef1b5ad75b1ed062020f1a8906ba9baf3143c4e2638b8b2189d7552838558e7b9a8a1ee9aa0baa076f5deabb23c1dc90fd78d7eab + languageName: node + linkType: hard + +"@csstools/postcss-hwb-function@npm:^3.0.11": + version: 3.0.11 + resolution: "@csstools/postcss-hwb-function@npm:3.0.11" + dependencies: + "@csstools/css-color-parser": "npm:^1.6.2" + "@csstools/css-parser-algorithms": "npm:^2.6.1" + "@csstools/css-tokenizer": "npm:^2.2.4" + "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1" + "@csstools/utilities": "npm:^1.0.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/d779617ef97ff22a125fbdd65f01dd3dd5bc607dbe7f3b02ae808d2fcccb1d5022b7f8e66e64283f7f9c52b6997bf0dc649566c734f0e3e4f3ba3c66a3b564a8 + languageName: node + linkType: hard + +"@csstools/postcss-ic-unit@npm:^3.0.5": + version: 3.0.5 + resolution: "@csstools/postcss-ic-unit@npm:3.0.5" + dependencies: + "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1" + "@csstools/utilities": "npm:^1.0.0" + postcss-value-parser: "npm:^4.2.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/bf21b74e1bdff425481724a36385f1ebe7c8aea6cccfcf6715cad58449d2d19419342e94d33d6626ec09bed8d4ab6e391b8eebaa3bda721e7f41e5c64c485f2a + languageName: node + linkType: hard + +"@csstools/postcss-initial@npm:^1.0.1": + version: 1.0.1 + resolution: "@csstools/postcss-initial@npm:1.0.1" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/5d21c7c611d90a4b6758ba5be5e38d8d9eea9499c62797c4f5e01fbc9ccc2c68daf1c201850efe70ffa4ff9e979e7dea80b854b8793768550879562881aa6f9f + languageName: node + linkType: hard + +"@csstools/postcss-is-pseudo-class@npm:^4.0.5": + version: 4.0.5 + resolution: "@csstools/postcss-is-pseudo-class@npm:4.0.5" + dependencies: + "@csstools/selector-specificity": "npm:^3.0.2" + postcss-selector-parser: "npm:^6.0.13" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/5f35d5474957be30f54b89cf46b818390754af8094c4d9a083a79d579ccd817452bb7e2cfef8951c664d4c6ba381d8d45cd89f49339a42941f947ccb032f9d45 + languageName: node + linkType: hard + +"@csstools/postcss-light-dark-function@npm:^1.0.1": + version: 1.0.1 + resolution: "@csstools/postcss-light-dark-function@npm:1.0.1" + dependencies: + "@csstools/css-parser-algorithms": "npm:^2.6.1" + "@csstools/css-tokenizer": "npm:^2.2.4" + "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1" + "@csstools/utilities": "npm:^1.0.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/538e809b473b91245cb79418949c4a27c0e82b0ea357f9c93b054e07d3194857e53979693226be9448904a7d9d4ad4732ad34183db82927bb172fe6cab1e53a8 + languageName: node + linkType: hard + +"@csstools/postcss-logical-float-and-clear@npm:^2.0.1": + version: 2.0.1 + resolution: "@csstools/postcss-logical-float-and-clear@npm:2.0.1" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/92d9184bf8a159753a5872463dcfde580abd9b935e2a59f7ebe601cd14d9871f2f9f4dc18d8bbe251e7d8a3e446e302d9d99bf408d9cabbd9a6323825f5e833d + languageName: node + linkType: hard + +"@csstools/postcss-logical-overflow@npm:^1.0.1": + version: 1.0.1 + resolution: "@csstools/postcss-logical-overflow@npm:1.0.1" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/a8f5b1fdaf4ce7b1665407dac2f2e0c0ea11195e6873cfc714d9cd206489170fd91fc172b337330baf60191206f60579e235264f0dc7fee750ccd27ffe02c163 + languageName: node + linkType: hard + +"@csstools/postcss-logical-overscroll-behavior@npm:^1.0.1": + version: 1.0.1 + resolution: "@csstools/postcss-logical-overscroll-behavior@npm:1.0.1" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/9485502bd9235276525351818d6cc11544ac1b270bb4f527f3fac32fe98ac66269366c34cdb8f61920b10ff9aac5824935004a5927490a5febca77eb41226604 + languageName: node + linkType: hard + +"@csstools/postcss-logical-resize@npm:^2.0.1": + version: 2.0.1 + resolution: "@csstools/postcss-logical-resize@npm:2.0.1" + dependencies: + postcss-value-parser: "npm:^4.2.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/18f7e19ea465a15b334d8231b9ed98b630c74a6c2a6c52884437b852065f7b55bb1282cdbbdc1136aade479e996605b01799ab0ab771e2c47fd78d966ed33162 + languageName: node + linkType: hard + +"@csstools/postcss-logical-viewport-units@npm:^2.0.7": + version: 2.0.7 + resolution: "@csstools/postcss-logical-viewport-units@npm:2.0.7" + dependencies: + "@csstools/css-tokenizer": "npm:^2.2.4" + "@csstools/utilities": "npm:^1.0.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/9493f5395ccfe88d0d0740e54f77f0c844afc79b164068fdd907aed75004b4252ba9423dea22194ad98114dd1a2e77c14e307604305d926425251d4ab3013949 + languageName: node + linkType: hard + +"@csstools/postcss-media-minmax@npm:^1.1.4": + version: 1.1.4 + resolution: "@csstools/postcss-media-minmax@npm:1.1.4" + dependencies: + "@csstools/css-calc": "npm:^1.2.0" + "@csstools/css-parser-algorithms": "npm:^2.6.1" + "@csstools/css-tokenizer": "npm:^2.2.4" + "@csstools/media-query-list-parser": "npm:^2.1.9" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/620bb85065195c72cf9c0abe9af822f9feeaf919b53bfd47ec09f75b644cb544bd967b09278c48f829348808b34c552718c1aa3eb5342e2dec983e22eb63b0a0 + languageName: node + linkType: hard + +"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^2.0.7": + version: 2.0.7 + resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:2.0.7" + dependencies: + "@csstools/css-parser-algorithms": "npm:^2.6.1" + "@csstools/css-tokenizer": "npm:^2.2.4" + "@csstools/media-query-list-parser": "npm:^2.1.9" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/d5d52a744f9a9466d86a506aab430811778dfa681d3f52f5486ee9b686390919eaae9ad356b84bc782d263227f35913ef68d9a6c3eefcfc38d8ffaccc9b94de0 + languageName: node + linkType: hard + +"@csstools/postcss-nested-calc@npm:^3.0.2": + version: 3.0.2 + resolution: "@csstools/postcss-nested-calc@npm:3.0.2" + dependencies: + "@csstools/utilities": "npm:^1.0.0" + postcss-value-parser: "npm:^4.2.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/3e24cf641170f9090f0dce088f6dae09ed9a0f38af1bdaa369ecc791a94cce54d7a02a0634f661a97fae24e04f1601c21d753593de018c80ad4236d36144b975 + languageName: node + linkType: hard + +"@csstools/postcss-normalize-display-values@npm:^3.0.2": + version: 3.0.2 + resolution: "@csstools/postcss-normalize-display-values@npm:3.0.2" + dependencies: + postcss-value-parser: "npm:^4.2.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/a20e2f4c213a5ec6e004c2ba76b543d3288a39aae21b3198b06a57df0d2c7916111d2cd70dcb0e8c6ca1cf1b01751e88fd2fe9abbc070e1efab1a4e54dcdbbbe + languageName: node + linkType: hard + +"@csstools/postcss-oklab-function@npm:^3.0.12": + version: 3.0.12 + resolution: "@csstools/postcss-oklab-function@npm:3.0.12" + dependencies: + "@csstools/css-color-parser": "npm:^1.6.2" + "@csstools/css-parser-algorithms": "npm:^2.6.1" + "@csstools/css-tokenizer": "npm:^2.2.4" + "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1" + "@csstools/utilities": "npm:^1.0.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/1454f57c756bdc882a523b50634823a0c31d7adc35330e13c80f9573c287f2a4ab30bbce48e0e8788dfe5a293d55113db2205373523b202a8828b9088e55e51c + languageName: node + linkType: hard + +"@csstools/postcss-progressive-custom-properties@npm:^3.1.1": + version: 3.1.1 + resolution: "@csstools/postcss-progressive-custom-properties@npm:3.1.1" + dependencies: + postcss-value-parser: "npm:^4.2.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/9303296c8285a8154d2ee22d5a1330c94c5f361d277a1fd27172e868e3511619a6876538beacae0c9e925a9d1e81a32438d405526170faa84cad0c2d2159fdd2 + languageName: node + linkType: hard + +"@csstools/postcss-relative-color-syntax@npm:^2.0.12": + version: 2.0.12 + resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.12" + dependencies: + "@csstools/css-color-parser": "npm:^1.6.2" + "@csstools/css-parser-algorithms": "npm:^2.6.1" + "@csstools/css-tokenizer": "npm:^2.2.4" + "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1" + "@csstools/utilities": "npm:^1.0.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/e12a59b89372fbc5cc460cfeceeea2ddc8b7a8f5639a767dbd6c7ff799bf740ac5dd7ae6797703f74efeadd696801042bff8770117cf5ed70646dcc598637334 + languageName: node + linkType: hard + +"@csstools/postcss-scope-pseudo-class@npm:^3.0.1": + version: 3.0.1 + resolution: "@csstools/postcss-scope-pseudo-class@npm:3.0.1" + dependencies: + postcss-selector-parser: "npm:^6.0.13" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/489c5469951277b810754ba02e9f6c42196e03f2203b908181a81747bf1dcaa7b194c8c0f5c7dcb6b7276d08f2573a71bd7df4f2251c034ef1b92968c7070285 + languageName: node + linkType: hard + +"@csstools/postcss-stepped-value-functions@npm:^3.0.6": + version: 3.0.6 + resolution: "@csstools/postcss-stepped-value-functions@npm:3.0.6" + dependencies: + "@csstools/css-calc": "npm:^1.2.0" + "@csstools/css-parser-algorithms": "npm:^2.6.1" + "@csstools/css-tokenizer": "npm:^2.2.4" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/a198aedc4fffe88909c92bfaa36031e6803e739a2578ba4a81c01b9f1525e6a6876d6ffacbbe21701298598dcade8b2ac8423d8ab0fc5d9f4ba86ed60f53cbca + languageName: node + linkType: hard + +"@csstools/postcss-text-decoration-shorthand@npm:^3.0.4": + version: 3.0.4 + resolution: "@csstools/postcss-text-decoration-shorthand@npm:3.0.4" + dependencies: + "@csstools/color-helpers": "npm:^4.0.0" + postcss-value-parser: "npm:^4.2.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/2e17535bbeed8ca5f095e6aecfb552004c1920597f16146fe6ec773b46af95f9e0e3cf77181d4216a23528de8e042bd85f82df1562447f52e7687ed8628f0adc + languageName: node + linkType: hard + +"@csstools/postcss-trigonometric-functions@npm:^3.0.6": + version: 3.0.6 + resolution: "@csstools/postcss-trigonometric-functions@npm:3.0.6" + dependencies: + "@csstools/css-calc": "npm:^1.2.0" + "@csstools/css-parser-algorithms": "npm:^2.6.1" + "@csstools/css-tokenizer": "npm:^2.2.4" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/4b484af853d9eb59a4a4b1c063fcf48e2658bb2d6930dfab1d79e676986534687e6440b8cdcd2731ddcb7726537f4ed484208a2b80ef2c9359053762ba35e5e7 + languageName: node + linkType: hard + +"@csstools/postcss-unset-value@npm:^3.0.1": + version: 3.0.1 + resolution: "@csstools/postcss-unset-value@npm:3.0.1" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/5032c3125eada0a3a77d0867644cf994e28b789aaa40e990e7eebcdf5a9ed9f36b30e0904827044cea39849c9a9a19c90e82d3ca655550d82a7530872b3b6ff8 + languageName: node + linkType: hard + +"@csstools/selector-resolve-nested@npm:^1.1.0": + version: 1.1.0 + resolution: "@csstools/selector-resolve-nested@npm:1.1.0" + peerDependencies: + postcss-selector-parser: ^6.0.13 + checksum: 10c0/3a53b14e048d48b8900c1cf30442ab5eec1a1087c74ce41459c4dcd42ad7d363c9327890ba7aed25288d09c206d9565178bae126b25cdc3e1170a1d55e763c77 + languageName: node + linkType: hard + "@csstools/selector-specificity@npm:^3.0.1": version: 3.0.1 resolution: "@csstools/selector-specificity@npm:3.0.1" @@ -1573,6 +2005,24 @@ __metadata: languageName: node linkType: hard +"@csstools/selector-specificity@npm:^3.0.2": + version: 3.0.2 + resolution: "@csstools/selector-specificity@npm:3.0.2" + peerDependencies: + postcss-selector-parser: ^6.0.13 + checksum: 10c0/d0c7dae2f1e9536e3e17f00467320a704f3208c76283c29c57fd69d4b83dcf6d062f492ed687c5ffd5f47fada9f0657c2efc89ea18fd4b038f757669553e0095 + languageName: node + linkType: hard + +"@csstools/utilities@npm:^1.0.0": + version: 1.0.0 + resolution: "@csstools/utilities@npm:1.0.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/2ac10895e0a1f9e1fc9c092197c8595a09f632552791af91219f38c55bb39083fb44b74a6a7de9112492cf24a2fe66d20c955a2b4aff041d5c017d87bbebc0f2 + languageName: node + linkType: hard + "@discoveryjs/json-ext@npm:0.5.7": version: 0.5.7 resolution: "@discoveryjs/json-ext@npm:0.5.7" @@ -2388,6 +2838,7 @@ __metadata: path-complete-extname: "npm:^1.0.0" postcss: "npm:^8.4.24" postcss-loader: "npm:^4.3.0" + postcss-preset-env: "npm:^9.5.2" prettier: "npm:^3.0.0" prop-types: "npm:^15.8.1" punycode: "npm:^2.3.0" @@ -4622,7 +5073,7 @@ __metadata: languageName: node linkType: hard -"autoprefixer@npm:^10.4.14": +"autoprefixer@npm:^10.4.14, autoprefixer@npm:^10.4.18": version: 10.4.18 resolution: "autoprefixer@npm:10.4.18" dependencies: @@ -5160,7 +5611,7 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.0.0, browserslist@npm:^4.22.2, browserslist@npm:^4.23.0": +"browserslist@npm:^4.0.0, browserslist@npm:^4.22.2, browserslist@npm:^4.22.3, browserslist@npm:^4.23.0": version: 4.23.0 resolution: "browserslist@npm:4.23.0" dependencies: @@ -6069,6 +6520,17 @@ __metadata: languageName: node linkType: hard +"css-blank-pseudo@npm:^6.0.1": + version: 6.0.1 + resolution: "css-blank-pseudo@npm:6.0.1" + dependencies: + postcss-selector-parser: "npm:^6.0.13" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/04f2dc1c39a429cb4958b60a9d00b03e29a78e3e55fe111b3a0660b7c6c478455d5907eda7c7a495cf72dbe83ae3c80b409e0468ca1ba5ccef992e69a8f49df8 + languageName: node + linkType: hard + "css-declaration-sorter@npm:^7.1.1": version: 7.1.1 resolution: "css-declaration-sorter@npm:7.1.1" @@ -6085,6 +6547,19 @@ __metadata: languageName: node linkType: hard +"css-has-pseudo@npm:^6.0.2": + version: 6.0.2 + resolution: "css-has-pseudo@npm:6.0.2" + dependencies: + "@csstools/selector-specificity": "npm:^3.0.2" + postcss-selector-parser: "npm:^6.0.13" + postcss-value-parser: "npm:^4.2.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/96f9a6a4f31e11797e583d458535e11fa513b3f1f430ab566964a2f0792eaaa543213598b0a509516f07464234348ab11d56448b6d0c0c8a36988e0c86cf4ca1 + languageName: node + linkType: hard + "css-loader@npm:^5.2.7": version: 5.2.7 resolution: "css-loader@npm:5.2.7" @@ -6105,6 +6580,15 @@ __metadata: languageName: node linkType: hard +"css-prefers-color-scheme@npm:^9.0.1": + version: 9.0.1 + resolution: "css-prefers-color-scheme@npm:9.0.1" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/b94da00d84c4ebb56eb8fce96d4fdb20d2e622a7cd8cd6d7b87d1d2b718a55ce88bccc9d871771bfe77c5107de06132ba87190e3656f049e45f19f652d50136c + languageName: node + linkType: hard + "css-select-base-adapter@npm:^0.1.1": version: 0.1.1 resolution: "css-select-base-adapter@npm:0.1.1" @@ -6198,6 +6682,13 @@ __metadata: languageName: node linkType: hard +"cssdb@npm:^7.11.1": + version: 7.11.2 + resolution: "cssdb@npm:7.11.2" + checksum: 10c0/5cd8dfee703dfbd7b7a8c3a93d65d26007ec1cd9692379b5868a0ceedf23b88e28d4b98f1cb9a4161f8b01e4a229e08ba9603fb94b756a3df6e07c423fff5b5d + languageName: node + linkType: hard + "cssesc@npm:^3.0.0": version: 3.0.0 resolution: "cssesc@npm:3.0.0" @@ -12628,6 +13119,17 @@ __metadata: languageName: node linkType: hard +"postcss-attribute-case-insensitive@npm:^6.0.3": + version: 6.0.3 + resolution: "postcss-attribute-case-insensitive@npm:6.0.3" + dependencies: + postcss-selector-parser: "npm:^6.0.13" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/6161a625356db17ea23daa50797e23fa830a15629fa45e7438b5ac72a389f81ba51088503c5893a941d34d287857882867199584c5f03bf7762258c74570f456 + languageName: node + linkType: hard + "postcss-calc@npm:^9.0.1": version: 9.0.1 resolution: "postcss-calc@npm:9.0.1" @@ -12640,6 +13142,56 @@ __metadata: languageName: node linkType: hard +"postcss-clamp@npm:^4.1.0": + version: 4.1.0 + resolution: "postcss-clamp@npm:4.1.0" + dependencies: + postcss-value-parser: "npm:^4.2.0" + peerDependencies: + postcss: ^8.4.6 + checksum: 10c0/701261026b38a4c27b3c3711635fac96005f36d3270adb76dbdb1eebc950fc841db45283ee66068a7121565592e9d7967d5534e15b6e4dd266afcabf9eafa905 + languageName: node + linkType: hard + +"postcss-color-functional-notation@npm:^6.0.7": + version: 6.0.7 + resolution: "postcss-color-functional-notation@npm:6.0.7" + dependencies: + "@csstools/css-color-parser": "npm:^1.6.2" + "@csstools/css-parser-algorithms": "npm:^2.6.1" + "@csstools/css-tokenizer": "npm:^2.2.4" + "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1" + "@csstools/utilities": "npm:^1.0.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/bd3c1831e885f395205d503bf4b24f462dc9f4af74be11c5b0ad7b09eb150b2d3f8b2c727ab9e67c474ff05baa8e8e3c950880ffe2085ed39794d308c0297667 + languageName: node + linkType: hard + +"postcss-color-hex-alpha@npm:^9.0.4": + version: 9.0.4 + resolution: "postcss-color-hex-alpha@npm:9.0.4" + dependencies: + "@csstools/utilities": "npm:^1.0.0" + postcss-value-parser: "npm:^4.2.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/57b5cfe17e0b659d5444f267c485462b8b25f6ab087b810c7dd44662af4828e1e8f9c4a9169b8635a4755509ca7c0f3463c2e96444764c4e6ff9f4036aad05e5 + languageName: node + linkType: hard + +"postcss-color-rebeccapurple@npm:^9.0.3": + version: 9.0.3 + resolution: "postcss-color-rebeccapurple@npm:9.0.3" + dependencies: + "@csstools/utilities": "npm:^1.0.0" + postcss-value-parser: "npm:^4.2.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/ab36d29df23dd475a2a540101427640ef9c7936bbf941816e8582caea05feced26c65f795a849e2ad17469cee6682d1bbccd2f8ab0da07fe91efcc0649568038 + languageName: node + linkType: hard + "postcss-colormin@npm:^6.1.0": version: 6.1.0 resolution: "postcss-colormin@npm:6.1.0" @@ -12666,6 +13218,60 @@ __metadata: languageName: node linkType: hard +"postcss-custom-media@npm:^10.0.4": + version: 10.0.4 + resolution: "postcss-custom-media@npm:10.0.4" + dependencies: + "@csstools/cascade-layer-name-parser": "npm:^1.0.9" + "@csstools/css-parser-algorithms": "npm:^2.6.1" + "@csstools/css-tokenizer": "npm:^2.2.4" + "@csstools/media-query-list-parser": "npm:^2.1.9" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/2384a40f0e38abe92fbfc707000b264e4bdfe65bd0086ab18c6aab71049198f9dd1431bc4f9bbf68f7cca86b4ff0da352bac4a6ecd04e3671b7ddf6ed6ec3d04 + languageName: node + linkType: hard + +"postcss-custom-properties@npm:^13.3.6": + version: 13.3.6 + resolution: "postcss-custom-properties@npm:13.3.6" + dependencies: + "@csstools/cascade-layer-name-parser": "npm:^1.0.9" + "@csstools/css-parser-algorithms": "npm:^2.6.1" + "@csstools/css-tokenizer": "npm:^2.2.4" + "@csstools/utilities": "npm:^1.0.0" + postcss-value-parser: "npm:^4.2.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/faa3b692966314a6dfcba93e74d91f20f2484ea328f88c809b1d0daa8ecc0d8d5125e06d1d7c18b5455ac30cb3501c7069b6e56e5efac61523a6ed75c3d73a30 + languageName: node + linkType: hard + +"postcss-custom-selectors@npm:^7.1.8": + version: 7.1.8 + resolution: "postcss-custom-selectors@npm:7.1.8" + dependencies: + "@csstools/cascade-layer-name-parser": "npm:^1.0.9" + "@csstools/css-parser-algorithms": "npm:^2.6.1" + "@csstools/css-tokenizer": "npm:^2.2.4" + postcss-selector-parser: "npm:^6.0.13" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/6a7d8248342177a222821531ea3b4008764362e4f7e8f7f2d5767e5880c37ffa39ac5adced2c686baeb9c1f4ed4c283fcc8a8d30ef3b4fc5f63d4ef9a691285e + languageName: node + linkType: hard + +"postcss-dir-pseudo-class@npm:^8.0.1": + version: 8.0.1 + resolution: "postcss-dir-pseudo-class@npm:8.0.1" + dependencies: + postcss-selector-parser: "npm:^6.0.13" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/8c096e096b09e4041818bd2edf5581b5172375621f5eeca013633166ea100ab98e71bf60fccd92fa20cfa7b55c57598605a1655c6bcbe54a80728a7d4e36859e + languageName: node + linkType: hard + "postcss-discard-comments@npm:^6.0.2": version: 6.0.2 resolution: "postcss-discard-comments@npm:6.0.2" @@ -12702,6 +13308,86 @@ __metadata: languageName: node linkType: hard +"postcss-double-position-gradients@npm:^5.0.5": + version: 5.0.5 + resolution: "postcss-double-position-gradients@npm:5.0.5" + dependencies: + "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1" + "@csstools/utilities": "npm:^1.0.0" + postcss-value-parser: "npm:^4.2.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/02c22ca055ceca1ecc3c6888eab5c84769c9df37f59855f0ff9e9faaedcb4acf6818e927bff18bd57df161045f775ecca4142b13f968332419976c556a769995 + languageName: node + linkType: hard + +"postcss-focus-visible@npm:^9.0.1": + version: 9.0.1 + resolution: "postcss-focus-visible@npm:9.0.1" + dependencies: + postcss-selector-parser: "npm:^6.0.13" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/b8eb14ef51df62969559a7b2b4a4b6313a802fc2de225de293ad484ed6528833fc6bb7574aad5fabe7eeb27e8cd62663c2d547b25ff058d31c06d3d066abd904 + languageName: node + linkType: hard + +"postcss-focus-within@npm:^8.0.1": + version: 8.0.1 + resolution: "postcss-focus-within@npm:8.0.1" + dependencies: + postcss-selector-parser: "npm:^6.0.13" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/cb0380d89f3b9313345dbea65c78c7ad16a6e6ab2ba9e90451d5b14f05ee691a0cdf458376368061327182e031644da21eee7e6e9ae508d195f083e0a20c0502 + languageName: node + linkType: hard + +"postcss-font-variant@npm:^5.0.0": + version: 5.0.0 + resolution: "postcss-font-variant@npm:5.0.0" + peerDependencies: + postcss: ^8.1.0 + checksum: 10c0/ccc96460cf6a52b5439c26c9a5ea0589882e46161e3c2331d4353de7574448f5feef667d1a68f7f39b9fe3ee75d85957383ae82bbfcf87c3162c7345df4a444e + languageName: node + linkType: hard + +"postcss-gap-properties@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-gap-properties@npm:5.0.1" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/3b28c38819add37a2fc7decd7e3bdda1cab1de861af228abfb3e4310d87786eff4572a693bec6cea1c435bcd3dd0bb58bc9a58f1dde3a1c7def9feaf800762b8 + languageName: node + linkType: hard + +"postcss-image-set-function@npm:^6.0.3": + version: 6.0.3 + resolution: "postcss-image-set-function@npm:6.0.3" + dependencies: + "@csstools/utilities": "npm:^1.0.0" + postcss-value-parser: "npm:^4.2.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/b35ce25aeca95f7abc5e5820f2398588150f5be02209054d714e870ae2fa01a8482fd10600fe1f847add898c39690275a60a5999f83f6bed6c66be9b0444b704 + languageName: node + linkType: hard + +"postcss-lab-function@npm:^6.0.12": + version: 6.0.12 + resolution: "postcss-lab-function@npm:6.0.12" + dependencies: + "@csstools/css-color-parser": "npm:^1.6.2" + "@csstools/css-parser-algorithms": "npm:^2.6.1" + "@csstools/css-tokenizer": "npm:^2.2.4" + "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1" + "@csstools/utilities": "npm:^1.0.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/1c96c19d0487346445749777df2af7cc828f3e3c4e8a435cac250d03c14efb0d14ee994ac58d966ed07f8f07aa297f0e3311248b78ba1e816bb18386e435a83c + languageName: node + linkType: hard + "postcss-loader@npm:^4.3.0": version: 4.3.0 resolution: "postcss-loader@npm:4.3.0" @@ -12718,6 +13404,17 @@ __metadata: languageName: node linkType: hard +"postcss-logical@npm:^7.0.1": + version: 7.0.1 + resolution: "postcss-logical@npm:7.0.1" + dependencies: + postcss-value-parser: "npm:^4.2.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/66a06b5d3cb31181dd76c80286addd219205066a4a8c216076869fc54769ee0011cdaa8063e1b2c19c114cdc5ad12a2e2e8b730f6971960dc77d55f25f290223 + languageName: node + linkType: hard + "postcss-media-query-parser@npm:^0.2.3": version: 0.2.3 resolution: "postcss-media-query-parser@npm:0.2.3" @@ -12843,6 +13540,19 @@ __metadata: languageName: node linkType: hard +"postcss-nesting@npm:^12.1.0": + version: 12.1.0 + resolution: "postcss-nesting@npm:12.1.0" + dependencies: + "@csstools/selector-resolve-nested": "npm:^1.1.0" + "@csstools/selector-specificity": "npm:^3.0.2" + postcss-selector-parser: "npm:^6.0.13" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/87902723214ec33a81520f51cce1e52f52c02272f2b7838d3aaa795e226104bf4809ef9dad8840f43852c1f229afb5f480ab1f20c7677bd021cf57739b625871 + languageName: node + linkType: hard + "postcss-normalize-charset@npm:^6.0.2": version: 6.0.2 resolution: "postcss-normalize-charset@npm:6.0.2" @@ -12941,6 +13651,15 @@ __metadata: languageName: node linkType: hard +"postcss-opacity-percentage@npm:^2.0.0": + version: 2.0.0 + resolution: "postcss-opacity-percentage@npm:2.0.0" + peerDependencies: + postcss: ^8.2 + checksum: 10c0/f031f3281060c4c0ede8f9a5832f65a3d8c2a1896ff324c41de42016e092635f0e0abee07545b01db93dc430a9741674a1d09c377c6c01cd8c2f4be65f889161 + languageName: node + linkType: hard + "postcss-ordered-values@npm:^6.0.2": version: 6.0.2 resolution: "postcss-ordered-values@npm:6.0.2" @@ -12953,6 +13672,118 @@ __metadata: languageName: node linkType: hard +"postcss-overflow-shorthand@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-overflow-shorthand@npm:5.0.1" + dependencies: + postcss-value-parser: "npm:^4.2.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/328407adffae084c096b3ea2c03037f0083a0000cae744872bb1168fdd317eef12bb049cdfef749343c3ed65b4275dc6eefe577d99cbc78e3617cb36d07e8717 + languageName: node + linkType: hard + +"postcss-page-break@npm:^3.0.4": + version: 3.0.4 + resolution: "postcss-page-break@npm:3.0.4" + peerDependencies: + postcss: ^8 + checksum: 10c0/eaaf4d8922b35f2acd637eb059f7e2510b24d65eb8f31424799dd5a98447b6ef010b41880c26e78f818e00f842295638ec75f89d5d489067f53e3dd3db74a00f + languageName: node + linkType: hard + +"postcss-place@npm:^9.0.1": + version: 9.0.1 + resolution: "postcss-place@npm:9.0.1" + dependencies: + postcss-value-parser: "npm:^4.2.0" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/d0fb5b0416fd15d5ac7da5fcc1829b9b78c5a90caba5bd045052c6ac0467910cbbeb2fff6c5257190affa656be27168c94ff339f86c0b7df54f9bea04bcadba7 + languageName: node + linkType: hard + +"postcss-preset-env@npm:^9.5.2": + version: 9.5.2 + resolution: "postcss-preset-env@npm:9.5.2" + dependencies: + "@csstools/postcss-cascade-layers": "npm:^4.0.3" + "@csstools/postcss-color-function": "npm:^3.0.12" + "@csstools/postcss-color-mix-function": "npm:^2.0.12" + "@csstools/postcss-exponential-functions": "npm:^1.0.5" + "@csstools/postcss-font-format-keywords": "npm:^3.0.2" + "@csstools/postcss-gamut-mapping": "npm:^1.0.5" + "@csstools/postcss-gradients-interpolation-method": "npm:^4.0.13" + "@csstools/postcss-hwb-function": "npm:^3.0.11" + "@csstools/postcss-ic-unit": "npm:^3.0.5" + "@csstools/postcss-initial": "npm:^1.0.1" + "@csstools/postcss-is-pseudo-class": "npm:^4.0.5" + "@csstools/postcss-light-dark-function": "npm:^1.0.1" + "@csstools/postcss-logical-float-and-clear": "npm:^2.0.1" + "@csstools/postcss-logical-overflow": "npm:^1.0.1" + "@csstools/postcss-logical-overscroll-behavior": "npm:^1.0.1" + "@csstools/postcss-logical-resize": "npm:^2.0.1" + "@csstools/postcss-logical-viewport-units": "npm:^2.0.7" + "@csstools/postcss-media-minmax": "npm:^1.1.4" + "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^2.0.7" + "@csstools/postcss-nested-calc": "npm:^3.0.2" + "@csstools/postcss-normalize-display-values": "npm:^3.0.2" + "@csstools/postcss-oklab-function": "npm:^3.0.12" + "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1" + "@csstools/postcss-relative-color-syntax": "npm:^2.0.12" + "@csstools/postcss-scope-pseudo-class": "npm:^3.0.1" + "@csstools/postcss-stepped-value-functions": "npm:^3.0.6" + "@csstools/postcss-text-decoration-shorthand": "npm:^3.0.4" + "@csstools/postcss-trigonometric-functions": "npm:^3.0.6" + "@csstools/postcss-unset-value": "npm:^3.0.1" + autoprefixer: "npm:^10.4.18" + browserslist: "npm:^4.22.3" + css-blank-pseudo: "npm:^6.0.1" + css-has-pseudo: "npm:^6.0.2" + css-prefers-color-scheme: "npm:^9.0.1" + cssdb: "npm:^7.11.1" + postcss-attribute-case-insensitive: "npm:^6.0.3" + postcss-clamp: "npm:^4.1.0" + postcss-color-functional-notation: "npm:^6.0.7" + postcss-color-hex-alpha: "npm:^9.0.4" + postcss-color-rebeccapurple: "npm:^9.0.3" + postcss-custom-media: "npm:^10.0.4" + postcss-custom-properties: "npm:^13.3.6" + postcss-custom-selectors: "npm:^7.1.8" + postcss-dir-pseudo-class: "npm:^8.0.1" + postcss-double-position-gradients: "npm:^5.0.5" + postcss-focus-visible: "npm:^9.0.1" + postcss-focus-within: "npm:^8.0.1" + postcss-font-variant: "npm:^5.0.0" + postcss-gap-properties: "npm:^5.0.1" + postcss-image-set-function: "npm:^6.0.3" + postcss-lab-function: "npm:^6.0.12" + postcss-logical: "npm:^7.0.1" + postcss-nesting: "npm:^12.1.0" + postcss-opacity-percentage: "npm:^2.0.0" + postcss-overflow-shorthand: "npm:^5.0.1" + postcss-page-break: "npm:^3.0.4" + postcss-place: "npm:^9.0.1" + postcss-pseudo-class-any-link: "npm:^9.0.1" + postcss-replace-overflow-wrap: "npm:^4.0.0" + postcss-selector-not: "npm:^7.0.2" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/40f94472f2d940cbf1df9974bea29a76ada4c1285b97e7104c0cdf001fcafd0a1f5966822250df0d659ec0ea51e577a1ab78c9f5f8a5683ea9897efe043515c1 + languageName: node + linkType: hard + +"postcss-pseudo-class-any-link@npm:^9.0.1": + version: 9.0.1 + resolution: "postcss-pseudo-class-any-link@npm:9.0.1" + dependencies: + postcss-selector-parser: "npm:^6.0.13" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/2d33f486af442a0ee095b7b8875701ed3f54ea3f80d2c4d1c1b35d105088b569c847e1c71fde2adf6cefb4920e8fb7d057ff1ad56e62c65892c7b68e26213b98 + languageName: node + linkType: hard + "postcss-reduce-initial@npm:^6.1.0": version: 6.1.0 resolution: "postcss-reduce-initial@npm:6.1.0" @@ -12976,6 +13807,15 @@ __metadata: languageName: node linkType: hard +"postcss-replace-overflow-wrap@npm:^4.0.0": + version: 4.0.0 + resolution: "postcss-replace-overflow-wrap@npm:4.0.0" + peerDependencies: + postcss: ^8.0.3 + checksum: 10c0/451361b714528cd3632951256ef073769cde725a46cda642a6864f666fb144921fa55e614aec1bcf5946f37d6ffdcca3b932b76f3d997c07b076e8db152b128d + languageName: node + linkType: hard + "postcss-resolve-nested-selector@npm:^0.1.1": version: 0.1.1 resolution: "postcss-resolve-nested-selector@npm:0.1.1" @@ -13001,6 +13841,17 @@ __metadata: languageName: node linkType: hard +"postcss-selector-not@npm:^7.0.2": + version: 7.0.2 + resolution: "postcss-selector-not@npm:7.0.2" + dependencies: + postcss-selector-parser: "npm:^6.0.13" + peerDependencies: + postcss: ^8.4 + checksum: 10c0/624b6e516d37d43406ff1414b3413fe7a5dc34eccadd6a6082fe7df13c5c2fab3e244af33ff0916f9be0a4f7db91d1c22102f5166d7a6e6595e7c00e11e20281 + languageName: node + linkType: hard + "postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.15, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4": version: 6.0.15 resolution: "postcss-selector-parser@npm:6.0.15" From 50fd94f481cf23a81662140afe99df2fbf1149be Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 20 Mar 2024 12:20:23 +0100 Subject: [PATCH 8/8] Fix blockquote color in reply indicator (#29659) --- app/javascript/styles/mastodon/rich_text.scss | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/javascript/styles/mastodon/rich_text.scss b/app/javascript/styles/mastodon/rich_text.scss index c77c23bc40..c57db26e03 100644 --- a/app/javascript/styles/mastodon/rich_text.scss +++ b/app/javascript/styles/mastodon/rich_text.scss @@ -1,5 +1,6 @@ .status__content__text, .e-content, +.edit-indicator__content, .reply-indicator__content { pre, blockquote { @@ -55,10 +56,3 @@ list-style-type: decimal; } } - -.reply-indicator__content { - blockquote { - border-left-color: $inverted-text-color; - color: $inverted-text-color; - } -}