mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream

pull/2780/head
Claire 2024-07-16 17:54:36 +02:00
parent b7b6f1c89a 66430cb25c
commit c546757cd1
53 changed files with 177 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -367,7 +367,7 @@ GEM
json-ld-preloaded (3.3.0)
json-ld (~> 3.3)
rdf (~> 3.3)
json-schema (4.3.0)
json-schema (4.3.1)
addressable (>= 2.8)
jsonapi-renderer (0.2.2)
jwt (2.7.1)

2
app/controllers/api/v1/reports_controller.rb
View File

@ -10,7 +10,7 @@ class Api::V1::ReportsController < Api::BaseController
@report = ReportService.new.call(
current_account,
reported_account,
report_params
report_params.merge(application: doorkeeper_token.application)
)
render json: @report, serializer: REST::ReportSerializer

2
app/javascript/mastodon/components/__tests__/hashtag_bar.tsx
View File

@ -165,7 +165,7 @@ describe('computeHashtagBarForStatus', () => {
);
});
it('puts the hashtags in the bar if a status content has hashtags in the only line and has a media', () => {
it('does not put the hashtags in the bar if a status content has hashtags in the only line and has a media', () => {
const status = createStatus(
'<p>This is my content! <a href="test">#hashtag</a></p>',
['hashtag'],

29
app/javascript/mastodon/locales/cy.json
View File

@ -48,8 +48,8 @@
"account.mention": "Crybwyll @{name}",
"account.moved_to": "Mae {name} wedi nodi fod eu cyfrif newydd yn:",
"account.mute": "Tewi @{name}",
"account.mute_notifications_short": "Distewi hysbysiadau",
"account.mute_short": "Tewi",
"account.mute_notifications_short": "Diffodd hysbysiadau",
"account.mute_short": "Anwybyddu",
"account.muted": "Wedi anwybyddu",
"account.mutual": "Cydgydnabod",
"account.no_bio": "Dim disgrifiad wedi'i gynnig.",
@ -92,7 +92,7 @@
"block_modal.they_cant_mention": "Nid ydynt yn gallu eich crybwyll na'ch dilyn.",
"block_modal.they_cant_see_posts": "Nid ydynt yn gallu gweld eich postiadau ac ni fyddwch yn gweld eu rhai hwy.",
"block_modal.they_will_know": "Gallant weld eu bod wedi'u rhwystro.",
"block_modal.title": "Rhwystro defnyddiwr?",
"block_modal.title": "Blocio defnyddiwr?",
"block_modal.you_wont_see_mentions": "Ni welwch bostiadau sy'n sôn amdanynt.",
"boost_modal.combo": "Mae modd pwyso {combo} er mwyn hepgor hyn tro nesa",
"bundle_column_error.copy_stacktrace": "Copïo'r adroddiad gwall",
@ -164,7 +164,7 @@
"compose_form.spoiler.marked": "Dileu rhybudd cynnwys",
"compose_form.spoiler.unmarked": "Ychwanegu rhybudd cynnwys",
"compose_form.spoiler_placeholder": "Rhybudd cynnwys (dewisol)",
"confirmation_modal.cancel": "Diddymu",
"confirmation_modal.cancel": "Canslo",
"confirmations.block.confirm": "Blocio",
"confirmations.cancel_follow_request.confirm": "Tynnu'r cais yn ôl",
"confirmations.cancel_follow_request.message": "Ydych chi'n siŵr eich bod am dynnu'ch cais i ddilyn {name} yn ôl?",
@ -174,7 +174,7 @@
"confirmations.delete_list.message": "Ydych chi'n siŵr eich bod eisiau dileu'r rhestr hwn am byth?",
"confirmations.discard_edit_media.confirm": "Dileu",
"confirmations.discard_edit_media.message": "Mae gennych newidiadau heb eu cadw i'r disgrifiad cyfryngau neu'r rhagolwg - eu dileu beth bynnag?",
"confirmations.domain_block.confirm": "Rhwystro gweinydd",
"confirmations.domain_block.confirm": "Blocio gweinydd",
"confirmations.domain_block.message": "Ydych chi wir, wir eisiau blocio'r holl {domain}? Fel arfer, mae blocio neu dewi pobl penodol yn broses mwy effeithiol. Fyddwch chi ddim yn gweld cynnwys o'r parth hwnnw mewn ffrydiau cyhoeddus neu yn eich hysbysiadau. Bydd eich dilynwyr o'r parth hwnnw yn cael eu ddileu.",
"confirmations.edit.confirm": "Golygu",
"confirmations.edit.message": "Bydd golygu nawr yn trosysgrifennu'r neges rydych yn ei ysgrifennu ar hyn o bryd. Ydych chi'n siŵr eich bod eisiau gwneud hyn?",
@ -201,17 +201,17 @@
"disabled_account_banner.account_settings": "Gosodiadau'r cyfrif",
"disabled_account_banner.text": "Mae eich cyfrif {disabledAccount} wedi ei analluogi ar hyn o bryd.",
"dismissable_banner.community_timeline": "Dyma'r postiadau cyhoeddus diweddaraf gan bobl sydd â chyfrifon ar {domain}.",
"dismissable_banner.dismiss": "Diddymu",
"dismissable_banner.dismiss": "Cau",
"dismissable_banner.explore_links": "Dyma straeon newyddion sy’n cael eu rhannu fwyaf ar y we gymdeithasol heddiw. Mae'r straeon newyddion diweddaraf sy'n cael eu postio gan fwy o unigolion gwahanol yn cael eu graddio'n uwch.",
"dismissable_banner.explore_statuses": "Mae'r rhain yn bostiadau o bob rhan o'r we gymdeithasol sydd ar gynnydd heddiw. Mae postiadau mwy diweddar sydd â mwy o hybiau a ffefrynu'n cael eu graddio'n uwch.",
"dismissable_banner.explore_tags": "Mae'r rhain yn hashnodau sydd ar gynnydd ar y we gymdeithasol heddiw. Mae hashnodau sy'n cael eu defnyddio gan fwy o unigolion gwahanol yn cael eu graddio'n uwch.",
"dismissable_banner.public_timeline": "Dyma'r postiadau cyhoeddus diweddaraf gan bobl ar y we gymdeithasol y mae pobl ar {domain} yn eu dilyn.",
"domain_block_modal.block": "Rhwystro gweinydd",
"domain_block_modal.block_account_instead": "Rhwystro @{name} yn lle hynny",
"domain_block_modal.block": "Blocio gweinydd",
"domain_block_modal.block_account_instead": "Blocio @{name} yn ei le",
"domain_block_modal.they_can_interact_with_old_posts": "Gall pobl o'r gweinydd hwn ryngweithio â'ch hen bostiadau.",
"domain_block_modal.they_cant_follow": "Ni all neb o'r gweinydd hwn eich dilyn.",
"domain_block_modal.they_wont_know": "Fyddan nhw ddim yn gwybod eu bod wedi cael eu rhwystro.",
"domain_block_modal.title": "Rhwystro parth?",
"domain_block_modal.they_wont_know": "Fyddan nhw ddim yn gwybod eu bod wedi cael eu blocio.",
"domain_block_modal.title": "Blocio parth?",
"domain_block_modal.you_will_lose_followers": "Bydd eich holl ddilynwyr o'r gweinydd hwn yn cael eu tynnu.",
"domain_block_modal.you_wont_see_posts": "Fyddwch chi ddim yn gweld postiadau na hysbysiadau gan ddefnyddwyr ar y gweinydd hwn.",
"domain_pill.activitypub_lets_connect": "Mae'n caniatáu ichi gysylltu a rhyngweithio â phobl nid yn unig ar Mastodon, ond ar draws gwahanol apiau cymdeithasol hefyd.",
@ -252,7 +252,7 @@
"empty_column.bookmarked_statuses": "Nid oes gennych unrhyw bostiad wedi'u cadw fel llyfrnodau eto. Pan fyddwch yn gosod nod tudalen i un, mi fydd yn ymddangos yma.",
"empty_column.community": "Mae'r ffrwd lleol yn wag. Beth am ysgrifennu rhywbeth cyhoeddus!",
"empty_column.direct": "Nid oes gennych unrhyw grybwylliadau preifat eto. Pan fyddwch chi'n anfon neu'n derbyn un, bydd yn ymddangos yma.",
"empty_column.domain_blocks": "Nid oes yna unrhyw barthau cuddiedig eto.",
"empty_column.domain_blocks": "Nid oes unrhyw barthau wedi'u blocio eto.",
"empty_column.explore_statuses": "Does dim yn trendio ar hyn o bryd. Dewch nôl nes ymlaen!",
"empty_column.favourited_statuses": "Nid oes gennych unrhyw hoff bostiadau eto. Pan byddwch yn hoffi un, bydd yn ymddangos yma.",
"empty_column.favourites": "Nid oes unrhyw un wedi hoffi'r postiad hwn eto. Pan fydd rhywun yn gwneud hynny, byddan nhw'n ymddangos yma.",
@ -411,6 +411,7 @@
"limited_account_hint.action": "Dangos y proffil beth bynnag",
"limited_account_hint.title": "Mae'r proffil hwn wedi cael ei guddio gan gymedrolwyr {domain}.",
"link_preview.author": "Gan {name}",
"link_preview.more_from_author": "Mwy gan {name}",
"lists.account.add": "Ychwanegu at restr",
"lists.account.remove": "Tynnu o'r rhestr",
"lists.delete": "Dileu rhestr",
@ -484,9 +485,9 @@
"notification.reblog": "Hybodd {name} eich post",
"notification.relationships_severance_event": "Wedi colli cysylltiad â {name}",
"notification.relationships_severance_event.account_suspension": "Mae gweinyddwr o {from} wedi atal {target}, sy'n golygu na allwch dderbyn diweddariadau ganddynt mwyach na rhyngweithio â nhw.",
"notification.relationships_severance_event.domain_block": "Mae gweinyddwr o {from} wedi rhwystro {target}, gan gynnwys {followersCount} o'ch dilynwyr a {followingCount, plural, one {# cyfrif} other {# cyfrif}} arall rydych chi'n ei ddilyn.",
"notification.relationships_severance_event.domain_block": "Mae gweinyddwr o {from} wedi blocio {target}, gan gynnwys {followersCount} o'ch dilynwyr a {followingCount, plural, one {# cyfrif} other {# cyfrif}} arall rydych chi'n ei ddilyn.",
"notification.relationships_severance_event.learn_more": "Dysgu mwy",
"notification.relationships_severance_event.user_domain_block": "Rydych wedi rhwystro {target}, gan ddileu {followersCount} o'ch dilynwyr a {followingCount, plural, one {# cyfrif} other {#cyfrifon}} arall rydych yn ei ddilyn.",
"notification.relationships_severance_event.user_domain_block": "Rydych wedi blocio {target}, gan ddileu {followersCount} o'ch dilynwyr a {followingCount, plural, one {# cyfrif} other {#cyfrifon}} arall rydych yn ei ddilyn.",
"notification.status": "{name} newydd ei bostio",
"notification.update": "Golygodd {name} bostiad",
"notification_requests.accept": "Derbyn",
@ -803,7 +804,7 @@
"video.expand": "Ymestyn fideo",
"video.fullscreen": "Sgrin llawn",
"video.hide": "Cuddio fideo",
"video.mute": "Tewi sain",
"video.mute": "Diffodd sain",
"video.pause": "Oedi",
"video.play": "Chwarae",
"video.unmute": "Dad-dewi sain"

4
app/javascript/mastodon/locales/gl.json
View File

@ -92,7 +92,7 @@
"block_modal.remote_users_caveat": "Ímoslle pedir ao servidor {domain} que respecte a túa decisión. Emporiso, non hai garantía de que atenda a petición xa que os servidores xestionan os bloqueos de formas diferentes. As publicacións públicas poderían aínda ser visibles para usuarias que non iniciaron sesión.",
"block_modal.show_less": "Mostrar menos",
"block_modal.show_more": "Mostrar máis",
"block_modal.they_cant_mention": "Non te poden seguir nin mencionar.",
"block_modal.they_cant_mention": "Non te pode seguir nin mencionar.",
"block_modal.they_cant_see_posts": "Non pode ver as túas publicacións nin ti as de ela.",
"block_modal.they_will_know": "Pode ver que a bloqueaches.",
"block_modal.title": "Bloquear usuaria?",
@ -216,7 +216,7 @@
"domain_block_modal.they_wont_know": "Non saberá que a bloqueaches.",
"domain_block_modal.title": "Bloquear dominio?",
"domain_block_modal.you_will_lose_followers": "Vanse eliminar todas as túas seguidoras deste servidor.",
"domain_block_modal.you_wont_see_posts": "Non verás publicacións ou notificación das usuarias neste servidor.",
"domain_block_modal.you_wont_see_posts": "Non verás publicacións ou notificacións das usuarias deste servidor.",
"domain_pill.activitypub_lets_connect": "Permíteche conectar e interactuar con persoas non só de Mastodon, se non tamén con outras apps sociais.",
"domain_pill.activitypub_like_language": "ActivityPub é algo así como o idioma que Mastodon fala con outras redes sociais.",
"domain_pill.server": "Servidor",

2
app/javascript/mastodon/locales/kab.json
View File

@ -580,7 +580,7 @@
"status.mute_conversation": "Sgugem adiwenni",
"status.open": "Semɣeṛ tasuffeɣt-ayi",
"status.pin": "Senteḍ-itt deg umaɣnu",
"status.pinned": "Tijewwiqin yettwasentḍen",
"status.pinned": "Tisuffaɣ yettwasentḍen",
"status.read_more": "Issin ugar",
"status.reblog": "Bḍu",
"status.reblogged_by": "Yebḍa-tt {name}",

10
app/javascript/mastodon/locales/zh-TW.json
View File

@ -113,7 +113,7 @@
"closed_registrations.other_server_instructions": "因為 Mastodon 是去中心化的，所以您也能於其他伺服器上建立帳號，並仍然與這個伺服器互動。",
"closed_registrations_modal.description": "目前無法於 {domain} 建立新帳號，但也請別忘了，您並不一定需要有 {domain} 伺服器的帳號，也能使用 Mastodon。",
"closed_registrations_modal.find_another_server": "尋找另一個伺服器",
"closed_registrations_modal.preamble": "Mastodon 是去中心化的，所以無論您於哪個伺服器新增帳號，都可以與此伺服器上的任何人跟隨及互動。您甚至能自行架設一個自己的伺服器！",
"closed_registrations_modal.preamble": "Mastodon 是去中心化的，所以無論您於哪個伺服器新增帳號，都可以與此伺服器上的任何人跟隨及互動。您甚至能自行架設自己的伺服器！",
"closed_registrations_modal.title": "註冊 Mastodon",
"column.about": "關於",
"column.blocks": "已封鎖的使用者",
@ -271,7 +271,7 @@
"empty_column.public": "這裡什麼都沒有！嘗試寫些公開的嘟文，或者跟隨其他伺服器的使用者後，就會有嘟文出現了",
"error.unexpected_crash.explanation": "由於發生系統故障或瀏覽器相容性問題，無法正常顯示此頁面。",
"error.unexpected_crash.explanation_addons": "此頁面無法被正常顯示，這可能是由瀏覽器附加元件或網頁自動翻譯工具造成的。",
"error.unexpected_crash.next_steps": "請嘗試重新整理頁面。如果狀況沒有改善，您可以使用不同的瀏覽器或應用程式來檢視來使用 Mastodon。",
"error.unexpected_crash.next_steps": "請嘗試重新整理頁面。如果狀況沒有改善，您可以使用不同的瀏覽器或應用程式以檢視來使用 Mastodon。",
"error.unexpected_crash.next_steps_addons": "請嘗試關閉它們然後重新整理頁面。如果狀況沒有改善，您可以使用不同的瀏覽器或應用程式來檢視來使用 Mastodon。",
"errors.unexpected_crash.copy_stacktrace": "複製 stacktrace 到剪貼簿",
"errors.unexpected_crash.report_issue": "回報問題",
@ -356,7 +356,7 @@
"home.show_announcements": "顯示公告",
"interaction_modal.description.favourite": "若於 Mastodon 上有個帳號，您可以將此嘟文加入最愛使作者知道您欣賞它且將它儲存下來。",
"interaction_modal.description.follow": "若於 Mastodon 上有個帳號，您可以跟隨 {name} 以於首頁時間軸接收他們的嘟文。",
"interaction_modal.description.reblog": "若於 Mastodon 上有個帳號，您可以轉嘟此嘟文以分享給您的跟隨者們。",
"interaction_modal.description.reblog": "若於 Mastodon 上有個帳號，您可以轉嘟此嘟文以向您的跟隨者們分享。",
"interaction_modal.description.reply": "若於 Mastodon 上有個帳號，您可以回覆此嘟文。",
"interaction_modal.login.action": "返回首頁",
"interaction_modal.login.prompt": "您帳號所屬伺服器之網域，例如：mastodon.social",
@ -552,7 +552,7 @@
"onboarding.follows.lead": "您的首頁時間軸是 Mastodon 的核心體驗。若您跟隨更多人，它將會變得更活躍有趣。這些個人檔案也許是個好起點，您可以隨時取消跟隨他們！",
"onboarding.follows.title": "客製化您的首頁時間軸",
"onboarding.profile.discoverable": "使我的個人檔案可以被找到",
"onboarding.profile.discoverable_hint": "當您於 Mastodon 上選擇加入可發現性時，您的嘟文可能會顯示於搜尋結果與趨勢中。您的個人檔案可能會被推薦給與您志趣相投的人。",
"onboarding.profile.discoverable_hint": "當您於 Mastodon 上選擇加入可發現性時，您的嘟文可能會顯示於搜尋結果與趨勢中。您的個人檔案可能會被推薦至與您志趣相投的人。",
"onboarding.profile.display_name": "顯示名稱",
"onboarding.profile.display_name_hint": "完整名稱或暱稱...",
"onboarding.profile.lead": "您隨時可以稍候於設定中完成此操作，將有更多自訂選項可使用。",
@ -797,7 +797,7 @@
"upload_modal.applying": "正在套用...",
"upload_modal.choose_image": "選擇圖片",
"upload_modal.description_placeholder": "我能吞下玻璃而不傷身體",
"upload_modal.detect_text": "從圖片中偵測文字",
"upload_modal.detect_text": "自圖片中偵測文字",
"upload_modal.edit_media": "編輯媒體",
"upload_modal.hint": "於預覽中點擊或拖曳圓圈以選擇將於所有縮圖中顯示的焦點。",
"upload_modal.preparing_ocr": "準備 OCR 中……",

2
app/lib/webfinger.rb
View File

@ -26,7 +26,7 @@ class Webfinger
private
def links
@links ||= @json['links'].index_by { |link| link['rel'] }
@links ||= @json.fetch('links', []).index_by { |link| link['rel'] }
end
def validate_response!

2
app/models/report.rb
View File

@ -18,6 +18,7 @@
# category :integer default("other"), not null
# action_taken_at :datetime
# rule_ids :bigint(8) is an Array
# application_id :bigint(8)
#
class Report < ApplicationRecord
@ -31,6 +32,7 @@ class Report < ApplicationRecord
rate_limit by: :account, family: :reports
belongs_to :account
belongs_to :application, class_name: 'Doorkeeper::Application', optional: true
with_options class_name: 'Account' do
belongs_to :target_account

4
app/services/report_service.rb
View File

@ -10,6 +10,7 @@ class ReportService < BaseService
@comment = options.delete(:comment).presence || ''
@category = options[:rule_ids].present? ? 'violation' : (options.delete(:category).presence || 'other')
@rule_ids = options.delete(:rule_ids).presence
@application = options.delete(:application).presence
@options = options
raise ActiveRecord::RecordNotFound if @target_account.unavailable?
@ -35,7 +36,8 @@ class ReportService < BaseService
uri: @options[:uri],
forwarded: forward_to_origin?,
category: @category,
rule_ids: @rule_ids
rule_ids: @rule_ids,
application: @application
)
end

6
app/views/admin/reports/_header_details.html.haml
View File

@ -14,6 +14,12 @@
= admin_account_link_to report.account
- else
= report.account.domain
- if report.application.present?
.report-header__details__item
.report-header__details__item__header
%strong= t('admin.reports.reported_with_application')
.report-header__details__item__content
= report.application.name
.report-header__details__item
.report-header__details__item__header
%strong= t('admin.reports.status')

9
config/locales/cy.yml
View File

@ -305,6 +305,7 @@ cy:
filter_by_action: Hidlo yn ôl gweithred
filter_by_user: Hidlo yn ôl defnyddiwr
title: Cofnod archwilio
unavailable_instance: "(nid yw enw'r parth ar gael)"
announcements:
destroyed_msg: Cyhoeddiad wedi'i ddileu'n llwyddiannus!
edit:
@ -1436,7 +1437,7 @@ cy:
domain_blocking_html: Rydych ar fin <strong>rhwystro</strong> hyd at <strong>%{total_items} parth</strong> o <strong>%{filename}</strong> .
following_html: Rydych ar fin <strong>dilyn</strong> hyd at <strong>%{total_items} cyfrif</strong> gan <strong>%{filename}</strong> .
lists_html: Rydych ar fin ychwanegu hyd at <strong>%{total_items} o gyfrifon</strong> o <strong>%{filename}</strong> at eich <strong>rhestrau</strong> . Bydd rhestrau newydd yn cael eu creu os nad oes rhestr i ychwanegu ati.
muting_html: Rydych ar fin <strong>tewi</strong> hyd at <strong>%{total_items} cyfrif</strong> o <strong>%{filename}</strong> .
muting_html: Rydych ar fin <strong>anwybyddu</strong> hyd at <strong>%{total_items} cyfrif</strong> o <strong>%{filename}</strong>.
preface: Gallwch fewnforio data rydych chi wedi'i allforio o weinydd arall, fel rhestr o'r bobl rydych chi'n eu dilyn neu'n eu blocio.
recent_imports: Mewnforion diweddar
states:
@ -1529,9 +1530,9 @@ cy:
too_many: Methu atodi mwy na 4 ffeil
migrations:
acct: Symudwyd i
cancel: Diddymu ailgyfeirio
cancel_explanation: Bydd diddymu'r ailgyfeiriad yn ail agor eich cyfrif cyfredol, ond ni fydd yn dod â dilynwyr sydd wedi'u symud i'r cyfrif hwnnw yn ôl.
cancelled_msg: Wedi diddymu'r ailgyfeiriad yn llwyddiannus.
cancel: Canslo ailgyfeirio
cancel_explanation: Bydd canslo'r ailgyfeiriad yn ail agor eich cyfrif cyfredol, ond ni fydd yn dod â dilynwyr sydd wedi'u symud i'r cyfrif hwnnw yn ôl.
cancelled_msg: Wedi canslo'r ailgyfeiriad yn llwyddiannus.
errors:
already_moved: yw'r un cyfrif rydych chi wedi symud iddo eisoes
missing_also_known_as: nid yw'n arallenw o'r cyfrif hwn

2
config/locales/devise.cy.yml
View File

@ -93,7 +93,7 @@ cy:
updated: Mae eich cyfrinair wedi'i newid yn llwyddiannus. Rydych chi bellach wedi mewngofnodi.
updated_not_active: Mae eich cyfrinair wedi ei newid yn llwyddiannus.
registrations:
destroyed: Hwyl fawr! Mae eich cyfrif wedi ei ddiddymu'n llwyddiannus. Gobeithiwn eich gweld chi eto'n fuan.
destroyed: Hwyl fawr! Mae eich cyfrif wedi ei chanslo'n llwyddiannus. Gobeithiwn eich gweld chi eto'n fuan.
signed_up: Croeso! Rydych wedi cofrestru'n llwyddiannus.
signed_up_but_inactive: Yr ydych wedi cofrestru'n llwyddiannus. Fodd bynnag, ni allwn eich mewngofnodi achos nid yw eich cyfrif wedi ei hagor eto.
signed_up_but_locked: Rydych chi wedi cofrestru'n llwyddiannus. Fodd bynnag, ni allem eich mewngofnodi oherwydd bod eich cyfrif wedi'i gloi.

4
config/locales/devise.zh-TW.yml
View File

@ -75,7 +75,7 @@ zh-TW:
title: 您的一支安全密鑰已經被移除
webauthn_disabled:
explanation: 您的帳號已停用安全金鑰身份驗證。
extra: 現在僅可使用配對的 TOTP 應用程式產生之 token 登入。
extra: 目前僅可使用配對的 TOTP 應用程式產生之 token 登入。
subject: Mastodon：安全密鑰認證方式已停用
title: 已停用安全密鑰
webauthn_enabled:
@ -90,7 +90,7 @@ zh-TW:
no_token: 您必須透過密碼重設信件才能存取此頁面。若確實如此，請確定輸入的網址是完整的。
send_instructions: 若電子郵件地址存在於我們的資料庫，幾分鐘後您將於信箱中收到密碼復原連結。若未收到請檢查垃圾郵件資料夾。
send_paranoid_instructions: 若電子郵件地址存在於我們的資料庫，幾分鐘後您將於信箱中收到密碼復原連結。若未收到請檢查垃圾郵件資料夾。
updated: 您的密碼已成功變更，現在已經登入。
updated: 您的密碼已成功變更，您現在已經成功登入。
updated_not_active: 您的密碼已成功變更。
registrations:
destroyed: 再見！您的帳號已成功取消，期待再相逢。

8
config/locales/doorkeeper.cy.yml
View File

@ -20,7 +20,7 @@ cy:
applications:
buttons:
authorize: Awdurdodi
cancel: Diddymu
cancel: Canslo
destroy: Dinistrio
edit: Golygu
submit: Cyflwyno
@ -72,7 +72,7 @@ cy:
revoke: Ydych chi'n siŵr?
index:
authorized_at: Wedi'i awdurdodi ar %{date}
description_html: Mae'r rhain yn raglenni sy'n gallu cael mynediad i'ch cyfrif gan ddefnyddio'r API. Os oes yna rhaglenni nad ydych chi'n eu hadnabod yma, neu os yw rhaglen yn camymddwyn, gallwch chi ddiddymu ei fynediad.
description_html: Mae'r rhain yn raglenni sy'n gallu cael mynediad i'ch cyfrif gan ddefnyddio'r API. Os oes yna rhaglenni nad ydych chi'n eu hadnabod yma, neu os yw rhaglen yn camymddwyn, gallwch chi ddirymu ei fynediad.
last_used_at: Defnyddiwyd ddiwethaf ar %{date}
never_used: Erioed wedi'i ddefnyddio
scopes: Caniatâd
@ -83,7 +83,7 @@ cy:
access_denied: Mae perchennog yr adnodd neu'r gweinydd awdurdodi wedi atal y cais.
credential_flow_not_configured: Llif meini prawf cyfrinair perchennog yr adnodd wedi methu achos fod Doorkeeper.configure.resource_owner_from_credentials heb ei ffurfweddu.
invalid_client: Methodd dilysu cleient oherwydd cleient anhysbys, dim dilysiad cleient wedi'i gynnwys, neu ddull dilysu heb ei gefnogi.
invalid_grant: Mae'r grant awdurdodi ar yr amod yn annilys, wedi dod i ben, wedi'i ddiddymu, nid yw'n cyfateb i'r URI ailgyfeirio a ddefnyddiwyd yn y cais am awdurdodiad, neu wedi'i roi i gleient arall.
invalid_grant: Mae'r grant awdurdodi ar yr amod yn annilys, wedi dod i ben, wedi'i ddirymu, nid yw'n cyfateb i'r URI ailgyfeirio a ddefnyddiwyd yn y cais am awdurdodiad, neu wedi'i roi i gleient arall.
invalid_redirect_uri: Nid yw'r uri ailgyfeirio a gynhwysir yn ddilys.
invalid_request:
missing_param: 'Paramedr gofynnol ar goll: %{value}.'
@ -135,6 +135,7 @@ cy:
media: Atodiadau cyfryngau
mutes: Anwybyddiadau
notifications: Hysbysiadau
profile: Eich proffil Mastodon
push: Hysbysiadau gwthiadwy
reports: Adroddiadau
search: Chwilio
@ -165,6 +166,7 @@ cy:
admin:write:reports: cyflawni camau cymedroli ar adroddiadau
crypto: defnyddio amgryptio ben i ben
follow: addasu perthnasau cyfrif
profile: darllen dim ond gwybodaeth proffil eich cyfrif
push: derbyn eich hysbysiadau gwthiadwy
read: darllen holl ddata eich cyfrif
read:accounts: gweld gwybodaeth y cyfrif

2
config/locales/en.yml
View File

@ -226,6 +226,7 @@ en:
update_custom_emoji: Update Custom Emoji
update_domain_block: Update Domain Block
update_ip_block: Update IP rule
update_report: Update Report
update_status: Update Post
update_user_role: Update Role
actions:
@ -638,6 +639,7 @@ en:
report: 'Report #%{id}'
reported_account: Reported account
reported_by: Reported by
reported_with_application: Reported with application
resolved: Resolved
resolved_msg: Report successfully resolved!
skip_to_actions: Skip to actions

2
config/locales/simple_form.ca.yml
View File

@ -243,11 +243,13 @@ ca:
warn: Oculta amb un avís
form_admin_settings:
activity_api_enabled: Publica a l'API estadístiques agregades sobre l'activitat dels usuaris
app_icon: Icona de l'aplicació
backups_retention_period: Període de retenció del arxiu d'usuari
bootstrap_timeline_accounts: Recomana sempre aquests comptes als nous usuaris
closed_registrations_message: Missatge personalitzat quan el registre no és accessible
content_cache_retention_period: Període de retenció del contingut remot
custom_css: CSS personalitzat
favicon: Icona de preferits
mascot: Mascota personalitzada (llegat)
media_cache_retention_period: Període de retenció del cau multimèdia
peers_api_enabled: Publica a l'API la llista de servidors descoberts

2
config/locales/simple_form.cy.yml
View File

@ -242,11 +242,13 @@ cy:
warn: Cuddio â rhybudd
form_admin_settings:
activity_api_enabled: Cyhoeddi ystadegau cyfanredol am weithgarwch defnyddwyr yn yr API
app_icon: Eicon ap
backups_retention_period: Cyfnod cadw archif defnyddwyr
bootstrap_timeline_accounts: Argymhellwch y cyfrifon hyn i ddefnyddwyr newydd bob amser
closed_registrations_message: Neges bersonol pan nad yw cofrestriadau ar gael
content_cache_retention_period: Cyfnod cadw cynnwys o bell
custom_css: CSS cyfaddas
favicon: Favicon
mascot: Mascot cyfaddas (hen)
media_cache_retention_period: Cyfnod cadw storfa cyfryngau
peers_api_enabled: Cyhoeddi rhestr o weinyddion a ddarganfuwyd yn yr API

2
config/locales/simple_form.da.yml
View File

@ -243,11 +243,13 @@ da:
warn: Skjul bag en advarsel
form_admin_settings:
activity_api_enabled: Offentliggør samlede statistikker vedr. brugeraktivitet i API'en
app_icon: App-ikon
backups_retention_period: Brugerarkivs opbevaringsperiode
bootstrap_timeline_accounts: Anbefal altid disse konti til nye brugere
closed_registrations_message: Tilpasset besked, når tilmelding er utilgængelig
content_cache_retention_period: Opbevaringsperiode for eksternt indhold
custom_css: Tilpasset CSS
favicon: Favikon
mascot: Tilpasset maskot (ældre funktion)
media_cache_retention_period: Media-cache opbevaringsperiode
peers_api_enabled: Udgiv liste over fundne server i API'en

2
config/locales/simple_form.de.yml
View File

@ -243,11 +243,13 @@ de:
warn: Mit einer Inhaltswarnung ausblenden
form_admin_settings:
activity_api_enabled: Aggregierte Nutzungsdaten über die API veröffentlichen
app_icon: App-Symbol
backups_retention_period: Aufbewahrungsfrist für Archive
bootstrap_timeline_accounts: Neuen Nutzern immer diese Konten empfehlen
closed_registrations_message: Nachricht, falls Registrierungen deaktiviert sind
content_cache_retention_period: Aufbewahrungsfrist für externe Inhalte
custom_css: Eigenes CSS
favicon: Favicon
mascot: Benutzerdefiniertes Maskottchen (Legacy)
media_cache_retention_period: Aufbewahrungsfrist für Medien im Cache
peers_api_enabled: Die entdeckten Server im Fediverse über die API veröffentlichen

1
config/locales/simple_form.eo.yml
View File

@ -235,6 +235,7 @@ eo:
warn: Kaŝi malantaŭ averto
form_admin_settings:
activity_api_enabled: Publikigi entutajn statistikojn pri uzantagado en la API
app_icon: Apbildo
backups_retention_period: Uzantoarkivretendauro
bootstrap_timeline_accounts: Ĉiam rekomendi ĉi tiujn kontojn al novaj uzantoj
closed_registrations_message: Kutima mesaĝo kiam registroj ne estas disponeblaj

2
config/locales/simple_form.es-AR.yml
View File

@ -243,11 +243,13 @@ es-AR:
warn: Ocultar con una advertencia
form_admin_settings:
activity_api_enabled: Publicar estadísticas agregadas sobre la actividad de la cuenta en la API
app_icon: Ícono de la aplicación
backups_retention_period: Período de retención del archivo historial del usuario
bootstrap_timeline_accounts: Siempre recomendar estas cuentas a usuarios nuevos
closed_registrations_message: Mensaje personalizado cuando los registros no están disponibles
content_cache_retention_period: Período de retención de contenido remoto
custom_css: CSS personalizado
favicon: Favicón
mascot: Mascota personalizada (legado)
media_cache_retention_period: Período de retención de la caché de medios
peers_api_enabled: Publicar lista de servidores descubiertos en la API

2
config/locales/simple_form.es-MX.yml
View File

@ -243,11 +243,13 @@ es-MX:
warn: Ocultar con una advertencia
form_admin_settings:
activity_api_enabled: Publicar estadísticas locales acerca de la actividad de usuario en la API
app_icon: Icono de la app
backups_retention_period: Período de retención del archivo de usuario
bootstrap_timeline_accounts: Recomendar siempre estas cuentas a nuevos usuarios
closed_registrations_message: Mensaje personalizado cuando los registros no están disponibles
content_cache_retention_period: Período de retención de contenido remoto
custom_css: CSS personalizado
favicon: Favicon
mascot: Mascota personalizada (legado)
media_cache_retention_period: Período de retención de caché multimedia
peers_api_enabled: Publicar lista de servidores descubiertos en la API

2
config/locales/simple_form.es.yml
View File

@ -243,11 +243,13 @@ es:
warn: Ocultar con una advertencia
form_admin_settings:
activity_api_enabled: Publicar estadísticas agregadas sobre la actividad del usuario con la API
app_icon: Icono de la app
backups_retention_period: Período de retención del archivo de usuario
bootstrap_timeline_accounts: Recomendar siempre estas cuentas a nuevos usuarios
closed_registrations_message: Mensaje personalizado cuando los registros no están disponibles
content_cache_retention_period: Período de retención de contenido remoto
custom_css: CSS personalizado
favicon: Favicon
mascot: Mascota personalizada (legado)
media_cache_retention_period: Período de retención de caché multimedia
peers_api_enabled: Publicar lista de servidores descubiertos en la API

2
config/locales/simple_form.fi.yml
View File

@ -243,11 +243,13 @@ fi:
warn: Piilota varoittaen
form_admin_settings:
activity_api_enabled: Julkaise yhteenlasketut tilastot käyttäjätoiminnasta ohjelmointirajapinnassa
app_icon: Sovelluskuvake
backups_retention_period: Käyttäjän arkiston säilytysaika
bootstrap_timeline_accounts: Suosittele aina näitä tilejä uusille käyttäjille
closed_registrations_message: Mukautettu viesti, kun rekisteröityminen ei ole saatavilla
content_cache_retention_period: Etäsisällön säilytysaika
custom_css: Mukautettu CSS
favicon: Suosikkikuvake
mascot: Mukautettu maskotti (vanhentunut ominaisuus)
media_cache_retention_period: Mediasisältövälimuistin säilytysaika
peers_api_enabled: Julkaise löydettyjen palvelinten luettelo ohjelmointirajapinnassa

2
config/locales/simple_form.fo.yml
View File

@ -243,11 +243,13 @@ fo:
warn: Fjal við eini ávaring
form_admin_settings:
activity_api_enabled: Útgev samantald hagtøl um brúkaravirksemi í API'num
app_icon: App ikon
backups_retention_period: Hvussu leingi verða brúkarasøvn goymd
bootstrap_timeline_accounts: Mæl altíð nýggjum brúkarum at fylgja hesar kontur
closed_registrations_message: Serskild boð, tá tað ikki er møguligt at tilmelda seg
content_cache_retention_period: Tíðarskeið fyri varðveiðslu av fjartilfari
custom_css: Serskilt CSS
favicon: Favikon
mascot: Serskildur maskottur (arvur)
media_cache_retention_period: Tíðarskeið, har miðlagoymslur verða varðveittar
peers_api_enabled: Kunnger lista við uppdagaðum ambætarum í API'num

2
config/locales/simple_form.gl.yml
View File

@ -243,11 +243,13 @@ gl:
warn: Agochar tras un aviso
form_admin_settings:
activity_api_enabled: Publicar na API estatísticas agregadas acerca da actividade das usuarias
app_icon: Icona da app
backups_retention_period: Período de retención do arquivo da usuaria
bootstrap_timeline_accounts: Recomendar sempre estas contas ás novas usuarias
closed_registrations_message: Mensaxe personalizada para cando o rexistro está pechado
content_cache_retention_period: Período de retención de contido remoto
custom_css: CSS personalizado
favicon: Favicon
mascot: Mascota propia (herdado)
media_cache_retention_period: Período de retención da caché multimedia
peers_api_enabled: Publicar na API unha lista dos servidores descubertos

2
config/locales/simple_form.he.yml
View File

@ -243,11 +243,13 @@ he:
warn: הסתרה עם אזהרה
form_admin_settings:
activity_api_enabled: פרסום סטטיסטיקות מקובצות עבור פעילות משתמשים באמצעות מנשק התוכנה
app_icon: אייקון יישומון
backups_retention_period: תקופת השמירה של ארכיון המשתמש
bootstrap_timeline_accounts: המלצה על חשבונות אלה למשתמשים חדשים
closed_registrations_message: הודעה מיוחדת כשההרשמה לא מאופשרת
content_cache_retention_period: תקופת השמירה על תוכן חיצוני
custom_css: CSS בהתאמה אישית
favicon: סמל מועדפים (Favicon)
mascot: סמל השרת (ישן)
media_cache_retention_period: תקופת שמירת מטמון מדיה
peers_api_enabled: פרסם רשימה של שרתים שנתגלו באמצעות ה-API

3
config/locales/simple_form.hu.yml
View File

@ -211,6 +211,7 @@ hu:
setting_default_privacy: Bejegyzések láthatósága
setting_default_sensitive: Minden médiafájl megjelölése kényesként
setting_delete_modal: Megerősítés kérése bejegyzés törlése előtt
setting_disable_hover_cards: Profilelőnézet letiltása föléhúzás esetén
setting_disable_swiping: Elhúzás művelet kikapcsolása
setting_display_media: Média megjelenítése
setting_display_media_default: Alapértelmezés
@ -242,11 +243,13 @@ hu:
warn: Elrejtés figyelmeztetéssel
form_admin_settings:
activity_api_enabled: Összesített statisztikák közzététele az API-ban a felhasználók aktivitásáról
app_icon: Alkalmazásikon
backups_retention_period: Felhasználói archívum megtartási időszaka
bootstrap_timeline_accounts: Mindig javasoljuk ezeket a fiókokat az új felhasználók számára
closed_registrations_message: A feliratkozáskor megjelenő egyéni üzenet nem érhető el
content_cache_retention_period: Távoli tartalmak megtartási időszaka
custom_css: Egyéni CSS
favicon: Könyvjelzőikon
mascot: Egyéni kabala (örökölt)
media_cache_retention_period: Média-gyorsítótár megtartási időszaka
peers_api_enabled: Felfedezett kiszolgálók listájának közzététele az API-ban

2
config/locales/simple_form.is.yml
View File

@ -243,11 +243,13 @@ is:
warn: Fela með aðvörun
form_admin_settings:
activity_api_enabled: Birta samantektartölfræði um virkni notanda í API-kerfisviðmótinu
app_icon: Táknmynd forrits
backups_retention_period: Tímalengd sem safni notandans er haldið eftir
bootstrap_timeline_accounts: Alltaf mæla með þessum notendaaðgöngum fyrir nýja notendur
closed_registrations_message: Sérsniðin skilaboð þegar ekki er hægt að nýskrá
content_cache_retention_period: Tímabil sem á að geyma fjartengt efni
custom_css: Sérsniðið CSS
favicon: Auðkennismynd
mascot: Sérsniðið gæludýr (eldra)
media_cache_retention_period: Tímalengd sem myndefni haldið
peers_api_enabled: Birta lista yfir uppgötvaða netþjóna í API-kerfisviðmótinu

2
config/locales/simple_form.it.yml
View File

@ -243,11 +243,13 @@ it:
warn: Nascondi con avviso
form_admin_settings:
activity_api_enabled: Pubblica le statistiche aggregate sull'attività degli utenti nell'API
app_icon: Icona app
backups_retention_period: Periodo di conservazione dell'archivio utente
bootstrap_timeline_accounts: Consiglia sempre questi account ai nuovi utenti
closed_registrations_message: Messaggio personalizzato quando le iscrizioni non sono disponibili
content_cache_retention_period: Periodo di ritenzione del contenuto remoto
custom_css: Personalizza CSS
favicon: Favicon
mascot: Personalizza mascotte (legacy)
media_cache_retention_period: Periodo di conservazione della cache multimediale
peers_api_enabled: Pubblica l'elenco dei server scoperti nell'API

2
config/locales/simple_form.ko.yml
View File

@ -243,11 +243,13 @@ ko:
warn: 경고와 함께 숨기기
form_admin_settings:
activity_api_enabled: API에 유저 활동에 대한 통계 발행
app_icon: 앱 아이콘
backups_retention_period: 사용자 아카이브 유지 기한
bootstrap_timeline_accounts: 새로운 사용자들에게 추천할 계정들
closed_registrations_message: 가입이 불가능 할 때의 사용자 지정 메시지
content_cache_retention_period: 리모트 콘텐츠 보유 기간
custom_css: 사용자 정의 CSS
favicon: 파비콘
mascot: 사용자 정의 마스코트 (legacy)
media_cache_retention_period: 미디어 캐시 유지 기한
peers_api_enabled: API에 발견 된 서버들의 목록 발행

3
config/locales/simple_form.lt.yml
View File

@ -137,6 +137,7 @@ lt:
setting_default_privacy: Skelbimo privatumas
setting_default_sensitive: Visada žymėti mediją kaip jautrią
setting_delete_modal: Rodyti patvirtinimo dialogą prieš ištrinant įrašą
setting_disable_hover_cards: Išjungti profilio peržiūrą užvedus
setting_disable_swiping: Išjungti perbraukimo judėjimus
setting_display_media: Medijos rodymas
setting_display_media_hide_all: Slėpti viską
@ -164,9 +165,11 @@ lt:
warn: Slėpti su įspėjimu
form_admin_settings:
activity_api_enabled: Skelbti suvestinį statistiką apie naudotojų veiklą per API
app_icon: Programėlės piktograma
bootstrap_timeline_accounts: Visada rekomenduoti šias paskyras naujiems naudotojams
content_cache_retention_period: Nuotolinio turinio saugojimo laikotarpis
custom_css: Pasirinktinis CSS
favicon: Svetainės piktograma
mascot: Pasirinktinis talismanas (pasenęs)
registrations_mode: Kas gali užsiregistruoti
require_invite_text: Reikalauti priežasties prisijungti

2
config/locales/simple_form.nl.yml
View File

@ -243,11 +243,13 @@ nl:
warn: Met een waarschuwing verbergen
form_admin_settings:
activity_api_enabled: Statistieken over gebruikersactiviteit via de API publiceren
app_icon: App-pictogram
backups_retention_period: Bewaartermijn gebruikersarchief
bootstrap_timeline_accounts: Accounts die altijd aan nieuwe gebruikers worden aanbevolen
closed_registrations_message: Aangepast bericht wanneer registratie is uitgeschakeld
content_cache_retention_period: Bewaartermijn voor externe inhoud
custom_css: Aangepaste CSS
favicon: Favicon
mascot: Aangepaste mascotte (legacy)
media_cache_retention_period: Bewaartermijn mediacache
peers_api_enabled: Lijst van bekende servers via de API publiceren

2
config/locales/simple_form.pl.yml
View File

@ -243,11 +243,13 @@ pl:
warn: Ukryj z ostrzeżeniem
form_admin_settings:
activity_api_enabled: Publikuj zagregowane statystyki dotyczące aktywności użytkownika w API
app_icon: Ikona aplikacji
backups_retention_period: Okres przechowywania archiwum użytkownika
bootstrap_timeline_accounts: Zawsze rekomenduj te konta nowym użytkownikom
closed_registrations_message: Niestandardowa wiadomość, gdy rejestracje nie są dostępne
content_cache_retention_period: Okres zachowywania zdalnych treści
custom_css: Niestandardowy CSS
favicon: Favicon
mascot: Własna ikona
media_cache_retention_period: Okres przechowywania pamięci podręcznej
peers_api_enabled: Opublikuj listę odkrytych serwerów w API

2
config/locales/simple_form.pt-PT.yml
View File

@ -243,11 +243,13 @@ pt-PT:
warn: Ocultar com um aviso
form_admin_settings:
activity_api_enabled: Publicar estatísticas agregadas sobre a atividade dos utilizadores na API
app_icon: Ícone da aplicação
backups_retention_period: Período de retenção de arquivos de utilizador
bootstrap_timeline_accounts: Recomendar sempre estas contas para novos utilizadores
closed_registrations_message: Mensagem personalizada quando as inscrições não estiverem disponíveis
content_cache_retention_period: Período de retenção de conteúdos remotos
custom_css: CSS personalizado
favicon: Ícone de favoritos
mascot: Mascote personalizada (legado)
media_cache_retention_period: Período de retenção de ficheiros de media em cache
peers_api_enabled: Publicar lista de servidores descobertos na API

2
config/locales/simple_form.sl.yml
View File

@ -243,11 +243,13 @@ sl:
warn: Skrij z opozorilom
form_admin_settings:
activity_api_enabled: Objavi združeno statistiko o dejavnosti uporabnikov v API-ju
app_icon: Ikona programa
backups_retention_period: Obdobje hrambe arhivov uporabnikov
bootstrap_timeline_accounts: Vedno priporočaj te račune novim uporabnikom
closed_registrations_message: Sporočilo po meri, ko registracije niso na voljo
content_cache_retention_period: Obdobje hranjenja vsebine z ostalih strežnikov
custom_css: CSS po meri
favicon: Ikona spletne strani
mascot: Maskota po meri (opuščeno)
media_cache_retention_period: Obdobje hrambe predpomnilnika predstavnosti
peers_api_enabled: Objavi seznam odkritih strežnikov v API-ju

2
config/locales/simple_form.sq.yml
View File

@ -243,11 +243,13 @@ sq:
warn: Fshihe me një sinjalizim
form_admin_settings:
activity_api_enabled: Publikoni te API statistika përmbledhëse rreth veprimtarisë së përdoruesve
app_icon: Ikonë aplikacioni
backups_retention_period: Periudhë mbajtjeje arkivash përdoruesish
bootstrap_timeline_accounts: Rekomandoju përherë këto llogari përdoruesve të rinj
closed_registrations_message: Mesazh vetjak për pamundësi regjistrimesh të reja
content_cache_retention_period: Periudhë mbajtjeje lënde të largët
custom_css: CSS Vetjake
favicon: Favikonë
mascot: Simbol vetjak (e dikurshme)
media_cache_retention_period: Periudhë mbajtjeje lënde media
peers_api_enabled: Publiko te API listë shërbyesish të zbuluar

2
config/locales/simple_form.sr-Latn.yml
View File

@ -243,11 +243,13 @@ sr-Latn:
warn: Sakrij uz upozorenje
form_admin_settings:
activity_api_enabled: Objavi prikupljenu statistiku o korisničkoj aktivnosti u API
app_icon: Ikonica aplikacije
backups_retention_period: Period čuvanja korisničke arhive
bootstrap_timeline_accounts: Uvek preporuči ove naloge novim korisnicima
closed_registrations_message: Prilagođena poruka kada prijave nisu moguće
content_cache_retention_period: Period zadržavanja udaljenog sadržaja
custom_css: Prilagođeni CSS
favicon: Favikon
mascot: Prilagođena maskota (nasleđe)
media_cache_retention_period: Period čuvanja keša medija
peers_api_enabled: Objavite listu otkrivenih servera u API

2
config/locales/simple_form.sr.yml
View File

@ -243,11 +243,13 @@ sr:
warn: Сакриј уз упозорење
form_admin_settings:
activity_api_enabled: Објави прикупљену статистику о корисничкој активности у API
app_icon: Иконица апликације
backups_retention_period: Период чувања корисничке архиве
bootstrap_timeline_accounts: Увек препоручи ове налоге новим корисницима
closed_registrations_message: Прилагођена порука када пријаве нису могуће
content_cache_retention_period: Период задржавања удаљеног садржаја
custom_css: Прилагођени CSS
favicon: Фавикон
mascot: Прилагођена маскота (наслеђе)
media_cache_retention_period: Период чувања кеша медија
peers_api_enabled: Објавите листу откривених сервера у API

2
config/locales/simple_form.sv.yml
View File

@ -242,11 +242,13 @@ sv:
warn: Dölj med en varning
form_admin_settings:
activity_api_enabled: Publicera aggregerad statistik om användaraktivitet i API:et
app_icon: Appikon
backups_retention_period: Lagringsperiod för användararkivet
bootstrap_timeline_accounts: Rekommendera alltid dessa konton till nya användare
closed_registrations_message: Anpassat meddelande när nyregistreringar inte är tillgängliga
content_cache_retention_period: Förvaringsperiod för fjärrinnehåll
custom_css: Anpassad CSS
favicon: Favicon
mascot: Anpassad maskot (tekniskt arv)
media_cache_retention_period: Tid för bibehållande av mediecache
peers_api_enabled: Publicera lista över upptäckta servrar i API:et

2
config/locales/simple_form.tr.yml
View File

@ -243,11 +243,13 @@ tr:
warn: Uyarıyla gizle
form_admin_settings:
activity_api_enabled: API'deki kullanıcı etkinliği hakkında toplu istatistikler yayınlayın
app_icon: Uygulama simgesi
backups_retention_period: Kullanıcı arşivi saklama süresi
bootstrap_timeline_accounts: Bu hesapları yeni kullanıcılara her zaman öner
closed_registrations_message: Kayıt olma mevcut değilken gösterilen özel ileti
content_cache_retention_period: Uzak içerik saklama süresi
custom_css: Özel CSS
favicon: Yer imi simgesi
mascot: Özel maskot (eski)
media_cache_retention_period: Medya önbelleği saklama süresi
peers_api_enabled: API'de keşfedilen sunucuların listesini yayınla

2
config/locales/simple_form.uk.yml
View File

@ -243,11 +243,13 @@ uk:
warn: Сховати за попередженням
form_admin_settings:
activity_api_enabled: Публікація агрегованої статистики про активність користувачів
app_icon: Значок застосунку
backups_retention_period: Період утримання архіву користувача
bootstrap_timeline_accounts: Завжди рекомендувати новим користувачам ці облікові записи
closed_registrations_message: Показуване повідомлення, якщо реєстрація недоступна
content_cache_retention_period: Період збереження віддаленого вмісту
custom_css: Користувацький CSS
favicon: Значок сайту
mascot: Користувацький символ (застарілий)
media_cache_retention_period: Період збереження кешу медіа
peers_api_enabled: Опублікувати список знайдених серверів у API

2
config/locales/simple_form.zh-CN.yml
View File

@ -243,11 +243,13 @@ zh-CN:
warn: 隐藏时显示警告信息
form_admin_settings:
activity_api_enabled: 在 API 中发布有关用户活动的汇总统计数据
app_icon: 应用图标
backups_retention_period: 用户存档保留期
bootstrap_timeline_accounts: 推荐新用户关注以下账号
closed_registrations_message: 在关闭注册时显示的自定义消息
content_cache_retention_period: 外站内容保留期
custom_css: 自定义 CSS
favicon: Favicon
mascot: 自定义吉祥物（旧）
media_cache_retention_period: 媒体缓存保留期
peers_api_enabled: 在API中公开的已知实例的服务器的列表

18
config/locales/simple_form.zh-TW.yml
View File

@ -24,7 +24,7 @@ zh-TW:
type_html: 設定要使用 <strong>%{acct}</strong> 做的事
types:
disable: 禁止該使用者使用他們的帳號，但是不刪除或隱藏他們的內容。
none: 使用這個寄送警告給該使用者，而不進行其他動作。
none: 使用這個寄送警告至該使用者，而不進行其他動作。
sensitive: 強制標記此使用者所有多媒體附加檔案為敏感內容。
silence: 禁止該使用者發公開嘟文，從無跟隨他們的帳號中隱藏嘟文與通知。關閉所有對此帳號之檢舉報告。
suspend: 禁止所有對該帳號任何互動，並且刪除其內容。三十天內可以撤銷此動作。關閉所有對此帳號之檢舉報告。
@ -34,7 +34,7 @@ zh-TW:
ends_at: 可選的。公告會於該時間點自動取消發布
scheduled_at: 空白則立即發布公告
starts_at: 可選的。使公告於特定時間範圍內顯示
text: 您可以使用嘟文語法，但請小心別讓公告太鴨霸而佔據使用者的整個版面。
text: 您可以使用嘟文語法，但請小心別使公告太鴨霸而佔據使用者的整個版面。
appeal:
text: 您只能對警示提出一次申訴
defaults:
@ -47,7 +47,7 @@ zh-TW:
digest: 僅於您長時間未登入且於未登入期間收到私訊時傳送
email: 您將收到一封確認電子郵件
header: 支援 WEBP、PNG、GIF 或 JPG 圖片格式，檔案最大為 %{size}。將等比例縮減至 %{dimensions} 像素
inbox_url: 從您想要使用的中繼首頁複製網址
inbox_url: 自您想要使用的中繼首頁複製網址
irreversible: 已過濾的嘟文將會不可逆地消失，即便之後移除過濾器也一樣
locale: 使用者介面、電子郵件與推播通知的語言
password: 使用至少 8 個字元
@ -92,7 +92,7 @@ zh-TW:
site_contact_email: 其他人如何聯繫您關於法律或支援之諮詢。
site_contact_username: 其他人如何於 Mastodon 上聯繫您。
site_extended_description: 任何其他可能對訪客或使用者有用的額外資訊。可由 Markdown 語法撰寫。
site_short_description: 一段有助於辨別您伺服器的簡短說明。例如：誰運行該伺服器、該伺服器是提供給哪些人群？
site_short_description: 一段有助於辨別您伺服器的簡短說明。例如：誰運行該伺服器、該伺服器是提供至哪些人群？
site_terms: 使用您自己的隱私權政策，或者保留空白以使用預設值。可由 Markdown 語法撰寫。
site_title: 除了網域外，其他人該如何指稱您的伺服器。
status_page_url: 當服務中斷時，可以提供使用者了解伺服器資訊頁面之 URL
@ -101,11 +101,11 @@ zh-TW:
timeline_preview: 未登入之訪客能夠瀏覽此伺服器上最新的公開嘟文。
trendable_by_default: 跳過手動審核熱門內容。仍能於登上熱門趨勢後移除個別內容。
trends: 熱門趨勢將顯示於您伺服器上正在吸引大量注意力的嘟文、主題標籤、或者新聞。
trends_as_landing_page: 顯示熱門趨勢內容給未登入使用者及訪客而不是關於此伺服器之描述。需要啟用熱門趨勢。
trends_as_landing_page: 顯示熱門趨勢內容至未登入使用者及訪客而不是關於此伺服器之描述。需要啟用熱門趨勢。
form_challenge:
current_password: 您正要進入安全區域
imports:
data: 從其他 Mastodon 伺服器匯出的 CSV 檔案
data: 自其他 Mastodon 伺服器匯出的 CSV 檔案
invite_request:
text: 這會協助我們審核您的申請
ip_block:
@ -133,7 +133,7 @@ zh-TW:
role: 角色控制使用者有哪些權限
user_role:
color: 於整個使用者介面中用於角色的顏色，十六進位格式的 RGB
highlighted: 這會使角色公開可見
highlighted: 這將使角色公開可見
name: 角色的公開名稱，如果角色設定為顯示為徽章
permissions_as_keys: 有此角色的使用者將有權存取...
position: 某些情況下，衝突的解決方式由更高階的角色決定。某些動作只能由優先程度較低的角色執行
@ -243,11 +243,13 @@ zh-TW:
warn: 隱藏於警告之後
form_admin_settings:
activity_api_enabled: 於 API 中公開使用者活躍度的統計數據
app_icon: 應用程式圖示
backups_retention_period: 使用者封存資料保留期間
bootstrap_timeline_accounts: 永遠推薦這些帳號給新使用者
bootstrap_timeline_accounts: 永遠推薦這些帳號至新使用者
closed_registrations_message: 當註冊關閉時的客製化訊息
content_cache_retention_period: 遠端內容保留期限
custom_css: 自訂 CSS
favicon: 網站圖示 (Favicon)
mascot: 自訂吉祥物 (legacy)
media_cache_retention_period: 多媒體快取資料保留期間
peers_api_enabled: 於 API 中公開已知伺服器的列表

40
config/locales/zh-TW.yml
View File

@ -227,7 +227,7 @@ zh-TW:
update_user_role: 更新角色
actions:
approve_appeal_html: "%{name} 已批准來自 %{target} 的審核決定申訴"
approve_user_html: "%{name} 已批准從 %{target} 而來的註冊"
approve_user_html: "%{name} 已批准自 %{target} 而來的註冊"
assigned_to_self_report_html: "%{name} 將報告 %{target} 指派給自己"
change_email_user_html: "%{name} 已變更使用者 %{target} 的電子郵件地址"
change_role_user_html: "%{name} 已變更 %{target} 的角色"
@ -264,10 +264,10 @@ zh-TW:
memorialize_account_html: "%{name} 將 %{target} 設定為追悼帳號"
promote_user_html: "%{name} 對使用者 %{target} 已進行晉級操作"
reject_appeal_html: "%{name} 已回絕來自 %{target} 的審核決定申訴"
reject_user_html: "%{name} 已回絕從 %{target} 而來的註冊"
reject_user_html: "%{name} 已回絕自 %{target} 而來的註冊"
remove_avatar_user_html: "%{name} 已移除 %{target} 的大頭貼"
reopen_report_html: "%{name} 重新開啟 %{target} 的檢舉"
resend_user_html: "%{name} 已重新發送驗證信給 %{target}"
resend_user_html: "%{name} 已重新發送驗證信至 %{target}"
reset_password_user_html: "%{name} 已重新設定使用者 %{target} 的密碼"
resolve_report_html: "%{name} 已處理 %{target} 的檢舉"
sensitive_account_html: "%{name} 將 %{target} 的媒體檔案標記為敏感內容"
@ -383,7 +383,7 @@ zh-TW:
confirm: 停權
permanent_action: 撤銷停權將不會回復任何資料或跟隨關係
preamble_html: 您將要停權 <strong>%{domain}</strong> 及其子網域。
remove_all_data: 此操作將從您伺服器移除所有來自此網域帳號之內容、媒體、個人檔案資料。
remove_all_data: 此操作將自您伺服器移除所有來自此網域帳號之內容、媒體、個人檔案資料。
stop_communication: 您伺服器將停止與這些伺服器交流。
title: 確認對 %{domain} 網域之封鎖
undo_relationships: 此操作將撤銷任何您伺服器與此伺服器帳號間之跟隨關係。
@ -555,11 +555,11 @@ zh-TW:
relays:
add_new: 新增中繼站
delete: 刪除
description_html: "<strong>聯邦中繼站</strong> 是種中繼伺服器，會於訂閱並推送至此中繼站的伺服器之間交換大量的公開嘟文。<strong>中繼站也能協助小型或中型伺服器從聯邦宇宙中探索內容</strong>，而無須本地使用者手動跟隨遠端伺服器的其他使用者。"
description_html: "<strong>聯邦中繼站</strong> 是種中繼伺服器，會於訂閱並推送至此中繼站的伺服器之間交換大量的公開嘟文。<strong>中繼站也能協助小型或中型伺服器自聯邦宇宙中探索內容</strong>，而無須本地使用者手動跟隨遠端伺服器的其他使用者。"
disable: 停用
disabled: 停用
enable: 啟用
enable_hint: 啟用後，您的伺服器將訂閱該中繼的所有公開文章，並將會此伺服器的公開文章發送給它。
enable_hint: 啟用後，您的伺服器將訂閱該中繼的所有公開文章，並將此伺服器的公開文章向它發送。
enabled: 已啟用
inbox_url: 中繼 URL
pending: 等待中繼站審核
@ -648,7 +648,7 @@ zh-TW:
delete_data_html: 於即日起 30 天後刪除 <strong>@%{acct}</strong>之個人檔案與內容，除非他們於期限前被解除停權
preview_preamble_html: "<strong>@%{acct}</strong> 將收到關於以下內容之警告："
record_strike_html: 紀錄關於 <strong>@%{acct}</strong>之警示有助於您升級對此帳號未來違規處理
send_email_html: 寄一封警告 e-mail 給 <strong>@%{acct}</strong>
send_email_html: 寄一封警告 e-mail 至 <strong>@%{acct}</strong>
warning_placeholder: 選填之其他站務動作理由。
target_origin: 檢舉帳號之來源
title: 檢舉
@ -671,7 +671,7 @@ zh-TW:
description_html: 透過<strong>使用者角色</strong>，您可以自訂您的使用者可以存取 Mastodon 的哪些功能與區域。
edit: 編輯「%{name}」角色
everyone: 預設權限
everyone_full_description_html: 這是會影響<strong>所有使用者</strong>的<strong>基本角色</strong>，即使是那些沒有被分配角色的使用者也一樣。其他所有的角色都從它繼承權限。
everyone_full_description_html: 這是會影響<strong>所有使用者</strong>的<strong>基本角色</strong>，即使是那些沒有被分配角色的使用者也一樣。其他所有的角色都自它繼承權限。
permissions_count:
other: "%{count} 個權限"
privileges:
@ -757,8 +757,8 @@ zh-TW:
title: 探索
trends: 熱門趨勢
domain_blocks:
all: 給任何人
disabled: 給沒有人
all: 至任何人
disabled: 至沒有人
users: 套用至所有登入的本站使用者
registrations:
moderation_recommandation: 對所有人開放註冊之前，請確保您有人手充足且反應靈敏的管理員團隊！
@ -797,7 +797,7 @@ zh-TW:
back_to_account: 返回帳號資訊頁面
back_to_report: 回到檢舉報告頁面
batch:
remove_from_report: 從檢舉報告中移除
remove_from_report: 自檢舉報告中移除
report: 檢舉報告
deleted: 已刪除
favourites: 最愛
@ -1055,7 +1055,7 @@ zh-TW:
dont_have_your_security_key: 找不到您的安全金鑰？
forgot_password: 忘記密碼？
invalid_reset_password_token: 密碼重設 token 無效或已過期。請重新設定密碼。
link_to_otp: 請從您手機輸入兩階段驗證 (2FA) 或備用驗證碼
link_to_otp: 請自您手機輸入兩階段驗證 (2FA) 或備用驗證碼
link_to_webauth: 使用您的安全金鑰
log_in_with: 登入，使用
login: 登入
@ -1138,7 +1138,7 @@ zh-TW:
x_seconds: "%{count}秒"
deletes:
challenge_not_passed: 您所輸入的資料不正確
confirm_password: 輸入您現在的密碼以驗證身份
confirm_password: 輸入您目前的密碼以驗證身份
confirm_username: 請輸入您的使用者名稱以作確認
proceed: 刪除帳號
success_msg: 您的帳號已經成功刪除
@ -1170,7 +1170,7 @@ zh-TW:
recipient: 此致
reject_appeal: 駁回申訴
status: '嘟文編號 #%{id}'
status_removed: 嘟文已從系統中移除
status_removed: 嘟文已自系統中移除
title: "%{action} 來自 %{date}"
title_actions:
delete_statuses: 嘟文移除
@ -1238,10 +1238,10 @@ zh-TW:
add_keyword: 新增關鍵字
keywords: 關鍵字
statuses: 各別嘟文
statuses_hint_html: 此過濾器會套用至所選之各別嘟文，無論其是否符合下列關鍵字。<a href="%{path}">審閱或從過濾條件移除嘟文</a>。
statuses_hint_html: 此過濾器會套用至所選之各別嘟文，無論其是否符合下列關鍵字。<a href="%{path}">審閱或自過濾條件移除嘟文</a>。
title: 編輯過濾條件
errors:
deprecated_api_multiple_keywords: 這些參數無法從此應用程式中更改，因為它們適用於一或多個過濾器關鍵字。請使用較新的應用程式或是網頁介面。
deprecated_api_multiple_keywords: 這些參數無法自此應用程式中更改，因為它們適用於一或多個過濾器關鍵字。請使用較新的應用程式或是網頁介面。
invalid_context: 沒有提供內文或內文無效
index:
contexts: "%{contexts} 中的過濾器"
@ -1262,7 +1262,7 @@ zh-TW:
statuses:
back_to_filter: 回到過濾器
batch:
remove: 從過濾器中移除
remove: 自過濾器中移除
index:
hint: 此過濾器會套用至所選之各別嘟文，不管它們有無符合其他條件。您可以從網頁介面中將更多嘟文加入至此過濾器。
title: 已過濾之嘟文
@ -1419,7 +1419,7 @@ zh-TW:
on_cooldown: 您最近已轉移過您的帳號。此功能將於 %{count} 天後可再度使用。
past_migrations: 以往的轉移紀錄
proceed_with_move: 移動跟隨者
redirected_msg: 您的帳號現在指向 %{acct}
redirected_msg: 您的帳號目前重導向至 %{acct}。
redirecting_to: 您的帳號目前正被重新導向到 %{acct}
set_redirect: 設定重新導向
warning:
@ -1552,7 +1552,7 @@ zh-TW:
mutual: 跟隨彼此
primary: 主要
relationship: 關係
remove_selected_domains: 從所選取網域中移除所有跟隨者
remove_selected_domains: 自所選取網域中移除所有跟隨者
remove_selected_followers: 移除選取的跟隨者
remove_selected_follows: 取消跟隨選取的使用者
status: 帳號狀態
@ -1599,7 +1599,7 @@ zh-TW:
current_session: 目前的 session
date: 日期
description: "%{platform} 上的 %{browser}"
explanation: 這些是現在正登入於您 Mastodon 帳號的瀏覽器。
explanation: 這些是目前正登入於您 Mastodon 帳號的瀏覽器。
ip: IP 位址
platforms:
adobe_air: Adobe Air

8
db/migrate/20240713171841_add_application_to_reports.rb Normal file
View File

@ -0,0 +1,8 @@
# frozen_string_literal: true
class AddApplicationToReports < ActiveRecord::Migration[7.1]
def change
add_column :reports, :application_id, :bigint, null: true
add_foreign_key :reports, :oauth_applications, column: :application_id, on_delete: :nullify, validate: false
end
end

7
db/migrate/20240713171909_validate_add_application_to_reports.rb Normal file
View File

@ -0,0 +1,7 @@
# frozen_string_literal: true
class ValidateAddApplicationToReports < ActiveRecord::Migration[7.1]
def change
validate_foreign_key :reports, :oauth_applications
end
end

4
db/schema.rb
View File

@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[7.1].define(version: 2024_07_12_064044) do
ActiveRecord::Schema[7.1].define(version: 2024_07_13_171909) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -929,6 +929,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_07_12_064044) do
t.integer "category", default: 0, null: false
t.datetime "action_taken_at", precision: nil
t.bigint "rule_ids", array: true
t.bigint "application_id"
t.index ["account_id"], name: "index_reports_on_account_id"
t.index ["action_taken_by_account_id"], name: "index_reports_on_action_taken_by_account_id", where: "(action_taken_by_account_id IS NOT NULL)"
t.index ["assigned_account_id"], name: "index_reports_on_assigned_account_id", where: "(assigned_account_id IS NOT NULL)"
@ -1364,6 +1365,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_07_12_064044) do
add_foreign_key "reports", "accounts", column: "assigned_account_id", on_delete: :nullify
add_foreign_key "reports", "accounts", column: "target_account_id", name: "fk_eb37af34f0", on_delete: :cascade
add_foreign_key "reports", "accounts", name: "fk_4b81f7522c", on_delete: :cascade
add_foreign_key "reports", "oauth_applications", column: "application_id", on_delete: :nullify
add_foreign_key "scheduled_statuses", "accounts", on_delete: :cascade
add_foreign_key "session_activations", "oauth_access_tokens", column: "access_token_id", name: "fk_957e5bda89", on_delete: :cascade
add_foreign_key "session_activations", "users", name: "fk_e5fda67334", on_delete: :cascade

1
spec/lib/activitypub/activity/flag_spec.rb
View File

@ -36,6 +36,7 @@ RSpec.describe ActivityPub::Activity::Flag do
expect(report).to_not be_nil
expect(report.comment).to eq 'Boo!!'
expect(report.status_ids).to eq [status.id]
expect(report.application).to be_nil
end
end

1
spec/requests/api/v1/reports_spec.rb
View File

@ -47,6 +47,7 @@ RSpec.describe 'Reports' do
expect(target_account.targeted_reports).to_not be_empty
expect(target_account.targeted_reports.first.comment).to eq 'reasons'
expect(target_account.targeted_reports.first.application).to eq token.application
expect(emails.size)
.to eq(1)

14
spec/services/report_service_spec.rb
View File

@ -23,6 +23,11 @@ RSpec.describe ReportService do
stub_request(:post, 'http://example.com/inbox').to_return(status: 200)
end
it 'does not have an application' do
report = subject.call(source_account, remote_account)
expect(report.application).to be_nil
end
context 'when forward is true', :inline_jobs do
let(:forward) { true }
@ -96,6 +101,15 @@ RSpec.describe ReportService do
end
end
context 'when passed an application' do
let(:application) { Fabricate(:application) }
it 'has an application' do
report = subject.call(source_account, target_account, application: application)
expect(report.application).to eq application
end
end
context 'when the reported status is a DM' do
subject do
-> { described_class.new.call(source_account, target_account, status_ids: [status.id]) }

6
yarn.lock
View File

@ -13220,8 +13220,8 @@ __metadata:
linkType: hard
"pino@npm:^9.0.0":
version: 9.2.0
resolution: "pino@npm:9.2.0"
version: 9.3.1
resolution: "pino@npm:9.3.1"
dependencies:
atomic-sleep: "npm:^1.0.0"
fast-redact: "npm:^3.1.1"
@ -13236,7 +13236,7 @@ __metadata:
thread-stream: "npm:^3.0.0"
bin:
pino: bin.js
checksum: 10c0/5fbd226ff7dab0961232b5aa5eca0530cdc5bb29f6bf17d929e42239293b1a587a26cc311db6abc1090c9dd57e8f7b031eae341b41d00d4a642b4f1736474c80
checksum: 10c0/ab1e81b3e5a91852136d80a592939883eeb81442e5d3a2c070bdbdeb47c5aaa297ead246530b10eb6d5ff59445f4645d1333d342f255d9f002f73aea843e74ee
languageName: node
linkType: hard