Merge pull request #691 from kmycode/upstream-20240403
Upstream 20240403
This commit is contained in:
KMY（雪あすか）
GitHub
commit
07c6d896e0
63 changed files with 828 additions and 388 deletions
|
|
@ -38,7 +38,12 @@ class Api::V1::AccountsController < Api::BaseController
|
|||
|
||||
def follow
|
||||
follow = FollowService.new.call(current_user.account, @account, reblogs: params.key?(:reblogs) ? truthy_param?(:reblogs) : nil, notify: params.key?(:notify) ? truthy_param?(:notify) : nil, languages: params.key?(:languages) ? params[:languages] : nil, with_rate_limit: true)
|
||||
options = @account.locked? || current_user.account.silenced? || (current_user.account.bot? && @account.user&.setting_lock_follow_from_bot) ? {} : { following_map: { @account.id => { reblogs: follow.show_reblogs?, notify: follow.notify?, languages: follow.languages } }, requested_map: { @account.id => false } }
|
||||
options = if @account.locked? || current_user.account.silenced? || (current_user.account.bot? && @account.user&.setting_lock_follow_from_bot)
|
||||
{}
|
||||
else
|
||||
{ following_map: { @account.id => { reblogs: follow.show_reblogs?, notify: follow.notify?, languages: follow.languages } },
|
||||
requested_map: { @account.id => false } }
|
||||
end
|
||||
|
||||
render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships(**options)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ module SignatureVerification
|
|||
compare_signed_string = build_signed_string(include_query_string: false)
|
||||
return actor unless verify_signature(actor, signature, compare_signed_string).nil?
|
||||
|
||||
actor = stoplight_wrap_request { actor_refresh_key!(actor) }
|
||||
actor = stoplight_wrapper.run { actor_refresh_key!(actor) }
|
||||
|
||||
raise SignatureVerificationError, "Could not refresh public key #{signature_params['keyId']}" if actor.nil?
|
||||
|
||||
|
|
@ -226,10 +226,10 @@ module SignatureVerification
|
|||
end
|
||||
|
||||
if key_id.start_with?('acct:')
|
||||
stoplight_wrap_request { ResolveAccountService.new.call(key_id.delete_prefix('acct:'), suppress_errors: false) }
|
||||
stoplight_wrapper.run { ResolveAccountService.new.call(key_id.delete_prefix('acct:'), suppress_errors: false) }
|
||||
elsif !ActivityPub::TagManager.instance.local_uri?(key_id)
|
||||
account = ActivityPub::TagManager.instance.uri_to_actor(key_id)
|
||||
account ||= stoplight_wrap_request { ActivityPub::FetchRemoteKeyService.new.call(key_id, suppress_errors: false) }
|
||||
account ||= stoplight_wrapper.run { ActivityPub::FetchRemoteKeyService.new.call(key_id, suppress_errors: false) }
|
||||
account
|
||||
end
|
||||
rescue Mastodon::PrivateNetworkAddressError => e
|
||||
|
|
@ -238,12 +238,11 @@ module SignatureVerification
|
|||
raise SignatureVerificationError, e.message
|
||||
end
|
||||
|
||||
def stoplight_wrap_request(&block)
|
||||
Stoplight("source:#{request.remote_ip}", &block)
|
||||
def stoplight_wrapper
|
||||
Stoplight("source:#{request.remote_ip}")
|
||||
.with_threshold(1)
|
||||
.with_cool_off_time(5.minutes.seconds)
|
||||
.with_error_handler { |error, handle| error.is_a?(HTTP::Error) || error.is_a?(OpenSSL::SSL::SSLError) ? handle.call(error) : raise(error) }
|
||||
.run
|
||||
end
|
||||
|
||||
def actor_refresh_key!(actor)
|
||||
|
|
|
|||
22
app/javascript/mastodon/api_types/media_attachments.ts
Normal file
22
app/javascript/mastodon/api_types/media_attachments.ts
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
// See app/serializers/rest/media_attachment_serializer.rb
|
||||
|
||||
export type MediaAttachmentType =
|
||||
| 'image'
|
||||
| 'gifv'
|
||||
| 'video'
|
||||
| 'unknown'
|
||||
| 'audio';
|
||||
|
||||
export interface ApiMediaAttachmentJSON {
|
||||
id: string;
|
||||
type: MediaAttachmentType;
|
||||
url: string;
|
||||
preview_url: string;
|
||||
remoteUrl: string;
|
||||
preview_remote_url: string;
|
||||
text_url: string;
|
||||
// TODO: how to define this?
|
||||
meta: unknown;
|
||||
description?: string;
|
||||
blurhash: string;
|
||||
}
|
||||
23
app/javascript/mastodon/api_types/polls.ts
Normal file
23
app/javascript/mastodon/api_types/polls.ts
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
import type { ApiCustomEmojiJSON } from './custom_emoji';
|
||||
|
||||
// See app/serializers/rest/poll_serializer.rb
|
||||
|
||||
export interface ApiPollOptionJSON {
|
||||
title: string;
|
||||
votes_count: number;
|
||||
}
|
||||
|
||||
export interface ApiPollJSON {
|
||||
id: string;
|
||||
expires_at: string;
|
||||
expired: boolean;
|
||||
multiple: boolean;
|
||||
votes_count: number;
|
||||
voters_count: number;
|
||||
|
||||
options: ApiPollOptionJSON[];
|
||||
emojis: ApiCustomEmojiJSON[];
|
||||
|
||||
voted: boolean;
|
||||
own_votes: number[];
|
||||
}
|
||||
97
app/javascript/mastodon/api_types/statuses.ts
Normal file
97
app/javascript/mastodon/api_types/statuses.ts
Normal file
|
|
@ -0,0 +1,97 @@
|
|||
// See app/serializers/rest/status_serializer.rb
|
||||
|
||||
import type { ApiAccountJSON } from './accounts';
|
||||
import type { ApiCustomEmojiJSON } from './custom_emoji';
|
||||
import type { ApiMediaAttachmentJSON } from './media_attachments';
|
||||
import type { ApiPollJSON } from './polls';
|
||||
|
||||
// See app/modals/status.rb visibility+limited_scope
|
||||
export type StatusVisibility =
|
||||
| 'public'
|
||||
| 'unlisted'
|
||||
| 'private'
|
||||
| 'direct'
|
||||
| 'public_unlisted'
|
||||
| 'login'
|
||||
| 'mutual'
|
||||
| 'circle'
|
||||
| 'personal'
|
||||
| 'reply'
|
||||
| 'limited';
|
||||
|
||||
export interface ApiStatusApplicationJSON {
|
||||
name: string;
|
||||
website: string;
|
||||
}
|
||||
|
||||
export interface ApiTagJSON {
|
||||
name: string;
|
||||
url: string;
|
||||
}
|
||||
|
||||
export interface ApiMentionJSON {
|
||||
id: string;
|
||||
username: string;
|
||||
url: string;
|
||||
acct: string;
|
||||
}
|
||||
|
||||
export interface ApiPreviewCardJSON {
|
||||
url: string;
|
||||
title: string;
|
||||
description: string;
|
||||
language: string;
|
||||
type: string;
|
||||
author_name: string;
|
||||
author_url: string;
|
||||
provider_name: string;
|
||||
provider_url: string;
|
||||
html: string;
|
||||
width: number;
|
||||
height: number;
|
||||
image: string;
|
||||
image_description: string;
|
||||
embed_url: string;
|
||||
blurhash: string;
|
||||
published_at: string;
|
||||
}
|
||||
|
||||
export interface ApiStatusJSON {
|
||||
id: string;
|
||||
created_at: string;
|
||||
in_reply_to_id?: string;
|
||||
in_reply_to_account_id?: string;
|
||||
sensitive: boolean;
|
||||
spoiler_text?: string;
|
||||
visibility: StatusVisibility;
|
||||
language: string;
|
||||
uri: string;
|
||||
url: string;
|
||||
replies_count: number;
|
||||
reblogs_count: number;
|
||||
favorites_count: number;
|
||||
edited_at?: string;
|
||||
|
||||
favorited?: boolean;
|
||||
reblogged?: boolean;
|
||||
muted?: boolean;
|
||||
bookmarked?: boolean;
|
||||
pinned?: boolean;
|
||||
|
||||
// filtered: FilterResult[]
|
||||
filtered: unknown; // TODO
|
||||
content?: string;
|
||||
text?: string;
|
||||
|
||||
reblog?: ApiStatusJSON;
|
||||
application?: ApiStatusApplicationJSON;
|
||||
account: ApiAccountJSON;
|
||||
media_attachments: ApiMediaAttachmentJSON[];
|
||||
mentions: ApiMentionJSON[];
|
||||
|
||||
tags: ApiTagJSON[];
|
||||
emojis: ApiCustomEmojiJSON[];
|
||||
|
||||
card?: ApiPreviewCardJSON;
|
||||
poll?: ApiPollJSON;
|
||||
}
|
||||
|
|
@ -27,7 +27,7 @@ export const FilteredNotificationsBanner = () => {
|
|||
};
|
||||
}, [dispatch]);
|
||||
|
||||
if (policy === null || policy.getIn(['summary', 'pending_notifications_count']) * 1 === 0) {
|
||||
if (policy === null || policy.getIn(['summary', 'pending_notifications_count']) === 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -92,7 +92,11 @@
|
|||
"block_modal.remote_users_caveat": "Serverile {domain} edastatakse palve otsust järgida. Ometi pole see tagatud, kuna mõned serverid võivad blokeeringuid käsitleda omal moel. Avalikud postitused võivad tuvastamata kasutajatele endiselt näha olla.",
|
||||
"block_modal.show_less": "Kuva vähem",
|
||||
"block_modal.show_more": "Kuva rohkem",
|
||||
"block_modal.they_cant_mention": "Ta ei saa mainida sind ega jälgida.",
|
||||
"block_modal.they_cant_see_posts": "Ta ei näe sinu postitusi ja sa ei näe tema omi.",
|
||||
"block_modal.they_will_know": "Ta näeb, et ta on blokeeritud.",
|
||||
"block_modal.title": "Blokeeri kasutaja?",
|
||||
"block_modal.you_wont_see_mentions": "Sa ei näe postitusi, mis mainivad teda.",
|
||||
"boost_modal.combo": "Vajutades {combo}, saab selle edaspidi vahele jätta",
|
||||
"bundle_column_error.copy_stacktrace": "Kopeeri veateade",
|
||||
"bundle_column_error.error.body": "Soovitud lehte ei õnnestunud esitada. See võib olla meie koodiviga või probleem brauseri ühilduvusega.",
|
||||
|
|
@ -206,8 +210,26 @@
|
|||
"dismissable_banner.explore_tags": "Need sildid siit ja teistes serveritest detsentraliseeritud võrgus koguvad tähelepanu just praegu selles serveris.",
|
||||
"dismissable_banner.public_timeline": "Need on kõige uuemad avalikud postitused inimestelt sotsiaalvõrgustikus, mida {domain} inimesed jälgivad.",
|
||||
"domain_block_modal.block": "Blokeeri server",
|
||||
"domain_block_modal.block_account_instead": "Selle asemel blokeeri @{name}",
|
||||
"domain_block_modal.they_can_interact_with_old_posts": "Inimesed sellest serverist saavad interakteeruda sinu vanade postitustega.",
|
||||
"domain_block_modal.they_cant_follow": "Sellest serverist ei saa keegi sind jälgida.",
|
||||
"domain_block_modal.they_wont_know": "Nad ei tea, et nad on blokeeritud.",
|
||||
"domain_block_modal.title": "Blokeerida domeen?",
|
||||
"domain_block_modal.you_will_lose_followers": "Kõik sinu sellest serverist pärit jälgijad eemaldatakse.",
|
||||
"domain_block_modal.you_wont_see_posts": "Sa ei näe selle serveri kasutajate postitusi ega teavitusi.",
|
||||
"domain_pill.activitypub_lets_connect": "See võimaldab sul ühenduda inimestega ja nendega suhelda mitte ainult Mastodonis, vaid ka teistes suhtlusrakendustes.",
|
||||
"domain_pill.activitypub_like_language": "ActivityPub on nagu keel, mida Mastodon räägib teiste suhtlusvõrgustikega.",
|
||||
"domain_pill.server": "Server",
|
||||
"domain_pill.their_handle": "Tema tunnus:",
|
||||
"domain_pill.their_server": "Tema digitaalne kodu, kus kõik tema postitused on.",
|
||||
"domain_pill.their_username": "Tema unikaalne tunnus tema serveris. On võimalik, et mingites teistes serverites on sama kasutajanimega kasutajaid.",
|
||||
"domain_pill.username": "Kasutajanimi",
|
||||
"domain_pill.whats_in_a_handle": "Mis on tunnuses?",
|
||||
"domain_pill.who_they_are": "Kuna tunnus ütleb, kes keegi on ja kus, saad suhelda inimestega üle <button>ActivityPub-poolt toetatud sotsiaalvõrkude platvormide</button>.",
|
||||
"domain_pill.who_you_are": "Kuna tunnus ütleb, kes sa oled ja kus, saavad inimesed sinuga suhelda üle <button>ActivityPub-poolt toetatud sotsiaalvõrkude platvormide</button>.",
|
||||
"domain_pill.your_handle": "Sinu tunnus:",
|
||||
"domain_pill.your_server": "Sinu digitaalne kodu, kus on kõik sinu postitused. Sulle ei meeldi see? Vaheta mistahes ajal serverit ja võta jälgijad ka.",
|
||||
"domain_pill.your_username": "Sinu unikaalne identifikaator siin serveris. On võimalik, et leiad teistes serverites samasuguse kasutajanimega kasutajaid.",
|
||||
"embed.instructions": "Lisa see postitus oma veebilehele, kopeerides alloleva koodi.",
|
||||
"embed.preview": "Nii näeb see välja:",
|
||||
"emoji_button.activity": "Tegevus",
|
||||
|
|
@ -244,6 +266,7 @@
|
|||
"empty_column.list": "Siin loetelus pole veel midagi. Kui loetelu liikmed teevad uusi postitusi, näed neid siin.",
|
||||
"empty_column.lists": "Pole veel ühtegi nimekirja. Kui lood mõne, näed neid siin.",
|
||||
"empty_column.mutes": "Sa pole veel ühtegi kasutajat vaigistanud.",
|
||||
"empty_column.notification_requests": "Kõik tühi! Siin pole mitte midagi. Kui saad uusi teavitusi, ilmuvad need siin vastavalt sinu seadistustele.",
|
||||
"empty_column.notifications": "Ei ole veel teateid. Kui keegi suhtleb sinuga, näed seda siin.",
|
||||
"empty_column.public": "Siin pole midagi! Kirjuta midagi avalikku või jälgi ise kasutajaid täitmaks seda ruumi",
|
||||
"error.unexpected_crash.explanation": "Meie poolse probleemi või veebilehitseja ühilduvusprobleemi tõttu ei suutnud me seda lehekülge korrektselt näidata.",
|
||||
|
|
@ -275,6 +298,8 @@
|
|||
"filter_modal.select_filter.title": "Filtreeri seda postitust",
|
||||
"filter_modal.title.status": "Postituse filtreerimine",
|
||||
"filtered_notifications_banner.pending_requests": "Teateid {count, plural, =0 {mitte üheltki} one {ühelt} other {#}} inimeselt, keda võid teada",
|
||||
"filtered_notifications_banner.private_mentions": "{count, plural, one {privaatne teavitus} other {privaatsed teavitused}}",
|
||||
"filtered_notifications_banner.title": "Filtreeritud teavitused",
|
||||
"firehose.all": "Kõik",
|
||||
"firehose.local": "See server",
|
||||
"firehose.remote": "Teised serverid",
|
||||
|
|
@ -403,8 +428,15 @@
|
|||
"loading_indicator.label": "Laadimine…",
|
||||
"media_gallery.toggle_visible": "{number, plural, one {Varja pilt} other {Varja pildid}}",
|
||||
"moved_to_account_banner.text": "Kontot {disabledAccount} ei ole praegu võimalik kasutada, sest kolisid kontole {movedToAccount}.",
|
||||
"mute_modal.hide_from_notifications": "Peida teavituste hulgast",
|
||||
"mute_modal.hide_options": "Peida valikud",
|
||||
"mute_modal.indefinite": "Kuni eemaldan neilt vaigistuse",
|
||||
"mute_modal.show_options": "Kuva valikud",
|
||||
"mute_modal.they_can_mention_and_follow": "Ta saab sind mainida ja sind jälgida, kuid sa ei näe teda.",
|
||||
"mute_modal.they_wont_know": "Ta ei tea, et ta on vaigistatud.",
|
||||
"mute_modal.title": "Vaigistada kasutaja?",
|
||||
"mute_modal.you_wont_see_mentions": "Sa ei näe postitusi, mis teda mainivad.",
|
||||
"mute_modal.you_wont_see_posts": "Ta näeb jätkuvalt sinu postitusi, kuid sa ei näe tema omi.",
|
||||
"navigation_bar.about": "Teave",
|
||||
"navigation_bar.advanced_interface": "Ava kohandatud veebiliides",
|
||||
"navigation_bar.blocks": "Blokeeritud kasutajad",
|
||||
|
|
@ -440,6 +472,10 @@
|
|||
"notification.own_poll": "Su küsitlus on lõppenud",
|
||||
"notification.poll": "Küsitlus, milles osalesid, on lõppenud",
|
||||
"notification.reblog": "{name} jagas edasi postitust",
|
||||
"notification.relationships_severance_event": "Kadunud ühendus kasutajaga {name}",
|
||||
"notification.relationships_severance_event.account_suspension": "{from} admin on kustutanud {target}, mis tähendab, et sa ei saa enam neilt uuendusi või suhelda nendega.",
|
||||
"notification.relationships_severance_event.domain_block": "{from} admin on blokeerinud {target}, sealhulgas {followersCount} sinu jälgijat ja {followingCount, plural, one {# konto} other {# kontot}}, mida jälgid.",
|
||||
"notification.relationships_severance_event.learn_more": "Saa rohkem teada",
|
||||
"notification.status": "{name} just postitas",
|
||||
"notification.update": "{name} muutis postitust",
|
||||
"notification_requests.accept": "Nõus",
|
||||
|
|
@ -450,6 +486,8 @@
|
|||
"notifications.column_settings.admin.sign_up": "Uued kasutajad:",
|
||||
"notifications.column_settings.alert": "Töölauateated",
|
||||
"notifications.column_settings.favourite": "Lemmikud:",
|
||||
"notifications.column_settings.filter_bar.advanced": "Näita kõiki kategooriaid",
|
||||
"notifications.column_settings.filter_bar.category": "Kiirfiltri riba",
|
||||
"notifications.column_settings.follow": "Uued jälgijad:",
|
||||
"notifications.column_settings.follow_request": "Uued jälgimistaotlused:",
|
||||
"notifications.column_settings.mention": "Mainimised:",
|
||||
|
|
@ -475,6 +513,7 @@
|
|||
"notifications.permission_denied": "Töölauamärguanded pole saadaval, kuna eelnevalt keelduti lehitsejale teavituste luba andmast",
|
||||
"notifications.permission_denied_alert": "Töölaua märguandeid ei saa lubada, kuna brauseri luba on varem keeldutud",
|
||||
"notifications.permission_required": "Töölaua märguanded ei ole saadaval, kuna vajalik luba pole antud.",
|
||||
"notifications.policy.filter_new_accounts.hint": "Loodud viimase {days, plural, one {ühe päeva} other {# päeva}} jooksul",
|
||||
"notifications.policy.filter_new_accounts_title": "Uued kontod",
|
||||
"notifications_permission_banner.enable": "Luba töölaua märguanded",
|
||||
"notifications_permission_banner.how_to_control": "Et saada teateid, ajal mil Mastodon pole avatud, luba töölauamärguanded. Saad täpselt määrata, mis tüüpi tegevused tekitavad märguandeid, kasutates peale teadaannete sisse lülitamist üleval olevat nuppu {icon}.",
|
||||
|
|
|
|||
|
|
@ -3,15 +3,15 @@
|
|||
"about.contact": "Contacto:",
|
||||
"about.disclaimer": "Mastodon es software libere, de codice aperte, e un marca de Mastodon gGmbH.",
|
||||
"about.domain_blocks.no_reason_available": "Ration non disponibile",
|
||||
"about.domain_blocks.preamble": "Mastodon generalmente permitte vider contento ab e interacter con usatores ab ulle altere servitor in le fediverso. Iste es le exceptiones que ha essite facite in iste servitor particular.",
|
||||
"about.domain_blocks.silenced.explanation": "Generalmente non videras perfiles e contento de iste servitor, a minus que tu expressemente lo cerca o opta pro lo per sequer.",
|
||||
"about.domain_blocks.preamble": "Mastodon generalmente permitte vider le contento de, e interager con, usatores de qualcunque altere servitor in le fediverso. Istes es le exceptiones que ha essite facite sur iste servitor particular.",
|
||||
"about.domain_blocks.silenced.explanation": "Generalmente, tu non videra le profilos e le contento de iste servitor, excepte si tu expressemente cerca le contento o seque le profilos.",
|
||||
"about.domain_blocks.silenced.title": "Limitate",
|
||||
"about.domain_blocks.suspended.explanation": "Nulle data de iste servitor essera processate, immagazinate o scambiate, faciente qualcunque interaction o communication con usatores de iste servitor impossibile.",
|
||||
"about.domain_blocks.suspended.explanation": "Nulle datos de iste servitor essera processate, immagazinate o excambiate, rendente omne interaction o communication con usatores de iste servitor impossibile.",
|
||||
"about.domain_blocks.suspended.title": "Suspendite",
|
||||
"about.not_available": "Iste information non faceva disponibile in iste servitor.",
|
||||
"about.not_available": "Iste information non ha essite rendite disponibile sur iste servitor.",
|
||||
"about.rules": "Regulas del servitor",
|
||||
"account.account_note_header": "Nota",
|
||||
"account.add_or_remove_from_list": "Adder o remover ab listas",
|
||||
"account.add_or_remove_from_list": "Adder a, o remover de listas",
|
||||
"account.badges.group": "Gruppo",
|
||||
"account.block": "Blocar @{name}",
|
||||
"account.block_domain": "Blocar dominio {domain}",
|
||||
|
|
@ -19,31 +19,31 @@
|
|||
"account.blocked": "Blocate",
|
||||
"account.browse_more_on_origin_server": "Navigar plus sur le profilo original",
|
||||
"account.copy": "Copiar ligamine a profilo",
|
||||
"account.direct": "Mentionar privatemente a @{name}",
|
||||
"account.disable_notifications": "Stoppar le notificationes quando @{name} publica",
|
||||
"account.direct": "Mentionar privatemente @{name}",
|
||||
"account.disable_notifications": "Non plus notificar me quando @{name} publica",
|
||||
"account.domain_blocked": "Dominio blocate",
|
||||
"account.edit_profile": "Modificar profilo",
|
||||
"account.enable_notifications": "Notifica me quando @{name} publica",
|
||||
"account.enable_notifications": "Notificar me quando @{name} publica",
|
||||
"account.endorse": "Evidentiar sur le profilo",
|
||||
"account.featured_tags.last_status_at": "Ultime message in {date}",
|
||||
"account.featured_tags.last_status_at": "Ultime message publicate le {date}",
|
||||
"account.featured_tags.last_status_never": "Necun messages",
|
||||
"account.featured_tags.title": "Hashtags eminente de {name}",
|
||||
"account.follow": "Sequer",
|
||||
"account.follow_back": "Sequer etiam",
|
||||
"account.follow_back": "Sequer in retorno",
|
||||
"account.followers": "Sequitores",
|
||||
"account.followers.empty": "Iste usator ancora non ha sequitores.",
|
||||
"account.followers.empty": "Necuno seque ancora iste usator.",
|
||||
"account.followers_counter": "{count, plural, one {{counter} sequitor} other {{counter} sequitores}}",
|
||||
"account.following": "Sequente",
|
||||
"account.follows.empty": "Iste usator ancora non seque nemo.",
|
||||
"account.follows.empty": "Iste usator non seque ancora alcuno.",
|
||||
"account.go_to_profile": "Vader al profilo",
|
||||
"account.hide_reblogs": "Celar boosts de @{name}",
|
||||
"account.in_memoriam": "In Memoriam.",
|
||||
"account.in_memoriam": "In memoriam.",
|
||||
"account.languages": "Cambiar le linguas subscribite",
|
||||
"account.link_verified_on": "Le proprietate de iste ligamine esseva verificate le {date}",
|
||||
"account.locked_info": "Le stato de confidentialitate de iste conto es definite a blocate. Le proprietario revisa manualmente qui pote sequer lo.",
|
||||
"account.link_verified_on": "Le proprietate de iste ligamine ha essite verificate le {date}",
|
||||
"account.locked_info": "Le stato de confidentialitate de iste conto es definite como serrate. Le proprietario determina manualmente qui pote sequer le.",
|
||||
"account.media": "Multimedia",
|
||||
"account.mention": "Mentionar @{name}",
|
||||
"account.moved_to": "{name} indicava que lor nove conto ora es:",
|
||||
"account.moved_to": "{name} ha indicate que su nove conto ora es:",
|
||||
"account.mute": "Silentiar @{name}",
|
||||
"account.mute_notifications_short": "Silentiar le notificationes",
|
||||
"account.mute_short": "Silentiar",
|
||||
|
|
@ -53,9 +53,9 @@
|
|||
"account.posts": "Messages",
|
||||
"account.posts_with_replies": "Messages e responsas",
|
||||
"account.requested": "Attendente le approbation. Clicca pro cancellar le requesta de sequer",
|
||||
"account.requested_follow": "{name} habeva requestate sequer te",
|
||||
"account.requested_follow": "{name} ha requestate de sequer te",
|
||||
"account.share": "Compartir profilo de @{name}",
|
||||
"account.show_reblogs": "Monstrar responsas de @{name}",
|
||||
"account.show_reblogs": "Monstrar impulsos de @{name}",
|
||||
"account.statuses_counter": "{count, plural, one {{counter} message} other {{counter} messages}}",
|
||||
"account.unblock": "Disblocar @{name}",
|
||||
"account.unblock_domain": "Disblocar dominio {domain}",
|
||||
|
|
@ -66,23 +66,26 @@
|
|||
"account.unmute_notifications_short": "Non plus silentiar le notificationes",
|
||||
"account.unmute_short": "Non plus silentiar",
|
||||
"account_note.placeholder": "Clicca pro adder un nota",
|
||||
"admin.dashboard.retention.average": "Median",
|
||||
"admin.dashboard.retention.average": "Media",
|
||||
"admin.dashboard.retention.cohort_size": "Nove usatores",
|
||||
"admin.impact_report.instance_followers": "Sequitores que nostre usatores poterea perder",
|
||||
"admin.impact_report.instance_follows": "Sequitores que lor usatores poterea perder",
|
||||
"alert.rate_limited.message": "Retenta depost {retry_time, time, medium}.",
|
||||
"alert.unexpected.message": "Ocurreva un error inexpectate.",
|
||||
"admin.impact_report.instance_followers": "Sequitores que nostre usatores perderea",
|
||||
"admin.impact_report.instance_follows": "Sequitores que lor usatores perderea",
|
||||
"alert.rate_limited.message": "Per favor retenta post {retry_time, time, medium}.",
|
||||
"alert.unexpected.message": "Un error inexpectate ha occurrite.",
|
||||
"announcement.announcement": "Annuncio",
|
||||
"audio.hide": "Celar audio",
|
||||
"bundle_column_error.error.title": "Oh, non!",
|
||||
"block_modal.show_less": "Monstrar minus",
|
||||
"block_modal.show_more": "Monstrar plus",
|
||||
"block_modal.title": "Blocar usator?",
|
||||
"bundle_column_error.error.title": "Oh, no!",
|
||||
"bundle_column_error.network.title": "Error de rete",
|
||||
"bundle_column_error.retry": "Tentar novemente",
|
||||
"bundle_column_error.return": "Retornar al initio",
|
||||
"bundle_modal_error.close": "Clauder",
|
||||
"bundle_modal_error.retry": "Tentar novemente",
|
||||
"closed_registrations_modal.description": "Crear un conto in {domain} actualmente non es possibile, ma considera que tu non besonia un conto specific in {domain} pro usar Mastodon.",
|
||||
"closed_registrations_modal.find_another_server": "Trovar altere servitor",
|
||||
"column.about": "A proposito de",
|
||||
"closed_registrations_modal.description": "Crear un conto in {domain} actualmente non es possibile, ma considera que non es necessari haber un conto specificamente sur {domain} pro usar Mastodon.",
|
||||
"closed_registrations_modal.find_another_server": "Cercar un altere servitor",
|
||||
"column.about": "A proposito",
|
||||
"column.blocks": "Usatores blocate",
|
||||
"column.bookmarks": "Marcapaginas",
|
||||
"column.community": "Chronologia local",
|
||||
|
|
@ -90,7 +93,7 @@
|
|||
"column.directory": "Navigar profilos",
|
||||
"column.domain_blocks": "Dominios blocate",
|
||||
"column.favourites": "Favoritos",
|
||||
"column.firehose": "Fluxos in directe",
|
||||
"column.firehose": "Fluxos in directo",
|
||||
"column.home": "Initio",
|
||||
"column.lists": "Listas",
|
||||
"column.mutes": "Usatores silentiate",
|
||||
|
|
@ -103,7 +106,7 @@
|
|||
"column_header.show_settings": "Monstrar le parametros",
|
||||
"column_subheading.settings": "Parametros",
|
||||
"community.column_settings.local_only": "Solmente local",
|
||||
"community.column_settings.media_only": "Solmente medios",
|
||||
"community.column_settings.media_only": "Solmente multimedia",
|
||||
"compose.language.change": "Cambiar le lingua",
|
||||
"compose.language.search": "Cercar linguas...",
|
||||
"compose.published.body": "Message publicate.",
|
||||
|
|
@ -111,14 +114,14 @@
|
|||
"compose.saved.body": "Message salvate.",
|
||||
"compose_form.direct_message_warning_learn_more": "Apprender plus",
|
||||
"compose_form.lock_disclaimer": "Tu conto non es {locked}. Quicunque pote sequer te pro vider tu messages solo pro sequitores.",
|
||||
"compose_form.lock_disclaimer.lock": "blocate",
|
||||
"compose_form.poll.duration": "Duration del inquesta",
|
||||
"compose_form.lock_disclaimer.lock": "serrate",
|
||||
"compose_form.poll.duration": "Durata del sondage",
|
||||
"compose_form.poll.multiple": "Selection multiple",
|
||||
"compose_form.poll.option_placeholder": "Option {number}",
|
||||
"compose_form.poll.single": "Seliger un",
|
||||
"compose_form.poll.switch_to_multiple": "Cambiar inquesta pro permitter selectiones multiple",
|
||||
"compose_form.poll.switch_to_single": "Cambiar inquesta pro permitter selection singule",
|
||||
"compose_form.poll.type": "Stylo",
|
||||
"compose_form.poll.switch_to_multiple": "Cambiar le sondage pro permitter selectiones multiple",
|
||||
"compose_form.poll.switch_to_single": "Cambiar le sondage pro permitter selection singule",
|
||||
"compose_form.poll.type": "Stilo",
|
||||
"compose_form.publish": "Publicar",
|
||||
"compose_form.publish_form": "Nove message",
|
||||
"compose_form.reply": "Responder",
|
||||
|
|
@ -129,18 +132,19 @@
|
|||
"confirmation_modal.cancel": "Cancellar",
|
||||
"confirmations.block.confirm": "Blocar",
|
||||
"confirmations.cancel_follow_request.confirm": "Retirar requesta",
|
||||
"confirmations.cancel_follow_request.message": "Es tu secur que tu vole retirar tu requesta a sequer a {name}?",
|
||||
"confirmations.cancel_follow_request.message": "Es tu secur que tu vole retirar tu requesta de sequer {name}?",
|
||||
"confirmations.delete.confirm": "Deler",
|
||||
"confirmations.delete.message": "Es tu secur que tu vole deler iste message?",
|
||||
"confirmations.delete_list.confirm": "Deler",
|
||||
"confirmations.delete_list.message": "Es tu secur que tu vole deler permanentemente iste lista?",
|
||||
"confirmations.domain_block.confirm": "Blocar le servitor",
|
||||
"confirmations.edit.confirm": "Modificar",
|
||||
"confirmations.logout.confirm": "Clauder le session",
|
||||
"confirmations.logout.confirm": "Clauder session",
|
||||
"confirmations.logout.message": "Es tu secur que tu vole clauder le session?",
|
||||
"confirmations.mute.confirm": "Silentiar",
|
||||
"confirmations.reply.confirm": "Responder",
|
||||
"confirmations.unfollow.confirm": "Non plus sequer",
|
||||
"confirmations.unfollow.message": "Es tu secur que tu vole non plus sequer {name}?",
|
||||
"confirmations.unfollow.message": "Es tu secur que tu vole cessar de sequer {name}?",
|
||||
"conversation.delete": "Deler conversation",
|
||||
"conversation.mark_as_read": "Marcar como legite",
|
||||
"conversation.open": "Vider conversation",
|
||||
|
|
@ -155,8 +159,11 @@
|
|||
"disabled_account_banner.account_settings": "Parametros de conto",
|
||||
"disabled_account_banner.text": "Tu conto {disabledAccount} es actualmente disactivate.",
|
||||
"dismissable_banner.dismiss": "Dimitter",
|
||||
"domain_block_modal.title": "Blocar dominio?",
|
||||
"domain_block_modal.you_will_lose_followers": "Omne sequitores ab iste servitor essera removite.",
|
||||
"domain_pill.server": "Servitor",
|
||||
"domain_pill.username": "Nomine de usator",
|
||||
"embed.preview": "Hic es como il parera:",
|
||||
"embed.preview": "Ecce como illlo parera:",
|
||||
"emoji_button.activity": "Activitate",
|
||||
"emoji_button.clear": "Rader",
|
||||
"emoji_button.custom": "Personalisate",
|
||||
|
|
@ -170,16 +177,16 @@
|
|||
"emoji_button.search_results": "Resultatos de recerca",
|
||||
"emoji_button.symbols": "Symbolos",
|
||||
"emoji_button.travel": "Viages e locos",
|
||||
"empty_column.account_hides_collections": "Le usator ha seligite non facer iste information disponibile",
|
||||
"empty_column.account_hides_collections": "Le usator non ha rendite iste information disponibile",
|
||||
"empty_column.account_suspended": "Conto suspendite",
|
||||
"empty_column.account_timeline": "Nulle messages hic!",
|
||||
"empty_column.account_unavailable": "Profilo non disponibile",
|
||||
"empty_column.blocks": "Tu non ha blocate alcun usator ancora.",
|
||||
"empty_column.domain_blocks": "Il non ha dominios blocate ancora.",
|
||||
"empty_column.explore_statuses": "Nihil es in tendentias ora mesme. Retorna postea!",
|
||||
"empty_column.favourited_statuses": "Tu non ha necun messages favorite ancora. Quando tu marca un como favorito, ille essera monstrate hic.",
|
||||
"empty_column.followed_tags": "Tu ancora non ha sequite necun hashtags. Quando tu lo face, illes essera monstrate hic.",
|
||||
"empty_column.hashtag": "Ancora non il ha nihil in iste hashtag.",
|
||||
"empty_column.explore_statuses": "Il non ha tendentias in iste momento. Reveni plus tarde!",
|
||||
"empty_column.favourited_statuses": "Tu non ha alcun message favorite ancora. Quando tu marca un message como favorite, illo apparera hic.",
|
||||
"empty_column.followed_tags": "Tu non ha ancora sequite alcun hashtags. Quando tu lo face, illos apparera hic.",
|
||||
"empty_column.hashtag": "Il non ha ancora alcun cosa in iste hashtag.",
|
||||
"errors.unexpected_crash.report_issue": "Signalar un defecto",
|
||||
"explore.search_results": "Resultatos de recerca",
|
||||
"explore.suggested_follows": "Personas",
|
||||
|
|
@ -189,7 +196,7 @@
|
|||
"explore.trending_tags": "Hashtags",
|
||||
"filter_modal.added.review_and_configure_title": "Parametros de filtro",
|
||||
"filter_modal.added.settings_link": "pagina de parametros",
|
||||
"filter_modal.added.short_explanation": "Iste message esseva addite al sequente categoria de filtros: {title}.",
|
||||
"filter_modal.added.short_explanation": "Iste message ha essite addite al sequente categoria de filtros: {title}.",
|
||||
"filter_modal.added.title": "Filtro addite!",
|
||||
"filter_modal.select_filter.prompt_new": "Nove categoria: {name}",
|
||||
"filter_modal.select_filter.search": "Cercar o crear",
|
||||
|
|
@ -203,9 +210,9 @@
|
|||
"follow_suggestions.personalized_suggestion": "Suggestion personalisate",
|
||||
"follow_suggestions.popular_suggestion": "Suggestion personalisate",
|
||||
"follow_suggestions.view_all": "Vider toto",
|
||||
"footer.about": "A proposito de",
|
||||
"footer.about": "A proposito",
|
||||
"footer.directory": "Directorio de profilos",
|
||||
"footer.get_app": "Obtene le application",
|
||||
"footer.get_app": "Obtener le application",
|
||||
"footer.invite": "Invitar personas",
|
||||
"footer.keyboard_shortcuts": "Accessos directe de claviero",
|
||||
"footer.privacy_policy": "Politica de confidentialitate",
|
||||
|
|
@ -221,24 +228,25 @@
|
|||
"hashtag.follow": "Sequer hashtag",
|
||||
"hashtag.unfollow": "Non sequer plus le hashtag",
|
||||
"hashtags.and_other": "…e {count, plural, one {}other {# plus}}",
|
||||
"home.column_settings.show_reblogs": "Monstrar boosts",
|
||||
"home.column_settings.show_reblogs": "Monstrar impulsos",
|
||||
"home.column_settings.show_replies": "Monstrar responsas",
|
||||
"home.hide_announcements": "Celar annuncios",
|
||||
"home.pending_critical_update.body": "Actualisa tu servitor de Mastodon le plus tosto possibile!",
|
||||
"home.pending_critical_update.link": "Vider actualisationes",
|
||||
"home.pending_critical_update.title": "Actualisation de securitate critic disponibile!",
|
||||
"home.show_announcements": "Monstrar annuncios",
|
||||
"interaction_modal.login.prompt": "Dominio de tu servitor, p.e. mastodon.social",
|
||||
"interaction_modal.login.prompt": "Dominio de tu servitor, p.ex. mastodon.social",
|
||||
"interaction_modal.no_account_yet": "Non sur Mstodon?",
|
||||
"interaction_modal.on_another_server": "In un servitor differente",
|
||||
"interaction_modal.on_this_server": "In iste servitor",
|
||||
"interaction_modal.on_another_server": "Sur un altere servitor",
|
||||
"interaction_modal.on_this_server": "Sur iste servitor",
|
||||
"interaction_modal.title.follow": "Sequer {name}",
|
||||
"interaction_modal.title.reblog": "Facer boost al message de {name}",
|
||||
"interaction_modal.title.reblog": "Impulsar le message de {name}",
|
||||
"interaction_modal.title.reply": "Responder al message de {name}",
|
||||
"keyboard_shortcuts.blocked": "Aperir lista de usatores blocate",
|
||||
"keyboard_shortcuts.boost": "Facer boost al message",
|
||||
"keyboard_shortcuts.boost": "Impulsar le message",
|
||||
"keyboard_shortcuts.description": "Description",
|
||||
"keyboard_shortcuts.enter": "Aperir message",
|
||||
"keyboard_shortcuts.favourite": "Message favorite",
|
||||
"keyboard_shortcuts.favourites": "Aperir lista de favoritos",
|
||||
"keyboard_shortcuts.federated": "Aperir le chronologia federate",
|
||||
"keyboard_shortcuts.heading": "Accessos directe de claviero",
|
||||
|
|
@ -247,22 +255,22 @@
|
|||
"keyboard_shortcuts.muted": "Aperir lista de usatores silentiate",
|
||||
"keyboard_shortcuts.my_profile": "Aperir tu profilo",
|
||||
"keyboard_shortcuts.notifications": "Aperir columna de notificationes",
|
||||
"keyboard_shortcuts.open_media": "Aperir medio",
|
||||
"keyboard_shortcuts.open_media": "Aperir multimedia",
|
||||
"keyboard_shortcuts.profile": "Aperir le profilo del autor",
|
||||
"keyboard_shortcuts.reply": "Responder al message",
|
||||
"keyboard_shortcuts.spoilers": "Monstrar/celar le campo CW",
|
||||
"keyboard_shortcuts.toggle_sensitivity": "Monstrar/celar medios",
|
||||
"keyboard_shortcuts.toggle_sensitivity": "Monstrar/celar multimedia",
|
||||
"keyboard_shortcuts.toot": "Initiar un nove message",
|
||||
"lightbox.close": "Clauder",
|
||||
"lightbox.next": "Sequente",
|
||||
"lightbox.previous": "Precedente",
|
||||
"link_preview.author": "Per {name}",
|
||||
"lists.account.add": "Adder al lista",
|
||||
"lists.account.remove": "Remover ab le lista",
|
||||
"lists.account.remove": "Remover del lista",
|
||||
"lists.delete": "Deler lista",
|
||||
"lists.edit": "Modificar lista",
|
||||
"lists.edit.submit": "Cambiar titulo",
|
||||
"lists.exclusive": "Celar iste messages ab le initio",
|
||||
"lists.exclusive": "Celar iste messages sur le pagina de initio",
|
||||
"lists.new.create": "Adder lista",
|
||||
"lists.new.title_placeholder": "Nove titulo del lista",
|
||||
"lists.replies_policy.none": "Nemo",
|
||||
|
|
@ -270,8 +278,10 @@
|
|||
"lists.subheading": "Tu listas",
|
||||
"loading_indicator.label": "Cargante…",
|
||||
"media_gallery.toggle_visible": "{number, plural, one {Celar imagine} other {Celar imagines}}",
|
||||
"navigation_bar.about": "A proposito de",
|
||||
"navigation_bar.advanced_interface": "Aperir in un interfacie web avantiate",
|
||||
"mute_modal.hide_options": "Celar optiones",
|
||||
"mute_modal.title": "Silentiar le usator?",
|
||||
"navigation_bar.about": "A proposito",
|
||||
"navigation_bar.advanced_interface": "Aperir in le interfacie web avantiate",
|
||||
"navigation_bar.blocks": "Usatores blocate",
|
||||
"navigation_bar.bookmarks": "Marcapaginas",
|
||||
"navigation_bar.community_timeline": "Chronologia local",
|
||||
|
|
@ -291,14 +301,18 @@
|
|||
"navigation_bar.public_timeline": "Chronologia federate",
|
||||
"navigation_bar.search": "Cercar",
|
||||
"navigation_bar.security": "Securitate",
|
||||
"notification.own_poll": "Tu inquesta finiva",
|
||||
"notification.update": "{name} modificava un message",
|
||||
"notification.own_poll": "Tu sondage ha finite",
|
||||
"notification.relationships_severance_event.learn_more": "Apprender plus",
|
||||
"notification.update": "{name} ha modificate un message",
|
||||
"notification_requests.notifications_from": "Notificationes de {name}",
|
||||
"notifications.clear": "Rader notificationes",
|
||||
"notifications.clear_confirmation": "Es tu secur que tu vole rader permanentemente tote tu notificationes?",
|
||||
"notifications.column_settings.alert": "Notificationes de scriptorio",
|
||||
"notifications.column_settings.favourite": "Favoritos:",
|
||||
"notifications.column_settings.filter_bar.advanced": "Monstrar tote le categorias",
|
||||
"notifications.column_settings.follow": "Nove sequitores:",
|
||||
"notifications.column_settings.mention": "Mentiones:",
|
||||
"notifications.column_settings.poll": "Resultatos del inquesta:",
|
||||
"notifications.column_settings.poll": "Resultatos del sondage:",
|
||||
"notifications.column_settings.push": "Notificationes push",
|
||||
"notifications.column_settings.show": "Monstrar in columna",
|
||||
"notifications.column_settings.sound": "Reproducer sono",
|
||||
|
|
@ -307,10 +321,11 @@
|
|||
"notifications.filter.all": "Toto",
|
||||
"notifications.filter.favourites": "Favoritos",
|
||||
"notifications.filter.mentions": "Mentiones",
|
||||
"notifications.filter.polls": "Resultatos del inquesta",
|
||||
"notifications.filter.polls": "Resultatos del sondage",
|
||||
"notifications.filter.statuses": "Actualisationes de personas que tu seque",
|
||||
"notifications.grant_permission": "Conceder permission.",
|
||||
"notifications.group": "{count} notificationes",
|
||||
"notifications.policy.filter_new_accounts_title": "Nove contos",
|
||||
"notifications_permission_banner.enable": "Activar notificationes de scriptorio",
|
||||
"onboarding.compose.template": "Salute #Mastodon!",
|
||||
"onboarding.profile.save_and_continue": "Salvar e continuar",
|
||||
|
|
@ -322,7 +337,7 @@
|
|||
"onboarding.steps.share_profile.title": "Compartir tu profilo de Mastodon",
|
||||
"poll.closed": "Claudite",
|
||||
"poll.reveal": "Vider le resultatos",
|
||||
"privacy.change": "Cambiar privacitate del message",
|
||||
"privacy.change": "Cambiar le confidentialitate del message",
|
||||
"privacy.public.short": "Public",
|
||||
"privacy_policy.last_updated": "Ultime actualisation {date}",
|
||||
"privacy_policy.title": "Politica de confidentialitate",
|
||||
|
|
@ -333,7 +348,7 @@
|
|||
"report.categories.other": "Alteres",
|
||||
"report.category.title_account": "profilo",
|
||||
"report.category.title_status": "message",
|
||||
"report.close": "Preste",
|
||||
"report.close": "Facite",
|
||||
"report.mute": "Silentiar",
|
||||
"report.next": "Sequente",
|
||||
"report.placeholder": "Commentos additional",
|
||||
|
|
@ -358,14 +373,14 @@
|
|||
"server_banner.learn_more": "Apprender plus",
|
||||
"server_banner.server_stats": "Statos del servitor:",
|
||||
"sign_in_banner.create_account": "Crear un conto",
|
||||
"sign_in_banner.sign_in": "Initiar le session",
|
||||
"sign_in_banner.sign_in": "Aperir session",
|
||||
"status.block": "Blocar @{name}",
|
||||
"status.copy": "Copiar ligamine a message",
|
||||
"status.delete": "Deler",
|
||||
"status.direct": "Mentionar privatemente a @{name}",
|
||||
"status.direct": "Mentionar privatemente @{name}",
|
||||
"status.direct_indicator": "Mention private",
|
||||
"status.edit": "Modificar",
|
||||
"status.edited_x_times": "Modificate {count, plural, one {{count} tempore} other {{count} tempores}}",
|
||||
"status.edited_x_times": "Modificate {count, plural, one {{count} vice} other {{count} vices}}",
|
||||
"status.favourite": "Adder al favoritos",
|
||||
"status.filter": "Filtrar iste message",
|
||||
"status.hide": "Celar le message",
|
||||
|
|
@ -376,20 +391,37 @@
|
|||
"status.more": "Plus",
|
||||
"status.mute_conversation": "Silentiar conversation",
|
||||
"status.read_more": "Leger plus",
|
||||
"status.reblogs.empty": "Necuno ha ancora impulsate iste message. Quando alcuno lo face, le impulsos apparera hic.",
|
||||
"status.redraft": "Deler e reconciper",
|
||||
"status.remove_bookmark": "Remover marcapagina",
|
||||
"status.replied_to": "Respondite a {name}",
|
||||
"status.reply": "Responder",
|
||||
"status.replyAll": "Responder al discussion",
|
||||
"status.report": "Signalar @{name}",
|
||||
"status.sensitive_warning": "Contento sensibile",
|
||||
"status.share": "Compartir",
|
||||
"status.show_filter_reason": "Monstrar in omne caso",
|
||||
"status.show_less": "Monstrar minus",
|
||||
"status.show_less_all": "Monstrar minus pro totes",
|
||||
"status.show_more": "Monstrar plus",
|
||||
"status.show_more_all": "Monstrar plus pro totes",
|
||||
"status.show_original": "Monstrar original",
|
||||
"status.title.with_attachments": "{user} ha publicate {attachmentCount, plural, one {un annexo} other {{attachmentCount} annexos}}",
|
||||
"status.translate": "Traducer",
|
||||
"status.translated_from_with": "Traducite ab {lang} usante {provider}",
|
||||
"status.uncached_media_warning": "Previsualisation non disponibile",
|
||||
"status.unmute_conversation": "Non plus silentiar conversation",
|
||||
"status.unpin": "Disfixar del profilo",
|
||||
"subscribed_languages.lead": "Solmente le messages in le linguas seligite apparera in tu chronologias de initio e de listas post le cambiamento. Selige necun pro reciper messages in tote le linguas.",
|
||||
"subscribed_languages.save": "Salveguardar le cambiamentos",
|
||||
"subscribed_languages.target": "Cambiar le linguas subscribite pro {target}",
|
||||
"tabs_bar.home": "Initio",
|
||||
"tabs_bar.notifications": "Notificationes",
|
||||
"timeline_hint.resources.statuses": "Messages ancian",
|
||||
"trends.trending_now": "Ora in tendentias",
|
||||
"upload_button.label": "Adde imagines, un video o un file de audio",
|
||||
"upload_modal.choose_image": "Seliger un imagine",
|
||||
"upload_modal.detect_text": "Deteger texto ab un pictura",
|
||||
"upload_modal.detect_text": "Deteger texto de un imagine",
|
||||
"video.close": "Clauder le video",
|
||||
"video.download": "Discargar le file",
|
||||
"video.fullscreen": "Schermo plen",
|
||||
|
|
|
|||
|
|
@ -91,6 +91,9 @@
|
|||
"audio.hide": "Celar audio",
|
||||
"block_modal.show_less": "Monstrar minu",
|
||||
"block_modal.show_more": "Monstrar plu",
|
||||
"block_modal.they_cant_mention": "Ne posse mentionar ni sequer te.",
|
||||
"block_modal.they_cant_see_posts": "Ne posse vider tui postas e inversi.",
|
||||
"block_modal.they_will_know": "Va esser conscient que tu ha bloccat.",
|
||||
"block_modal.title": "Bloccar usator?",
|
||||
"block_modal.you_wont_see_mentions": "Tu ne va vider postas mentionant li usator.",
|
||||
"boost_modal.combo": "Li proxim vez tu posse pressar {combo} por passar to-ci",
|
||||
|
|
@ -206,6 +209,16 @@
|
|||
"dismissable_banner.explore_tags": "Tis-ci es hashtags queles es popular che li social retage hodie. Hashtags usat de plu mult persones diferent es monstrat plu alt.",
|
||||
"dismissable_banner.public_timeline": "Tis-ci es li max recent public postas de persones che li social retage quem gente che {domain} seque.",
|
||||
"domain_block_modal.block": "Bloccar servitor",
|
||||
"domain_block_modal.block_account_instead": "Altrimen, bloccar @{name}",
|
||||
"domain_block_modal.they_can_interact_with_old_posts": "Persones de ti servitor posse interacter con tui old postas.",
|
||||
"domain_block_modal.they_cant_follow": "Nequi de ti-ci servitor posse sequer te.",
|
||||
"domain_pill.activitypub_like_language": "ActivityPub es li lingue usat de Mastodon por parlar con altri social retages.",
|
||||
"domain_pill.server": "Servitor",
|
||||
"domain_pill.their_handle": "Identificator:",
|
||||
"domain_pill.their_server": "Su digital hem e omni su postas.",
|
||||
"domain_pill.username": "Usator-nómine",
|
||||
"domain_pill.whats_in_a_handle": "Ex quo consiste un identificator?",
|
||||
"domain_pill.your_handle": "Tui identificator:",
|
||||
"embed.instructions": "Inbedar ti-ci posta per copiar li code in infra.",
|
||||
"embed.preview": "Vi qualmen it va aspecter:",
|
||||
"emoji_button.activity": "Activitá",
|
||||
|
|
@ -242,6 +255,7 @@
|
|||
"empty_column.list": "Ancor ne hay quocunc in ti-ci liste. Quande membres de ti-ci liste publica nov postas, ili va aparir ci.",
|
||||
"empty_column.lists": "Tu ancor have null listes. Quande tu crea un, it va aparir ci.",
|
||||
"empty_column.mutes": "Tu ancor ha silentiat null usatores.",
|
||||
"empty_column.notification_requests": "Omnicos clar! Hay necos ci. Nov notificationes va venir ci quande tu recive les secun tui parametres.",
|
||||
"empty_column.notifications": "Tu have null notificationes. Quande altri persones interacte con te, tu va vider it ci.",
|
||||
"empty_column.public": "Hay nullcos ci! Scri alquo publicmen, o manualmen seque usatores de altri servitores por plenar to-ci",
|
||||
"error.unexpected_crash.explanation": "Pro un error in nor code o un problema de compatibilitá in li navigator, ti-ci págine ne posset esser monstrat correctmen.",
|
||||
|
|
@ -272,6 +286,9 @@
|
|||
"filter_modal.select_filter.subtitle": "Usar un existent categorie o crear nov",
|
||||
"filter_modal.select_filter.title": "Filtrar ti-ci posta",
|
||||
"filter_modal.title.status": "Filtrar un posta",
|
||||
"filtered_notifications_banner.pending_requests": "Notificationes de {count, plural, =0 {nequi} one {un person} other {# persones}} quel tu possibilmen conosse",
|
||||
"filtered_notifications_banner.private_mentions": "{count, plural, one {privat mention} other {privat mentiones}}",
|
||||
"filtered_notifications_banner.title": "Filtrat notificationes",
|
||||
"firehose.all": "Omno",
|
||||
"firehose.local": "Ti-ci servitor",
|
||||
"firehose.remote": "Altri servitores",
|
||||
|
|
@ -400,6 +417,13 @@
|
|||
"loading_indicator.label": "Cargant…",
|
||||
"media_gallery.toggle_visible": "{number, plural, one {Celar image} other {Celar images}}",
|
||||
"moved_to_account_banner.text": "Tui conto {disabledAccount} es actualmen desactivisat pro que tu movet te a {movedToAccount}.",
|
||||
"mute_modal.hide_from_notifications": "Celar de notificationes",
|
||||
"mute_modal.hide_options": "Celar optiones",
|
||||
"mute_modal.indefinite": "Til quande yo dessilentia li usator",
|
||||
"mute_modal.show_options": "Monstrar optiones",
|
||||
"mute_modal.they_can_mention_and_follow": "Posse mentionar e sequer te, ma va esser ínvisibil a te.",
|
||||
"mute_modal.they_wont_know": "Ne va esser conscient pri li silentation.",
|
||||
"mute_modal.title": "Silentiar usator?",
|
||||
"navigation_bar.about": "Information",
|
||||
"navigation_bar.advanced_interface": "Aperter in li web-interfacie avansat",
|
||||
"navigation_bar.blocks": "Bloccat usatores",
|
||||
|
|
@ -435,14 +459,20 @@
|
|||
"notification.own_poll": "Tui balotation ha finit",
|
||||
"notification.poll": "Un balotation in quel tu votat ha finit",
|
||||
"notification.reblog": "{name} boostat tui posta",
|
||||
"notification.relationships_severance_event.learn_more": "Aprender plu",
|
||||
"notification.status": "{name} just postat",
|
||||
"notification.update": "{name} modificat un posta",
|
||||
"notification_requests.accept": "Acceptar",
|
||||
"notification_requests.dismiss": "Demisser",
|
||||
"notification_requests.notifications_from": "Notificationes de {name}",
|
||||
"notification_requests.title": "Filtrat notificationes",
|
||||
"notifications.clear": "Aclarar notificationes",
|
||||
"notifications.clear_confirmation": "Vole tu vermen permanentmen aclarar omni tui notificationes?",
|
||||
"notifications.column_settings.admin.report": "Nov raportas:",
|
||||
"notifications.column_settings.admin.sign_up": "Nov registrationes:",
|
||||
"notifications.column_settings.alert": "Notificationes sur li computator",
|
||||
"notifications.column_settings.favourite": "Favorites:",
|
||||
"notifications.column_settings.filter_bar.advanced": "Monstrar omni categories",
|
||||
"notifications.column_settings.follow": "Nov sequitores:",
|
||||
"notifications.column_settings.follow_request": "Nov petitiones de sequer:",
|
||||
"notifications.column_settings.mention": "Mentiones:",
|
||||
|
|
@ -468,6 +498,15 @@
|
|||
"notifications.permission_denied": "Notificationes sur li computator es índisponibil pro que on ha previamen rejectet un petition por navigator-permissiones",
|
||||
"notifications.permission_denied_alert": "Notificationes sur li computator ne posse esser activisat, pro que navigator-permission ha esset previamen rejectet",
|
||||
"notifications.permission_required": "Notificationes sur li computator es índisponibil pro que li besonat permission ne ha esset dat.",
|
||||
"notifications.policy.filter_new_accounts.hint": "Creat durant li passat {days, plural, one {un die} other {# dies}}",
|
||||
"notifications.policy.filter_new_accounts_title": "Nov contos",
|
||||
"notifications.policy.filter_not_followers_hint": "Includente tis qui ha sequet te minu quam {days, plural, one {un die} other {# dies}}",
|
||||
"notifications.policy.filter_not_followers_title": "Persones qui ne seque te",
|
||||
"notifications.policy.filter_not_following_hint": "Til quande tu manualmen aproba",
|
||||
"notifications.policy.filter_not_following_title": "Persones queles tu ne seque",
|
||||
"notifications.policy.filter_private_mentions_hint": "Filtrat except si it es un response a tui propri mention o si tu seque li missor",
|
||||
"notifications.policy.filter_private_mentions_title": "Ínsolicitat privat mentiones",
|
||||
"notifications.policy.title": "Filtrar notificationes de…",
|
||||
"notifications_permission_banner.enable": "Activisar notificationes sur li computator",
|
||||
"notifications_permission_banner.how_to_control": "Por reciver notificationes quande Mastodon ne es apert, activisa notificationes sur li computator. Tu posse decider precisimen quel species de interactiones genera notificationes per li buton {icon} in-supra quande ili es activisat.",
|
||||
"notifications_permission_banner.title": "Nequande preterlassa quocunc",
|
||||
|
|
@ -644,9 +683,11 @@
|
|||
"status.direct": "Privatmen mentionar @{name}",
|
||||
"status.direct_indicator": "Privat mention",
|
||||
"status.edit": "Modificar",
|
||||
"status.edited": "Ultimmen actualisat ye {date}",
|
||||
"status.edited_x_times": "Modificat {count, plural, one {{count} vez} other {{count} vezes}}",
|
||||
"status.embed": "Inbedar",
|
||||
"status.favourite": "Favoritisar",
|
||||
"status.favourites": "{count, plural, one {favorit} other {favorites}}",
|
||||
"status.filter": "Filtrar ti-ci posta",
|
||||
"status.filtered": "Filtrat",
|
||||
"status.hide": "Celar posta",
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@
|
|||
"confirmations.delete.confirm": "Elimina",
|
||||
"confirmations.delete.message": "Sei sicuro di voler eliminare questo post?",
|
||||
"confirmations.delete_list.confirm": "Elimina",
|
||||
"confirmations.delete_list.message": "Sei sicuro di voler eliminare permanentemente questa lista?",
|
||||
"confirmations.delete_list.message": "Sei sicuro/a di voler eliminare permanentemente questo elenco?",
|
||||
"confirmations.discard_edit_media.confirm": "Scarta",
|
||||
"confirmations.discard_edit_media.message": "Hai delle modifiche non salvate alla descrizione o anteprima del media, scartarle comunque?",
|
||||
"confirmations.domain_block.confirm": "Blocca il server",
|
||||
|
|
@ -263,8 +263,8 @@
|
|||
"empty_column.followed_tags": "Non hai ancora seguito alcun hashtag. Quando lo farai, appariranno qui.",
|
||||
"empty_column.hashtag": "Non c'è ancora nulla in questo hashtag.",
|
||||
"empty_column.home": "La cronologia della tua home è vuota! Segui altre persone per riempirla. {suggestions}",
|
||||
"empty_column.list": "Non c'è ancora nulla in questa lista. Quando i membri di questa lista pubblicheranno dei nuovi post, appariranno qui.",
|
||||
"empty_column.lists": "Non hai ancora alcuna lista. Quando ne creerai una, apparirà qui.",
|
||||
"empty_column.list": "Non c'è ancora nulla in questo elenco. Quando i membri di questo elenco pubblicheranno nuovi post, appariranno qui.",
|
||||
"empty_column.lists": "Non hai ancora nessun elenco. Quando ne creerai uno, apparirà qui.",
|
||||
"empty_column.mutes": "Non hai ancora silenziato alcun utente.",
|
||||
"empty_column.notification_requests": "Tutto chiaro! Non c'è niente qui. Quando ricevi nuove notifiche, verranno visualizzate qui in base alle tue impostazioni.",
|
||||
"empty_column.notifications": "Non hai ancora nessuna notifica. Quando altre persone interagiranno con te, le vedrai qui.",
|
||||
|
|
@ -410,20 +410,20 @@
|
|||
"limited_account_hint.action": "Mostra comunque il profilo",
|
||||
"limited_account_hint.title": "Questo profilo è stato nascosto dai moderatori di {domain}.",
|
||||
"link_preview.author": "Di {name}",
|
||||
"lists.account.add": "Aggiungi alla lista",
|
||||
"lists.account.remove": "Togli dalla lista",
|
||||
"lists.delete": "Elimina lista",
|
||||
"lists.edit": "Modifica lista",
|
||||
"lists.account.add": "Aggiungi all'elenco",
|
||||
"lists.account.remove": "Rimuovi dall'elenco",
|
||||
"lists.delete": "Elimina elenco",
|
||||
"lists.edit": "Modifica elenco",
|
||||
"lists.edit.submit": "Cambia il titolo",
|
||||
"lists.exclusive": "Nascondi questi post dalla home",
|
||||
"lists.new.create": "Aggiungi lista",
|
||||
"lists.new.title_placeholder": "Titolo della nuova lista",
|
||||
"lists.new.title_placeholder": "Titolo del nuovo elenco",
|
||||
"lists.replies_policy.followed": "Qualsiasi utente seguito",
|
||||
"lists.replies_policy.list": "Membri della lista",
|
||||
"lists.replies_policy.list": "Membri dell'elenco",
|
||||
"lists.replies_policy.none": "Nessuno",
|
||||
"lists.replies_policy.title": "Mostra risposte a:",
|
||||
"lists.search": "Cerca tra le persone che segui",
|
||||
"lists.subheading": "Le tue liste",
|
||||
"lists.subheading": "I tuoi elenchi",
|
||||
"load_pending": "{count, plural, one {# nuovo oggetto} other {# nuovi oggetti}}",
|
||||
"loading_indicator.label": "Caricamento…",
|
||||
"media_gallery.toggle_visible": "{number, plural, one {Nascondi immagine} other {Nascondi immagini}}",
|
||||
|
|
|
|||
|
|
@ -304,6 +304,19 @@
|
|||
"domain_block_modal.title": "ドメインをブロックしますか？",
|
||||
"domain_block_modal.you_will_lose_followers": "このサーバーのフォロワーはすべてフォロー解除されます。",
|
||||
"domain_block_modal.you_wont_see_posts": "このサーバーのユーザーからの投稿や通知が閲覧できなくなります。",
|
||||
"domain_pill.activitypub_lets_connect": "Mastodonからほかのソーシャルアプリのユーザーへ、そのまた別のアプリのユーザーへと、それぞれが互いにつながり関わり合うことをこのActivityPubの仕組みが実現しています。",
|
||||
"domain_pill.activitypub_like_language": "ActivityPubとは、Mastodonがほかのサーバーと会話をするときにしゃべる「言葉」のようなものです。",
|
||||
"domain_pill.server": "サーバー",
|
||||
"domain_pill.their_handle": "このユーザーのユーザーID:",
|
||||
"domain_pill.their_server": "ユーザーの仮想の住所です。そのユーザーIDによるすべての投稿を保持しています。",
|
||||
"domain_pill.their_username": "ユーザーを識別する名前です。ユーザー名はひとつのサーバー内においては唯一無二の名前ですが、ほかのサーバーには同名のユーザーがいることもあります。",
|
||||
"domain_pill.username": "ユーザー名",
|
||||
"domain_pill.whats_in_a_handle": "ユーザーIDについて",
|
||||
"domain_pill.who_they_are": "そのユーザーが「誰であるか」「どこに住んでいるか」はユーザーIDから知ることができます。これにより<button>いくつものActivityPub対応のプラットフォーム</button>の集まりからなるネットワークを介してそれぞれのユーザーと関わり合うことができます。",
|
||||
"domain_pill.who_you_are": "ほかのユーザーはあなたが「誰であるか」「どこに住んでいるか」をユーザーIDから認識でき、これにより<button>いくつものActivityPub対応のプラットフォーム</button>の集まりからなるネットワークを介してあなたと関わり合うことができます。",
|
||||
"domain_pill.your_handle": "あなたのユーザーID:",
|
||||
"domain_pill.your_server": "あなたの仮想の住所です。投稿した内容はすべてここに保持されます。もし今いるサーバーが気に入っていない場合は、フォロワーを引き継いで別のサーバーに引っ越すこともできます。",
|
||||
"domain_pill.your_username": "あなたを識別する名前です。ユーザー名はひとつのサーバー内においては唯一無二の名前ですが、ほかのサーバーには同名のユーザーがいることもあります。",
|
||||
"embed.instructions": "下記のコードをコピーしてウェブサイトに埋め込みます。",
|
||||
"embed.preview": "表示例:",
|
||||
"emoji_button.activity": "活動",
|
||||
|
|
|
|||
|
|
@ -457,6 +457,7 @@
|
|||
"notification.own_poll": "Tu anketa eskapo",
|
||||
"notification.poll": "Anketa en ke votates eskapo",
|
||||
"notification.reblog": "{name} repartajo tu publikasyon",
|
||||
"notification.relationships_severance_event.learn_more": "Ambezate mas",
|
||||
"notification.status": "{name} publiko algo",
|
||||
"notification.update": "{name} edito una publikasyon",
|
||||
"notification_requests.accept": "Acheta",
|
||||
|
|
@ -469,6 +470,8 @@
|
|||
"notifications.column_settings.admin.sign_up": "Muevas enrejistrasyones:",
|
||||
"notifications.column_settings.alert": "Avizos de ensimameza",
|
||||
"notifications.column_settings.favourite": "Te plazen:",
|
||||
"notifications.column_settings.filter_bar.advanced": "Amostra todas las kategorias",
|
||||
"notifications.column_settings.filter_bar.category": "Vara de filtrado rapido",
|
||||
"notifications.column_settings.follow": "Muevos suivantes:",
|
||||
"notifications.column_settings.follow_request": "Muevas solisitudes de segimiento:",
|
||||
"notifications.column_settings.mention": "Enmentaduras:",
|
||||
|
|
|
|||
|
|
@ -89,6 +89,14 @@
|
|||
"announcement.announcement": "Объявление",
|
||||
"attachments_list.unprocessed": "(не обработан)",
|
||||
"audio.hide": "Скрыть аудио",
|
||||
"block_modal.remote_users_caveat": "Мы попросим сервер {domain} уважать ваше решение. Однако, соблюдение требований не гарантировано, поскольку некоторые серверы могут работать с блокировками по-разному. Публичные записи по-прежнему могут быть видны неавторизованным пользователям.",
|
||||
"block_modal.show_less": "Показать меньше",
|
||||
"block_modal.show_more": "Показать больше",
|
||||
"block_modal.they_cant_mention": "Он не может упоминать или подписываться на вас.",
|
||||
"block_modal.they_cant_see_posts": "Он не может видеть ваши сообщения, и вы не увидите его.",
|
||||
"block_modal.they_will_know": "Он может видеть, что он заблокирован.",
|
||||
"block_modal.title": "Заблокировать пользователя?",
|
||||
"block_modal.you_wont_see_mentions": "Вы не увидите записи, которые упоминают его.",
|
||||
"boost_modal.combo": "{combo}, чтобы пропустить это в следующий раз",
|
||||
"bundle_column_error.copy_stacktrace": "Скопировать отчет об ошибке",
|
||||
"bundle_column_error.error.body": "Запрошенная страница не может быть отображена. Это может быть вызвано ошибкой в нашем коде или проблемой совместимости браузера.",
|
||||
|
|
@ -169,6 +177,7 @@
|
|||
"confirmations.delete_list.message": "Вы действительно хотите навсегда удалить этот список?",
|
||||
"confirmations.discard_edit_media.confirm": "Отменить",
|
||||
"confirmations.discard_edit_media.message": "У вас есть несохранённые изменения описания мультимедиа или предпросмотра, отменить их?",
|
||||
"confirmations.domain_block.confirm": "Заблокировать сервер",
|
||||
"confirmations.domain_block.message": "Вы точно уверены, что хотите заблокировать {domain} полностью? В большинстве случаев нескольких блокировок и игнорирований вполне достаточно. Вы перестанете видеть публичную ленту и уведомления оттуда. Ваши подписчики из этого домена будут удалены.",
|
||||
"confirmations.edit.confirm": "Редактировать",
|
||||
"confirmations.edit.message": "В данный момент, редактирование перезапишет составляемое вами сообщение. Вы уверены, что хотите продолжить?",
|
||||
|
|
@ -200,6 +209,27 @@
|
|||
"dismissable_banner.explore_statuses": "Эти сообщения со связанных серверов сети сейчас набирают популярность.",
|
||||
"dismissable_banner.explore_tags": "Эти хэштеги привлекают людей на этом и других серверах децентрализованной сети прямо сейчас.",
|
||||
"dismissable_banner.public_timeline": "Это самые последние публичные сообщения от людей в социальной сети, за которыми подписались пользователи {domain}.",
|
||||
"domain_block_modal.block": "Заблокировать сервер",
|
||||
"domain_block_modal.block_account_instead": "Заблокировать @{name} вместо",
|
||||
"domain_block_modal.they_can_interact_with_old_posts": "Люди с этого сервера могут взаимодействовать с вашими старыми записями.",
|
||||
"domain_block_modal.they_cant_follow": "Никто из этого сервера не может подписываться на вас.",
|
||||
"domain_block_modal.they_wont_know": "Он не будет знать, что его заблокировали.",
|
||||
"domain_block_modal.title": "Заблокировать домен?",
|
||||
"domain_block_modal.you_will_lose_followers": "Все ваши подписчики с этого сервера будут удалены.",
|
||||
"domain_block_modal.you_wont_see_posts": "Вы не будете видеть записи или уведомления от пользователей на этом сервере.",
|
||||
"domain_pill.activitypub_lets_connect": "Это позволяет вам общаться и взаимодействовать с людьми не только на Mastodon, но и в различных социальных приложениях.",
|
||||
"domain_pill.activitypub_like_language": "ActivityPub как язык Mastodon говорит с другими социальными сетями.",
|
||||
"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": "Поскольку бейджи говорят о том, кто и где находится, вы можете взаимодействовать с людьми в социальной сети <button>платформ, работающих на платформе ActivityPub</button>.",
|
||||
"domain_pill.who_you_are": "Поскольку ваш бейдж говорит о том, кто вы и где находитесь, люди могут взаимодействовать с вами через социальную сеть <button>платформ, работающих на платформе ActivityPub</button>.",
|
||||
"domain_pill.your_handle": "Ваш бейдж:",
|
||||
"domain_pill.your_server": "Сервер, где живут все ваши посты. Этот не нравится? Поменяй сервер в любое время вместе со своими подписчиками.",
|
||||
"domain_pill.your_username": "Ваш уникальный идентификатор на этом сервере. Вы можете найти пользователей с одним именем пользователя на разных серверах.",
|
||||
"embed.instructions": "Встройте этот пост на свой сайт, скопировав следующий код:",
|
||||
"embed.preview": "Так это будет выглядеть:",
|
||||
"emoji_button.activity": "Занятия",
|
||||
|
|
@ -236,6 +266,7 @@
|
|||
"empty_column.list": "В этом списке пока ничего нет.",
|
||||
"empty_column.lists": "У вас ещё нет списков. Созданные вами списки будут показаны здесь.",
|
||||
"empty_column.mutes": "Вы ещё никого не добавляли в список игнорируемых.",
|
||||
"empty_column.notification_requests": "Здесь ничего нет! Когда вы получите новые уведомления, они здесь появятся согласно вашим настройкам.",
|
||||
"empty_column.notifications": "У вас пока нет уведомлений. Взаимодействуйте с другими, чтобы завести разговор.",
|
||||
"empty_column.public": "Здесь ничего нет! Опубликуйте что-нибудь или подпишитесь на пользователей с других узлов, чтобы заполнить ленту",
|
||||
"error.unexpected_crash.explanation": "Из-за несовместимого браузера или ошибки в нашем коде, эта страница не может быть корректно отображена.",
|
||||
|
|
@ -266,13 +297,22 @@
|
|||
"filter_modal.select_filter.subtitle": "Используйте существующую категорию или создайте новую",
|
||||
"filter_modal.select_filter.title": "Фильтровать этот пост",
|
||||
"filter_modal.title.status": "Фильтровать пост",
|
||||
"filtered_notifications_banner.pending_requests": "Уведомления от {count, plural, =0 {никого} one {# человека} other {# других людей, с кем вы можете быть знакомы}}",
|
||||
"filtered_notifications_banner.private_mentions": "{count, plural, one {личное упоминание} other {личные упоминания}}",
|
||||
"filtered_notifications_banner.title": "Отфильтрованные уведомления",
|
||||
"firehose.all": "Все",
|
||||
"firehose.local": "Текущий сервер",
|
||||
"firehose.remote": "Другие серверы",
|
||||
"follow_request.authorize": "Авторизовать",
|
||||
"follow_request.reject": "Отказать",
|
||||
"follow_requests.unlocked_explanation": "Хотя ваша учетная запись не закрыта, команда {domain} подумала, что вы захотите просмотреть запросы от этих учетных записей вручную.",
|
||||
"follow_suggestions.curated_suggestion": "Выбор администрации",
|
||||
"follow_suggestions.dismiss": "Больше не показывать",
|
||||
"follow_suggestions.hints.featured": "Этот профиль был вручную выбран командой {domain}.",
|
||||
"follow_suggestions.hints.friends_of_friends": "Этот профиль популярен среди людей, на которых вы подписаны.",
|
||||
"follow_suggestions.hints.most_followed": "Этот профиль один из самых отслеживаемых на {domain}.",
|
||||
"follow_suggestions.hints.most_interactions": "Этот профиль в последнее время привлекает много внимания на {domain}.",
|
||||
"follow_suggestions.hints.similar_to_recently_followed": "Этот профиль похож на другие профили, на которые вы подписывались в последнее время.",
|
||||
"follow_suggestions.personalized_suggestion": "Персонализированное предложение",
|
||||
"follow_suggestions.popular_suggestion": "Популярное предложение",
|
||||
"follow_suggestions.view_all": "Посмотреть все",
|
||||
|
|
@ -388,6 +428,15 @@
|
|||
"loading_indicator.label": "Загрузка…",
|
||||
"media_gallery.toggle_visible": "Показать/скрыть {number, plural, =1 {изображение} other {изображения}}",
|
||||
"moved_to_account_banner.text": "Ваша учетная запись {disabledAccount} в настоящее время заморожена, потому что вы переехали на {movedToAccount}.",
|
||||
"mute_modal.hide_from_notifications": "Скрыть из уведомлений",
|
||||
"mute_modal.hide_options": "Скрыть параметры",
|
||||
"mute_modal.indefinite": "Пока я не разблокирую их",
|
||||
"mute_modal.show_options": "Показать опции",
|
||||
"mute_modal.they_can_mention_and_follow": "Они могут упоминать и следить за вами, но вы не будете их видеть.",
|
||||
"mute_modal.they_wont_know": "Они не будут знать, что их заглушили.",
|
||||
"mute_modal.title": "Заглушить пользователя?",
|
||||
"mute_modal.you_wont_see_mentions": "Вы не увидите постов, которые их упоминают.",
|
||||
"mute_modal.you_wont_see_posts": "Они по-прежнему смогут видеть ваши посты, но вы не сможете видеть их посты.",
|
||||
"navigation_bar.about": "О проекте",
|
||||
"navigation_bar.advanced_interface": "Включить многоколоночный интерфейс",
|
||||
"navigation_bar.blocks": "Заблокированные пользователи",
|
||||
|
|
@ -423,8 +472,17 @@
|
|||
"notification.own_poll": "Ваш опрос закончился",
|
||||
"notification.poll": "Опрос, в котором вы приняли участие, завершился",
|
||||
"notification.reblog": "{name} продвинул(а) ваш пост",
|
||||
"notification.relationships_severance_event": "Потеряно соединение с {name}",
|
||||
"notification.relationships_severance_event.account_suspension": "Администратор {from} заблокировал {target}, что означает, что вы больше не сможете получать обновления от них или взаймодествовать с ними.",
|
||||
"notification.relationships_severance_event.domain_block": "Администратор {from} заблокировал {target} включая {followersCount} ваших подписчиков и {followingCount, plural, one {# аккаунт} few {# аккаунта} other {# аккаунтов}}, на которые вы подписаны.",
|
||||
"notification.relationships_severance_event.learn_more": "Узнать больше",
|
||||
"notification.relationships_severance_event.user_domain_block": "Вы заблокировали {target} включая {followersCount} ваших подписчиков и {followingCount, plural, one {# аккаунт} few {# аккаунта} other {# аккаунтов}}, на которые вы подписаны.",
|
||||
"notification.status": "{name} только что запостил",
|
||||
"notification.update": "{name} изменил(а) пост",
|
||||
"notification_requests.accept": "Принять",
|
||||
"notification_requests.dismiss": "Отклонить",
|
||||
"notification_requests.notifications_from": "Уведомления от {name}",
|
||||
"notification_requests.title": "Отфильтрованные уведомления",
|
||||
"notifications.clear": "Очистить уведомления",
|
||||
"notifications.clear_confirmation": "Вы уверены, что хотите очистить все уведомления?",
|
||||
"notifications.column_settings.admin.report": "Новые жалобы:",
|
||||
|
|
|
|||
|
|
@ -220,8 +220,15 @@
|
|||
"domain_pill.activitypub_lets_connect": "Det låter dig ansluta och interagera med människor inte bara på Mastodon, men även på andra sociala appar.",
|
||||
"domain_pill.activitypub_like_language": "ActivityPub är som språket Mastodon talar med andra sociala nätverk.",
|
||||
"domain_pill.server": "Server",
|
||||
"domain_pill.their_handle": "Deras handtag:",
|
||||
"domain_pill.their_server": "Deras digitala hem, där alla deras tjänster bor.",
|
||||
"domain_pill.their_username": "Deras unika identifierare på deras server. Det är möjligt att hitta användare med samma användarnamn på olika servrar.",
|
||||
"domain_pill.username": "Användarnamn",
|
||||
"domain_pill.whats_in_a_handle": "Vad finns i ett handtag?",
|
||||
"domain_pill.who_they_are": "Eftersom handtag säger vem någon är och var de är, kan du interagera med människor på det sociala nätet av <button>ActivityPub-drivna plattformar</button>.",
|
||||
"domain_pill.who_you_are": "Eftersom handtag säger vem någon är och var de är, kan människor interagera med dig på det sociala nätet av <button>ActivityPub-drivna plattformar</button>.",
|
||||
"domain_pill.your_handle": "Ditt handtag:",
|
||||
"domain_pill.your_server": "Ditt digitala hem, där alla dina inlägg bor. Gillar du inte just denna? Byt server när som helst och ta med dina anhängare också.",
|
||||
"domain_pill.your_username": "Din unika identifierare på denna server. Det är möjligt att hitta användare med samma användarnamn på olika servrar.",
|
||||
"embed.instructions": "Bädda in detta inlägg på din webbplats genom att kopiera koden nedan.",
|
||||
"embed.preview": "Så här kommer det att se ut:",
|
||||
|
|
@ -259,6 +266,7 @@
|
|||
"empty_column.list": "Det finns inget i denna lista än. När listmedlemmar publicerar nya inlägg kommer de synas här.",
|
||||
"empty_column.lists": "Du har inga listor än. När skapar en kommer den dyka upp här.",
|
||||
"empty_column.mutes": "Du har ännu inte tystat några användare.",
|
||||
"empty_column.notification_requests": "Allt klart! Det finns inget mer här. När du får nya meddelanden visas de här enligt dina inställningar.",
|
||||
"empty_column.notifications": "Du har inga meddelanden än. Interagera med andra för att starta konversationen.",
|
||||
"empty_column.public": "Det finns inget här! Skriv något offentligt, eller följ manuellt användarna från andra instanser för att fylla på det",
|
||||
"error.unexpected_crash.explanation": "På grund av en bugg i vår kod eller kompatiblitetsproblem i webbläsaren kan den här sidan inte visas korrekt.",
|
||||
|
|
@ -289,6 +297,9 @@
|
|||
"filter_modal.select_filter.subtitle": "Använd en befintlig kategori eller skapa en ny",
|
||||
"filter_modal.select_filter.title": "Filtrera detta inlägg",
|
||||
"filter_modal.title.status": "Filtrera ett inlägg",
|
||||
"filtered_notifications_banner.pending_requests": "Aviseringar från {count, plural, =0 {ingen} one {en person} other {# personer}} du kanske känner",
|
||||
"filtered_notifications_banner.private_mentions": "{count, plural, one {privat omnämnande} other {privat omnämnande}}",
|
||||
"filtered_notifications_banner.title": "Filtrerade aviseringar",
|
||||
"firehose.all": "Allt",
|
||||
"firehose.local": "Denna server",
|
||||
"firehose.remote": "Andra servrar",
|
||||
|
|
@ -417,7 +428,9 @@
|
|||
"loading_indicator.label": "Laddar…",
|
||||
"media_gallery.toggle_visible": "Växla synlighet",
|
||||
"moved_to_account_banner.text": "Ditt konto {disabledAccount} är för närvarande inaktiverat eftersom du flyttat till {movedToAccount}.",
|
||||
"mute_modal.hide_from_notifications": "Dölj från aviseringslistan",
|
||||
"mute_modal.hide_options": "Dölj alternativ",
|
||||
"mute_modal.indefinite": "Tills jag avtystar dem",
|
||||
"mute_modal.show_options": "Visa alternativ",
|
||||
"mute_modal.they_can_mention_and_follow": "De kan nämna och följa dig, men du ser dem inte.",
|
||||
"mute_modal.they_wont_know": "De vet inte att de har blivit tysta.",
|
||||
|
|
@ -459,6 +472,9 @@
|
|||
"notification.own_poll": "Din röstning har avslutats",
|
||||
"notification.poll": "En omröstning du röstat i har avslutats",
|
||||
"notification.reblog": "{name} boostade ditt inlägg",
|
||||
"notification.relationships_severance_event": "Förlorade kontakter med {name}",
|
||||
"notification.relationships_severance_event.account_suspension": "En administratör från {from} har stängt av {target}, vilket innebär att du inte längre kan ta emot uppdateringar från dem eller interagera med dem.",
|
||||
"notification.relationships_severance_event.domain_block": "En administratör från {from} har blockerat {target}, inklusive {followersCount} av dina följare och {followingCount, plural, one {# konto} other {# konton}} du följer.",
|
||||
"notification.relationships_severance_event.learn_more": "Läs mer",
|
||||
"notification.status": "{name} publicerade just ett inlägg",
|
||||
"notification.update": "{name} redigerade ett inlägg",
|
||||
|
|
|
|||
|
|
@ -730,7 +730,7 @@
|
|||
"status.reblogs.empty": "還沒有人轉嘟過這則嘟文。當有人轉嘟時，它將於此顯示。",
|
||||
"status.redraft": "刪除並重新編輯",
|
||||
"status.remove_bookmark": "移除書籤",
|
||||
"status.replied_to": "回覆給 {name}",
|
||||
"status.replied_to": "回覆 {name}",
|
||||
"status.reply": "回覆",
|
||||
"status.replyAll": "回覆討論串",
|
||||
"status.report": "檢舉 @{name}",
|
||||
|
|
|
|||
|
|
@ -1,15 +1,4 @@
|
|||
export type StatusVisibility =
|
||||
| 'public'
|
||||
| 'unlisted'
|
||||
| 'private'
|
||||
| 'direct'
|
||||
| 'public_unlisted'
|
||||
| 'login'
|
||||
| 'mutual'
|
||||
| 'circle'
|
||||
| 'personal'
|
||||
| 'reply'
|
||||
| 'limited';
|
||||
export type { StatusVisibility } from 'mastodon/api_types/statuses';
|
||||
|
||||
// Temporary until we type it correctly
|
||||
export type Status = Immutable.Map<string, unknown>;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,8 @@ function isActionWithmaybeAlertParams(
|
|||
return isAction(action);
|
||||
}
|
||||
|
||||
export const errorsMiddleware: Middleware<Record<string, never>, RootState> =
|
||||
// eslint-disable-next-line @typescript-eslint/ban-types -- we need to use `{}` here to ensure the dispatch types can be merged
|
||||
export const errorsMiddleware: Middleware<{}, RootState> =
|
||||
({ dispatch }) =>
|
||||
(next) =>
|
||||
(action) => {
|
||||
|
|
|
|||
|
|
@ -51,7 +51,8 @@ const play = (audio: HTMLAudioElement) => {
|
|||
};
|
||||
|
||||
export const soundsMiddleware = (): Middleware<
|
||||
Record<string, never>,
|
||||
// eslint-disable-next-line @typescript-eslint/ban-types -- we need to use `{}` here to ensure the dispatch types can be merged
|
||||
{},
|
||||
RootState
|
||||
> => {
|
||||
const soundCache: Record<string, HTMLAudioElement> = {};
|
||||
|
|
|
|||
|
|
@ -70,10 +70,10 @@ export function roundTo10(num: number): number {
|
|||
return Math.round(num * 0.1) / 0.1;
|
||||
}
|
||||
|
||||
export function toCappedNumber(num: string): string {
|
||||
if (parseInt(num) > 99) {
|
||||
return '99+';
|
||||
export function toCappedNumber(num: number, max = 99): string {
|
||||
if (num > max) {
|
||||
return `${max}+`;
|
||||
} else {
|
||||
return num;
|
||||
return num.toString();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,6 +80,7 @@ html {
|
|||
}
|
||||
|
||||
.search__input,
|
||||
.search__popout,
|
||||
.setting-text,
|
||||
.report-dialog-modal__textarea,
|
||||
.audio-player {
|
||||
|
|
@ -439,7 +440,8 @@ html {
|
|||
.directory__tag > div,
|
||||
.card > a,
|
||||
.page-header,
|
||||
.compose-form .compose-form__warning {
|
||||
.compose-form,
|
||||
.compose-form__warning {
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
|
|
@ -475,12 +477,17 @@ html {
|
|||
color: $white;
|
||||
}
|
||||
|
||||
.compose-form .spoiler-input__input {
|
||||
.compose-form,
|
||||
.spoiler-input__input,
|
||||
.search__input,
|
||||
.search__popout {
|
||||
color: lighten($ui-highlight-color, 8%);
|
||||
}
|
||||
|
||||
.compose-form .autosuggest-textarea__textarea,
|
||||
.compose-form__highlightable,
|
||||
.search__input,
|
||||
.search__popout,
|
||||
.poll__option input[type='text'] {
|
||||
background: darken($ui-base-color, 10%);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10534,9 +10534,10 @@ noscript {
|
|||
}
|
||||
|
||||
.filtered-notifications-banner__badge {
|
||||
background-color: $highlight-text-color;
|
||||
background: $ui-button-background-color;
|
||||
border-radius: 4px;
|
||||
padding: 1px 6px;
|
||||
color: $white;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -163,7 +163,10 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
|
|||
valid = !Admin::NgWord.reject?("#{@params[:spoiler_text]}\n#{@params[:text]}", uri: @params[:uri], target_type: :status, public: @status_parser.distributable_visibility?, stranger: mention_to_local_stranger? || reference_to_local_stranger?) if valid
|
||||
valid = !Admin::NgWord.hashtag_reject?(@tags.size, uri: @params[:uri], target_type: :status, public: @status_parser.distributable_visibility?, text: "#{@params[:spoiler_text]}\n#{@params[:text]}") if valid
|
||||
valid = !Admin::NgWord.mention_reject?(@raw_mention_uris.size, uri: @params[:uri], target_type: :status, public: @status_parser.distributable_visibility?, text: "#{@params[:spoiler_text]}\n#{@params[:text]}") if valid
|
||||
valid = !Admin::NgWord.stranger_mention_reject_with_count?(@raw_mention_uris.size, uri: @params[:uri], target_type: :status, public: @status_parser.distributable_visibility?, text: "#{@params[:spoiler_text]}\n#{@params[:text]}") if valid && (mention_to_local_stranger? || reference_to_local_stranger?)
|
||||
if valid && (mention_to_local_stranger? || reference_to_local_stranger?)
|
||||
valid = !Admin::NgWord.stranger_mention_reject_with_count?(@raw_mention_uris.size, uri: @params[:uri], target_type: :status, public: @status_parser.distributable_visibility?,
|
||||
text: "#{@params[:spoiler_text]}\n#{@params[:text]}")
|
||||
end
|
||||
valid = false if valid && Setting.block_unfollow_account_mention && (mention_to_local_stranger? || reference_to_local_stranger?) && !local_following_sender?
|
||||
|
||||
valid
|
||||
|
|
|
|||
|
|
@ -469,10 +469,10 @@ class FeedManager
|
|||
# @param [List] list
|
||||
# @return [Boolean]
|
||||
def filter_from_list?(status, list)
|
||||
if status.reply? && status.in_reply_to_account_id != status.account_id
|
||||
should_filter = status.in_reply_to_account_id != list.account_id
|
||||
should_filter &&= !list.show_followed?
|
||||
should_filter &&= !(list.show_list? && ListAccount.exists?(list_id: list.id, account_id: status.in_reply_to_account_id))
|
||||
if status.reply? && status.in_reply_to_account_id != status.account_id # Status is a reply to account other than status account
|
||||
should_filter = status.in_reply_to_account_id != list.account_id # Status replies to account id other than list account
|
||||
should_filter &&= !list.show_followed? # List show_followed? is false
|
||||
should_filter &&= !(list.show_list? && ListAccount.exists?(list_id: list.id, account_id: status.in_reply_to_account_id)) # If show_list? true, check for a ListAccount with list and reply to account
|
||||
|
||||
return !!should_filter
|
||||
end
|
||||
|
|
@ -487,7 +487,11 @@ class FeedManager
|
|||
# @param [Hash] crutches
|
||||
# @return [Boolean]
|
||||
def filter_from_tags?(status, receiver_id, crutches)
|
||||
receiver_id == status.account_id || ((crutches[:active_mentions][status.id] || []) + [status.account_id]).any? { |target_account_id| crutches[:blocking][target_account_id] || crutches[:muting][target_account_id] } || crutches[:blocked_by][status.account_id] || crutches[:domain_blocking][status.account.domain]
|
||||
receiver_id == status.account_id || # Receiver is status account?
|
||||
((crutches[:active_mentions][status.id] || []) + [status.account_id]) # For mentioned accounts or status account:
|
||||
.any? { |target_account_id| crutches[:blocking][target_account_id] || crutches[:muting][target_account_id] } || # - Target account is muted or blocked?
|
||||
crutches[:blocked_by][status.account_id] || # Blocked by status account?
|
||||
crutches[:domain_blocking][status.account.domain] # Blocking domain of status account?
|
||||
end
|
||||
|
||||
# Adds a status to an account's feed, returning true if a status was
|
||||
|
|
|
|||
|
|
@ -15,4 +15,6 @@ class UserIp < ApplicationRecord
|
|||
self.primary_key = :user_id
|
||||
|
||||
belongs_to :user
|
||||
|
||||
scope :by_latest_used, -> { order(used_at: :desc) }
|
||||
end
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
|
|||
|
||||
accounts: {
|
||||
max_featured_tags: FeaturedTag::LIMIT,
|
||||
max_pinned_statuses: StatusPinValidator::PIN_LIMIT,
|
||||
},
|
||||
|
||||
statuses: {
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
class REST::MediaAttachmentSerializer < ActiveModel::Serializer
|
||||
include RoutingHelper
|
||||
|
||||
# Please update `app/javascript/mastodon/api_types/media_attachments.ts` when making changes to the attributes
|
||||
|
||||
attributes :id, :type, :url, :preview_url,
|
||||
:remote_url, :preview_remote_url, :text_url, :meta,
|
||||
:description, :blurhash
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ class REST::NotificationPolicySerializer < ActiveModel::Serializer
|
|||
|
||||
def summary
|
||||
{
|
||||
pending_requests_count: object.pending_requests_count.to_s,
|
||||
pending_notifications_count: object.pending_notifications_count.to_s,
|
||||
pending_requests_count: object.pending_requests_count.to_i,
|
||||
pending_notifications_count: object.pending_notifications_count.to_i,
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class REST::PollSerializer < ActiveModel::Serializer
|
||||
# Please update `app/javascript/mastodon/api_types/polls.ts` when making changes to the attributes
|
||||
|
||||
attributes :id, :expires_at, :expired,
|
||||
:multiple, :votes_count, :voters_count
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
class REST::StatusSerializer < ActiveModel::Serializer
|
||||
include FormattingHelper
|
||||
|
||||
# Please update `app/javascript/mastodon/api_types/statuses.ts` when making changes to the attributes
|
||||
|
||||
attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id,
|
||||
:sensitive, :spoiler_text, :visibility, :visibility_ex, :limited_scope, :language,
|
||||
:uri, :url, :replies_count, :reblogs_count, :searchability, :markdown,
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ class BulkImportRowService
|
|||
when :following, :blocking, :muting, :lists
|
||||
target_acct = @data['acct']
|
||||
target_domain = domain(target_acct)
|
||||
@target_account = stoplight_wrap_request(target_domain) { ResolveAccountService.new.call(target_acct, { check_delivery_availability: true }) }
|
||||
@target_account = stoplight_wrapper(target_domain).run { ResolveAccountService.new.call(target_acct, { check_delivery_availability: true }) }
|
||||
return false if @target_account.nil?
|
||||
when :bookmarks
|
||||
target_uri = @data['uri']
|
||||
|
|
@ -18,7 +18,7 @@ class BulkImportRowService
|
|||
@target_status = ActivityPub::TagManager.instance.uri_to_resource(target_uri, Status)
|
||||
return false if @target_status.nil? && ActivityPub::TagManager.instance.local_uri?(target_uri)
|
||||
|
||||
@target_status ||= stoplight_wrap_request(target_domain) { ActivityPub::FetchRemoteStatusService.new.call(target_uri) }
|
||||
@target_status ||= stoplight_wrapper(target_domain).run { ActivityPub::FetchRemoteStatusService.new.call(target_uri) }
|
||||
return false if @target_status.nil?
|
||||
end
|
||||
|
||||
|
|
@ -51,16 +51,15 @@ class BulkImportRowService
|
|||
TagManager.instance.local_domain?(domain) ? nil : TagManager.instance.normalize_domain(domain)
|
||||
end
|
||||
|
||||
def stoplight_wrap_request(domain, &block)
|
||||
def stoplight_wrapper(domain)
|
||||
if domain.present?
|
||||
Stoplight("source:#{domain}", &block)
|
||||
Stoplight("source:#{domain}")
|
||||
.with_fallback { nil }
|
||||
.with_threshold(1)
|
||||
.with_cool_off_time(5.minutes.seconds)
|
||||
.with_error_handler { |error, handle| error.is_a?(HTTP::Error) || error.is_a?(OpenSSL::SSL::SSLError) ? handle.call(error) : raise(error) }
|
||||
.run
|
||||
else
|
||||
yield
|
||||
Stoplight('domain-blank')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -197,7 +197,8 @@ class PostStatusService < BaseService
|
|||
end
|
||||
|
||||
def postprocess_status!
|
||||
@account.user.update!(settings_attributes: { default_privacy: @options[:visibility] }) if @account.user&.setting_stay_privacy && !@status.reply? && %i(public public_unlisted login unlisted private).include?(@status.visibility.to_sym) && @status.visibility.to_s != @account.user&.setting_default_privacy && !@dtl
|
||||
@account.user.update!(settings_attributes: { default_privacy: @options[:visibility] }) if @account.user&.setting_stay_privacy && !@status.reply? && %i(public public_unlisted login unlisted
|
||||
private).include?(@status.visibility.to_sym) && @status.visibility.to_s != @account.user&.setting_default_privacy && !@dtl
|
||||
|
||||
process_hashtags_service.call(@status)
|
||||
Trends.tags.register(@status)
|
||||
|
|
|
|||
|
|
@ -62,13 +62,7 @@
|
|||
%td
|
||||
%time.formatted{ datetime: account.created_at.iso8601, title: l(account.created_at) }= l account.created_at
|
||||
%td
|
||||
- recent_ips = account.user.ips.order(used_at: :desc).to_a
|
||||
- recent_ips.each_with_index do |recent_ip, i|
|
||||
%tr
|
||||
- if i.zero?
|
||||
%th{ rowspan: recent_ips.size }= t('admin.accounts.most_recent_ip')
|
||||
%td= recent_ip.ip
|
||||
%td= table_link_to 'search', t('admin.accounts.search_same_ip'), admin_accounts_path(ip: recent_ip.ip)
|
||||
= render partial: 'admin/accounts/user_ip', collection: account.user.ips.by_latest_used
|
||||
%tr
|
||||
%th= t('admin.accounts.most_recent_activity')
|
||||
%td
|
||||
|
|
|
|||
5
app/views/admin/accounts/_user_ip.html.haml
Normal file
5
app/views/admin/accounts/_user_ip.html.haml
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
%tr
|
||||
- if user_ip_iteration.first?
|
||||
%th{ rowspan: user_ip_iteration.size }= t('admin.accounts.most_recent_ip')
|
||||
%td= user_ip.ip
|
||||
%td= table_link_to 'search', t('admin.accounts.search_same_ip'), admin_accounts_path(ip: user_ip.ip)
|
||||
|
|
@ -59,7 +59,7 @@ class ActivityPub::DeliveryWorker
|
|||
end
|
||||
|
||||
def perform_request
|
||||
light = Stoplight(@inbox_url) do
|
||||
stoplight_wrapper.run do
|
||||
request_pool.with(@host) do |http_client|
|
||||
build_request(http_client).perform do |response|
|
||||
raise Mastodon::UnexpectedResponseError, response unless response_successful?(response) || response_error_unsalvageable?(response)
|
||||
|
|
@ -68,10 +68,12 @@ class ActivityPub::DeliveryWorker
|
|||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
light.with_threshold(STOPLIGHT_FAILURE_THRESHOLD)
|
||||
.with_cool_off_time(STOPLIGHT_COOLDOWN)
|
||||
.run
|
||||
def stoplight_wrapper
|
||||
Stoplight(@inbox_url)
|
||||
.with_threshold(STOPLIGHT_FAILURE_THRESHOLD)
|
||||
.with_cool_off_time(STOPLIGHT_COOLDOWN)
|
||||
end
|
||||
|
||||
def failure_tracker
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ class Import::RelationshipWorker
|
|||
def perform(account_id, target_account_uri, relationship, options)
|
||||
from_account = Account.find(account_id)
|
||||
target_domain = domain(target_account_uri)
|
||||
target_account = stoplight_wrap_request(target_domain) { ResolveAccountService.new.call(target_account_uri, { check_delivery_availability: true }) }
|
||||
target_account = stoplight_wrapper(target_domain).run { ResolveAccountService.new.call(target_account_uri, { check_delivery_availability: true }) }
|
||||
options.symbolize_keys!
|
||||
|
||||
return if target_account.nil?
|
||||
|
|
@ -43,16 +43,15 @@ class Import::RelationshipWorker
|
|||
TagManager.instance.local_domain?(domain) ? nil : TagManager.instance.normalize_domain(domain)
|
||||
end
|
||||
|
||||
def stoplight_wrap_request(domain, &block)
|
||||
def stoplight_wrapper(domain)
|
||||
if domain.present?
|
||||
Stoplight("source:#{domain}", &block)
|
||||
Stoplight("source:#{domain}")
|
||||
.with_fallback { nil }
|
||||
.with_threshold(1)
|
||||
.with_cool_off_time(5.minutes.seconds)
|
||||
.with_error_handler { |error, handle| error.is_a?(HTTP::Error) || error.is_a?(OpenSSL::SSL::SSLError) ? handle.call(error) : raise(error) }
|
||||
.run
|
||||
else
|
||||
yield
|
||||
Stoplight('domain-blank')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue