diff --git a/.github/renovate.json5 b/.github/renovate.json5 index dab99829a1..e92608a437 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -125,6 +125,22 @@ ], groupName: null, // We dont want them to belong to any group }, + { + // Group all RuboCop packages with `rubocop` in the same PR + matchManagers: ['bundler'], + matchPackageNames: ['rubocop'], + matchPackagePrefixes: ['rubocop-'], + matchUpdateTypes: ['patch', 'minor'], + groupName: 'RuboCop (non-major)', + }, + { + // Group all RSpec packages with `rspec` in the same PR + matchManagers: ['bundler'], + matchPackageNames: ['rspec'], + matchPackagePrefixes: ['rspec-'], + matchUpdateTypes: ['patch', 'minor'], + groupName: 'RSpec (non-major)', + }, // Add labels depending on package manager { matchManagers: ['npm', 'nvm'], addLabels: ['javascript'] }, { matchManagers: ['bundler', 'ruby-version'], addLabels: ['ruby'] }, diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml index 7fd259ae01..624c3b7a2f 100644 --- a/.github/workflows/test-ruby.yml +++ b/.github/workflows/test-ruby.yml @@ -114,6 +114,7 @@ jobs: - '3.0' - '3.1' - '.ruby-version' + - '3.3' steps: - uses: actions/checkout@v4 @@ -189,6 +190,7 @@ jobs: - '3.0' - '3.1' - '.ruby-version' + - '3.3' steps: - uses: actions/checkout@v4 @@ -288,6 +290,7 @@ jobs: - '3.0' - '3.1' - '.ruby-version' + - '3.3' search-image: - docker.elastic.co/elasticsearch/elasticsearch:7.17.13 include: diff --git a/.haml-lint.yml b/.haml-lint.yml index b94eb8b0df..2b553ca56c 100644 --- a/.haml-lint.yml +++ b/.haml-lint.yml @@ -1,5 +1,3 @@ -inherits_from: .haml-lint_todo.yml - exclude: - 'vendor/**/*' - lib/templates/haml/scaffold/_form.html.haml diff --git a/Gemfile b/Gemfile index f2cf820b21..5dfaeaba9a 100644 --- a/Gemfile +++ b/Gemfile @@ -58,6 +58,7 @@ gem 'htmlentities', '~> 4.3' gem 'http', '~> 5.1' gem 'http_accept_language', '~> 2.1' gem 'httplog', '~> 1.6.2' +gem 'i18n', '1.14.1' # TODO: Remove version when resolved: https://github.com/glebm/i18n-tasks/issues/552 / https://github.com/ruby-i18n/i18n/pull/688 gem 'idn-ruby', require: 'idn' gem 'inline_svg' gem 'kaminari', '~> 1.2' @@ -89,7 +90,7 @@ gem 'sidekiq-bulk', '~> 0.2.0' gem 'simple-navigation', '~> 4.4' gem 'simple_form', '~> 5.2' gem 'stoplight', '~> 3.0.1' -gem 'strong_migrations', '1.7.0' +gem 'strong_migrations', '1.8.0' gem 'tty-prompt', '~> 0.23', require: false gem 'twitter-text', '~> 3.1.0' gem 'tzinfo-data', '~> 1.2023' diff --git a/Gemfile.lock b/Gemfile.lock index 9c5bb940bc..b341ca84b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,7 +139,7 @@ GEM erubi (~> 1.4) parser (>= 2.4) smart_properties - bigdecimal (3.1.6) + bigdecimal (3.1.7) bindata (2.4.15) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) @@ -213,7 +213,7 @@ GEM devise_pam_authenticatable2 (9.2.0) devise (>= 4.0.0) rpam2 (~> 4.0) - diff-lcs (1.5.0) + diff-lcs (1.5.1) discard (1.3.0) activerecord (>= 4.2, < 8) docile (1.4.0) @@ -225,8 +225,7 @@ GEM dotenv-rails (2.8.1) dotenv (= 2.8.1) railties (>= 3.2) - drb (2.2.0) - ruby2_keywords + drb (2.2.1) ed25519 (1.3.0) elasticsearch (7.13.3) elasticsearch-api (= 7.13.3) @@ -438,7 +437,7 @@ GEM mime-types-data (3.2023.1205) mini_mime (1.1.5) mini_portile2 (2.8.5) - minitest (5.21.2) + minitest (5.22.3) msgpack (1.7.2) multi_json (1.15.0) multipart-post (2.3.0) @@ -500,7 +499,7 @@ GEM openssl-signature_algorithm (1.3.0) openssl (> 2.0) orm_adapter (0.5.0) - ox (2.14.17) + ox (2.14.18) parallel (1.24.0) parser (3.3.0.5) ast (~> 2.4.1) @@ -535,7 +534,7 @@ GEM activesupport (>= 3.0.0) raabro (1.4.0) racc (1.7.3) - rack (2.2.8.1) + rack (2.2.9) rack-attack (6.7.0) rack (>= 1.0, < 4) rack-cors (2.0.2) @@ -583,7 +582,7 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - rails-i18n (7.0.8) + rails-i18n (7.0.9) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) railties (7.1.3.2) @@ -601,7 +600,7 @@ GEM link_header (~> 0.0, >= 0.0.8) rdf-normalize (0.7.0) rdf (~> 3.3) - rdoc (6.6.2) + rdoc (6.6.3.1) psych (>= 4.0.0) redcarpet (3.6.0) redis (4.8.1) @@ -635,21 +634,21 @@ GEM rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (6.1.1) + rspec-rails (6.1.2) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) - rspec-core (~> 3.12) - rspec-expectations (~> 3.12) - rspec-mocks (~> 3.12) - rspec-support (~> 3.12) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) rspec-sidekiq (4.1.0) rspec-core (~> 3.0) rspec-expectations (~> 3.0) rspec-mocks (~> 3.0) sidekiq (>= 5, < 8) rspec-support (3.13.1) - rubocop (1.60.2) + rubocop (1.62.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -657,24 +656,24 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) + rubocop-ast (1.31.2) + parser (>= 3.3.0.4) rubocop-capybara (2.20.0) rubocop (~> 1.41) - rubocop-factory_bot (2.25.0) - rubocop (~> 1.33) + rubocop-factory_bot (2.25.1) + rubocop (~> 1.41) rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.23.1) + rubocop-rails (2.24.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rspec (2.26.1) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rspec (2.27.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -735,7 +734,7 @@ GEM stoplight (3.0.2) redlock (~> 1.0) stringio (3.1.0) - strong_migrations (1.7.0) + strong_migrations (1.8.0) activerecord (>= 5.2) swd (1.3.0) activesupport (>= 3) @@ -866,6 +865,7 @@ DEPENDENCIES http (~> 5.1) http_accept_language (~> 2.1) httplog (~> 1.6.2) + i18n (= 1.14.1) i18n-tasks (~> 1.0) idn-ruby inline_svg @@ -940,7 +940,7 @@ DEPENDENCIES simplecov-lcov (~> 0.8) stackprof stoplight (~> 3.0.1) - strong_migrations (= 1.7.0) + strong_migrations (= 1.8.0) test-prof thor (~> 1.2) tty-prompt (~> 0.23) diff --git a/app/controllers/api/v1/featured_tags/suggestions_controller.rb b/app/controllers/api/v1/featured_tags/suggestions_controller.rb index 76633210a1..4f732ed2d5 100644 --- a/app/controllers/api/v1/featured_tags/suggestions_controller.rb +++ b/app/controllers/api/v1/featured_tags/suggestions_controller.rb @@ -12,6 +12,10 @@ class Api::V1::FeaturedTags::SuggestionsController < Api::BaseController private def set_recently_used_tags - @recently_used_tags = Tag.recently_used(current_account).where.not(id: current_account.featured_tags).limit(10) + @recently_used_tags = Tag.recently_used(current_account).where.not(id: featured_tag_ids).limit(10) + end + + def featured_tag_ids + current_account.featured_tags.pluck(:tag_id) end end diff --git a/app/controllers/severed_relationships_controller.rb b/app/controllers/severed_relationships_controller.rb new file mode 100644 index 0000000000..168e85e3fe --- /dev/null +++ b/app/controllers/severed_relationships_controller.rb @@ -0,0 +1,61 @@ +# frozen_string_literal: true + +class SeveredRelationshipsController < ApplicationController + layout 'admin' + + before_action :authenticate_user! + before_action :set_body_classes + before_action :set_cache_headers + + before_action :set_event, only: [:following, :followers] + + def index + @events = AccountRelationshipSeveranceEvent.where(account: current_account) + end + + def following + respond_to do |format| + format.csv { send_data following_data, filename: "following-#{@event.target_name}-#{@event.created_at.to_date.iso8601}.csv" } + end + end + + def followers + respond_to do |format| + format.csv { send_data followers_data, filename: "followers-#{@event.target_name}-#{@event.created_at.to_date.iso8601}.csv" } + end + end + + private + + def set_event + @event = AccountRelationshipSeveranceEvent.find(params[:id]) + end + + def following_data + CSV.generate(headers: ['Account address', 'Show boosts', 'Notify on new posts', 'Languages'], write_headers: true) do |csv| + @event.severed_relationships.active.about_local_account(current_account).includes(:remote_account).reorder(id: :desc).each do |follow| + csv << [acct(follow.target_account), follow.show_reblogs, follow.notify, follow.languages&.join(', ')] + end + end + end + + def followers_data + CSV.generate(headers: ['Account address'], write_headers: true) do |csv| + @event.severed_relationships.passive.about_local_account(current_account).includes(:remote_account).reorder(id: :desc).each do |follow| + csv << [acct(follow.account)] + end + end + end + + def acct(account) + account.local? ? account.local_username_and_domain : account.acct + end + + def set_body_classes + @body_classes = 'admin' + end + + def set_cache_headers + response.cache_control.replace(private: true, no_store: true) + end +end diff --git a/app/javascript/flavours/glitch/actions/compose.js b/app/javascript/flavours/glitch/actions/compose.js index 2646aa7b02..1dca94ae68 100644 --- a/app/javascript/flavours/glitch/actions/compose.js +++ b/app/javascript/flavours/glitch/actions/compose.js @@ -81,6 +81,7 @@ export const INIT_MEDIA_EDIT_MODAL = 'INIT_MEDIA_EDIT_MODAL'; export const COMPOSE_CHANGE_MEDIA_DESCRIPTION = 'COMPOSE_CHANGE_MEDIA_DESCRIPTION'; export const COMPOSE_CHANGE_MEDIA_FOCUS = 'COMPOSE_CHANGE_MEDIA_FOCUS'; +export const COMPOSE_CHANGE_MEDIA_ORDER = 'COMPOSE_CHANGE_MEDIA_ORDER'; export const COMPOSE_SET_STATUS = 'COMPOSE_SET_STATUS'; export const COMPOSE_FOCUS = 'COMPOSE_FOCUS'; @@ -845,3 +846,9 @@ export function changePollSettings(expiresIn, isMultiple) { isMultiple, }; } + +export const changeMediaOrder = (a, b) => ({ + type: COMPOSE_CHANGE_MEDIA_ORDER, + a, + b, +}); diff --git a/app/javascript/flavours/glitch/components/badge.jsx b/app/javascript/flavours/glitch/components/badge.jsx index 646655c249..5e0b2587bd 100644 --- a/app/javascript/flavours/glitch/components/badge.jsx +++ b/app/javascript/flavours/glitch/components/badge.jsx @@ -7,8 +7,8 @@ import PersonIcon from '@/material-icons/400-24px/person.svg?react'; import SmartToyIcon from '@/material-icons/400-24px/smart_toy.svg?react'; -export const Badge = ({ icon, label, domain }) => ( -
+export const Badge = ({ icon, label, domain, roleId }) => ( +
{icon} {label} {domain && {domain}} @@ -19,6 +19,7 @@ Badge.propTypes = { icon: PropTypes.node, label: PropTypes.node, domain: PropTypes.node, + roleId: PropTypes.string }; Badge.defaultProps = { diff --git a/app/javascript/flavours/glitch/components/column_header.jsx b/app/javascript/flavours/glitch/components/column_header.jsx index c2524b6dd9..0177812480 100644 --- a/app/javascript/flavours/glitch/components/column_header.jsx +++ b/app/javascript/flavours/glitch/components/column_header.jsx @@ -13,7 +13,7 @@ import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react' import CloseIcon from '@/material-icons/400-24px/close.svg?react'; import SettingsIcon from '@/material-icons/400-24px/settings.svg?react'; import { Icon } from 'flavours/glitch/components/icon'; -import { ButtonInTabsBar, useColumnsContext } from 'flavours/glitch/features/ui/util/columns_context'; +import { ButtonInTabsBar } from 'flavours/glitch/features/ui/util/columns_context'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; import { useAppHistory } from './router'; @@ -26,10 +26,9 @@ const messages = defineMessages({ back: { id: 'column_back_button.label', defaultMessage: 'Back' }, }); -const BackButton = ({ pinned, show, onlyIcon }) => { +const BackButton = ({ onlyIcon }) => { const history = useAppHistory(); const intl = useIntl(); - const { multiColumn } = useColumnsContext(); const handleBackClick = useCallback(() => { if (history.location?.state?.fromMastodon) { @@ -39,10 +38,6 @@ const BackButton = ({ pinned, show, onlyIcon }) => { } }, [history]); - const showButton = history && !pinned && ((multiColumn && history.location?.state?.fromMastodon) || show); - - if (!showButton) return null; - return ( ; } - backButton = ; + if (history && !pinned && ((multiColumn && history.location?.state?.fromMastodon) || showBackButton)) { + backButton = ; + } const collapsedContent = [ extraContent, @@ -199,16 +194,16 @@ class ColumnHeader extends PureComponent {

{hasTitle && ( <> - {showBackButton && backButton} + {backButton} )} - {!hasTitle && showBackButton && backButton} + {!hasTitle && backButton}
{extraButton} diff --git a/app/javascript/flavours/glitch/containers/account_container.jsx b/app/javascript/flavours/glitch/containers/account_container.jsx index a134452e77..f171fcc2fe 100644 --- a/app/javascript/flavours/glitch/containers/account_container.jsx +++ b/app/javascript/flavours/glitch/containers/account_container.jsx @@ -13,7 +13,6 @@ import { import { openModal } from '../actions/modal'; import { initMuteModal } from '../actions/mutes'; import Account from '../components/account'; -import { unfollowModal } from '../initial_state'; import { makeGetAccount } from '../selectors'; const messages = defineMessages({ @@ -34,18 +33,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ onFollow (account) { if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) { - if (unfollowModal) { - dispatch(openModal({ - modalType: 'CONFIRM', - modalProps: { - message: @{account.get('acct')} }} />, - confirm: intl.formatMessage(messages.unfollowConfirm), - onConfirm: () => dispatch(unfollowAccount(account.get('id'))), - }, - })); - } else { - dispatch(unfollowAccount(account.get('id'))); - } + dispatch(openModal({ + modalType: 'CONFIRM', + modalProps: { + message: @{account.get('acct')} }} />, + confirm: intl.formatMessage(messages.unfollowConfirm), + onConfirm: () => dispatch(unfollowAccount(account.get('id'))), + }, + })); } else { dispatch(followAccount(account.get('id'))); } diff --git a/app/javascript/flavours/glitch/features/account/components/header.jsx b/app/javascript/flavours/glitch/features/account/components/header.jsx index b97de5aeab..e311936af9 100644 --- a/app/javascript/flavours/glitch/features/account/components/header.jsx +++ b/app/javascript/flavours/glitch/features/account/components/header.jsx @@ -329,7 +329,7 @@ class Header extends ImmutablePureComponent { } account.get('roles', []).forEach((role) => { - badges.push({role.get('name')}} domain={domain} />); + badges.push({role.get('name')}} domain={domain} roleId={role.get('id')} />); }); return ( diff --git a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx b/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx index d42bb2c251..a87c7fd3e4 100644 --- a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx +++ b/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx @@ -19,7 +19,6 @@ import { initDomainBlockModal, unblockDomain } from '../../../actions/domain_blo import { openModal } from '../../../actions/modal'; import { initMuteModal } from '../../../actions/mutes'; import { initReport } from '../../../actions/reports'; -import { unfollowModal } from '../../../initial_state'; import { makeGetAccount, getAccountHidden } from '../../../selectors'; import Header from '../components/header'; @@ -45,31 +44,23 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ onFollow (account) { if (account.getIn(['relationship', 'following'])) { - if (unfollowModal) { - dispatch(openModal({ - modalType: 'CONFIRM', - modalProps: { - message: @{account.get('acct')} }} />, - confirm: intl.formatMessage(messages.unfollowConfirm), - onConfirm: () => dispatch(unfollowAccount(account.get('id'))), - }, - })); - } else { - dispatch(unfollowAccount(account.get('id'))); - } + dispatch(openModal({ + modalType: 'CONFIRM', + modalProps: { + message: @{account.get('acct')} }} />, + confirm: intl.formatMessage(messages.unfollowConfirm), + onConfirm: () => dispatch(unfollowAccount(account.get('id'))), + }, + })); } else if (account.getIn(['relationship', 'requested'])) { - if (unfollowModal) { - dispatch(openModal({ - modalType: 'CONFIRM', - modalProps: { - message: @{account.get('acct')} }} />, - confirm: intl.formatMessage(messages.cancelFollowRequestConfirm), - onConfirm: () => dispatch(unfollowAccount(account.get('id'))), - }, - })); - } else { - dispatch(unfollowAccount(account.get('id'))); - } + dispatch(openModal({ + modalType: 'CONFIRM', + modalProps: { + message: @{account.get('acct')} }} />, + confirm: intl.formatMessage(messages.cancelFollowRequestConfirm), + onConfirm: () => dispatch(unfollowAccount(account.get('id'))), + }, + })); } else { dispatch(followAccount(account.get('id'))); } diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx index a09830d2c6..6f16abfc7f 100644 --- a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx @@ -21,7 +21,6 @@ import PollButtonContainer from '../containers/poll_button_container'; import PrivacyDropdownContainer from '../containers/privacy_dropdown_container'; import SpoilerButtonContainer from '../containers/spoiler_button_container'; import UploadButtonContainer from '../containers/upload_button_container'; -import UploadFormContainer from '../containers/upload_form_container'; import WarningContainer from '../containers/warning_container'; import { countableText } from '../util/counter'; @@ -34,6 +33,7 @@ import { PollForm } from "./poll_form"; import { ReplyIndicator } from './reply_indicator'; import { SecondaryPrivacyButton } from './secondary_privacy_button'; import { ThreadModeButton } from './thread_mode_button'; +import { UploadForm } from './upload_form'; const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d'; @@ -308,7 +308,7 @@ class ComposeForm extends ImmutablePureComponent { />
- +
diff --git a/app/javascript/flavours/glitch/features/compose/components/upload.jsx b/app/javascript/flavours/glitch/features/compose/components/upload.jsx index a6115184e3..790d76264d 100644 --- a/app/javascript/flavours/glitch/features/compose/components/upload.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/upload.jsx @@ -1,77 +1,81 @@ import PropTypes from 'prop-types'; +import { useCallback } from 'react'; import { FormattedMessage } from 'react-intl'; import classNames from 'classnames'; -import ImmutablePropTypes from 'react-immutable-proptypes'; -import ImmutablePureComponent from 'react-immutable-pure-component'; +import { useDispatch, useSelector } from 'react-redux'; import spring from 'react-motion/lib/spring'; import CloseIcon from '@/material-icons/400-20px/close.svg?react'; import EditIcon from '@/material-icons/400-24px/edit.svg?react'; import WarningIcon from '@/material-icons/400-24px/warning.svg?react'; +import { undoUploadCompose, initMediaEditModal } from 'flavours/glitch/actions/compose'; import { Blurhash } from 'flavours/glitch/components/blurhash'; import { Icon } from 'flavours/glitch/components/icon'; +import Motion from 'flavours/glitch/features/ui/util/optional_motion'; -import Motion from '../../ui/util/optional_motion'; +export const Upload = ({ id, onDragStart, onDragEnter, onDragEnd }) => { + const dispatch = useDispatch(); + const media = useSelector(state => state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id)); + const sensitive = useSelector(state => state.getIn(['compose', 'sensitive'])); -export default class Upload extends ImmutablePureComponent { + const handleUndoClick = useCallback(() => { + dispatch(undoUploadCompose(id)); + }, [dispatch, id]); - static propTypes = { - media: ImmutablePropTypes.map.isRequired, - sensitive: PropTypes.bool, - onUndo: PropTypes.func.isRequired, - onOpenFocalPoint: PropTypes.func.isRequired, - }; + const handleFocalPointClick = useCallback(() => { + dispatch(initMediaEditModal(id)); + }, [dispatch, id]); - handleUndoClick = e => { - e.stopPropagation(); - this.props.onUndo(this.props.media.get('id')); - }; + const handleDragStart = useCallback(() => { + onDragStart(id); + }, [onDragStart, id]); - handleFocalPointClick = e => { - e.stopPropagation(); - this.props.onOpenFocalPoint(this.props.media.get('id')); - }; + const handleDragEnter = useCallback(() => { + onDragEnter(id); + }, [onDragEnter, id]); - render () { - const { media, sensitive } = this.props; - - if (!media) { - return null; - } - - const focusX = media.getIn(['meta', 'focus', 'x']); - const focusY = media.getIn(['meta', 'focus', 'y']); - const x = ((focusX / 2) + .5) * 100; - const y = ((focusY / -2) + .5) * 100; - const missingDescription = (media.get('description') || '').length === 0; - - return ( -
- - {({ scale }) => ( -
- {sensitive && } - -
- - -
- -
- -
-
- )} - -
- ); + if (!media) { + return null; } -} + const focusX = media.getIn(['meta', 'focus', 'x']); + const focusY = media.getIn(['meta', 'focus', 'y']); + const x = ((focusX / 2) + .5) * 100; + const y = ((focusY / -2) + .5) * 100; + const missingDescription = (media.get('description') || '').length === 0; + + return ( +
+ + {({ scale }) => ( +
+ {sensitive && } + +
+ + +
+ +
+ +
+
+ )} + +
+ ); +}; + +Upload.propTypes = { + id: PropTypes.string, + onDragEnter: PropTypes.func, + onDragStart: PropTypes.func, + onDragEnd: PropTypes.func, +}; diff --git a/app/javascript/flavours/glitch/features/compose/components/upload_form.jsx b/app/javascript/flavours/glitch/features/compose/components/upload_form.jsx index 5c6406c3ba..2b26735f5e 100644 --- a/app/javascript/flavours/glitch/features/compose/components/upload_form.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/upload_form.jsx @@ -1,35 +1,56 @@ -import ImmutablePropTypes from 'react-immutable-proptypes'; -import ImmutablePureComponent from 'react-immutable-pure-component'; +import { useRef, useCallback } from 'react'; -import UploadContainer from '../containers/upload_container'; -import UploadProgressContainer from '../containers/upload_progress_container'; +import { useSelector, useDispatch } from 'react-redux'; + +import { changeMediaOrder } from 'flavours/glitch/actions/compose'; import { SensitiveButton } from './sensitive_button'; +import { Upload } from './upload'; +import { UploadProgress } from './upload_progress'; -export default class UploadForm extends ImmutablePureComponent { +export const UploadForm = () => { + const dispatch = useDispatch(); + const mediaIds = useSelector(state => state.getIn(['compose', 'media_attachments']).map(item => item.get('id'))); + const active = useSelector(state => state.getIn(['compose', 'is_uploading'])); + const progress = useSelector(state => state.getIn(['compose', 'progress'])); + const isProcessing = useSelector(state => state.getIn(['compose', 'is_processing'])); - static propTypes = { - mediaIds: ImmutablePropTypes.list.isRequired, - }; + const dragItem = useRef(); + const dragOverItem = useRef(); - render () { - const { mediaIds } = this.props; + const handleDragStart = useCallback(id => { + dragItem.current = id; + }, [dragItem]); - return ( - <> - + const handleDragEnter = useCallback(id => { + dragOverItem.current = id; + }, [dragOverItem]); - {mediaIds.size > 0 && ( -
- {mediaIds.map(id => ( - - ))} -
- )} + const handleDragEnd = useCallback(() => { + dispatch(changeMediaOrder(dragItem.current, dragOverItem.current)); + dragItem.current = null; + dragOverItem.current = null; + }, [dispatch, dragItem, dragOverItem]); - {!mediaIds.isEmpty() && } - - ); - } + return ( + <> + -} + {mediaIds.size > 0 && ( +
+ {mediaIds.map(id => ( + + ))} +
+ )} + + {!mediaIds.isEmpty() && } + + ); +}; diff --git a/app/javascript/flavours/glitch/features/compose/components/upload_progress.jsx b/app/javascript/flavours/glitch/features/compose/components/upload_progress.jsx index 7af5d9090e..f72f2c4603 100644 --- a/app/javascript/flavours/glitch/features/compose/components/upload_progress.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/upload_progress.jsx @@ -1,5 +1,4 @@ import PropTypes from 'prop-types'; -import { PureComponent } from 'react'; import { FormattedMessage } from 'react-intl'; @@ -10,46 +9,40 @@ import { Icon } from 'flavours/glitch/components/icon'; import Motion from '../../ui/util/optional_motion'; -export default class UploadProgress extends PureComponent { - - static propTypes = { - active: PropTypes.bool, - progress: PropTypes.number, - isProcessing: PropTypes.bool, - }; - - render () { - const { active, progress, isProcessing } = this.props; - - if (!active) { - return null; - } - - let message; - - if (isProcessing) { - message = ; - } else { - message = ; - } - - return ( -
- - -
- {message} - -
- - {({ width }) => -
- } - -
-
-
- ); +export const UploadProgress = ({ active, progress, isProcessing }) => { + if (!active) { + return null; } -} + let message; + + if (isProcessing) { + message = ; + } else { + message = ; + } + + return ( +
+ + +
+ {message} + +
+ + {({ width }) => +
+ } + +
+
+
+ ); +}; + +UploadProgress.propTypes = { + active: PropTypes.bool, + progress: PropTypes.number, + isProcessing: PropTypes.bool, +}; diff --git a/app/javascript/flavours/glitch/features/compose/containers/upload_container.js b/app/javascript/flavours/glitch/features/compose/containers/upload_container.js deleted file mode 100644 index 5afe6eaa1a..0000000000 --- a/app/javascript/flavours/glitch/features/compose/containers/upload_container.js +++ /dev/null @@ -1,27 +0,0 @@ -import { connect } from 'react-redux'; - -import { undoUploadCompose, initMediaEditModal, submitCompose } from '../../../actions/compose'; -import Upload from '../components/upload'; - -const mapStateToProps = (state, { id }) => ({ - media: state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id), - sensitive: state.getIn(['compose', 'sensitive']), -}); - -const mapDispatchToProps = dispatch => ({ - - onUndo: id => { - dispatch(undoUploadCompose(id)); - }, - - onOpenFocalPoint: id => { - dispatch(initMediaEditModal(id)); - }, - - onSubmit (router) { - dispatch(submitCompose(router)); - }, - -}); - -export default connect(mapStateToProps, mapDispatchToProps)(Upload); diff --git a/app/javascript/flavours/glitch/features/compose/containers/upload_form_container.js b/app/javascript/flavours/glitch/features/compose/containers/upload_form_container.js deleted file mode 100644 index 336525cf53..0000000000 --- a/app/javascript/flavours/glitch/features/compose/containers/upload_form_container.js +++ /dev/null @@ -1,9 +0,0 @@ -import { connect } from 'react-redux'; - -import UploadForm from '../components/upload_form'; - -const mapStateToProps = state => ({ - mediaIds: state.getIn(['compose', 'media_attachments']).map(item => item.get('id')), -}); - -export default connect(mapStateToProps)(UploadForm); diff --git a/app/javascript/flavours/glitch/features/compose/containers/upload_progress_container.js b/app/javascript/flavours/glitch/features/compose/containers/upload_progress_container.js deleted file mode 100644 index ffff321c3f..0000000000 --- a/app/javascript/flavours/glitch/features/compose/containers/upload_progress_container.js +++ /dev/null @@ -1,11 +0,0 @@ -import { connect } from 'react-redux'; - -import UploadProgress from '../components/upload_progress'; - -const mapStateToProps = state => ({ - active: state.getIn(['compose', 'is_uploading']), - progress: state.getIn(['compose', 'progress']), - isProcessing: state.getIn(['compose', 'is_processing']), -}); - -export default connect(mapStateToProps)(UploadProgress); diff --git a/app/javascript/flavours/glitch/features/directory/components/account_card.jsx b/app/javascript/flavours/glitch/features/directory/components/account_card.jsx index 60927f81c3..ed4736d7e6 100644 --- a/app/javascript/flavours/glitch/features/directory/components/account_card.jsx +++ b/app/javascript/flavours/glitch/features/directory/components/account_card.jsx @@ -21,7 +21,7 @@ import { DisplayName } from 'flavours/glitch/components/display_name'; import { IconButton } from 'flavours/glitch/components/icon_button'; import { Permalink } from 'flavours/glitch/components/permalink'; import { ShortNumber } from 'flavours/glitch/components/short_number'; -import { autoPlayGif, me, unfollowModal } from 'flavours/glitch/initial_state'; +import { autoPlayGif, me } from 'flavours/glitch/initial_state'; import { makeGetAccount } from 'flavours/glitch/selectors'; const messages = defineMessages({ @@ -50,38 +50,30 @@ const makeMapStateToProps = () => { const mapDispatchToProps = (dispatch, { intl }) => ({ onFollow(account) { if (account.getIn(['relationship', 'following'])) { - if (unfollowModal) { - dispatch( - openModal({ - modalType: 'CONFIRM', - modalProps: { - message: ( - @{account.get('acct')} }} - /> - ), - confirm: intl.formatMessage(messages.unfollowConfirm), - onConfirm: () => dispatch(unfollowAccount(account.get('id'))), - } }), - ); - } else { - dispatch(unfollowAccount(account.get('id'))); - } - } else if (account.getIn(['relationship', 'requested'])) { - if (unfollowModal) { - dispatch(openModal({ + dispatch( + openModal({ modalType: 'CONFIRM', modalProps: { - message: @{account.get('acct')} }} />, - confirm: intl.formatMessage(messages.cancelFollowRequestConfirm), + message: ( + @{account.get('acct')} }} + /> + ), + confirm: intl.formatMessage(messages.unfollowConfirm), onConfirm: () => dispatch(unfollowAccount(account.get('id'))), - }, - })); - } else { - dispatch(unfollowAccount(account.get('id'))); - } + } }), + ); + } else if (account.getIn(['relationship', 'requested'])) { + dispatch(openModal({ + modalType: 'CONFIRM', + modalProps: { + message: @{account.get('acct')} }} />, + confirm: intl.formatMessage(messages.cancelFollowRequestConfirm), + onConfirm: () => dispatch(unfollowAccount(account.get('id'))), + }, + })); } else { dispatch(followAccount(account.get('id'))); } diff --git a/app/javascript/flavours/glitch/features/follow_requests/index.jsx b/app/javascript/flavours/glitch/features/follow_requests/index.jsx index 7d651f2ca6..a8f40a31d0 100644 --- a/app/javascript/flavours/glitch/features/follow_requests/index.jsx +++ b/app/javascript/flavours/glitch/features/follow_requests/index.jsx @@ -68,7 +68,7 @@ class FollowRequests extends ImmutablePureComponent { ); return ( - + {
- {toCappedNumber(policy.getIn(['summary', 'pending_notifications_count']))} +
{toCappedNumber(policy.getIn(['summary', 'pending_notifications_count']))}
+
); diff --git a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx index 4aac5e8d6d..211a319679 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx +++ b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx @@ -22,12 +22,14 @@ import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; import FollowRequestContainer from '../containers/follow_request_container'; import NotificationOverlayContainer from '../containers/overlay_container'; +import { RelationshipsSeveranceEvent } from './relationships_severance_event'; import Report from './report'; const messages = defineMessages({ follow: { id: 'notification.follow', defaultMessage: '{name} followed you' }, adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' }, adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' }, + relationshipsSevered: { id: 'notification.relationships_severance_event', defaultMessage: 'Lost connections with {name}' }, }); const notificationForScreenReader = (intl, message, timestamp) => { @@ -303,6 +305,29 @@ class Notification extends ImmutablePureComponent { ); } + renderRelationshipsSevered (notification) { + const { intl, unread, hidden } = this.props; + const event = notification.get('event'); + + if (!event) { + return null; + } + + return ( + +
+
+ + ); + } + renderAdminSignUp (notification, account, link) { const { intl, unread } = this.props; @@ -396,6 +421,8 @@ class Notification extends ImmutablePureComponent { return this.renderUpdate(notification); case 'poll': return this.renderPoll(notification); + case 'severed_relationships': + return this.renderRelationshipsSevered(notification); case 'admin.sign_up': return this.renderAdminSignUp(notification, account, link); case 'admin.report': diff --git a/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx b/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx index 6ba97066ce..6c9e2980de 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx +++ b/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx @@ -7,8 +7,8 @@ import { Link } from 'react-router-dom'; import { useSelector, useDispatch } from 'react-redux'; +import DeleteIcon from '@/material-icons/400-24px/delete.svg?react'; import DoneIcon from '@/material-icons/400-24px/done.svg?react'; -import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react'; import { acceptNotificationRequest, dismissNotificationRequest } from 'flavours/glitch/actions/notifications'; import { Avatar } from 'flavours/glitch/components/avatar'; import { IconButton } from 'flavours/glitch/components/icon_button'; @@ -51,7 +51,7 @@ export const NotificationRequest = ({ id, accountId, notificationsCount }) => {
- +
diff --git a/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx b/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx new file mode 100644 index 0000000000..05cee6aaa1 --- /dev/null +++ b/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx @@ -0,0 +1,45 @@ +import PropTypes from 'prop-types'; + +import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; + +import HeartBrokenIcon from '@/material-icons/400-24px/heart_broken-fill.svg?react'; +import { Icon } from 'flavours/glitch/components/icon'; +import { domain } from 'flavours/glitch/initial_state'; + +// This needs to be kept in sync with app/models/relationships_severance_event.rb +const messages = defineMessages({ + account_suspension: { id: 'notification.relationships_severance_event.account_suspension', defaultMessage: 'An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.' }, + domain_block: { id: 'notification.relationships_severance_event.domain_block', defaultMessage: 'An admin from {from} has blocked {target}, including {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.' }, + user_domain_block: { id: 'notification.relationships_severance_event.user_domain_block', defaultMessage: 'You have blocked {target}, removing {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.' }, +}); + +export const RelationshipsSeveranceEvent = ({ type, target, followingCount, followersCount, hidden }) => { + const intl = useIntl(); + + if (hidden) { + return null; + } + + return ( + + + +
+

{intl.formatMessage(messages[type], { from: {domain}, target: {target}, followingCount, followersCount })}

+ +
+ + ); +}; + +RelationshipsSeveranceEvent.propTypes = { + type: PropTypes.oneOf([ + 'account_suspension', + 'domain_block', + 'user_domain_block', + ]).isRequired, + target: PropTypes.string.isRequired, + followersCount: PropTypes.number.isRequired, + followingCount: PropTypes.number.isRequired, + hidden: PropTypes.bool, +}; diff --git a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx index bf31c137f1..0ee84dd0c2 100644 --- a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx @@ -22,7 +22,7 @@ import { GIFV } from 'flavours/glitch/components/gifv'; import { IconButton } from 'flavours/glitch/components/icon_button'; import Audio from 'flavours/glitch/features/audio'; import { CharacterCounter } from 'flavours/glitch/features/compose/components/character_counter'; -import UploadProgress from 'flavours/glitch/features/compose/components/upload_progress'; +import { UploadProgress } from 'flavours/glitch/features/compose/components/upload_progress'; import { Tesseract as fetchTesseract } from 'flavours/glitch/features/ui/util/async-components'; import { me } from 'flavours/glitch/initial_state'; import { assetHost } from 'flavours/glitch/utils/config'; diff --git a/app/javascript/flavours/glitch/initial_state.js b/app/javascript/flavours/glitch/initial_state.js index 93991b19cf..3e84966cb4 100644 --- a/app/javascript/flavours/glitch/initial_state.js +++ b/app/javascript/flavours/glitch/initial_state.js @@ -118,7 +118,6 @@ export const source_url = getMeta('source_url'); export const timelinePreview = getMeta('timeline_preview'); export const title = getMeta('title'); export const trendsAsLanding = getMeta('trends_as_landing_page'); -export const unfollowModal = getMeta('unfollow_modal'); export const useBlurhash = getMeta('use_blurhash'); export const usePendingItems = getMeta('use_pending_items'); export const version = getMeta('version'); diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json index 990c8afe4c..76f7ed535e 100644 --- a/app/javascript/flavours/glitch/locales/en.json +++ b/app/javascript/flavours/glitch/locales/en.json @@ -64,8 +64,6 @@ "notification_purge.btn_invert": "Invert\nselection", "notification_purge.btn_none": "Select\nnone", "notification_purge.start": "Enter notification cleaning mode", - "notifications.column_settings.filter_bar.advanced": "Display all categories", - "notifications.column_settings.filter_bar.category": "Quick filter bar", "notifications.column_settings.filter_bar.show_bar": "Show filter bar", "notifications.marked_clear": "Clear selected notifications", "notifications.marked_clear_confirmation": "Are you sure you want to permanently clear all selected notifications?", diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js index f96d9e959f..36430e8238 100644 --- a/app/javascript/flavours/glitch/reducers/compose.js +++ b/app/javascript/flavours/glitch/reducers/compose.js @@ -48,6 +48,7 @@ import { INIT_MEDIA_EDIT_MODAL, COMPOSE_CHANGE_MEDIA_DESCRIPTION, COMPOSE_CHANGE_MEDIA_FOCUS, + COMPOSE_CHANGE_MEDIA_ORDER, COMPOSE_SET_STATUS, COMPOSE_FOCUS, } from '../actions/compose'; @@ -656,6 +657,14 @@ export default function compose(state = initialState, action) { return state.set('language', action.language); case COMPOSE_FOCUS: return state.set('focusDate', new Date()).update('text', text => text.length > 0 ? text : action.defaultText); + case COMPOSE_CHANGE_MEDIA_ORDER: + return state.update('media_attachments', list => { + const indexA = list.findIndex(x => x.get('id') === action.a); + const moveItem = list.get(indexA); + const indexB = list.findIndex(x => x.get('id') === action.b); + + return list.splice(indexA, 1).splice(indexB, 0, moveItem); + }); default: return state; } diff --git a/app/javascript/flavours/glitch/reducers/notifications.js b/app/javascript/flavours/glitch/reducers/notifications.js index c6d70945ba..14862bef07 100644 --- a/app/javascript/flavours/glitch/reducers/notifications.js +++ b/app/javascript/flavours/glitch/reducers/notifications.js @@ -61,6 +61,7 @@ export const notificationToMap = (notification, markForDelete = false) => Immuta markedForDelete: markForDelete, status: notification.status ? notification.status.id : null, report: notification.report ? fromJS(notification.report) : null, + event: notification.event ? fromJS(notification.event) : null, }); const normalizeNotification = (state, notification, usePendingItems) => { diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss index 42a262c9fc..4496179d6d 100644 --- a/app/javascript/flavours/glitch/styles/components.scss +++ b/app/javascript/flavours/glitch/styles/components.scss @@ -2379,6 +2379,44 @@ a.account__display-name { } } +.notification__relationships-severance-event { + display: flex; + gap: 16px; + color: $secondary-text-color; + text-decoration: none; + align-items: flex-start; + padding: 16px 32px; + border-bottom: 1px solid var(--background-border-color); + + &:hover { + color: $primary-text-color; + } + + .icon { + padding: 2px; + color: $highlight-text-color; + } + + &__content { + display: flex; + flex-direction: column; + align-items: flex-start; + gap: 8px; + flex-grow: 1; + font-size: 16px; + line-height: 24px; + + strong { + font-weight: 700; + } + + .link-button { + font-size: inherit; + line-height: inherit; + } + } +} + .notification__message { padding: 8px 14px; // glitch: reduced padding padding-bottom: 0; @@ -9411,8 +9449,9 @@ noscript { .safety-action-modal, .interaction-modal { - max-width: 90vw; + max-width: 100vw; width: 600px; + overflow-y: auto; } .interaction-modal { @@ -10321,18 +10360,24 @@ noscript { margin-top: 16px; display: flex; flex-wrap: wrap; - font-size: 14px; - line-height: 18px; - gap: 4px; + font-size: 12px; + line-height: 16px; + gap: 6px; color: $darker-text-color; a { display: inline-flex; color: inherit; text-decoration: none; + padding: 4px 12px; + background: $ui-base-color; + border-radius: 4px; + font-weight: 500; - &:hover span { - text-decoration: underline; + &:hover, + &:focus, + &:active { + background: lighten($ui-base-color, 4%); } } @@ -10548,10 +10593,10 @@ noscript { .filtered-notifications-banner { display: flex; align-items: center; - background: $ui-base-color; - border-bottom: 1px solid lighten($ui-base-color, 8%); - padding: 15px; - gap: 15px; + border: 1px solid var(--background-border-color); + border-top: 0; + padding: 24px 32px; + gap: 16px; color: $darker-text-color; text-decoration: none; @@ -10559,15 +10604,12 @@ noscript { &:active, &:focus { color: $secondary-text-color; - - .filtered-notifications-banner__badge { - background: $secondary-text-color; - } } .icon { width: 24px; height: 24px; + padding: 2px; } &__text { @@ -10583,13 +10625,24 @@ noscript { } &__badge { - background: $darker-text-color; - color: $ui-base-color; - border-radius: 100px; - padding: 2px 8px; + display: flex; + align-items: center; + border-radius: 999px; + background: var(--background-border-color); + color: $darker-text-color; + padding: 4px; + padding-inline-end: 8px; + gap: 6px; font-weight: 500; font-size: 11px; line-height: 16px; + + &__badge { + background: $ui-button-background-color; + color: $white; + border-radius: 100px; + padding: 2px 8px; + } } } @@ -10598,7 +10651,7 @@ noscript { align-items: center; gap: 16px; padding: 15px; - border-bottom: 1px solid lighten($ui-base-color, 8%); + border-bottom: 1px solid var(--background-border-color); &__link { display: flex; @@ -10646,7 +10699,7 @@ noscript { .icon-button { border-radius: 4px; - border: 1px solid lighten($ui-base-color, 8%); + border: 1px solid var(--background-border-color); padding: 5px; } } diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js index e3c0e805d6..013050e6f1 100644 --- a/app/javascript/mastodon/actions/compose.js +++ b/app/javascript/mastodon/actions/compose.js @@ -75,6 +75,7 @@ export const INIT_MEDIA_EDIT_MODAL = 'INIT_MEDIA_EDIT_MODAL'; export const COMPOSE_CHANGE_MEDIA_DESCRIPTION = 'COMPOSE_CHANGE_MEDIA_DESCRIPTION'; export const COMPOSE_CHANGE_MEDIA_FOCUS = 'COMPOSE_CHANGE_MEDIA_FOCUS'; +export const COMPOSE_CHANGE_MEDIA_ORDER = 'COMPOSE_CHANGE_MEDIA_ORDER'; export const COMPOSE_SET_STATUS = 'COMPOSE_SET_STATUS'; export const COMPOSE_FOCUS = 'COMPOSE_FOCUS'; @@ -811,3 +812,9 @@ export function changePollSettings(expiresIn, isMultiple) { isMultiple, }; } + +export const changeMediaOrder = (a, b) => ({ + type: COMPOSE_CHANGE_MEDIA_ORDER, + a, + b, +}); diff --git a/app/javascript/mastodon/components/badge.jsx b/app/javascript/mastodon/components/badge.jsx index 646655c249..5e0b2587bd 100644 --- a/app/javascript/mastodon/components/badge.jsx +++ b/app/javascript/mastodon/components/badge.jsx @@ -7,8 +7,8 @@ import PersonIcon from '@/material-icons/400-24px/person.svg?react'; import SmartToyIcon from '@/material-icons/400-24px/smart_toy.svg?react'; -export const Badge = ({ icon, label, domain }) => ( -
+export const Badge = ({ icon, label, domain, roleId }) => ( +
{icon} {label} {domain && {domain}} @@ -19,6 +19,7 @@ Badge.propTypes = { icon: PropTypes.node, label: PropTypes.node, domain: PropTypes.node, + roleId: PropTypes.string }; Badge.defaultProps = { diff --git a/app/javascript/mastodon/components/column_header.jsx b/app/javascript/mastodon/components/column_header.jsx index 7fd646690d..a7d07ffdb0 100644 --- a/app/javascript/mastodon/components/column_header.jsx +++ b/app/javascript/mastodon/components/column_header.jsx @@ -13,7 +13,7 @@ import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react' import CloseIcon from '@/material-icons/400-24px/close.svg?react'; import SettingsIcon from '@/material-icons/400-24px/settings.svg?react'; import { Icon } from 'mastodon/components/icon'; -import { ButtonInTabsBar, useColumnsContext } from 'mastodon/features/ui/util/columns_context'; +import { ButtonInTabsBar } from 'mastodon/features/ui/util/columns_context'; import { WithRouterPropTypes } from 'mastodon/utils/react_router'; import { useAppHistory } from './router'; @@ -26,10 +26,9 @@ const messages = defineMessages({ back: { id: 'column_back_button.label', defaultMessage: 'Back' }, }); -const BackButton = ({ pinned, show, onlyIcon }) => { +const BackButton = ({ onlyIcon }) => { const history = useAppHistory(); const intl = useIntl(); - const { multiColumn } = useColumnsContext(); const handleBackClick = useCallback(() => { if (history.location?.state?.fromMastodon) { @@ -39,10 +38,6 @@ const BackButton = ({ pinned, show, onlyIcon }) => { } }, [history]); - const showButton = history && !pinned && ((multiColumn && history.location?.state?.fromMastodon) || show); - - if (!showButton) return null; - return ( ; } - backButton = ; + if (history && !pinned && ((multiColumn && history.location?.state?.fromMastodon) || showBackButton)) { + backButton = ; + } const collapsedContent = [ extraContent, @@ -199,16 +194,16 @@ class ColumnHeader extends PureComponent {

{hasTitle && ( <> - {showBackButton && backButton} + {backButton} )} - {!hasTitle && showBackButton && backButton} + {!hasTitle && backButton}
{extraButton} diff --git a/app/javascript/mastodon/containers/account_container.jsx b/app/javascript/mastodon/containers/account_container.jsx index a134452e77..f171fcc2fe 100644 --- a/app/javascript/mastodon/containers/account_container.jsx +++ b/app/javascript/mastodon/containers/account_container.jsx @@ -13,7 +13,6 @@ import { import { openModal } from '../actions/modal'; import { initMuteModal } from '../actions/mutes'; import Account from '../components/account'; -import { unfollowModal } from '../initial_state'; import { makeGetAccount } from '../selectors'; const messages = defineMessages({ @@ -34,18 +33,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ onFollow (account) { if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) { - if (unfollowModal) { - dispatch(openModal({ - modalType: 'CONFIRM', - modalProps: { - message: @{account.get('acct')} }} />, - confirm: intl.formatMessage(messages.unfollowConfirm), - onConfirm: () => dispatch(unfollowAccount(account.get('id'))), - }, - })); - } else { - dispatch(unfollowAccount(account.get('id'))); - } + dispatch(openModal({ + modalType: 'CONFIRM', + modalProps: { + message: @{account.get('acct')} }} />, + confirm: intl.formatMessage(messages.unfollowConfirm), + onConfirm: () => dispatch(unfollowAccount(account.get('id'))), + }, + })); } else { dispatch(followAccount(account.get('id'))); } diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx index ecb1108ded..e9d6071a21 100644 --- a/app/javascript/mastodon/features/account/components/header.jsx +++ b/app/javascript/mastodon/features/account/components/header.jsx @@ -408,7 +408,7 @@ class Header extends ImmutablePureComponent { } account.get('roles', []).forEach((role) => { - badges.push({role.get('name')}} domain={domain} />); + badges.push({role.get('name')}} domain={domain} roleId={role.get('id')} />); }); return ( diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx index 071dbdbfb7..73fd62841b 100644 --- a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx +++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx @@ -21,7 +21,6 @@ import { initDomainBlockModal, unblockDomain } from '../../../actions/domain_blo import { openModal } from '../../../actions/modal'; import { initMuteModal } from '../../../actions/mutes'; import { initReport } from '../../../actions/reports'; -import { unfollowModal } from '../../../initial_state'; import { makeGetAccount, getAccountHidden } from '../../../selectors'; import Header from '../components/header'; @@ -47,31 +46,23 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ onFollow (account) { if (account.getIn(['relationship', 'following'])) { - if (unfollowModal) { - dispatch(openModal({ - modalType: 'CONFIRM', - modalProps: { - message: @{account.get('acct')} }} />, - confirm: intl.formatMessage(messages.unfollowConfirm), - onConfirm: () => dispatch(unfollowAccount(account.get('id'))), - }, - })); - } else { - dispatch(unfollowAccount(account.get('id'))); - } + dispatch(openModal({ + modalType: 'CONFIRM', + modalProps: { + message: @{account.get('acct')} }} />, + confirm: intl.formatMessage(messages.unfollowConfirm), + onConfirm: () => dispatch(unfollowAccount(account.get('id'))), + }, + })); } else if (account.getIn(['relationship', 'requested'])) { - if (unfollowModal) { - dispatch(openModal({ - modalType: 'CONFIRM', - modalProps: { - message: @{account.get('acct')} }} />, - confirm: intl.formatMessage(messages.cancelFollowRequestConfirm), - onConfirm: () => dispatch(unfollowAccount(account.get('id'))), - }, - })); - } else { - dispatch(unfollowAccount(account.get('id'))); - } + dispatch(openModal({ + modalType: 'CONFIRM', + modalProps: { + message: @{account.get('acct')} }} />, + confirm: intl.formatMessage(messages.cancelFollowRequestConfirm), + onConfirm: () => dispatch(unfollowAccount(account.get('id'))), + }, + })); } else { dispatch(followAccount(account.get('id'))); } diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx index b93bac9d19..9b4d3dfeb5 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.jsx +++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx @@ -21,7 +21,6 @@ import PollButtonContainer from '../containers/poll_button_container'; import PrivacyDropdownContainer from '../containers/privacy_dropdown_container'; import SpoilerButtonContainer from '../containers/spoiler_button_container'; import UploadButtonContainer from '../containers/upload_button_container'; -import UploadFormContainer from '../containers/upload_form_container'; import WarningContainer from '../containers/warning_container'; import { countableText } from '../util/counter'; @@ -30,6 +29,7 @@ import { EditIndicator } from './edit_indicator'; import { NavigationBar } from './navigation_bar'; import { PollForm } from "./poll_form"; import { ReplyIndicator } from './reply_indicator'; +import { UploadForm } from './upload_form'; const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d'; @@ -283,7 +283,7 @@ class ComposeForm extends ImmutablePureComponent { />
- +
diff --git a/app/javascript/mastodon/features/compose/components/upload.jsx b/app/javascript/mastodon/features/compose/components/upload.jsx index e8045ae81f..7f6ef6cfd8 100644 --- a/app/javascript/mastodon/features/compose/components/upload.jsx +++ b/app/javascript/mastodon/features/compose/components/upload.jsx @@ -1,77 +1,81 @@ import PropTypes from 'prop-types'; +import { useCallback } from 'react'; import { FormattedMessage } from 'react-intl'; import classNames from 'classnames'; -import ImmutablePropTypes from 'react-immutable-proptypes'; -import ImmutablePureComponent from 'react-immutable-pure-component'; +import { useDispatch, useSelector } from 'react-redux'; import spring from 'react-motion/lib/spring'; import CloseIcon from '@/material-icons/400-20px/close.svg?react'; import EditIcon from '@/material-icons/400-24px/edit.svg?react'; import WarningIcon from '@/material-icons/400-24px/warning.svg?react'; +import { undoUploadCompose, initMediaEditModal } from 'mastodon/actions/compose'; import { Blurhash } from 'mastodon/components/blurhash'; import { Icon } from 'mastodon/components/icon'; +import Motion from 'mastodon/features/ui/util/optional_motion'; -import Motion from '../../ui/util/optional_motion'; +export const Upload = ({ id, onDragStart, onDragEnter, onDragEnd }) => { + const dispatch = useDispatch(); + const media = useSelector(state => state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id)); + const sensitive = useSelector(state => state.getIn(['compose', 'spoiler'])); -export default class Upload extends ImmutablePureComponent { + const handleUndoClick = useCallback(() => { + dispatch(undoUploadCompose(id)); + }, [dispatch, id]); - static propTypes = { - media: ImmutablePropTypes.map.isRequired, - sensitive: PropTypes.bool, - onUndo: PropTypes.func.isRequired, - onOpenFocalPoint: PropTypes.func.isRequired, - }; + const handleFocalPointClick = useCallback(() => { + dispatch(initMediaEditModal(id)); + }, [dispatch, id]); - handleUndoClick = e => { - e.stopPropagation(); - this.props.onUndo(this.props.media.get('id')); - }; + const handleDragStart = useCallback(() => { + onDragStart(id); + }, [onDragStart, id]); - handleFocalPointClick = e => { - e.stopPropagation(); - this.props.onOpenFocalPoint(this.props.media.get('id')); - }; + const handleDragEnter = useCallback(() => { + onDragEnter(id); + }, [onDragEnter, id]); - render () { - const { media, sensitive } = this.props; - - if (!media) { - return null; - } - - const focusX = media.getIn(['meta', 'focus', 'x']); - const focusY = media.getIn(['meta', 'focus', 'y']); - const x = ((focusX / 2) + .5) * 100; - const y = ((focusY / -2) + .5) * 100; - const missingDescription = (media.get('description') || '').length === 0; - - return ( -
- - {({ scale }) => ( -
- {sensitive && } - -
- - -
- -
- -
-
- )} - -
- ); + if (!media) { + return null; } -} + const focusX = media.getIn(['meta', 'focus', 'x']); + const focusY = media.getIn(['meta', 'focus', 'y']); + const x = ((focusX / 2) + .5) * 100; + const y = ((focusY / -2) + .5) * 100; + const missingDescription = (media.get('description') || '').length === 0; + + return ( +
+ + {({ scale }) => ( +
+ {sensitive && } + +
+ + +
+ +
+ +
+
+ )} + +
+ ); +}; + +Upload.propTypes = { + id: PropTypes.string, + onDragEnter: PropTypes.func, + onDragStart: PropTypes.func, + onDragEnd: PropTypes.func, +}; diff --git a/app/javascript/mastodon/features/compose/components/upload_form.jsx b/app/javascript/mastodon/features/compose/components/upload_form.jsx index 46bac7823b..adf5591382 100644 --- a/app/javascript/mastodon/features/compose/components/upload_form.jsx +++ b/app/javascript/mastodon/features/compose/components/upload_form.jsx @@ -1,31 +1,53 @@ -import ImmutablePropTypes from 'react-immutable-proptypes'; -import ImmutablePureComponent from 'react-immutable-pure-component'; +import { useRef, useCallback } from 'react'; -import UploadContainer from '../containers/upload_container'; -import UploadProgressContainer from '../containers/upload_progress_container'; +import { useSelector, useDispatch } from 'react-redux'; -export default class UploadForm extends ImmutablePureComponent { +import { changeMediaOrder } from 'mastodon/actions/compose'; - static propTypes = { - mediaIds: ImmutablePropTypes.list.isRequired, - }; +import { Upload } from './upload'; +import { UploadProgress } from './upload_progress'; - render () { - const { mediaIds } = this.props; +export const UploadForm = () => { + const dispatch = useDispatch(); + const mediaIds = useSelector(state => state.getIn(['compose', 'media_attachments']).map(item => item.get('id'))); + const active = useSelector(state => state.getIn(['compose', 'is_uploading'])); + const progress = useSelector(state => state.getIn(['compose', 'progress'])); + const isProcessing = useSelector(state => state.getIn(['compose', 'is_processing'])); - return ( - <> - + const dragItem = useRef(); + const dragOverItem = useRef(); - {mediaIds.size > 0 && ( -
- {mediaIds.map(id => ( - - ))} -
- )} - - ); - } + const handleDragStart = useCallback(id => { + dragItem.current = id; + }, [dragItem]); -} + const handleDragEnter = useCallback(id => { + dragOverItem.current = id; + }, [dragOverItem]); + + const handleDragEnd = useCallback(() => { + dispatch(changeMediaOrder(dragItem.current, dragOverItem.current)); + dragItem.current = null; + dragOverItem.current = null; + }, [dispatch, dragItem, dragOverItem]); + + return ( + <> + + + {mediaIds.size > 0 && ( +
+ {mediaIds.map(id => ( + + ))} +
+ )} + + ); +}; diff --git a/app/javascript/mastodon/features/compose/components/upload_progress.jsx b/app/javascript/mastodon/features/compose/components/upload_progress.jsx index 1276cded1f..fd0c8f4530 100644 --- a/app/javascript/mastodon/features/compose/components/upload_progress.jsx +++ b/app/javascript/mastodon/features/compose/components/upload_progress.jsx @@ -1,5 +1,4 @@ import PropTypes from 'prop-types'; -import { PureComponent } from 'react'; import { FormattedMessage } from 'react-intl'; @@ -10,46 +9,40 @@ import { Icon } from 'mastodon/components/icon'; import Motion from '../../ui/util/optional_motion'; -export default class UploadProgress extends PureComponent { - - static propTypes = { - active: PropTypes.bool, - progress: PropTypes.number, - isProcessing: PropTypes.bool, - }; - - render () { - const { active, progress, isProcessing } = this.props; - - if (!active) { - return null; - } - - let message; - - if (isProcessing) { - message = ; - } else { - message = ; - } - - return ( -
- - -
- {message} - -
- - {({ width }) => -
- } - -
-
-
- ); +export const UploadProgress = ({ active, progress, isProcessing }) => { + if (!active) { + return null; } -} + let message; + + if (isProcessing) { + message = ; + } else { + message = ; + } + + return ( +
+ + +
+ {message} + +
+ + {({ width }) => +
+ } + +
+
+
+ ); +}; + +UploadProgress.propTypes = { + active: PropTypes.bool, + progress: PropTypes.number, + isProcessing: PropTypes.bool, +}; diff --git a/app/javascript/mastodon/features/compose/containers/upload_container.js b/app/javascript/mastodon/features/compose/containers/upload_container.js deleted file mode 100644 index a17a691444..0000000000 --- a/app/javascript/mastodon/features/compose/containers/upload_container.js +++ /dev/null @@ -1,27 +0,0 @@ -import { connect } from 'react-redux'; - -import { undoUploadCompose, initMediaEditModal, submitCompose } from '../../../actions/compose'; -import Upload from '../components/upload'; - -const mapStateToProps = (state, { id }) => ({ - media: state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id), - sensitive: state.getIn(['compose', 'spoiler']), -}); - -const mapDispatchToProps = dispatch => ({ - - onUndo: id => { - dispatch(undoUploadCompose(id)); - }, - - onOpenFocalPoint: id => { - dispatch(initMediaEditModal(id)); - }, - - onSubmit (router) { - dispatch(submitCompose(router)); - }, - -}); - -export default connect(mapStateToProps, mapDispatchToProps)(Upload); diff --git a/app/javascript/mastodon/features/compose/containers/upload_form_container.js b/app/javascript/mastodon/features/compose/containers/upload_form_container.js deleted file mode 100644 index 336525cf53..0000000000 --- a/app/javascript/mastodon/features/compose/containers/upload_form_container.js +++ /dev/null @@ -1,9 +0,0 @@ -import { connect } from 'react-redux'; - -import UploadForm from '../components/upload_form'; - -const mapStateToProps = state => ({ - mediaIds: state.getIn(['compose', 'media_attachments']).map(item => item.get('id')), -}); - -export default connect(mapStateToProps)(UploadForm); diff --git a/app/javascript/mastodon/features/compose/containers/upload_progress_container.js b/app/javascript/mastodon/features/compose/containers/upload_progress_container.js deleted file mode 100644 index ffff321c3f..0000000000 --- a/app/javascript/mastodon/features/compose/containers/upload_progress_container.js +++ /dev/null @@ -1,11 +0,0 @@ -import { connect } from 'react-redux'; - -import UploadProgress from '../components/upload_progress'; - -const mapStateToProps = state => ({ - active: state.getIn(['compose', 'is_uploading']), - progress: state.getIn(['compose', 'progress']), - isProcessing: state.getIn(['compose', 'is_processing']), -}); - -export default connect(mapStateToProps)(UploadProgress); diff --git a/app/javascript/mastodon/features/directory/components/account_card.jsx b/app/javascript/mastodon/features/directory/components/account_card.jsx index ff1f8a653b..9c5e688120 100644 --- a/app/javascript/mastodon/features/directory/components/account_card.jsx +++ b/app/javascript/mastodon/features/directory/components/account_card.jsx @@ -20,7 +20,7 @@ import { Avatar } from 'mastodon/components/avatar'; import { Button } from 'mastodon/components/button'; import { DisplayName } from 'mastodon/components/display_name'; import { ShortNumber } from 'mastodon/components/short_number'; -import { autoPlayGif, me, unfollowModal } from 'mastodon/initial_state'; +import { autoPlayGif, me } from 'mastodon/initial_state'; import { makeGetAccount } from 'mastodon/selectors'; const messages = defineMessages({ @@ -48,38 +48,30 @@ const makeMapStateToProps = () => { const mapDispatchToProps = (dispatch, { intl }) => ({ onFollow(account) { if (account.getIn(['relationship', 'following'])) { - if (unfollowModal) { - dispatch( - openModal({ - modalType: 'CONFIRM', - modalProps: { - message: ( - @{account.get('acct')} }} - /> - ), - confirm: intl.formatMessage(messages.unfollowConfirm), - onConfirm: () => dispatch(unfollowAccount(account.get('id'))), - } }), - ); - } else { - dispatch(unfollowAccount(account.get('id'))); - } - } else if (account.getIn(['relationship', 'requested'])) { - if (unfollowModal) { - dispatch(openModal({ + dispatch( + openModal({ modalType: 'CONFIRM', modalProps: { - message: @{account.get('acct')} }} />, - confirm: intl.formatMessage(messages.cancelFollowRequestConfirm), + message: ( + @{account.get('acct')} }} + /> + ), + confirm: intl.formatMessage(messages.unfollowConfirm), onConfirm: () => dispatch(unfollowAccount(account.get('id'))), - }, - })); - } else { - dispatch(unfollowAccount(account.get('id'))); - } + } }), + ); + } else if (account.getIn(['relationship', 'requested'])) { + dispatch(openModal({ + modalType: 'CONFIRM', + modalProps: { + message: @{account.get('acct')} }} />, + confirm: intl.formatMessage(messages.cancelFollowRequestConfirm), + onConfirm: () => dispatch(unfollowAccount(account.get('id'))), + }, + })); } else { dispatch(followAccount(account.get('id'))); } diff --git a/app/javascript/mastodon/features/follow_requests/index.jsx b/app/javascript/mastodon/features/follow_requests/index.jsx index 7d651f2ca6..a8f40a31d0 100644 --- a/app/javascript/mastodon/features/follow_requests/index.jsx +++ b/app/javascript/mastodon/features/follow_requests/index.jsx @@ -68,7 +68,7 @@ class FollowRequests extends ImmutablePureComponent { ); return ( - + ; const unreadMarkersShowStr = ; const alertStr = ; const showStr = ; @@ -116,6 +117,16 @@ export default class ColumnSettings extends PureComponent {
+
+

+ +

+ +
+ +
+
+

diff --git a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx index adf58afbf0..ecf4b74e80 100644 --- a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx +++ b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx @@ -41,7 +41,8 @@ export const FilteredNotificationsBanner = () => {
- {toCappedNumber(policy.getIn(['summary', 'pending_notifications_count']))} +
{toCappedNumber(policy.getIn(['summary', 'pending_notifications_count']))}
+
); diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx index d7101f8384..c091554628 100644 --- a/app/javascript/mastodon/features/notifications/components/notification.jsx +++ b/app/javascript/mastodon/features/notifications/components/notification.jsx @@ -26,6 +26,7 @@ import { WithRouterPropTypes } from 'mastodon/utils/react_router'; import FollowRequestContainer from '../containers/follow_request_container'; +import { RelationshipsSeveranceEvent } from './relationships_severance_event'; import Report from './report'; const messages = defineMessages({ @@ -38,6 +39,7 @@ const messages = defineMessages({ update: { id: 'notification.update', defaultMessage: '{name} edited a post' }, adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' }, adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' }, + relationshipsSevered: { id: 'notification.relationships_severance_event', defaultMessage: 'Lost connections with {name}' }, }); const notificationForScreenReader = (intl, message, timestamp) => { @@ -358,6 +360,29 @@ class Notification extends ImmutablePureComponent { ); } + renderRelationshipsSevered (notification) { + const { intl, unread, hidden } = this.props; + const event = notification.get('event'); + + if (!event) { + return null; + } + + return ( + +
+
+ + ); + } + renderAdminSignUp (notification, account, link) { const { intl, unread } = this.props; @@ -429,6 +454,8 @@ class Notification extends ImmutablePureComponent { return this.renderUpdate(notification, link); case 'poll': return this.renderPoll(notification, account); + case 'severed_relationships': + return this.renderRelationshipsSevered(notification); case 'admin.sign_up': return this.renderAdminSignUp(notification, account, link); case 'admin.report': diff --git a/app/javascript/mastodon/features/notifications/components/notification_request.jsx b/app/javascript/mastodon/features/notifications/components/notification_request.jsx index e24124ca6a..3a77ef4e2e 100644 --- a/app/javascript/mastodon/features/notifications/components/notification_request.jsx +++ b/app/javascript/mastodon/features/notifications/components/notification_request.jsx @@ -7,8 +7,8 @@ import { Link } from 'react-router-dom'; import { useSelector, useDispatch } from 'react-redux'; +import DeleteIcon from '@/material-icons/400-24px/delete.svg?react'; import DoneIcon from '@/material-icons/400-24px/done.svg?react'; -import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react'; import { acceptNotificationRequest, dismissNotificationRequest } from 'mastodon/actions/notifications'; import { Avatar } from 'mastodon/components/avatar'; import { IconButton } from 'mastodon/components/icon_button'; @@ -51,7 +51,7 @@ export const NotificationRequest = ({ id, accountId, notificationsCount }) => {
- +
diff --git a/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx b/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx new file mode 100644 index 0000000000..738159fc5a --- /dev/null +++ b/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx @@ -0,0 +1,45 @@ +import PropTypes from 'prop-types'; + +import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; + +import HeartBrokenIcon from '@/material-icons/400-24px/heart_broken-fill.svg?react'; +import { Icon } from 'mastodon/components/icon'; +import { domain } from 'mastodon/initial_state'; + +// This needs to be kept in sync with app/models/relationships_severance_event.rb +const messages = defineMessages({ + account_suspension: { id: 'notification.relationships_severance_event.account_suspension', defaultMessage: 'An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.' }, + domain_block: { id: 'notification.relationships_severance_event.domain_block', defaultMessage: 'An admin from {from} has blocked {target}, including {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.' }, + user_domain_block: { id: 'notification.relationships_severance_event.user_domain_block', defaultMessage: 'You have blocked {target}, removing {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.' }, +}); + +export const RelationshipsSeveranceEvent = ({ type, target, followingCount, followersCount, hidden }) => { + const intl = useIntl(); + + if (hidden) { + return null; + } + + return ( + + + +
+

{intl.formatMessage(messages[type], { from: {domain}, target: {target}, followingCount, followersCount })}

+ +
+ + ); +}; + +RelationshipsSeveranceEvent.propTypes = { + type: PropTypes.oneOf([ + 'account_suspension', + 'domain_block', + 'user_domain_block', + ]).isRequired, + target: PropTypes.string.isRequired, + followersCount: PropTypes.number.isRequired, + followingCount: PropTypes.number.isRequired, + hidden: PropTypes.bool, +}; diff --git a/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js b/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js index e448cd26ad..4e0184cef3 100644 --- a/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js +++ b/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js @@ -5,7 +5,7 @@ import FilterBar from '../components/filter_bar'; const makeMapStateToProps = state => ({ selectedFilter: state.getIn(['settings', 'notifications', 'quickFilter', 'active']), - advancedMode: false, + advancedMode: state.getIn(['settings', 'notifications', 'quickFilter', 'advanced']), }); const mapDispatchToProps = (dispatch) => ({ diff --git a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx index 5f430d5392..7adfc208e7 100644 --- a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx +++ b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx @@ -22,7 +22,7 @@ import { GIFV } from 'mastodon/components/gifv'; import { IconButton } from 'mastodon/components/icon_button'; import Audio from 'mastodon/features/audio'; import { CharacterCounter } from 'mastodon/features/compose/components/character_counter'; -import UploadProgress from 'mastodon/features/compose/components/upload_progress'; +import { UploadProgress } from 'mastodon/features/compose/components/upload_progress'; import { Tesseract as fetchTesseract } from 'mastodon/features/ui/util/async-components'; import { me } from 'mastodon/initial_state'; import { assetHost } from 'mastodon/utils/config'; diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js index 596c9ca49f..d8c57a2a0c 100644 --- a/app/javascript/mastodon/initial_state.js +++ b/app/javascript/mastodon/initial_state.js @@ -38,7 +38,6 @@ * @property {string} title * @property {boolean} show_trends * @property {boolean} trends_as_landing_page - * @property {boolean} unfollow_modal * @property {boolean} use_blurhash * @property {boolean=} use_pending_items * @property {string} version @@ -99,7 +98,6 @@ export const source_url = getMeta('source_url'); export const timelinePreview = getMeta('timeline_preview'); export const title = getMeta('title'); export const trendsAsLanding = getMeta('trends_as_landing_page'); -export const unfollowModal = getMeta('unfollow_modal'); export const useBlurhash = getMeta('use_blurhash'); export const usePendingItems = getMeta('use_pending_items'); export const version = getMeta('version'); diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json index 747c47960f..62ac7739d3 100644 --- a/app/javascript/mastodon/locales/ar.json +++ b/app/javascript/mastodon/locales/ar.json @@ -89,6 +89,7 @@ "announcement.announcement": "إعلان", "attachments_list.unprocessed": "(غير معالَج)", "audio.hide": "إخفاء المقطع الصوتي", + "block_modal.remote_users_caveat": "Do t’i kërkojmë shërbyesit {domain} të respektojë vendimin tuaj. Por, pajtimi s’është i garantuar, ngaqë disa shërbyes mund t’i trajtojnë ndryshe bllokimet. Psotimet publike mundet të jenë ende të dukshme për përdorues pa bërë hyrje në llogari.", "boost_modal.combo": "يُمكنك الضّغط على {combo} لتخطي هذا في المرة المُقبلة", "bundle_column_error.copy_stacktrace": "انسخ تقرير الخطأ", "bundle_column_error.error.body": "لا يمكن تقديم الصفحة المطلوبة. قد يكون بسبب خطأ في التعليمات البرمجية، أو مشكلة توافق المتصفح.", diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json index 1ff94eca6c..754b7156b8 100644 --- a/app/javascript/mastodon/locales/be.json +++ b/app/javascript/mastodon/locales/be.json @@ -471,6 +471,7 @@ "notification.own_poll": "Ваша апытанне скончылася", "notification.poll": "Апытанне, дзе вы прынялі ўдзел, скончылася", "notification.reblog": "{name} пашырыў ваш допіс", + "notification.severed_relationships": "Зносіны з {name} былі разарваныя", "notification.status": "Новы допіс ад {name}", "notification.update": "Допіс {name} адрэдагаваны", "notification_requests.accept": "Прыняць", @@ -483,6 +484,7 @@ "notifications.column_settings.admin.sign_up": "Новыя ўваходы:", "notifications.column_settings.alert": "Апавяшчэнні на працоўным стале", "notifications.column_settings.favourite": "Упадабанае:", + "notifications.column_settings.filter_bar.advanced": "Паказаць усе катэгорыі", "notifications.column_settings.follow": "Новыя падпісчыкі:", "notifications.column_settings.follow_request": "Новыя запыты на падпіску:", "notifications.column_settings.mention": "Згадванні:", @@ -587,6 +589,8 @@ "refresh": "Абнавiць", "regeneration_indicator.label": "Загрузка…", "regeneration_indicator.sublabel": "Пачакайце, рыхтуем вашу стужку!", + "relationship_severance_notification.types.user_domain_block": "Вы заблакіравалі гэты дамен", + "relationship_severance_notification.view": "Праглядзець", "relative_time.days": "{number} д", "relative_time.full.days": "{number, plural, one {# дзень} few {# дні} many {# дзён} other {# дня}} таму", "relative_time.full.hours": "{number, plural, one {# гадзіна} few {# гадзіны} many {# гадзін} other {# гадзіны}} таму", diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json index d692925d15..4670a6e2d6 100644 --- a/app/javascript/mastodon/locales/bg.json +++ b/app/javascript/mastodon/locales/bg.json @@ -434,7 +434,7 @@ "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_mentions": "Няма да виждате споменаващите ги публикации.", "mute_modal.you_wont_see_posts": "Още могат да виждат публикациите ви, но вие техните не.", "navigation_bar.about": "Относно", "navigation_bar.advanced_interface": "Отваряне в разширен уебинтерфейс", @@ -471,6 +471,7 @@ "notification.own_poll": "Анкетата ви приключи", "notification.poll": "Анкета, в която гласувахте, приключи", "notification.reblog": "{name} подсили ваша публикация", + "notification.severed_relationships": "Връзката с {name} е прекъсната", "notification.status": "{name} току-що публикува", "notification.update": "{name} промени публикация", "notification_requests.accept": "Приемам", @@ -587,6 +588,12 @@ "refresh": "Опресняване", "regeneration_indicator.label": "Зареждане…", "regeneration_indicator.sublabel": "Подготовка на началния ви инфоканал!", + "relationship_severance_notification.purged_data": "прочистено от администраторите", + "relationship_severance_notification.relationships": "{count, plural, one {# връзка} other {# връзки}}", + "relationship_severance_notification.types.account_suspension": "Акаунтът е спрян", + "relationship_severance_notification.types.domain_block": "Домейнът е спрян", + "relationship_severance_notification.types.user_domain_block": "Блокирахте този домейн", + "relationship_severance_notification.view": "Преглед", "relative_time.days": "{number} д.", "relative_time.full.days": "преди {number, plural, one {# ден} other {# дни}}", "relative_time.full.hours": "преди {number, plural, one {# час} other {# часа}}", diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index e0d62c78bb..c95e8a9502 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -471,6 +471,7 @@ "notification.own_poll": "La teva enquesta ha finalitzat", "notification.poll": "Ha finalitzat una enquesta en què has votat", "notification.reblog": "{name} t'ha impulsat", + "notification.severed_relationships": "S'han eliminat les relacions amb {name}", "notification.status": "{name} acaba de publicar", "notification.update": "{name} ha editat un tut", "notification_requests.accept": "Accepta", @@ -587,6 +588,12 @@ "refresh": "Actualitza", "regeneration_indicator.label": "Es carrega…", "regeneration_indicator.sublabel": "Es prepara la teva línia de temps d'Inici!", + "relationship_severance_notification.purged_data": "purgat pels administradors", + "relationship_severance_notification.relationships": "{count, plural, one {# relació} other {# relacions}}", + "relationship_severance_notification.types.account_suspension": "S'ha suspès el compte", + "relationship_severance_notification.types.domain_block": "S'ha suspès el domini", + "relationship_severance_notification.types.user_domain_block": "Heu blocat aquest domini", + "relationship_severance_notification.view": "Visualitza", "relative_time.days": "{number}d", "relative_time.full.days": "fa {number, plural, one {# dia} other {# dies}}", "relative_time.full.hours": "fa {number, plural, one {# hora} other {# hores}}", diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json index bff044e7d6..97468c6272 100644 --- a/app/javascript/mastodon/locales/da.json +++ b/app/javascript/mastodon/locales/da.json @@ -220,7 +220,7 @@ "domain_pill.activitypub_lets_connect": "Det muliggør at komme i forbindelse og interagere med folk ikke kun på Mastodon, men også på tværs af forskellige sociale apps.", "domain_pill.activitypub_like_language": "ActivityPub er \"sproget\", Mastodon taler med andre sociale netværk.", "domain_pill.server": "Server", - "domain_pill.their_handle": "Deres handle:", + "domain_pill.their_handle": "Vedkommendes handle:", "domain_pill.username": "Brugernavn", "domain_pill.whats_in_a_handle": "Hvad er der i et handle (@brugernavn)?", "domain_pill.who_they_are": "Da et handle fortæller, hvem nogen er, og hvor de er, kan man interagere med folk på tværs af det sociale net af .", @@ -481,6 +481,8 @@ "notifications.column_settings.admin.sign_up": "Nye tilmeldinger:", "notifications.column_settings.alert": "Computernotifikationer", "notifications.column_settings.favourite": "Favoritter:", + "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier", + "notifications.column_settings.filter_bar.category": "Hurtigfiltreringsbjælke", "notifications.column_settings.follow": "Nye følgere:", "notifications.column_settings.follow_request": "Nye følgeanmodninger:", "notifications.column_settings.mention": "Omtaler:", @@ -585,6 +587,12 @@ "refresh": "Genindlæs", "regeneration_indicator.label": "Indlæser…", "regeneration_indicator.sublabel": "Din hjemmetidslinje klargøres!", + "relationship_severance_notification.purged_data": "renset af administratorer", + "relationship_severance_notification.relationships": "{count, plural, one {# forhold} other {# forhold}}", + "relationship_severance_notification.types.account_suspension": "Konto er blevet suspenderet", + "relationship_severance_notification.types.domain_block": "Domæne er blevet suspenderet", + "relationship_severance_notification.types.user_domain_block": "Dette domæne blev blokeret", + "relationship_severance_notification.view": "Vis", "relative_time.days": "{number}d", "relative_time.full.days": "{number, plural, one {# dag} other {# dage}} siden", "relative_time.full.hours": "{number, plural, one {# time} other {# timer}} siden", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index cb03e7ba3d..8cc77c0725 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -471,6 +471,7 @@ "notification.own_poll": "Deine Umfrage ist beendet", "notification.poll": "Eine Umfrage, an der du teilgenommen hast, ist beendet", "notification.reblog": "{name} teilte deinen Beitrag", + "notification.severed_relationships": "Beziehungen zu {name} getrennt", "notification.status": "{name} hat gerade etwas gepostet", "notification.update": "{name} bearbeitete einen Beitrag", "notification_requests.accept": "Akzeptieren", @@ -483,6 +484,8 @@ "notifications.column_settings.admin.sign_up": "Neue Registrierungen:", "notifications.column_settings.alert": "Desktop-Benachrichtigungen", "notifications.column_settings.favourite": "Favoriten:", + "notifications.column_settings.filter_bar.advanced": "Alle Filterkategorien anzeigen", + "notifications.column_settings.filter_bar.category": "Filterleiste", "notifications.column_settings.follow": "Neue Follower:", "notifications.column_settings.follow_request": "Neue Follower-Anfragen:", "notifications.column_settings.mention": "Erwähnungen:", @@ -587,6 +590,12 @@ "refresh": "Aktualisieren", "regeneration_indicator.label": "Wird geladen …", "regeneration_indicator.sublabel": "Deine Startseite wird gerade vorbereitet!", + "relationship_severance_notification.purged_data": "von Administrator*innen entfernt", + "relationship_severance_notification.relationships": "{count, plural, one {# Beziehung} other {# Beziehungen}}", + "relationship_severance_notification.types.account_suspension": "Konto wurde gesperrt", + "relationship_severance_notification.types.domain_block": "Domain wurde gesperrt", + "relationship_severance_notification.types.user_domain_block": "Du hast diese Domain blockiert", + "relationship_severance_notification.view": "Anzeigen", "relative_time.days": "{number} T.", "relative_time.full.days": "vor {number, plural, one {# Tag} other {# Tagen}}", "relative_time.full.hours": "vor {number, plural, one {# Stunde} other {# Stunden}}", diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 376dfb7e4b..881ed19e0e 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -298,6 +298,7 @@ "filter_modal.select_filter.title": "Filter this post", "filter_modal.title.status": "Filter a post", "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know", + "filtered_notifications_banner.private_mentions": "{count, plural, one {private mention} other {private mentions}}", "filtered_notifications_banner.title": "Filtered notifications", "firehose.all": "All", "firehose.local": "This server", @@ -471,6 +472,11 @@ "notification.own_poll": "Your poll has ended", "notification.poll": "A poll you have voted in has ended", "notification.reblog": "{name} boosted your post", + "notification.relationships_severance_event": "Lost connections with {name}", + "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.", + "notification.relationships_severance_event.domain_block": "An admin from {from} has blocked {target}, including {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.", + "notification.relationships_severance_event.learn_more": "Learn more", + "notification.relationships_severance_event.user_domain_block": "You have blocked {target}, removing {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.", "notification.status": "{name} just posted", "notification.update": "{name} edited a post", "notification_requests.accept": "Accept", @@ -483,6 +489,8 @@ "notifications.column_settings.admin.sign_up": "New sign-ups:", "notifications.column_settings.alert": "Desktop notifications", "notifications.column_settings.favourite": "Favorites:", + "notifications.column_settings.filter_bar.advanced": "Display all categories", + "notifications.column_settings.filter_bar.category": "Quick filter bar", "notifications.column_settings.follow": "New followers:", "notifications.column_settings.follow_request": "New follow requests:", "notifications.column_settings.mention": "Mentions:", diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json index 53144cfcbf..a9db8831e2 100644 --- a/app/javascript/mastodon/locales/es-AR.json +++ b/app/javascript/mastodon/locales/es-AR.json @@ -427,7 +427,7 @@ "loading_indicator.label": "Cargando…", "media_gallery.toggle_visible": "Ocultar {number, plural, one {imagen} other {imágenes}}", "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te mudaste a {movedToAccount}.", - "mute_modal.hide_from_notifications": "Ocultar de las notificaciones", + "mute_modal.hide_from_notifications": "Ocultar en las notificaciones", "mute_modal.hide_options": "Ocultar opciones", "mute_modal.indefinite": "Hasta que deje de silenciarlos", "mute_modal.show_options": "Mostrar opciones", @@ -471,6 +471,7 @@ "notification.own_poll": "Tu encuesta finalizó", "notification.poll": "Finalizó una encuesta en la que votaste", "notification.reblog": "{name} adhirió a tu mensaje", + "notification.severed_relationships": "Relaciones con {name} cortadas", "notification.status": "{name} acaba de enviar un mensaje", "notification.update": "{name} editó un mensaje", "notification_requests.accept": "Aceptar", @@ -483,6 +484,8 @@ "notifications.column_settings.admin.sign_up": "Nuevos registros:", "notifications.column_settings.alert": "Notificaciones de escritorio", "notifications.column_settings.favourite": "Favoritos:", + "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías", + "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido", "notifications.column_settings.follow": "Nuevos seguidores:", "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:", "notifications.column_settings.mention": "Menciones:", @@ -587,6 +590,12 @@ "refresh": "Refrescar", "regeneration_indicator.label": "Cargando…", "regeneration_indicator.sublabel": "¡Se está preparando tu línea temporal principal!", + "relationship_severance_notification.purged_data": "purgada por administradores", + "relationship_severance_notification.relationships": "{count, plural, one {# relación} other {# relaciones}}", + "relationship_severance_notification.types.account_suspension": "La cuenta fue suspendida", + "relationship_severance_notification.types.domain_block": "El dominio fue suspendido", + "relationship_severance_notification.types.user_domain_block": "Bloqueaste este dominio", + "relationship_severance_notification.view": "Ver", "relative_time.days": "{number}d", "relative_time.full.days": "{number, plural,one {hace # día} other {hace # días}}", "relative_time.full.hours": "{number, plural,one {hace # hora} other {hace # horas}}", diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json index 00dcb81461..dea71a9351 100644 --- a/app/javascript/mastodon/locales/es-MX.json +++ b/app/javascript/mastodon/locales/es-MX.json @@ -471,6 +471,7 @@ "notification.own_poll": "Tu encuesta ha terminado", "notification.poll": "Una encuesta en la que has votado ha terminado", "notification.reblog": "{name} ha retooteado tu estado", + "notification.severed_relationships": "Se han cortado las relaciones con {name}", "notification.status": "{name} acaba de publicar", "notification.update": "{name} editó una publicación", "notification_requests.accept": "Aceptar", @@ -483,6 +484,8 @@ "notifications.column_settings.admin.sign_up": "Registros nuevos:", "notifications.column_settings.alert": "Notificaciones de escritorio", "notifications.column_settings.favourite": "Favoritos:", + "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías", + "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido", "notifications.column_settings.follow": "Nuevos seguidores:", "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:", "notifications.column_settings.mention": "Menciones:", @@ -587,6 +590,12 @@ "refresh": "Actualizar", "regeneration_indicator.label": "Cargando…", "regeneration_indicator.sublabel": "¡Tu historia de inicio se está preparando!", + "relationship_severance_notification.purged_data": "purgado por administradores", + "relationship_severance_notification.relationships": "{count, plural, one {# relación} other {# relaciones}}", + "relationship_severance_notification.types.account_suspension": "La cuenta ha sido suspendida", + "relationship_severance_notification.types.domain_block": "El dominio ha sido suspendido", + "relationship_severance_notification.types.user_domain_block": "Bloqueaste este dominio", + "relationship_severance_notification.view": "Ver", "relative_time.days": "{number} d", "relative_time.full.days": "{number, plural, one {# día} other {# días hace}}", "relative_time.full.hours": "{number, plural, one {# hora} other {# horas}} hace", diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index 728f4d05fc..64bcf7d9c0 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -471,6 +471,7 @@ "notification.own_poll": "Tu encuesta ha terminado", "notification.poll": "Una encuesta en la que has votado ha terminado", "notification.reblog": "{name} ha impulsado tu publicación", + "notification.severed_relationships": "Se han cortado las relaciones con {name}", "notification.status": "{name} acaba de publicar", "notification.update": "{name} editó una publicación", "notification_requests.accept": "Aceptar", @@ -483,6 +484,8 @@ "notifications.column_settings.admin.sign_up": "Nuevos registros:", "notifications.column_settings.alert": "Notificaciones de escritorio", "notifications.column_settings.favourite": "Favoritos:", + "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías", + "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido", "notifications.column_settings.follow": "Nuevos seguidores:", "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:", "notifications.column_settings.mention": "Menciones:", @@ -587,6 +590,12 @@ "refresh": "Actualizar", "regeneration_indicator.label": "Cargando…", "regeneration_indicator.sublabel": "¡Tu historia de inicio se está preparando!", + "relationship_severance_notification.purged_data": "purgado por administradores", + "relationship_severance_notification.relationships": "{count, plural, one {# relación} other {# relaciones}}", + "relationship_severance_notification.types.account_suspension": "La cuenta ha sido suspendida", + "relationship_severance_notification.types.domain_block": "El dominio ha sido suspendido", + "relationship_severance_notification.types.user_domain_block": "Bloqueaste este dominio", + "relationship_severance_notification.view": "Ver", "relative_time.days": "{number} d", "relative_time.full.days": "hace {number, plural, one {# día} other {# días}}", "relative_time.full.hours": "hace {number, plural, one {# hora} other {# horas}}", diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json index aae678a7d6..8c3c5f9845 100644 --- a/app/javascript/mastodon/locales/eu.json +++ b/app/javascript/mastodon/locales/eu.json @@ -471,6 +471,7 @@ "notification.own_poll": "Zure inkesta amaitu da", "notification.poll": "Zuk erantzun duzun inkesta bat bukatu da", "notification.reblog": "{name}(e)k bultzada eman dio zure bidalketari", + "notification.severed_relationships": "{name} erabiltzailearekin zenuen erlazioa galdu da", "notification.status": "{name} erabiltzaileak bidalketa egin berri du", "notification.update": "{name} erabiltzaileak bidalketa bat editatu du", "notification_requests.accept": "Onartu", @@ -483,6 +484,8 @@ "notifications.column_settings.admin.sign_up": "Izen-emate berriak:", "notifications.column_settings.alert": "Mahaigaineko jakinarazpenak", "notifications.column_settings.favourite": "Gogokoak:", + "notifications.column_settings.filter_bar.advanced": "Bistaratu kategoria guztiak", + "notifications.column_settings.filter_bar.category": "Iragazki-barra bizkorra", "notifications.column_settings.follow": "Jarraitzaile berriak:", "notifications.column_settings.follow_request": "Jarraitzeko eskaera berriak:", "notifications.column_settings.mention": "Aipamenak:", @@ -587,6 +590,12 @@ "refresh": "Berritu", "regeneration_indicator.label": "Kargatzen…", "regeneration_indicator.sublabel": "Zure hasiera-jarioa prestatzen ari da!", + "relationship_severance_notification.purged_data": "administratzaileek kendua", + "relationship_severance_notification.relationships": "{count, plural, one {Erlazio #} other {# erlazio}}", + "relationship_severance_notification.types.account_suspension": "Kontua bertan behera utzi da", + "relationship_severance_notification.types.domain_block": "Domeinua bertan behera utzi da", + "relationship_severance_notification.types.user_domain_block": "Domeinu hau blokeatu duzu", + "relationship_severance_notification.view": "Ikusi", "relative_time.days": "{number}e", "relative_time.full.days": "Duela {number, plural, one {egun #} other {# egun}}", "relative_time.full.hours": "Duela {number, plural, one {ordu #} other {# ordu}}", diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index b784a1d5c0..6d6b7d612c 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -462,6 +462,8 @@ "notifications.permission_denied": "آگاهی‌های میزکار به دلیل رد کردن درخواست اجازهٔ پیشین مرورگر، در دسترس نیستند", "notifications.permission_denied_alert": "از آن‌جا که پیش از این اجازهٔ مرورگر رد شده است، آگاهی‌های میزکار نمی‌توانند به کار بیفتند", "notifications.permission_required": "آگاهی‌های میزکار در دسترس نیستند زیرا اجازه‌های لازم، اعطا نشده.", + "notifications.policy.filter_not_followers_title": "کسانی که شما را دنبال میکنند", + "notifications.policy.filter_not_following_hint": "", "notifications_permission_banner.enable": "به کار انداختن آگاهی‌های میزکار", "notifications_permission_banner.how_to_control": "برای دریافت آگاهی‌ها هنگام باز نبودن ماستودون، آگاهی‌های میزکار را به کار بیندازید. پس از به کار افتادنشان می‌توانید گونه‌های دقیق برهم‌کنش‌هایی که آگاهی‌های میزکار تولید می‌کنند را از {icon} بالا واپایید.", "notifications_permission_banner.title": "هرگز چیزی را از دست ندهید", diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json index bb5370b6d7..16670d9ffe 100644 --- a/app/javascript/mastodon/locales/fi.json +++ b/app/javascript/mastodon/locales/fi.json @@ -471,6 +471,7 @@ "notification.own_poll": "Äänestyksesi on päättynyt", "notification.poll": "Kysely, johon osallistuit, on päättynyt", "notification.reblog": "{name} tehosti julkaisuasi", + "notification.severed_relationships": "Suhteet palvelimeen {name} katkenneet", "notification.status": "{name} julkaisi juuri", "notification.update": "{name} muokkasi julkaisua", "notification_requests.accept": "Hyväksy", @@ -483,6 +484,8 @@ "notifications.column_settings.admin.sign_up": "Uudet rekisteröitymiset:", "notifications.column_settings.alert": "Työpöytäilmoitukset", "notifications.column_settings.favourite": "Suosikit:", + "notifications.column_settings.filter_bar.advanced": "Näytä kaikki luokat", + "notifications.column_settings.filter_bar.category": "Pikasuodatuspalkki", "notifications.column_settings.follow": "Uudet seuraajat:", "notifications.column_settings.follow_request": "Uudet seuraamispyynnöt:", "notifications.column_settings.mention": "Maininnat:", @@ -587,6 +590,12 @@ "refresh": "Päivitä", "regeneration_indicator.label": "Ladataan…", "regeneration_indicator.sublabel": "Kotisyötettäsi valmistellaan!", + "relationship_severance_notification.purged_data": "ylläpitäjien tyhjentämä", + "relationship_severance_notification.relationships": "{count, plural, one {# suhde} other {# suhdetta}}", + "relationship_severance_notification.types.account_suspension": "Tili on jäädytetty", + "relationship_severance_notification.types.domain_block": "Verkkotunnus on jäädytetty", + "relationship_severance_notification.types.user_domain_block": "Estit tämän verkkotunnuksen", + "relationship_severance_notification.view": "Näytä", "relative_time.days": "{number} pv", "relative_time.full.days": "{number, plural, one {# päivä} other {# päivää}} sitten", "relative_time.full.hours": "{number, plural, one {# tunti} other {# tuntia}} sitten", diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json index 27c0c8548f..c86829ee30 100644 --- a/app/javascript/mastodon/locales/fo.json +++ b/app/javascript/mastodon/locales/fo.json @@ -471,6 +471,7 @@ "notification.own_poll": "Tín atkvøðugreiðsla er endað", "notification.poll": "Ein atkvøðugreiðsla, har tú hevur atkvøtt, er endað", "notification.reblog": "{name} lyfti tín post", + "notification.severed_relationships": "Tilknýti við {name} avbrotið", "notification.status": "{name} hevur júst postað", "notification.update": "{name} rættaði ein post", "notification_requests.accept": "Góðtak", @@ -483,6 +484,8 @@ "notifications.column_settings.admin.sign_up": "Nýggjar tilmeldingar:", "notifications.column_settings.alert": "Skriviborðsfráboðanir", "notifications.column_settings.favourite": "Dámdir postar:", + "notifications.column_settings.filter_bar.advanced": "Vís allar bólkar", + "notifications.column_settings.filter_bar.category": "Skjótfilturbjálki", "notifications.column_settings.follow": "Nýggir fylgjarar:", "notifications.column_settings.follow_request": "Nýggjar umbønir um at fylgja:", "notifications.column_settings.mention": "Umrøður:", @@ -587,6 +590,12 @@ "refresh": "Endurles", "regeneration_indicator.label": "Innlesur…", "regeneration_indicator.sublabel": "Tín heimarás verður gjørd klár!", + "relationship_severance_notification.purged_data": "reinsað av umsitarum", + "relationship_severance_notification.relationships": "{count, plural, one {# tilknýti} other {# tilknýti}}", + "relationship_severance_notification.types.account_suspension": "Kontan er ógildað", + "relationship_severance_notification.types.domain_block": "Økisnavn er ógildað", + "relationship_severance_notification.types.user_domain_block": "Tú hevur forðað hesum økisnavni", + "relationship_severance_notification.view": "Vís", "relative_time.days": "{number}d", "relative_time.full.days": "{number, plural, one {# dagur} other {# dagar}} síðani", "relative_time.full.hours": "{number, plural, one {# tími} other {# tímar}} síðani", diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json index 9549686d7c..1e1c78f29d 100644 --- a/app/javascript/mastodon/locales/fr-CA.json +++ b/app/javascript/mastodon/locales/fr-CA.json @@ -89,6 +89,14 @@ "announcement.announcement": "Annonce", "attachments_list.unprocessed": "(non traité)", "audio.hide": "Masquer l'audio", + "block_modal.remote_users_caveat": "Nous allons demander au serveur {domain} de respecter votre décision. Cependant, ce respect n'est pas garanti, car certains serveurs peuvent gérer différemment les blocages. Les messages publics peuvent rester visibles par les utilisateurs non connectés.", + "block_modal.show_less": "Afficher moins", + "block_modal.show_more": "Afficher plus", + "block_modal.they_cant_mention": "Il ne peut pas vous mentionner ou vous suivre.", + "block_modal.they_cant_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.", + "block_modal.they_will_know": "Il peut voir qu'il est bloqué.", + "block_modal.title": "Bloquer l'utilisateur ?", + "block_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.", "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour sauter ceci la prochaine fois", "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur", "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela pourrait être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.", @@ -169,6 +177,7 @@ "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste?", "confirmations.discard_edit_media.confirm": "Rejeter", "confirmations.discard_edit_media.message": "Vous avez des modifications non enregistrées de la description ou de l'aperçu du média, voulez-vous quand même les supprimer?", + "confirmations.domain_block.confirm": "Bloquer le serveur", "confirmations.domain_block.message": "Voulez-vous vraiment, vraiment bloquer {domain} en entier? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans vos fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.", "confirmations.edit.confirm": "Éditer", "confirmations.edit.message": "Modifier maintenant écrasera votre message en cours de rédaction. Voulez-vous vraiment continuer ?", @@ -200,6 +209,27 @@ "dismissable_banner.explore_statuses": "Voici des publications venant de tout le web social gagnant en popularité aujourd’hui. Les nouvelles publications avec plus de boosts et de favoris sont classés plus haut.", "dismissable_banner.explore_tags": "Ces hashtags sont présentement en train de gagner de l'ampleur parmi des personnes sur les serveurs du réseau décentralisé dont celui-ci.", "dismissable_banner.public_timeline": "Ce sont les messages publics les plus récents de personnes sur le web social que les gens de {domain} suivent.", + "domain_block_modal.block": "Bloquer le serveur", + "domain_block_modal.block_account_instead": "Bloquer @{name} à la place", + "domain_block_modal.they_can_interact_with_old_posts": "Les personnes de ce serveur peuvent interagir avec vos anciennes publications.", + "domain_block_modal.they_cant_follow": "Personne de ce serveur ne peut vous suivre.", + "domain_block_modal.they_wont_know": "Il ne saura pas qu'il a été bloqué.", + "domain_block_modal.title": "Bloquer le domaine ?", + "domain_block_modal.you_will_lose_followers": "Tous vos abonnés de ce serveur seront supprimés.", + "domain_block_modal.you_wont_see_posts": "Vous ne verrez plus les publications ou les notifications des utilisateurs de ce serveur.", + "domain_pill.activitypub_lets_connect": "Cela vous permet de vous connecter et d'interagir avec les autres non seulement sur Mastodon, mais également sur d'autres applications de réseaux sociaux.", + "domain_pill.activitypub_like_language": "ActivityPub est comme une langue que Mastodon utilise pour communiquer avec les autres réseaux sociaux.", + "domain_pill.server": "Serveur", + "domain_pill.their_handle": "Son identifiant :", + "domain_pill.their_server": "Son foyer numérique, là où tous ses posts résident.", + "domain_pill.their_username": "Son identifiant unique sur leur serveur. Il est possible de rencontrer des utilisateurs avec le même nom sur différents serveurs.", + "domain_pill.username": "Nom d’utilisateur", + "domain_pill.whats_in_a_handle": "Qu'est-ce qu'un identifiant ?", + "domain_pill.who_they_are": "Comme un identifiant contient le nom et le service hébergeant une personne, vous pouvez interagir sur .", + "domain_pill.who_you_are": "Comme un identifiant indique votre nom et le service vous hébergeant, vous pouvez interagir avec .", + "domain_pill.your_handle": "Votre identifiant :", + "domain_pill.your_server": "Votre foyer numérique, là où vos messages résident. Vous souhaitez changer ? Lancez un transfert vers un autre serveur quand vous le voulez et vos abonné·e·s suivront automatiquement.", + "domain_pill.your_username": "Votre identifiant unique sur ce serveur. Il est possible de trouver des utilisateurs ayant le même nom d'utilisateur sur différents serveurs.", "embed.instructions": "Intégrez cette publication à votre site en copiant le code ci-dessous.", "embed.preview": "Voici comment il apparaîtra:", "emoji_button.activity": "Activité", @@ -236,6 +266,7 @@ "empty_column.list": "Il n’y a rien dans cette liste pour l’instant. Quand des membres de cette liste publieront de nouvelles publications, elles apparaîtront ici.", "empty_column.lists": "Vous n’avez pas encore de liste. Lorsque vous en créerez une, elle apparaîtra ici.", "empty_column.mutes": "Vous n’avez masqué aucun compte pour le moment.", + "empty_column.notification_requests": "C'est fini ! Il n'y a plus rien ici. Lorsque vous recevez de nouvelles notifications, elles apparaitront ici conformément à vos préférences.", "empty_column.notifications": "Vous n'avez pas encore de notifications. Quand d'autres personnes interagissent avec vous, vous en verrez ici.", "empty_column.public": "Il n’y a rien ici! Écrivez quelque chose publiquement, ou bien suivez manuellement des personnes d’autres serveurs pour remplir le fil public", "error.unexpected_crash.explanation": "En raison d’un bogue dans notre code ou d’un problème de compatibilité avec votre navigateur, cette page n’a pas pu être affichée correctement.", @@ -396,6 +427,15 @@ "loading_indicator.label": "Chargement…", "media_gallery.toggle_visible": "{number, plural, one {Cacher l’image} other {Cacher les images}}", "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous avez déménagé sur {movedToAccount}.", + "mute_modal.hide_from_notifications": "Cacher des notifications", + "mute_modal.hide_options": "Masquer les options", + "mute_modal.indefinite": "Jusqu'à ce que je les réactive", + "mute_modal.show_options": "Afficher les options", + "mute_modal.they_can_mention_and_follow": "Ils peuvent vous mentionner et vous suivre, mais vous ne les verrez pas.", + "mute_modal.they_wont_know": "Ils ne sauront pas qu'ils ont été rendus silencieux.", + "mute_modal.title": "Rendre cet utilisateur silencieux ?", + "mute_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.", + "mute_modal.you_wont_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.", "navigation_bar.about": "À propos", "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée", "navigation_bar.blocks": "Comptes bloqués", @@ -431,8 +471,13 @@ "notification.own_poll": "Votre sondage est terminé", "notification.poll": "Un sondage auquel vous avez participé est terminé", "notification.reblog": "{name} a boosté votre message", + "notification.severed_relationships": "Relation avec {name} rompues", "notification.status": "{name} vient de publier", "notification.update": "{name} a modifié une publication", + "notification_requests.accept": "Accepter", + "notification_requests.dismiss": "Rejeter", + "notification_requests.notifications_from": "Notifications de {name}", + "notification_requests.title": "Notifications filtrées", "notifications.clear": "Effacer notifications", "notifications.clear_confirmation": "Voulez-vous vraiment effacer toutes vos notifications?", "notifications.column_settings.admin.report": "Nouveaux signalements:", @@ -464,6 +509,15 @@ "notifications.permission_denied": "Les notifications de bureau ne sont pas disponibles en raison d'une demande de permission de navigateur précédemment refusée", "notifications.permission_denied_alert": "Les notifications de bureau ne peuvent pas être activées, car l’autorisation du navigateur a précedemment été refusée", "notifications.permission_required": "Les notifications de bureau ne sont pas disponibles car l’autorisation requise n’a pas été accordée.", + "notifications.policy.filter_new_accounts.hint": "Créés au cours des derniers {days, plural, one {un jour} other {# jours}}", + "notifications.policy.filter_new_accounts_title": "Nouveaux comptes", + "notifications.policy.filter_not_followers_hint": "Incluant les personnes qui vous suivent depuis moins de {days, plural, one {un jour} other {# jours}}", + "notifications.policy.filter_not_followers_title": "Personnes qui ne vous suivent pas", + "notifications.policy.filter_not_following_hint": "Jusqu'à ce que vous les validiez manuellement", + "notifications.policy.filter_not_following_title": "Personnes que vous ne suivez pas", + "notifications.policy.filter_private_mentions_hint": "Filtré sauf si c'est en réponse à une mention de vous ou si vous suivez l'expéditeur", + "notifications.policy.filter_private_mentions_title": "Mentions privées non sollicitées", + "notifications.policy.title": "Filtrer les notifications de…", "notifications_permission_banner.enable": "Activer les notifications de bureau", "notifications_permission_banner.how_to_control": "Pour recevoir des notifications lorsque Mastodon n’est pas ouvert, activez les notifications de bureau. Vous pouvez contrôler précisément quels types d’interactions génèrent des notifications de bureau via le bouton {icon} ci-dessus une fois qu’elles sont activées.", "notifications_permission_banner.title": "Ne rien rater", @@ -534,6 +588,12 @@ "refresh": "Actualiser", "regeneration_indicator.label": "Chargement…", "regeneration_indicator.sublabel": "Votre fil d'accueil est en cours de préparation!", + "relationship_severance_notification.purged_data": "supprimées par les administrateurs", + "relationship_severance_notification.relationships": "{count, plural, one {# relation} other {# relations}}", + "relationship_severance_notification.types.account_suspension": "Le compte a été suspendu", + "relationship_severance_notification.types.domain_block": "Le domaine a été suspendu", + "relationship_severance_notification.types.user_domain_block": "Vous avez bloqué ce domaine", + "relationship_severance_notification.view": "Afficher", "relative_time.days": "{number} j", "relative_time.full.days": "il y a {number, plural, one {# jour} other {# jours}}", "relative_time.full.hours": "il y a {number, plural, one {# heure} other {# heures}}", @@ -640,9 +700,11 @@ "status.direct": "Mention privée @{name}", "status.direct_indicator": "Mention privée", "status.edit": "Modifier", + "status.edited": "Dernière modification le {date}", "status.edited_x_times": "Modifiée {count, plural, one {{count} fois} other {{count} fois}}", "status.embed": "Intégrer", "status.favourite": "Ajouter aux favoris", + "status.favourites": "{count, plural, one {favori} other {favoris}}", "status.filter": "Filtrer cette publication", "status.filtered": "Filtrée", "status.hide": "Masquer le message", @@ -663,6 +725,7 @@ "status.reblog": "Booster", "status.reblog_private": "Booster avec visibilité originale", "status.reblogged_by": "{name} a boosté", + "status.reblogs": "{count, plural, one {boost} other {boosts}}", "status.reblogs.empty": "Personne n’a encore boosté cette publication. Lorsque quelqu’un le fera, elle apparaîtra ici.", "status.redraft": "Supprimer et réécrire", "status.remove_bookmark": "Retirer des signets", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index 29b4d56a4f..af5ed66bd8 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -89,6 +89,14 @@ "announcement.announcement": "Annonce", "attachments_list.unprocessed": "(non traité)", "audio.hide": "Masquer l'audio", + "block_modal.remote_users_caveat": "Nous allons demander au serveur {domain} de respecter votre décision. Cependant, ce respect n'est pas garanti, car certains serveurs peuvent gérer différemment les blocages. Les messages publics peuvent rester visibles par les utilisateurs non connectés.", + "block_modal.show_less": "Afficher moins", + "block_modal.show_more": "Afficher plus", + "block_modal.they_cant_mention": "Il ne peut pas vous mentionner ou vous suivre.", + "block_modal.they_cant_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.", + "block_modal.they_will_know": "Il peut voir qu'il est bloqué.", + "block_modal.title": "Bloquer l'utilisateur ?", + "block_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.", "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois", "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur", "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela peut être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.", @@ -169,6 +177,7 @@ "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste ?", "confirmations.discard_edit_media.confirm": "Rejeter", "confirmations.discard_edit_media.message": "Vous avez des modifications non enregistrées de la description ou de l'aperçu du média, les supprimer quand même ?", + "confirmations.domain_block.confirm": "Bloquer le serveur", "confirmations.domain_block.message": "Voulez-vous vraiment, vraiment bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans vos fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.", "confirmations.edit.confirm": "Modifier", "confirmations.edit.message": "Modifier maintenant écrasera votre message en cours de rédaction. Voulez-vous vraiment continuer ?", @@ -200,6 +209,27 @@ "dismissable_banner.explore_statuses": "Ces messages venant de tout le web social gagnent en popularité aujourd’hui. Les nouveaux messages avec plus de boosts et de favoris sont classés plus haut.", "dismissable_banner.explore_tags": "Ces hashtags sont actuellement en train de gagner de l'ampleur parmi les personnes sur les serveurs du réseau décentralisé dont celui-ci.", "dismissable_banner.public_timeline": "Ce sont les posts publics les plus récents de personnes sur le web social que les gens sur {domain} suivent.", + "domain_block_modal.block": "Bloquer le serveur", + "domain_block_modal.block_account_instead": "Bloquer @{name} à la place", + "domain_block_modal.they_can_interact_with_old_posts": "Les personnes de ce serveur peuvent interagir avec vos anciennes publications.", + "domain_block_modal.they_cant_follow": "Personne de ce serveur ne peut vous suivre.", + "domain_block_modal.they_wont_know": "Il ne saura pas qu'il a été bloqué.", + "domain_block_modal.title": "Bloquer le domaine ?", + "domain_block_modal.you_will_lose_followers": "Tous vos abonnés de ce serveur seront supprimés.", + "domain_block_modal.you_wont_see_posts": "Vous ne verrez plus les publications ou les notifications des utilisateurs de ce serveur.", + "domain_pill.activitypub_lets_connect": "Cela vous permet de vous connecter et d'interagir avec les autres non seulement sur Mastodon, mais également sur d'autres applications de réseaux sociaux.", + "domain_pill.activitypub_like_language": "ActivityPub est comme une langue que Mastodon utilise pour communiquer avec les autres réseaux sociaux.", + "domain_pill.server": "Serveur", + "domain_pill.their_handle": "Son identifiant :", + "domain_pill.their_server": "Son foyer numérique, là où tous ses posts résident.", + "domain_pill.their_username": "Son identifiant unique sur leur serveur. Il est possible de rencontrer des utilisateurs avec le même nom sur différents serveurs.", + "domain_pill.username": "Nom d’utilisateur", + "domain_pill.whats_in_a_handle": "Qu'est-ce qu'un identifiant ?", + "domain_pill.who_they_are": "Comme un identifiant contient le nom et le service hébergeant une personne, vous pouvez interagir sur .", + "domain_pill.who_you_are": "Comme un identifiant indique votre nom et le service vous hébergeant, vous pouvez interagir avec .", + "domain_pill.your_handle": "Votre identifiant :", + "domain_pill.your_server": "Votre foyer numérique, là où vos messages résident. Vous souhaitez changer ? Lancez un transfert vers un autre serveur quand vous le voulez et vos abonné·e·s suivront automatiquement.", + "domain_pill.your_username": "Votre identifiant unique sur ce serveur. Il est possible de trouver des utilisateurs ayant le même nom d'utilisateur sur différents serveurs.", "embed.instructions": "Intégrez ce message à votre site en copiant le code ci-dessous.", "embed.preview": "Il apparaîtra comme cela :", "emoji_button.activity": "Activités", @@ -236,6 +266,7 @@ "empty_column.list": "Il n’y a rien dans cette liste pour l’instant. Quand des membres de cette liste publieront de nouveaux messages, ils apparaîtront ici.", "empty_column.lists": "Vous n’avez pas encore de liste. Lorsque vous en créerez une, elle apparaîtra ici.", "empty_column.mutes": "Vous n’avez masqué aucun compte pour le moment.", + "empty_column.notification_requests": "C'est fini ! Il n'y a plus rien ici. Lorsque vous recevez de nouvelles notifications, elles apparaitront ici conformément à vos préférences.", "empty_column.notifications": "Vous n’avez pas encore de notification. Interagissez avec d’autres personnes pour débuter la conversation.", "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des personnes d’autres serveurs pour remplir le fil public", "error.unexpected_crash.explanation": "En raison d’un bug dans notre code ou d’un problème de compatibilité avec votre navigateur, cette page n’a pas pu être affichée correctement.", @@ -396,6 +427,15 @@ "loading_indicator.label": "Chargement…", "media_gallery.toggle_visible": "{number, plural, one {Cacher l’image} other {Cacher les images}}", "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous l'avez déplacé à {movedToAccount}.", + "mute_modal.hide_from_notifications": "Cacher des notifications", + "mute_modal.hide_options": "Masquer les options", + "mute_modal.indefinite": "Jusqu'à ce que je les réactive", + "mute_modal.show_options": "Afficher les options", + "mute_modal.they_can_mention_and_follow": "Ils peuvent vous mentionner et vous suivre, mais vous ne les verrez pas.", + "mute_modal.they_wont_know": "Ils ne sauront pas qu'ils ont été rendus silencieux.", + "mute_modal.title": "Rendre cet utilisateur silencieux ?", + "mute_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.", + "mute_modal.you_wont_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.", "navigation_bar.about": "À propos", "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée", "navigation_bar.blocks": "Comptes bloqués", @@ -431,8 +471,13 @@ "notification.own_poll": "Votre sondage est terminé", "notification.poll": "Un sondage auquel vous avez participé vient de se terminer", "notification.reblog": "{name} a partagé votre message", + "notification.severed_relationships": "Relation avec {name} rompues", "notification.status": "{name} vient de publier", "notification.update": "{name} a modifié un message", + "notification_requests.accept": "Accepter", + "notification_requests.dismiss": "Rejeter", + "notification_requests.notifications_from": "Notifications de {name}", + "notification_requests.title": "Notifications filtrées", "notifications.clear": "Effacer les notifications", "notifications.clear_confirmation": "Voulez-vous vraiment effacer toutes vos notifications ?", "notifications.column_settings.admin.report": "Nouveaux signalements :", @@ -464,6 +509,15 @@ "notifications.permission_denied": "Impossible d’activer les notifications de bureau car l’autorisation a été refusée.", "notifications.permission_denied_alert": "Les notifications de bureau ne peuvent pas être activées, car l’autorisation du navigateur a été refusée avant", "notifications.permission_required": "Les notifications de bureau ne sont pas disponibles car l’autorisation requise n’a pas été accordée.", + "notifications.policy.filter_new_accounts.hint": "Créés au cours des derniers {days, plural, one {un jour} other {# jours}}", + "notifications.policy.filter_new_accounts_title": "Nouveaux comptes", + "notifications.policy.filter_not_followers_hint": "Incluant les personnes qui vous suivent depuis moins de {days, plural, one {un jour} other {# jours}}", + "notifications.policy.filter_not_followers_title": "Personnes qui ne vous suivent pas", + "notifications.policy.filter_not_following_hint": "Jusqu'à ce que vous les validiez manuellement", + "notifications.policy.filter_not_following_title": "Personnes que vous ne suivez pas", + "notifications.policy.filter_private_mentions_hint": "Filtré sauf si c'est en réponse à une mention de vous ou si vous suivez l'expéditeur", + "notifications.policy.filter_private_mentions_title": "Mentions privées non sollicitées", + "notifications.policy.title": "Filtrer les notifications de…", "notifications_permission_banner.enable": "Activer les notifications de bureau", "notifications_permission_banner.how_to_control": "Pour recevoir des notifications lorsque Mastodon n’est pas ouvert, activez les notifications du bureau. Vous pouvez contrôler précisément quels types d’interactions génèrent des notifications de bureau via le bouton {icon} ci-dessus une fois qu’elles sont activées.", "notifications_permission_banner.title": "Toujours au courant", @@ -534,6 +588,12 @@ "refresh": "Actualiser", "regeneration_indicator.label": "Chargement…", "regeneration_indicator.sublabel": "Votre fil principal est en cours de préparation !", + "relationship_severance_notification.purged_data": "supprimées par les administrateurs", + "relationship_severance_notification.relationships": "{count, plural, one {# relation} other {# relations}}", + "relationship_severance_notification.types.account_suspension": "Le compte a été suspendu", + "relationship_severance_notification.types.domain_block": "Le domaine a été suspendu", + "relationship_severance_notification.types.user_domain_block": "Vous avez bloqué ce domaine", + "relationship_severance_notification.view": "Afficher", "relative_time.days": "{number} j", "relative_time.full.days": "il y a {number, plural, one {# jour} other {# jours}}", "relative_time.full.hours": "il y a {number, plural, one {# heure} other {# heures}}", @@ -640,9 +700,11 @@ "status.direct": "Mention privée @{name}", "status.direct_indicator": "Mention privée", "status.edit": "Modifier", + "status.edited": "Dernière modification le {date}", "status.edited_x_times": "Modifié {count, plural, one {{count} fois} other {{count} fois}}", "status.embed": "Intégrer", "status.favourite": "Ajouter aux favoris", + "status.favourites": "{count, plural, one {favori} other {favoris}}", "status.filter": "Filtrer ce message", "status.filtered": "Filtré", "status.hide": "Masquer le message", @@ -663,6 +725,7 @@ "status.reblog": "Partager", "status.reblog_private": "Partager à l’audience originale", "status.reblogged_by": "{name} a partagé", + "status.reblogs": "{count, plural, one {boost} other {boosts}}", "status.reblogs.empty": "Personne n’a encore partagé ce message. Lorsque quelqu’un le fera, il apparaîtra ici.", "status.redraft": "Supprimer et réécrire", "status.remove_bookmark": "Retirer des marque-pages", diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json index ad9a58d83d..612e363774 100644 --- a/app/javascript/mastodon/locales/gd.json +++ b/app/javascript/mastodon/locales/gd.json @@ -471,6 +471,7 @@ "notification.own_poll": "Thàinig an cunntas-bheachd agad gu crìoch", "notification.poll": "Thàinig cunntas-bheachd sa bhòt thu gu crìoch", "notification.reblog": "Bhrosnaich {name} am post agad", + "notification.severed_relationships": "Chaidh na dàimhean le {name} a dhealachadh", "notification.status": "Phostaich {name} rud", "notification.update": "Dheasaich {name} post", "notification_requests.accept": "Gabh ris", @@ -508,13 +509,13 @@ "notifications.permission_denied": "Chan eil brathan deasga ri fhaighinn on a chaidh iarrtas ceadan a’ bhrabhsair a dhiùltadh cheana", "notifications.permission_denied_alert": "Cha ghabh brathan deasga a chur an comas on a chaidh iarrtas ceadan a’ bhrabhsair a dhiùltadh cheana", "notifications.permission_required": "Chan eil brathan deasga ri fhaighinn on nach deach an cead riatanach a thoirt seachad.", - "notifications.policy.filter_new_accounts.hint": "Chaidh a chruthachadh o chionn {count, plural, one {# latha} two {# latha} few {# làithean} other {# latha}}", + "notifications.policy.filter_new_accounts.hint": "Chaidh a chruthachadh o chionn {days, plural, one {# latha} two {# latha} few {# làithean} other {# latha}}", "notifications.policy.filter_new_accounts_title": "Cunntasan ùra", - "notifications.policy.filter_not_followers_hint": "A’ gabhail a-staigh an fheadhainn a lean ort nas lugha na {count, plural, one {# latha} two {# latha} few {# làithean} other {# latha}} seo chaidh", + "notifications.policy.filter_not_followers_hint": "A’ gabhail a-staigh an fheadhainn a lean ort nas lugha na {days, plural, one {# latha} two {# latha} few {# làithean} other {# latha}} seo chaidh", "notifications.policy.filter_not_followers_title": "Daoine nach eil gad leantainn", "notifications.policy.filter_not_following_hint": "Gus an aontaich thu riutha a làimh", "notifications.policy.filter_not_following_title": "Daoine nach eil thu a’ leantainn", - "notifications.policy.filter_private_mentions_hint": "Criathraichte ach ma tha e a’ freagairt do dh’iomradh agad fhèin no ma tha thu a’ leantainn an seòladair", + "notifications.policy.filter_private_mentions_hint": "Criathraichte ach ma tha e a’ freagairt do dh’iomradh agad fhèin no ma tha thu a’ leantainn an t-seòladair", "notifications.policy.filter_private_mentions_title": "Iomraidhean prìobhaideach o choigrich", "notifications.policy.title": "Falamhaich na brathan o…", "notifications_permission_banner.enable": "Cuir brathan deasga an comas", @@ -587,6 +588,12 @@ "refresh": "Ath-nuadhaich", "regeneration_indicator.label": "’Ga luchdadh…", "regeneration_indicator.sublabel": "Tha do dhachaigh ’ga ullachadh!", + "relationship_severance_notification.purged_data": "chaidh a phurgaideachadh leis na rianairean", + "relationship_severance_notification.relationships": "{count, plural, one {# dàimh} two {# dhàimh} few {# dàimhean} other {# dàimh}}", + "relationship_severance_notification.types.account_suspension": "Chaidh cunntas a chur à rèim", + "relationship_severance_notification.types.domain_block": "Chaidh àrainn a chur à rèim", + "relationship_severance_notification.types.user_domain_block": "Bhac thu an àrainn seo", + "relationship_severance_notification.view": "Seall", "relative_time.days": "{number}l", "relative_time.full.days": "{number, plural, one {# latha} two {# latha} few {# làithean} other {# latha}} air ais", "relative_time.full.hours": "{number, plural, one {# uair a thìde} two {# uair a thìde} few {# uairean a thìde} other {# uair a thìde}} air ais", @@ -694,10 +701,10 @@ "status.direct_indicator": "Iomradh prìobhaideach", "status.edit": "Deasaich", "status.edited": "An deasachadh mu dheireadh {date}", - "status.edited_x_times": "Chaidh a dheasachadh {count, plural, one {{counter} turas} two {{counter} thuras} few {{counter} tursan} other {{counter} turas}}", + "status.edited_x_times": "Chaidh a dheasachadh {count, plural, one {{count} turas} two {{count} thuras} few {{count} tursan} other {{count} turas}}", "status.embed": "Leabaich", "status.favourite": "Cuir ris na h-annsachdan", - "status.favourites": "{count, plural, one {annsachd} two {annsachd} few {annsachdan} other {annsachd}", + "status.favourites": "{count, plural, one {annsachd} two {annsachd} few {annsachdan} other {annsachd}}", "status.filter": "Criathraich am post seo", "status.filtered": "Criathraichte", "status.hide": "Falaich am post", @@ -718,7 +725,7 @@ "status.reblog": "Brosnaich", "status.reblog_private": "Brosnaich leis an t-so-fhaicsinneachd tùsail", "status.reblogged_by": "’Ga bhrosnachadh le {name}", - "status.reblogs": "{count, plural, one {bhrosnachadh} two {bhrosnachadh} few {brosnachaidhean} other {brosnachadh}", + "status.reblogs": "{count, plural, one {bhrosnachadh} two {bhrosnachadh} few {brosnachaidhean} other {brosnachadh}}", "status.reblogs.empty": "Chan deach am post seo a bhrosnachadh le duine sam bith fhathast. Nuair a bhrosnaicheas cuideigin e, nochdaidh iad an-seo.", "status.redraft": "Sguab às ⁊ dèan dreachd ùr", "status.remove_bookmark": "Thoir an comharra-lìn air falbh", diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json index 57882196f3..57d13205fb 100644 --- a/app/javascript/mastodon/locales/gl.json +++ b/app/javascript/mastodon/locales/gl.json @@ -471,6 +471,7 @@ "notification.own_poll": "A túa enquisa rematou", "notification.poll": "Rematou a enquisa na que votaches", "notification.reblog": "{name} compartiu a túa publicación", + "notification.severed_relationships": "Cortouse a relación con {name}", "notification.status": "{name} publicou", "notification.update": "{name} editou unha publicación", "notification_requests.accept": "Aceptar", @@ -587,6 +588,12 @@ "refresh": "Actualizar", "regeneration_indicator.label": "Estase a cargar…", "regeneration_indicator.sublabel": "Estase a preparar a túa cronoloxía de inicio!", + "relationship_severance_notification.purged_data": "purgada pola administración", + "relationship_severance_notification.relationships": "{count, plural, one {# relación} other {# relacións}}", + "relationship_severance_notification.types.account_suspension": "A conta foi suspendida", + "relationship_severance_notification.types.domain_block": "O dominio foi suspendido", + "relationship_severance_notification.types.user_domain_block": "Bloqueaches este dominio", + "relationship_severance_notification.view": "Ver", "relative_time.days": "{number}d", "relative_time.full.days": "hai {number, plural, one {# día} other {# días}}", "relative_time.full.hours": "hai {number, plural, one {# hora} other {# horas}}", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index 48f028f3b5..82dec2d863 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -248,7 +248,7 @@ "emoji_button.symbols": "סמלים", "emoji_button.travel": "טיולים ואתרים", "empty_column.account_hides_collections": "המשתמש.ת בחר.ה להסתיר מידע זה", - "empty_column.account_suspended": "חשבון מושהה", + "empty_column.account_suspended": "חשבון מושעה", "empty_column.account_timeline": "אין עדיין אף הודעה!", "empty_column.account_unavailable": "פרופיל לא זמין", "empty_column.blocks": "עדיין לא חסמתם משתמשים אחרים.", @@ -471,6 +471,7 @@ "notification.own_poll": "הסקר שלך הסתיים", "notification.poll": "סקר שהצבעת בו הסתיים", "notification.reblog": "הודעתך הודהדה על ידי {name}", + "notification.severed_relationships": "חתכתם כל קשר עם {name}", "notification.status": "{name} הרגע פרסמו", "notification.update": "{name} ערכו הודעה", "notification_requests.accept": "לקבל", @@ -483,6 +484,8 @@ "notifications.column_settings.admin.sign_up": "הרשמות חדשות:", "notifications.column_settings.alert": "התראות לשולחן העבודה", "notifications.column_settings.favourite": "חיבובים:", + "notifications.column_settings.filter_bar.advanced": "להציג את כל הקטגוריות", + "notifications.column_settings.filter_bar.category": "שורת סינון מהיר", "notifications.column_settings.follow": "עוקבים חדשים:", "notifications.column_settings.follow_request": "בקשות מעקב חדשות:", "notifications.column_settings.mention": "פניות:", @@ -587,6 +590,12 @@ "refresh": "רענון", "regeneration_indicator.label": "טוען…", "regeneration_indicator.sublabel": "פיד הבית שלך בהכנה!", + "relationship_severance_notification.purged_data": "המידע נמחק על ידי ההנהלה", + "relationship_severance_notification.relationships": "{count, plural, one {קשר אחד} other {# קשרים}}", + "relationship_severance_notification.types.account_suspension": "החשבון הושעה", + "relationship_severance_notification.types.domain_block": "השרת הושעה", + "relationship_severance_notification.types.user_domain_block": "חסמת שרת זה", + "relationship_severance_notification.view": "הצג", "relative_time.days": "{number} ימים", "relative_time.full.days": "לפני {number, plural, one {# יום} other {# ימים}}", "relative_time.full.hours": "לפני {number, plural, one {# שעה} other {# שעות}}", diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index 38e46399d3..d9dfd01a26 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -471,6 +471,7 @@ "notification.own_poll": "A szavazásod véget ért", "notification.poll": "Egy szavazás, melyben részt vettél, véget ért", "notification.reblog": "{name} megtolta a bejegyzésedet", + "notification.severed_relationships": "A kapcsolatok megszakítva ezzel: {name}", "notification.status": "{name} bejegyzést tett közzé", "notification.update": "{name} szerkesztett egy bejegyzést", "notification_requests.accept": "Elfogadás", @@ -587,6 +588,12 @@ "refresh": "Frissítés", "regeneration_indicator.label": "Betöltés…", "regeneration_indicator.sublabel": "A saját idővonalad épp készül!", + "relationship_severance_notification.purged_data": "rendszergazdák által véglegesen törölve", + "relationship_severance_notification.relationships": "{count, plural, one {# kapcsolat} other {# kapcsolat}}", + "relationship_severance_notification.types.account_suspension": "A fiók fel van függesztve", + "relationship_severance_notification.types.domain_block": "A domain fel van függesztve", + "relationship_severance_notification.types.user_domain_block": "Blokkoltad ezt a domaint", + "relationship_severance_notification.view": "Megtekintés", "relative_time.days": "{number}n", "relative_time.full.days": "{number, plural, one {# napja} other {# napja}}", "relative_time.full.hours": "{number, plural, one {# órája} other {# órája}}", diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json index d050aa0311..b65df2fc51 100644 --- a/app/javascript/mastodon/locales/is.json +++ b/app/javascript/mastodon/locales/is.json @@ -483,6 +483,8 @@ "notifications.column_settings.admin.sign_up": "Nýjar skráningar:", "notifications.column_settings.alert": "Tilkynningar á skjáborði", "notifications.column_settings.favourite": "Eftirlæti:", + "notifications.column_settings.filter_bar.advanced": "Birta alla flokka", + "notifications.column_settings.filter_bar.category": "Skyndisíustika", "notifications.column_settings.follow": "Nýir fylgjendur:", "notifications.column_settings.follow_request": "Nýjar beiðnir um að fylgjast með:", "notifications.column_settings.mention": "Tilvísanir:", @@ -587,6 +589,8 @@ "refresh": "Endurlesa", "regeneration_indicator.label": "Hleð inn…", "regeneration_indicator.sublabel": "Verið er að útbúa heimastreymið þitt!", + "relationship_severance_notification.relationships": "{count, plural, one {# tengsl} other {# tengsl}}", + "relationship_severance_notification.view": "Skoða", "relative_time.days": "{number}d", "relative_time.full.days": "Fyrir {number, plural, one {# degi} other {# dögum}} síðan", "relative_time.full.hours": "Fyrir {number, plural, one {# klukkustund} other {# klukkustundum}} síðan", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index 3b4ea15f9e..090278b83b 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -89,6 +89,14 @@ "announcement.announcement": "Annuncio", "attachments_list.unprocessed": "(non elaborato)", "audio.hide": "Nascondi audio", + "block_modal.remote_users_caveat": "Chiederemo al server {domain} di rispettare la tua decisione. Tuttavia, la conformità non è garantita poiché alcuni server potrebbero gestire i blocchi in modo diverso. I post pubblici potrebbero essere ancora visibili agli utenti che non hanno effettuato l'accesso.", + "block_modal.show_less": "Mostra meno", + "block_modal.show_more": "Mostra di più", + "block_modal.they_cant_mention": "Non possono menzionarti o seguirti.", + "block_modal.they_cant_see_posts": "Non possono vedere i tuoi post e tu non vedrai i loro.", + "block_modal.they_will_know": "Possono vedere che sono bloccati.", + "block_modal.title": "Bloccare l'utente?", + "block_modal.you_wont_see_mentions": "Non vedrai i post che li menzionano.", "boost_modal.combo": "Puoi premere {combo} per saltare questo passaggio, la prossima volta", "bundle_column_error.copy_stacktrace": "Copia rapporto sull'errore", "bundle_column_error.error.body": "Impossibile rendedrizzare la pagina richiesta. Potrebbe dipendere da un bug nel nostro codice o da un problema di compatibilità di un browser.", @@ -169,6 +177,7 @@ "confirmations.delete_list.message": "Sei sicuro di voler eliminare permanentemente questa lista?", "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", "confirmations.domain_block.message": "Sei davvero sicuro di voler bloccare l'intero {domain}? In gran parte dei casi, è sufficiente e preferibile bloccare o silenziare alcuni profili. Non visualizzerai i contenuti da quel dominio in alcuna cronologia pubblica o tra le tue notifiche. I tuoi seguaci da quel dominio saranno rimossi.", "confirmations.edit.confirm": "Modifica", "confirmations.edit.message": "Modificare ora sovrascriverà il messaggio che stai correntemente componendo. Sei sicuro di voler procedere?", @@ -200,6 +209,27 @@ "dismissable_banner.explore_statuses": "Questi sono post da tutto il social web che stanno guadagnando popolarità oggi. I post più recenti con più condivisioni e preferiti sono classificati più in alto.", "dismissable_banner.explore_tags": "Questi hashtag stanno ottenendo popolarità tra le persone su questo e altri server della rete decentralizzata, al momento.", "dismissable_banner.public_timeline": "Questi sono i post pubblici più recenti di persone sul social che le persone su {domain} seguono.", + "domain_block_modal.block": "Blocca il server", + "domain_block_modal.block_account_instead": "Blocca invece @{name}", + "domain_block_modal.they_can_interact_with_old_posts": "Le persone da questo server possono interagire con i tuoi vecchi post.", + "domain_block_modal.they_cant_follow": "Nessuno da questo server può seguirti.", + "domain_block_modal.they_wont_know": "Non sapranno di essere stati bloccati.", + "domain_block_modal.title": "Bloccare il dominio?", + "domain_block_modal.you_will_lose_followers": "Tutti i tuoi seguaci da questo server verranno rimossi.", + "domain_block_modal.you_wont_see_posts": "Non vedrai post o notifiche dagli utenti su questo server.", + "domain_pill.activitypub_lets_connect": "Ti consente di connetterti e interagire con le persone non solo su Mastodon, ma anche su diverse app social.", + "domain_pill.activitypub_like_language": "ActivityPub è come la lingua che Mastodon parla con altri social network.", + "domain_pill.server": "Server", + "domain_pill.their_handle": "Il loro nome univoco:", + "domain_pill.their_server": "La loro casa digitale, dove risiedono tutti i loro post.", + "domain_pill.their_username": "Il loro identificatore univoco sul loro server. È possibile trovare utenti con lo stesso nome utente su server diversi.", + "domain_pill.username": "Nome utente", + "domain_pill.whats_in_a_handle": "Cosa c'è in un nome univoco?", + "domain_pill.who_they_are": "Poiché i nomi univoci indicano chi sia qualcuno e dove si trovi, puoi interagire con le persone attraverso la rete sociale delle .", + "domain_pill.who_you_are": "Poiché il tuo nome univoco indica chi tu sia e dove ti trovi, le persone possono interagire con te sulla rete sociale delle .", + "domain_pill.your_handle": "Il tuo nome univoco:", + "domain_pill.your_server": "La tua casa digitale, dove vivono tutti i tuoi post. Non ti piace questa? Cambia server in qualsiasi momento e porta con te anche i tuoi seguaci.", + "domain_pill.your_username": "Il tuo identificatore univoco su questo server. È possibile trovare utenti con lo stesso nome utente su server diversi.", "embed.instructions": "Incorpora questo post sul tuo sito web, copiando il seguente codice.", "embed.preview": "Ecco come apparirà:", "emoji_button.activity": "Attività", @@ -397,6 +427,15 @@ "loading_indicator.label": "Caricamento…", "media_gallery.toggle_visible": "{number, plural, one {Nascondi immagine} other {Nascondi immagini}}", "moved_to_account_banner.text": "Il tuo profilo {disabledAccount} è correntemente disabilitato perché ti sei spostato a {movedToAccount}.", + "mute_modal.hide_from_notifications": "Nascondi dalle notifiche", + "mute_modal.hide_options": "Nascondi le opzioni", + "mute_modal.indefinite": "Finché io non le riattivo", + "mute_modal.show_options": "Mostre le opzioni", + "mute_modal.they_can_mention_and_follow": "Possono menzionarti e seguirti, ma non li vedrai.", + "mute_modal.they_wont_know": "Non sapranno di essere stati silenziati.", + "mute_modal.title": "Silenziare l'utente?", + "mute_modal.you_wont_see_mentions": "Non vedrai i post che li menzionano.", + "mute_modal.you_wont_see_posts": "Possono ancora vedere i tuoi post, ma tu non vedrai i loro.", "navigation_bar.about": "Info", "navigation_bar.advanced_interface": "Apri nell'interfaccia web avanzata", "navigation_bar.blocks": "Utenti bloccati", @@ -432,6 +471,7 @@ "notification.own_poll": "Il tuo sondaggio è terminato", "notification.poll": "Un sondaggio in cui hai votato è terminato", "notification.reblog": "{name} ha rebloggato il tuo post", + "notification.severed_relationships": "Relazioni interrotte con {name}", "notification.status": "{name} ha appena pubblicato un post", "notification.update": "{name} ha modificato un post", "notification_requests.accept": "Accetta", @@ -444,6 +484,8 @@ "notifications.column_settings.admin.sign_up": "Nuove iscrizioni:", "notifications.column_settings.alert": "Notifiche desktop", "notifications.column_settings.favourite": "Preferiti:", + "notifications.column_settings.filter_bar.advanced": "Mostra tutte le categorie", + "notifications.column_settings.filter_bar.category": "Barra del filtro veloce", "notifications.column_settings.follow": "Nuovi seguaci:", "notifications.column_settings.follow_request": "Nuove richieste di seguirti:", "notifications.column_settings.mention": "Menzioni:", @@ -548,6 +590,12 @@ "refresh": "Ricarica", "regeneration_indicator.label": "Caricamento…", "regeneration_indicator.sublabel": "Il feed della tua home è in preparazione!", + "relationship_severance_notification.purged_data": "rimossi dagli amministratori", + "relationship_severance_notification.relationships": "{count, plural,one {# relazione} other {# relazioni}}", + "relationship_severance_notification.types.account_suspension": "L'account è stato sospeso", + "relationship_severance_notification.types.domain_block": "Il dominio è stato sospeso", + "relationship_severance_notification.types.user_domain_block": "Hai bloccato questo dominio", + "relationship_severance_notification.view": "Visualizza", "relative_time.days": "{number}g", "relative_time.full.days": "{number, plural, one {# giorno} other {# giorni}} fa", "relative_time.full.hours": "{number, plural, one {# ora} other {# ore}} fa", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 66811eafd6..1f1065f5fd 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -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": "要求されたページをレンダリングできませんでした。コードのバグ、またはブラウザの互換性の問題が原因である可能性があります。", @@ -200,6 +208,14 @@ "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": "このサーバーのユーザーからの投稿や通知が閲覧できなくなります。", "embed.instructions": "下記のコードをコピーしてウェブサイトに埋め込みます。", "embed.preview": "表示例:", "emoji_button.activity": "活動", @@ -397,6 +413,15 @@ "loading_indicator.label": "読み込み中…", "media_gallery.toggle_visible": "{number, plural, one {画像を閉じる} 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": "上級者向けUIに戻る", "navigation_bar.blocks": "ブロックしたユーザー", diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index 96407b0020..5553636f26 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -220,7 +220,7 @@ "domain_pill.activitypub_lets_connect": "이것은 마스토돈 뿐만이 아니라 다른 소셜 앱들을 넘나들며 사람들을 연결하고 상호작용 할 수 있게 합니다.", "domain_pill.activitypub_like_language": "액티비티펍은 마스토돈이 다른 소셜 네트워크와 대화할 때 쓰는 언어 같은 것입니다.", "domain_pill.server": "서버", - "domain_pill.their_handle": "그의 핸들:", + "domain_pill.their_handle": "이 사람의 핸들:", "domain_pill.their_server": "그의 게시물이 살고 있는 디지털 거처입니다.", "domain_pill.their_username": "그의 서버에서 유일한 식별자입니다. 다른 서버에서 같은 사용자명을 가진 사용자를 찾을 수도 있습니다.", "domain_pill.username": "사용자명", @@ -471,6 +471,7 @@ "notification.own_poll": "설문을 마침", "notification.poll": "참여한 설문이 종료됨", "notification.reblog": "{name} 님이 부스트했습니다", + "notification.severed_relationships": "{name} 님과의 관계가 단절되었습니다", "notification.status": "{name} 님이 방금 게시물을 올렸습니다", "notification.update": "{name} 님이 게시물을 수정했습니다", "notification_requests.accept": "수락", @@ -483,6 +484,7 @@ "notifications.column_settings.admin.sign_up": "새로운 가입:", "notifications.column_settings.alert": "데스크탑 알림", "notifications.column_settings.favourite": "좋아요:", + "notifications.column_settings.filter_bar.advanced": "모든 범주 표시", "notifications.column_settings.follow": "새 팔로워:", "notifications.column_settings.follow_request": "새 팔로우 요청:", "notifications.column_settings.mention": "멘션:", @@ -587,6 +589,12 @@ "refresh": "새로고침", "regeneration_indicator.label": "불러오는 중…", "regeneration_indicator.sublabel": "홈 피드를 준비하고 있습니다!", + "relationship_severance_notification.purged_data": "관리자에 의해 제거되었습니다", + "relationship_severance_notification.relationships": "{count, plural, other {# 건의 관계}}", + "relationship_severance_notification.types.account_suspension": "계정이 정지되었습니다", + "relationship_severance_notification.types.domain_block": "도메인이 정지되었습니다", + "relationship_severance_notification.types.user_domain_block": "내가 이 도메인을 차단했습니다", + "relationship_severance_notification.view": "보기", "relative_time.days": "{number}일 전", "relative_time.full.days": "{number} 일 전", "relative_time.full.hours": "{number} 시간 전", diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json index 2f4185f69e..1eb8aa4abc 100644 --- a/app/javascript/mastodon/locales/lad.json +++ b/app/javascript/mastodon/locales/lad.json @@ -91,7 +91,10 @@ "audio.hide": "Eskonde audio", "block_modal.show_less": "Amostra manko", "block_modal.show_more": "Amostra mas", + "block_modal.they_cant_mention": "No te puede enmentar ni segir.", + "block_modal.they_will_know": "Puede ver ke esta blokado.", "block_modal.title": "Bloka utilizador?", + "block_modal.you_wont_see_mentions": "No veras publikasyones ke lo enmentan.", "boost_modal.combo": "Puedes klikar {combo} para ometer esto la proksima vez", "bundle_column_error.copy_stacktrace": "Kopia el raporto de yerro", "bundle_column_error.error.body": "La pajina solisitada no pudo ser renderada. Podria ser por un yerro en muestro kodiche o un problem de kompatibilita kon el navigador.", @@ -205,9 +208,17 @@ "dismissable_banner.explore_tags": "Estas etiketas estan agora popularas en la red sosyala. Etiketas uzadas por mas djente aparesen primero.", "dismissable_banner.public_timeline": "Estas son las publikasyones publikas mas resientes de personas en la red sosyala a las kualas la djente de {domain} sige.", "domain_block_modal.block": "Bloka sirvidor", + "domain_block_modal.block_account_instead": "Bloka @{name} en su lugar", + "domain_block_modal.they_cant_follow": "Dingun de este sirvidor puede segirte.", + "domain_block_modal.they_wont_know": "No savra ke tiene sido blokado.", "domain_block_modal.title": "Bloka el domeno?", + "domain_block_modal.you_will_lose_followers": "Se efasaran todos tus suivantes de este sirvidor.", + "domain_block_modal.you_wont_see_posts": "No veras publikasyones ni avizos de utilizadores en este sirvidor.", "domain_pill.server": "Sirvidor", + "domain_pill.their_handle": "Su alias:", "domain_pill.username": "Nombre de utilizador", + "domain_pill.whats_in_a_handle": "En ke konsiste el alias?", + "domain_pill.your_handle": "Tu alias:", "embed.instructions": "Enkrusta esta publikasyon en tu sitio internetiko kopiando este kodiche.", "embed.preview": "Paresera ansina:", "emoji_button.activity": "Aktivita", @@ -404,6 +415,13 @@ "loading_indicator.label": "Eskargando…", "media_gallery.toggle_visible": "{number, plural, one {Eskonde imaje} other {Eskonde imajes}}", "moved_to_account_banner.text": "Tu kuento {disabledAccount} esta aktualmente inkapasitado porke transferates a {movedToAccount}.", + "mute_modal.hide_from_notifications": "Eskonde de avizos", + "mute_modal.hide_options": "Eskonde opsyones", + "mute_modal.indefinite": "Asta ke desho de silensyarlo", + "mute_modal.show_options": "Amostra opsyones", + "mute_modal.they_wont_know": "No savra ke tiene sido silensyado.", + "mute_modal.title": "Silensiar utilizador?", + "mute_modal.you_wont_see_mentions": "No veras publikasyones ke lo enmentan.", "navigation_bar.about": "Sovre mozotros", "navigation_bar.advanced_interface": "Avre en la enterfaz avanzada", "navigation_bar.blocks": "Utilizadores blokados", @@ -553,6 +571,8 @@ "refresh": "Arefreska", "regeneration_indicator.label": "Eskargando…", "regeneration_indicator.sublabel": "Tu linya de tiempo prinsipala esta preparando!", + "relationship_severance_notification.types.user_domain_block": "Blokates este domeno", + "relationship_severance_notification.view": "Mira", "relative_time.days": "{number} d", "relative_time.full.days": "antes {number, plural, one {# diya} other {# diyas}}", "relative_time.full.hours": "antes {number, plural, one {# ora} other {# oras}}", diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json index f9ef7e242c..728485b2bc 100644 --- a/app/javascript/mastodon/locales/lt.json +++ b/app/javascript/mastodon/locales/lt.json @@ -555,6 +555,9 @@ "refresh": "Atnaujinti", "regeneration_indicator.label": "Kraunama…", "regeneration_indicator.sublabel": "Ruošiamas tavo pagrindinis srautas!", + "relationship_severance_notification.relationships": "{count, plural, one {# santykis} few {# santykiai} many {# santykio} other {# santykių}}", + "relationship_severance_notification.types.user_domain_block": "Užblokavai šį domeną", + "relationship_severance_notification.view": "Peržiūrėti", "relative_time.days": "{number} d.", "relative_time.full.days": "prieš {number, plural, one {# dieną} few {# dienas} many {# dienos} other {# dienų}}", "relative_time.full.hours": "prieš {number, plural, one {# valandą} few {# valandas} many {# valandos} other {# valandų}}", diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json index 51d06c8233..21fa46faa6 100644 --- a/app/javascript/mastodon/locales/lv.json +++ b/app/javascript/mastodon/locales/lv.json @@ -236,7 +236,7 @@ "empty_column.lists": "Pašlaik Tev nav neviena saraksta. Kad tādu izveidosi, tas parādīsies šeit.", "empty_column.mutes": "Neviens lietotājs vēl nav apklusināts.", "empty_column.notifications": "Tev vēl nav paziņojumu. Kad citi cilvēki ar Tevi mijiedarbosies, Tu to redzēsi šeit.", - "empty_column.public": "Šeit nekā nav! Ieraksti kaut ko publiski vai seko lietotājiem no citiem serveriem, lai iegūtu saturu", + "empty_column.public": "Šeit nekā nav. Ieraksti kaut ko publiski vai seko lietotājiem no citiem serveriem, lai iegūtu saturu", "error.unexpected_crash.explanation": "Koda kļūdas vai pārlūkprogrammas saderības problēmas dēļ šo lapu nevarēja parādīt pareizi.", "error.unexpected_crash.explanation_addons": "Šo lapu nevarēja parādīt pareizi. Šo kļūdu, iespējams, izraisīja pārlūkprogrammas papildinājums vai automātiskās tulkošanas rīki.", "error.unexpected_crash.next_steps": "Mēģini atsvaidzināt lapu. Ja tas nepalīdz, iespējams, varēsi lietot Mastodon, izmantojot citu pārlūkprogrammu vai lietotni.", @@ -265,6 +265,7 @@ "filter_modal.select_filter.subtitle": "Izmanto esošu kategoriju vai izveido jaunu", "filter_modal.select_filter.title": "Filtrēt šo ziņu", "filter_modal.title.status": "Filtrēt ziņu", + "filtered_notifications_banner.pending_requests": "Paziņojumi no {count, plural, =0 {neviena} one {viena cilvēka} other {# cilvēkiem}}, ko Tu varētu zināt", "firehose.all": "Visi", "firehose.local": "Šis serveris", "firehose.remote": "Citi serveri", @@ -273,6 +274,7 @@ "follow_requests.unlocked_explanation": "Lai gan Tavs konts nav slēgts, {domain} darbinieki iedomājās, ka Tu varētu vēlēties pašrocīgi pārskatīt sekošanas pieprasījumus no šiem kontiem.", "follow_suggestions.curated_suggestion": "Darbinieku izvēle", "follow_suggestions.dismiss": "Vairs nerādīt", + "follow_suggestions.personalized_suggestion": "Pielāgots ieteikums", "follow_suggestions.view_all": "Skatīt visu", "follow_suggestions.who_to_follow": "Kam sekot", "followed_tags": "Sekojamie tēmturi", @@ -413,7 +415,7 @@ "navigation_bar.security": "Drošība", "not_signed_in_indicator.not_signed_in": "Ir jāpiesakās, lai piekļūtu šim resursam.", "notification.admin.report": "{name} ziņoja par {target}", - "notification.admin.sign_up": "{name} ir pierakstījies", + "notification.admin.sign_up": "{name} pierakstījās", "notification.favourite": "{name} pievienoja tavu ziņu izlasei", "notification.follow": "{name} uzsāka Tev sekot", "notification.follow_request": "{name} nosūtīja Tev sekošanas pieprasījumu", @@ -464,7 +466,7 @@ "onboarding.compose.template": "Sveiki, #Mastodon!", "onboarding.follows.empty": "Diemžēl pašlaik nevar parādīt rezultātus. Vari mēģināt izmantot meklēšanu vai pārlūkot izpētes lapu, lai atrastu cilvēkus, kuriem sekot, vai vēlāk mēģināt vēlreiz.", "onboarding.follows.lead": "Tava mājas plūsma ir galvenais veids, kā izbaudīt Mastodon. Jo vairāk cilvēku sekosi, jo aktīvāk un interesantāk tas būs. Lai sāktu, šeit ir daži ieteikumi:", - "onboarding.follows.title": "Populārs Mastodon", + "onboarding.follows.title": "Pielāgo savu mājas barotni", "onboarding.profile.discoverable": "Padarīt manu profilu atklājamu", "onboarding.profile.display_name": "Attēlojamais vārds", "onboarding.profile.display_name_hint": "Tavs pilnais vārds vai Tavs joku vārds…", @@ -482,7 +484,7 @@ "onboarding.start.skip": "Nav nepieciešama palīdzība darba sākšanai?", "onboarding.start.title": "Tev tas izdevās!", "onboarding.steps.follow_people.body": "Tu pats veido savu plūsmu. Piepildīsim to ar interesantiem cilvēkiem.", - "onboarding.steps.follow_people.title": "Sekot {count, plural, one {one person} other {# cilvēkiem}}", + "onboarding.steps.follow_people.title": "Pielāgo savu mājas barotni", "onboarding.steps.publish_status.body": "Sveicini pasauli ar tekstu, fotoattēliem, video, vai aptaujām {emoji}", "onboarding.steps.publish_status.title": "Izveido savu pirmo ziņu", "onboarding.steps.setup_profile.body": "Palielini mijiedarbību ar aptverošu profilu!", @@ -492,14 +494,14 @@ "onboarding.tips.2fa": "Vai zināji? Tu vari aizsargāt savu kontu, konta iestatījumos iestatot divpakāpju autentifikāciju. Tas darbojas ar jebkuru Tevis izvēlētu TOTP lietotni, nav nepieciešams tālruņa numurs!", "onboarding.tips.accounts_from_other_servers": "Vai zināji? Tā kā Mastodon ir decentralizēts, daži profili, ar kuriem saskaraties, tiks mitināti citos, nevis tavos serveros. Un tomēr tu varat sazināties ar viņiem nevainojami! Viņu serveris atrodas viņu lietotājvārda otrajā pusē!", "onboarding.tips.migration": "Vai zināji? Ja uzskati, ka {domain} nākotnē nav lieliska servera izvēle, vari pāriet uz citu Mastodon serveri, nezaudējot savus sekotājus. Tu pat vari mitināt savu serveri!", - "onboarding.tips.verification": "Vai zināji? Tu vari verificēt savu kontu, ievietojot saiti uz savu Mastodon profilu savā vietnē un pievienojot vietni savam profilam. Nav nepieciešami nekādi maksājumi vai dokumenti!", + "onboarding.tips.verification": "Vai zināji? Tu vari apliecināt savu kontu, ievietojot savā tīmekļvietnē saiti uz savu Mastodon profilu un pievienojot tīmekļvietni savam profilam. Nav nepieciešami nekādi maksājumi vai dokumenti.", "password_confirmation.exceeds_maxlength": "Paroles apstiprināšana pārsniedz maksimālo paroles garumu", "password_confirmation.mismatching": "Paroles apstiprinājums neatbilst", "picture_in_picture.restore": "Novietot atpakaļ", "poll.closed": "Pabeigta", "poll.refresh": "Atsvaidzināt", "poll.reveal": "Skatīt rezultātus", - "poll.total_people": "{count, plural, zero {# cilvēku} one {# persona} other {# cilvēki}}", + "poll.total_people": "{count, plural, zero {# cilvēku} one {# cilvēks} other {# cilvēki}}", "poll.total_votes": "{count, plural, zero {# balsojumu} one {# balsojums} other {# balsojumi}}", "poll.vote": "Balsot", "poll.voted": "Tu balsoji par šo atbildi", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index 9bf40a7148..1e710bda45 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -205,10 +205,10 @@ "disabled_account_banner.text": "Jouw account {disabledAccount} is momenteel uitgeschakeld.", "dismissable_banner.community_timeline": "Dit zijn de meest recente openbare berichten van accounts op {domain}. Je kunt onder 'instellingen > voorkeuren > overig' kiezen welke talen je wilt zien.", "dismissable_banner.dismiss": "Sluiten", - "dismissable_banner.explore_links": "Dit zijn nieuwsberichten die vandaag het meest op het sociale web worden gedeeld. Nieuwere nieuwsberichten die door meer verschillende mensen zijn geplaatst staan hoger op de lijst.", - "dismissable_banner.explore_statuses": "Dit zijn berichten op het sociale web die vandaag aan populariteit winnen. Nieuwere berichten met meer boosts en favorieten staan hoger.", - "dismissable_banner.explore_tags": "Deze hashtags winnen aan populariteit op het sociale web. Hashtags die door meer verschillende mensen worden gebruikt staan hoger.", - "dismissable_banner.public_timeline": "Dit zijn de meest recente openbare berichten van accounts op het sociale web die door mensen op {domain} worden gevolgd.", + "dismissable_banner.explore_links": "Dit zijn nieuwsberichten die vandaag het meest op het sociale web (fediverse) worden gedeeld. Nieuwere nieuwsberichten die door meer verschillende mensen zijn geplaatst staan hoger op de lijst.", + "dismissable_banner.explore_statuses": "Dit zijn berichten op het sociale web (fediverse) die vandaag aan populariteit winnen. Nieuwere berichten met meer boosts en favorieten staan hoger.", + "dismissable_banner.explore_tags": "Deze hashtags winnen aan populariteit op het sociale web (fediverse). Hashtags die door meer verschillende mensen worden gebruikt staan hoger.", + "dismissable_banner.public_timeline": "Dit zijn de meest recente openbare berichten van accounts op het sociale web (fediverse) die door mensen op {domain} worden gevolgd.", "domain_block_modal.block": "Server blokkeren", "domain_block_modal.block_account_instead": "In plaats hiervan {name} blokkeren", "domain_block_modal.they_can_interact_with_old_posts": "Mensen op deze server kunnen interactie hebben met jouw oude berichten.", @@ -220,14 +220,14 @@ "domain_pill.activitypub_lets_connect": "Het zorgt ervoor dat je niet alleen maar kunt verbinden en communiceren met mensen op Mastodon, maar ook met andere sociale apps.", "domain_pill.activitypub_like_language": "ActivityPub is de taal die Mastodon met andere sociale netwerken spreekt.", "domain_pill.server": "Server", - "domain_pill.their_handle": "Hun Mastodon-adres:", + "domain_pill.their_handle": "Hun fediverse-adres:", "domain_pill.their_server": "Hun digitale thuis, waar al hun berichten zich bevinden.", "domain_pill.their_username": "Hun unieke identificatie-adres op hun server. Het is mogelijk dat er gebruikers met dezelfde gebruikersnaam op verschillende servers te vinden zijn.", "domain_pill.username": "Gebruikersnaam", - "domain_pill.whats_in_a_handle": "Wat is een Mastodon-adres?", - "domain_pill.who_they_are": "Omdat je aan een Mastodon-adres kunt zien wie iemand is en waar die zich bevindt, kun je met mensen op het door sociale web communiceren.", - "domain_pill.who_you_are": "Omdat je aan jouw Mastodon-adres kunt zien wie jij bent is en waar je je bevindt, kunnen mensen op het door sociale web met jou communiceren.", - "domain_pill.your_handle": "Jouw Mastodon-adres:", + "domain_pill.whats_in_a_handle": "Wat is een fediverse-adres?", + "domain_pill.who_they_are": "Omdat je aan een fediverse-adres kunt zien wie iemand is en waar die zich bevindt, kun je met mensen op het door sociale web (fediverse) communiceren.", + "domain_pill.who_you_are": "Omdat je aan jouw fediverse-adres kunt zien wie jij bent is en waar je je bevindt, kunnen mensen op het door sociale web (fediverse) met jou communiceren.", + "domain_pill.your_handle": "Jouw fediverse-adres:", "domain_pill.your_server": "Jouw digitale thuis, waar al jouw berichten zich bevinden. Is deze server toch niet naar jouw wens? Dan kun je op elk moment naar een andere server verhuizen en ook jouw volgers overbrengen.", "domain_pill.your_username": "Jouw unieke identificatie-adres op deze server. Het is mogelijk dat er gebruikers met dezelfde gebruikersnaam op verschillende servers te vinden zijn.", "embed.instructions": "Embed dit bericht op jouw website door de onderstaande code te kopiëren.", @@ -471,6 +471,7 @@ "notification.own_poll": "Jouw peiling is beëindigd", "notification.poll": "Een peiling waaraan jij hebt meegedaan is beëindigd", "notification.reblog": "{name} boostte jouw bericht", + "notification.severed_relationships": "Volgrelaties met {name} verbroken", "notification.status": "{name} heeft zojuist een bericht geplaatst", "notification.update": "{name} heeft een bericht bewerkt", "notification_requests.accept": "Accepteren", @@ -483,6 +484,8 @@ "notifications.column_settings.admin.sign_up": "Nieuwe registraties:", "notifications.column_settings.alert": "Desktopmeldingen", "notifications.column_settings.favourite": "Favorieten:", + "notifications.column_settings.filter_bar.advanced": "Alle categorieën tonen", + "notifications.column_settings.filter_bar.category": "Snelle filterbalk", "notifications.column_settings.follow": "Nieuwe volgers:", "notifications.column_settings.follow_request": "Nieuw volgverzoek:", "notifications.column_settings.mention": "Vermeldingen:", @@ -587,6 +590,12 @@ "refresh": "Vernieuwen", "regeneration_indicator.label": "Aan het laden…", "regeneration_indicator.sublabel": "Jouw starttijdlijn wordt aangemaakt!", + "relationship_severance_notification.purged_data": "verwijderd door beheerders", + "relationship_severance_notification.relationships": "{count, plural, one {# volgrelatie} other {# volgrelaties}}", + "relationship_severance_notification.types.account_suspension": "Account is opgeschort", + "relationship_severance_notification.types.domain_block": "Domein is opgeschort", + "relationship_severance_notification.types.user_domain_block": "Je hebt dit domein geblokkeerd", + "relationship_severance_notification.view": "Weergeven", "relative_time.days": "{number}d", "relative_time.full.days": "{number, plural, one {# dag} other {# dagen}} geleden", "relative_time.full.hours": "{number, plural, one {# uur} other {# uur}} geleden", diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json index aa20207a76..7742d83e17 100644 --- a/app/javascript/mastodon/locales/nn.json +++ b/app/javascript/mastodon/locales/nn.json @@ -32,7 +32,7 @@ "account.featured_tags.last_status_never": "Ingen innlegg", "account.featured_tags.title": "{name} sine framheva emneknaggar", "account.follow": "Fylg", - "account.follow_back": "Følg tilbake", + "account.follow_back": "Fylg tilbake", "account.followers": "Fylgjarar", "account.followers.empty": "Ingen fylgjer denne brukaren enno.", "account.followers_counter": "{count, plural, one {{counter} fylgjar} other {{counter} fylgjarar}}", @@ -49,7 +49,7 @@ "account.media": "Media", "account.mention": "Nemn @{name}", "account.moved_to": "{name} seier at deira nye konto no er:", - "account.mute": "Målbind @{name}", + "account.mute": "Demp @{name}", "account.mute_notifications_short": "Demp varslingar", "account.mute_short": "Demp", "account.muted": "Målbunden", @@ -69,9 +69,9 @@ "account.unblock_short": "Stopp blokkering", "account.unendorse": "Ikkje vis på profil", "account.unfollow": "Slutt å fylgja", - "account.unmute": "Opphev målbinding av @{name}", + "account.unmute": "Opphev demping av @{name}", "account.unmute_notifications_short": "Opphev demping av varslingar", - "account.unmute_short": "Opphev målbinding", + "account.unmute_short": "Opphev demping", "account_note.placeholder": "Klikk for å leggja til merknad", "admin.dashboard.daily_retention": "Mengda brukarar aktive ved dagar etter registrering", "admin.dashboard.monthly_retention": "Mengda brukarar aktive ved månader etter registrering", @@ -79,8 +79,8 @@ "admin.dashboard.retention.cohort": "Registrert månad", "admin.dashboard.retention.cohort_size": "Nye brukarar", "admin.impact_report.instance_accounts": "Kontoprofilar dette vil sletta", - "admin.impact_report.instance_followers": "Følgjarar våre brukarar vil mista", - "admin.impact_report.instance_follows": "Følgjarar deira brukarar vil mista", + "admin.impact_report.instance_followers": "Fylgjarar som brukarane våre ville mista", + "admin.impact_report.instance_follows": "Fylgjarar som brukarane deira ville mista", "admin.impact_report.title": "Samandrag av konsekvensane", "alert.rate_limited.message": "Ver venleg å prøv på nytt etter {retry_time, time, medium}.", "alert.rate_limited.title": "Redusert kapasitet", @@ -89,7 +89,7 @@ "announcement.announcement": "Kunngjering", "attachments_list.unprocessed": "(ubehandla)", "audio.hide": "Gøym lyd", - "block_modal.remote_users_caveat": "Vi vil be tenaren {domain} om å respektere di avgjerd. Det kan ikkje garanterast at det vert etterfølgd, sidan nokre tenarar kan handtere blokkering ulikt. Offentlege innlegg kan framleis vere synlege for ikkje-innlogga brukarar.", + "block_modal.remote_users_caveat": "Me vil be tenaren {domain} om å respektere di avgjerd. Me kan ikkje garantera at det vert gjort, sidan nokre tenarar kan handtera blokkering ulikt. Offentlege innlegg kan framleis vera synlege for ikkje-innlogga brukarar.", "block_modal.show_less": "Vis mindre", "block_modal.show_more": "Vis meir", "block_modal.they_cant_mention": "Dei kan ikkje nemna eller fylgja deg.", @@ -178,12 +178,12 @@ "confirmations.discard_edit_media.confirm": "Forkast", "confirmations.discard_edit_media.message": "Du har ulagra endringar i mediaskildringa eller førehandsvisinga. Vil du forkasta dei likevel?", "confirmations.domain_block.confirm": "Blokker tenaren", - "confirmations.domain_block.message": "Er du heilt, heilt sikker på at du vil skjula heile {domain}? I dei fleste tilfelle er det godt nok og føretrekt med nokre få målretta blokkeringar eller målbindingar. Du kjem ikkje til å sjå innhald frå domenet i fødererte tidsliner eller i varsla dine. Fylgjarane dine frå domenet vert fjerna.", + "confirmations.domain_block.message": "Er du heilt, heilt sikker på at du vil skjula heile {domain}? I dei fleste tilfelle er det godt nok og føretrekt med nokre få målretta blokkeringar eller dempingar. Du kjem ikkje til å sjå innhald frå domenet i fødererte tidsliner eller i varsla dine. Fylgjarane dine frå domenet vert fjerna.", "confirmations.edit.confirm": "Rediger", "confirmations.edit.message": "Å redigera no vil overskriva den meldinga du er i ferd med å skriva. Er du sikker på at du vil halda fram?", "confirmations.logout.confirm": "Logg ut", "confirmations.logout.message": "Er du sikker på at du vil logga ut?", - "confirmations.mute.confirm": "Målbind", + "confirmations.mute.confirm": "Demp", "confirmations.redraft.confirm": "Slett & skriv på nytt", "confirmations.redraft.message": "Er du sikker på at du vil sletta denne statusen og skriva han på nytt? Då misser du favorittar og framhevingar, og svar til det opprinnelege innlegget vert foreldrelause.", "confirmations.reply.confirm": "Svar", @@ -208,7 +208,7 @@ "dismissable_banner.explore_links": "Desse nyhendesakene snakkast om av folk på denne og andre tenarar på det desentraliserte nettverket no.", "dismissable_banner.explore_statuses": "Dette er innlegg frå det desentraliserte nettverket som er i støytet i dag. Nye statusar som er mykje framheva og merkte som favorittar er rangert høgare.", "dismissable_banner.explore_tags": "Desse emneknaggane er populære blant folk på denne tenaren og andre tenarar i det desentraliserte nettverket nett no.", - "dismissable_banner.public_timeline": "Dette er dei nyaste offentlege innlegga frå menneske på det sosiale nettet som folk på {domain} følgjer.", + "dismissable_banner.public_timeline": "Dette er dei nyaste offentlege innlegga frå menneske på det sosiale nettet som folk på {domain} fylgjer.", "domain_block_modal.block": "Blokker tenaren", "domain_block_modal.block_account_instead": "Blokker @{name} i staden", "domain_block_modal.they_can_interact_with_old_posts": "Folk på denne tenaren kan samhandla med dei gamle innlegga dine.", @@ -228,7 +228,7 @@ "domain_pill.who_they_are": "Sidan handtak seier kven nokon er og kvar dei er, kan du interagere med folk på tvers av det sosiale nettverket av .", "domain_pill.who_you_are": "Sidan handtaket ditt seier kven du er og kvar du er, kan folk interagere med deg på tvers av det sosiale nettverket av .", "domain_pill.your_handle": "Handtaket ditt:", - "domain_pill.your_server": "Din digitale heim, som alle postane dine bur i. Liker du ikkje dette? Overfør tenarar når som helst og ta med følgjarane dine òg.", + "domain_pill.your_server": "Din digitale heim, der alle innlegga dine bur i. Liker du ikkje dette? Byt til ein ny tenar når som helst og ta med fylgjarane dine òg.", "domain_pill.your_username": "Din unike identifikator på denne tenaren. Det er mogleg å finne brukarar med same brukarnamn på forskjellige tenarar.", "embed.instructions": "Bygg inn denne statusen på nettsida di ved å kopiera koden nedanfor.", "embed.preview": "Slik kjem det til å sjå ut:", @@ -259,16 +259,16 @@ "empty_column.explore_statuses": "Ingenting er i støytet nett no. Prøv igjen seinare!", "empty_column.favourited_statuses": "Du har ingen favoritt-statusar ennå. Når du merkjer ein som favoritt, dukkar han opp her.", "empty_column.favourites": "Ingen har merkt denne statusen som favoritt enno. Når nokon gjer det, dukkar dei opp her.", - "empty_column.follow_requests": "Du har ingen følgjeførespurnadar ennå. Når du får ein, så vil den dukke opp her.", + "empty_column.follow_requests": "Ingen har spurt om å fylgja deg enno. Når nokon gjer det, vil det dukka opp her.", "empty_column.followed_tags": "Du fylgjer ingen emneknaggar enno. Når du gjer det, vil dei syna her.", "empty_column.hashtag": "Det er ingenting i denne emneknaggen enno.", - "empty_column.home": "Heime-tidslina di er tom! Følg fleire folk for å fylle ho med innhald. {suggestions}", + "empty_column.home": "Heime-tidslina di er tom! Fylg fleire folk for å fylla ho med innhald. {suggestions}.", "empty_column.list": "Det er ingenting i denne lista enno. Når medlemer av denne lista legg ut nye statusar, så dukkar dei opp her.", "empty_column.lists": "Du har ingen lister enno. Når du lagar ei, så dukkar ho opp her.", "empty_column.mutes": "Du har ikkje målbunde nokon enno.", "empty_column.notification_requests": "Ferdig! Her er det ingenting. Når du får nye varsel, kjem dei opp her slik du har valt.", "empty_column.notifications": "Du har ingen varsel enno. Kommuniser med andre for å starte samtalen.", - "empty_column.public": "Det er ingenting her! Skriv noko offentleg, eller følg brukarar frå andre tenarar manuelt for å fylle det opp", + "empty_column.public": "Det er ingenting her! Skriv noko offentleg, eller fylg brukarar frå andre tenarar manuelt for å få meir her", "error.unexpected_crash.explanation": "På grunn av eit nettlesarkompatibilitetsproblem eller ein feil i koden vår, kunne ikkje denne sida bli vist slik den skal.", "error.unexpected_crash.explanation_addons": "Denne sida kunne ikkje visast som den skulle. Feilen kjem truleg frå ei nettleserutviding eller frå automatiske omsetjingsverktøy.", "error.unexpected_crash.next_steps": "Prøv å lasta inn sida på nytt. Hjelper ikkje dette kan du framleis nytta Mastodon i ein annan nettlesar eller app.", @@ -315,7 +315,7 @@ "follow_suggestions.personalized_suggestion": "Personleg forslag", "follow_suggestions.popular_suggestion": "Populært forslag", "follow_suggestions.view_all": "Vis alle", - "follow_suggestions.who_to_follow": "Kven som skal følgjast", + "follow_suggestions.who_to_follow": "Kven du kan fylgja", "followed_tags": "Fylgde emneknaggar", "footer.about": "Om", "footer.directory": "Profilmappe", @@ -471,6 +471,7 @@ "notification.own_poll": "Rundspørjinga di er ferdig", "notification.poll": "Ei rundspørjing du har røysta i er ferdig", "notification.reblog": "{name} framheva innlegget ditt", + "notification.severed_relationships": "Forholda med {name} er brotne", "notification.status": "{name} la nettopp ut", "notification.update": "{name} redigerte eit innlegg", "notification_requests.accept": "Godkjenn", @@ -574,8 +575,8 @@ "privacy.change": "Endre personvernet på innlegg", "privacy.direct.long": "Alle nemnde i innlegget", "privacy.direct.short": "Spesifikke folk", - "privacy.private.long": "Berre dine følgjarar", - "privacy.private.short": "Følgjarar", + "privacy.private.long": "Berre dei som fylgjer deg", + "privacy.private.short": "Fylgjarar", "privacy.public.long": "Kven som helst på og av Mastodon", "privacy.public.short": "Offentleg", "privacy.unlisted.additional": "Dette er akkurat som offentleg, bortsett frå at innlegga ikkje dukkar opp i direktestraumar eller merkelappar, i oppdagingar eller Mastodon-søk, sjølv om du har sagt ja til at kontoen skal vera synleg.", @@ -587,6 +588,12 @@ "refresh": "Oppdater", "regeneration_indicator.label": "Lastar…", "regeneration_indicator.sublabel": "Heimetidslina di vert førebudd!", + "relationship_severance_notification.purged_data": "sletta av administratorar", + "relationship_severance_notification.relationships": "{count, plural, one {# forhold} other {# forhold}}", + "relationship_severance_notification.types.account_suspension": "Kontoen er utvist", + "relationship_severance_notification.types.domain_block": "Domenet er utestengt", + "relationship_severance_notification.types.user_domain_block": "Du blokkerte dette domenet", + "relationship_severance_notification.view": "Sjå", "relative_time.days": "{number}dg", "relative_time.full.days": "{number, plural, one {# dag} other {# dagar}} sidan", "relative_time.full.hours": "{number, plural, one {# time} other {# timar}} sidan", @@ -615,7 +622,7 @@ "report.comment.title": "Er det noko anna du meiner me bør vite?", "report.forward": "Vidaresend til {target}", "report.forward_hint": "Kontoen er frå ein annan tenar. Vil du senda ein anonymisert kopi av rapporten dit òg?", - "report.mute": "Målbind", + "report.mute": "Demp", "report.mute_explanation": "Du vil ikkje lenger sjå innlegga deira. Dei kan framleis fylgje deg og sjå innlegga dine, men vil ikkje vite at du har valt å ikkje sjå innlegga deira.", "report.next": "Neste", "report.placeholder": "Tilleggskommentarar", @@ -686,7 +693,7 @@ "status.block": "Blokker @{name}", "status.bookmark": "Set bokmerke", "status.cancel_reblog_private": "Opphev framheving", - "status.cannot_reblog": "Denne posten kan ikkje framhevast", + "status.cannot_reblog": "Du kan ikkje framheva dette innlegget", "status.copy": "Kopier lenke til status", "status.delete": "Slett", "status.detailed_status": "Detaljert samtalevisning", @@ -709,8 +716,8 @@ "status.media_hidden": "Mediet er gøymt", "status.mention": "Nemn @{name}", "status.more": "Meir", - "status.mute": "Målbind @{name}", - "status.mute_conversation": "Målbind samtale", + "status.mute": "Demp @{name}", + "status.mute_conversation": "Demp samtale", "status.open": "Utvid denne statusen", "status.pin": "Fest på profil", "status.pinned": "Festa tut", @@ -734,11 +741,11 @@ "status.show_more": "Vis meir", "status.show_more_all": "Vis meir for alle", "status.show_original": "Vis original", - "status.title.with_attachments": "{user} postet {attachmentCount, plural, one {et vedlegg} other {{attachmentCount} vedlegg}}", + "status.title.with_attachments": "{user} la ut {attachmentCount, plural, one {eitt vedlegg} other {{attachmentCount} vedlegg}}", "status.translate": "Omset", "status.translated_from_with": "Omsett frå {lang} ved bruk av {provider}", "status.uncached_media_warning": "Førehandsvisning er ikkje tilgjengeleg", - "status.unmute_conversation": "Opphev målbinding av samtalen", + "status.unmute_conversation": "Opphev demping av samtalen", "status.unpin": "Løys frå profil", "subscribed_languages.lead": "Kun innlegg på valde språk vil bli dukke opp i heimestraumen din og i listene dine etter denne endringa. For å motta innlegg på alle språk, la vere å velje nokon.", "subscribed_languages.save": "Lagre endringar", diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index 782ea9d762..3ee134d6c5 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -471,6 +471,7 @@ "notification.own_poll": "Twoje głosowanie zakończyło się", "notification.poll": "Głosowanie w którym brałeś(-aś) udział zakończyło się", "notification.reblog": "Twój post został podbity przez {name}", + "notification.severed_relationships": "Zerwano związki z {name}", "notification.status": "{name} opublikował(a) nowy wpis", "notification.update": "{name} edytował(a) post", "notification_requests.accept": "Akceptuj", @@ -483,6 +484,8 @@ "notifications.column_settings.admin.sign_up": "Nowe rejestracje:", "notifications.column_settings.alert": "Powiadomienia na pulpicie", "notifications.column_settings.favourite": "Ulubione:", + "notifications.column_settings.filter_bar.advanced": "Wyświetl wszystkie kategorie", + "notifications.column_settings.filter_bar.category": "Szybkie filtrowanie", "notifications.column_settings.follow": "Nowi obserwujący:", "notifications.column_settings.follow_request": "Nowe prośby o możliwość obserwacji:", "notifications.column_settings.mention": "Wspomnienia:", @@ -587,6 +590,12 @@ "refresh": "Odśwież", "regeneration_indicator.label": "Ładuję…", "regeneration_indicator.sublabel": "Twoja oś czasu jest przygotowywana!", + "relationship_severance_notification.purged_data": "wyczyszczone przez administratorów", + "relationship_severance_notification.relationships": "{count, plural, one {# związek} few {# związki} other {# związków}}", + "relationship_severance_notification.types.account_suspension": "Konto zostało zawieszone", + "relationship_severance_notification.types.domain_block": "Domena została zawieszona", + "relationship_severance_notification.types.user_domain_block": "Domena przez ciebie blokowana", + "relationship_severance_notification.view": "Pokaż", "relative_time.days": "{number} dni", "relative_time.full.days": "{number, plural, one {# dzień} few {# dni} many {# dni} other {# dni}} temu", "relative_time.full.hours": "{number, plural, one {# godzinę} few {# godziny} many {# godzin} other {# godzin}} temu", diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json index d4b37ffe6d..6732973d5a 100644 --- a/app/javascript/mastodon/locales/pt-PT.json +++ b/app/javascript/mastodon/locales/pt-PT.json @@ -471,6 +471,7 @@ "notification.own_poll": "A sua votação terminou", "notification.poll": "Uma votação em que participaste chegou ao fim", "notification.reblog": "{name} reforçou a tua publicação", + "notification.severed_relationships": "Relações com {name} cessadas", "notification.status": "{name} acabou de publicar", "notification.update": "{name} editou uma publicação", "notification_requests.accept": "Aceitar", @@ -483,6 +484,8 @@ "notifications.column_settings.admin.sign_up": "Novas inscrições:", "notifications.column_settings.alert": "Notificações no ambiente de trabalho", "notifications.column_settings.favourite": "Favoritos:", + "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias", + "notifications.column_settings.filter_bar.category": "Barra de filtros rápidos", "notifications.column_settings.follow": "Novos seguidores:", "notifications.column_settings.follow_request": "Novos pedidos de seguidor:", "notifications.column_settings.mention": "Menções:", @@ -587,6 +590,12 @@ "refresh": "Actualizar", "regeneration_indicator.label": "A carregar…", "regeneration_indicator.sublabel": "A tua página inicial está a ser preparada!", + "relationship_severance_notification.purged_data": "purgado pelos administradores", + "relationship_severance_notification.relationships": "{count, plural,one {# relação} other {# relações}}", + "relationship_severance_notification.types.account_suspension": "A conta foi suspensa", + "relationship_severance_notification.types.domain_block": "O domínio foi suspenso", + "relationship_severance_notification.types.user_domain_block": "Bloqueou este domínio", + "relationship_severance_notification.view": "Visualizar", "relative_time.days": "{number}d", "relative_time.full.days": "{number, plural,one {# dia} other {# dias}} atrás", "relative_time.full.hours": "{number, plural,one {# hora}other {# horas}} atrás", diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json index 62772f4f22..67aad91005 100644 --- a/app/javascript/mastodon/locales/ry.json +++ b/app/javascript/mastodon/locales/ry.json @@ -35,11 +35,13 @@ "account.following": "Слідуєте", "account.follows.empty": "Сись хосновач щи никого не слідує.", "account.go_to_profile": "Перейти на профіл", + "account.hide_reblogs": "Спрятати друленя уд @{name}", "account.joined_short": "Датум прикапчованя", "account.languages": "Поміняти убрані языкы", "account.link_verified_on": "Властность сього удкликованя было звірено {date}", "account.media": "Медіа", "account.moved_to": "Хосновач {name} указав, ож новый профіл йим є:", + "account.mute": "Стишити {name}", "account.mute_notifications_short": "Стишити голошіня", "account.mute_short": "Стишити", "account.muted": "Стишено", @@ -52,8 +54,22 @@ "account.requested": "Чекат ся на пудтвердженя. Нажміт убы удмінити запрос на слідованя", "account.requested_follow": "Хосновач {name} просит ся пудписати ся на вас", "account.share": "Пошырити профіл хосновача {name}", + "account.show_reblogs": "Указати друленя уд {name}", "account.unblock": "Розблоковати {name}", "account.unblock_domain": "Розблоковати домен {domain}", + "account.unblock_short": "Розблоковати", + "account.unendorse": "Не указовати на профілови", + "account.unfollow": "Удписати ся", + "account.unmute_notifications_short": "Указовати голошіня", + "account.unmute_short": "Указовати", + "account_note.placeholder": "Клопкніт обы додати примітку", + "admin.dashboard.retention.cohort_size": "Нові хосновачі", + "admin.impact_report.instance_accounts": "Профілі из акаунтув, котрі ся удалят", + "admin.impact_report.instance_followers": "Пудписникы, котрых стратят наші хосновачі", + "admin.impact_report.instance_follows": "Пудписникы, котрых стратят їхні хосновачі", + "admin.impact_report.title": "Вплыв цілком", + "alert.rate_limited.message": "Попробуйте зась по {retry_time, time, medium}.", + "alert.rate_limited.title": "Частота обмежена", "bundle_column_error.return": "Вернути ся на головну", "bundle_column_error.routing.body": "Не можеме найти сяку сторунку. Бизувні сьте, ож URL у адресному шорикови є добрый?", "bundle_column_error.routing.title": "404", diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index c2b1cede94..0ab1475699 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -205,8 +205,10 @@ "dismissable_banner.explore_tags": "Toto sú hashtagy zo sociálnej siete, ktoré sú dnes populárne. Novšie hashtagy používané viacerými ľuďmi sú radené vyššie.", "dismissable_banner.public_timeline": "Toto sú najnovšie verejné príspevky od účtov na sociálnej sieti, ktoré sú sledované účtami z {domain}.", "domain_block_modal.block": "Blokovať server", + "domain_block_modal.block_account_instead": "Namiesto toho zablokuj @{name}", "domain_block_modal.title": "Blokovať doménu?", "domain_pill.server": "Server", + "domain_pill.their_server": "Ich digitálny domov, kde žijú všetky ich príspevky.", "domain_pill.username": "Používateľské meno", "embed.instructions": "Tento príspevok môžete pridať na svoju webovú stránku použitím tohto kódu.", "embed.preview": "Takto bude vyzerať:", @@ -404,6 +406,7 @@ "loading_indicator.label": "Načítavanie…", "media_gallery.toggle_visible": "{number, plural, one {Skryť obrázok} other {Skryť obrázky}}", "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálne deaktivovaný, pretože ste sa presunuli na {movedToAccount}.", + "mute_modal.hide_from_notifications": "Ukryť z upozornení", "mute_modal.hide_options": "Skryť možnosti", "mute_modal.show_options": "Zobraziť možnosti", "mute_modal.title": "Stíšiť užívateľa?", @@ -454,6 +457,7 @@ "notifications.column_settings.admin.sign_up": "Nové registrácie:", "notifications.column_settings.alert": "Upozornenia na ploche", "notifications.column_settings.favourite": "Ohviezdičkované:", + "notifications.column_settings.filter_bar.advanced": "Zobraziť všetky kategórie", "notifications.column_settings.follow": "Nové sledovania od:", "notifications.column_settings.follow_request": "Nové žiadosti o sledovanie od:", "notifications.column_settings.mention": "Označenia:", @@ -553,6 +557,8 @@ "refresh": "Obnoviť", "regeneration_indicator.label": "Načítavanie…", "regeneration_indicator.sublabel": "Váš domovský kanál sa pripravuje.", + "relationship_severance_notification.types.user_domain_block": "Túto doménu si zablokoval/a", + "relationship_severance_notification.view": "Zobraziť", "relative_time.days": "{number} dní", "relative_time.full.days": "Pred {number, plural, one {# dňom} other {# dňami}}", "relative_time.full.hours": "Pred {number, plural, one {# hodinou} other {# hodinami}}", diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json index de22e98f07..d31b410804 100644 --- a/app/javascript/mastodon/locales/sl.json +++ b/app/javascript/mastodon/locales/sl.json @@ -471,6 +471,7 @@ "notification.own_poll": "Vaša anketa je zaključena", "notification.poll": "Anketa, v kateri ste sodelovali, je zaključena", "notification.reblog": "{name} je izpostavila/a vašo objavo", + "notification.severed_relationships": "Veze z {name} prekinjene", "notification.status": "{name} je pravkar objavil/a", "notification.update": "{name} je uredil(a) objavo", "notification_requests.accept": "Sprejmi", @@ -516,7 +517,7 @@ "notifications.policy.filter_not_following_title": "Ljudje, ki jim ne sledite", "notifications.policy.filter_private_mentions_hint": "Filtrirano, razen če je odgovor na vašo lastno omembo ali če sledite pošiljatelju", "notifications.policy.filter_private_mentions_title": "Neželene zasebne omembe", - "notifications.policy.title": "Skrij obvestila od …", + "notifications.policy.title": "Filtriraj obvestila od …", "notifications_permission_banner.enable": "Omogoči obvestila na namizju", "notifications_permission_banner.how_to_control": "Če želite prejemati obvestila, ko Mastodon ni odprt, omogočite namizna obvestila. Natančno lahko nadzirate, katere vrste interakcij naj tvorijo namizna obvestila; ko so omogočena, za to uporabite gumb {icon} zgoraj.", "notifications_permission_banner.title": "Nikoli ne zamudite ničesar", @@ -587,6 +588,12 @@ "refresh": "Osveži", "regeneration_indicator.label": "Nalaganje …", "regeneration_indicator.sublabel": "Vaš domači vir se pripravlja!", + "relationship_severance_notification.purged_data": "očistili skrbniki", + "relationship_severance_notification.relationships": "{count, plural, one {# veza} two {# vezi} few {# veze} other {# vez}}", + "relationship_severance_notification.types.account_suspension": "Račun je bil suspendiran", + "relationship_severance_notification.types.domain_block": "Domena je bila suspendirana", + "relationship_severance_notification.types.user_domain_block": "Domeno ste blokirali", + "relationship_severance_notification.view": "Pogled", "relative_time.days": "{number} d", "relative_time.full.days": "{number, plural, one {pred # dnem} two {pred # dnevoma} few {pred # dnevi} other {pred # dnevi}}", "relative_time.full.hours": "{number, plural, one {pred # uro} two {pred # urama} few {pred # urami} other {pred # urami}}", diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json index dd8f4ad980..d69231d823 100644 --- a/app/javascript/mastodon/locales/sq.json +++ b/app/javascript/mastodon/locales/sq.json @@ -470,6 +470,7 @@ "notification.own_poll": "Pyetësori juaj ka përfunduar", "notification.poll": "Ka përfunduar një pyetësor ku keni votuar", "notification.reblog": "{name} përforcoi mesazhin tuaj", + "notification.severed_relationships": "Marrëdhëniet me {name} u ndërprenë", "notification.status": "{name} sapo postoi", "notification.update": "{name} përpunoi një postim", "notification_requests.accept": "Pranoje", @@ -482,6 +483,8 @@ "notifications.column_settings.admin.sign_up": "Regjistrime të reja:", "notifications.column_settings.alert": "Njoftime desktopi", "notifications.column_settings.favourite": "Të parapëlqyer:", + "notifications.column_settings.filter_bar.advanced": "Shfaq krejt kategoritë", + "notifications.column_settings.filter_bar.category": "Shtyllë filtrimesh të shpejta", "notifications.column_settings.follow": "Ndjekës të rinj:", "notifications.column_settings.follow_request": "Kërkesa të reja për ndjekje:", "notifications.column_settings.mention": "Përmendje:", @@ -584,6 +587,12 @@ "refresh": "Rifreskoje", "regeneration_indicator.label": "Po ngarkohet…", "regeneration_indicator.sublabel": "Prurja juaj vetjake po përgatitet!", + "relationship_severance_notification.purged_data": "spastruar nga përgjegjës", + "relationship_severance_notification.relationships": "{count, plural, one {# marrëdhënie} other {# marrëdhënie}}", + "relationship_severance_notification.types.account_suspension": "Llogaria është pezulluar", + "relationship_severance_notification.types.domain_block": "Përkatësia është pezulluar", + "relationship_severance_notification.types.user_domain_block": "E bllokuat këtë përkatësi", + "relationship_severance_notification.view": "Shiheni", "relative_time.days": "{number}d", "relative_time.full.days": "{number, plural, one {# ditë} other {# ditë}} më parë", "relative_time.full.hours": "{number, plural, one {# orë} other {# orë}} më parë", diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json index 1bfd3e480f..b28b4826d4 100644 --- a/app/javascript/mastodon/locales/sv.json +++ b/app/javascript/mastodon/locales/sv.json @@ -89,6 +89,7 @@ "announcement.announcement": "Meddelande", "attachments_list.unprocessed": "(obehandlad)", "audio.hide": "Dölj audio", + "block_modal.remote_users_caveat": "Vi kommer att be servern {domain} att respektera ditt beslut. Dock garanteras inte efterlevnad eftersom vissa servrar kan hantera blockeringar på olika sätt. Offentliga inlägg kan fortfarande vara synliga för icke-inloggade användare.", "block_modal.show_less": "Visa mindre", "block_modal.show_more": "Visa mer", "block_modal.they_cant_mention": "De kan inte nämna eller följa dig.", @@ -212,8 +213,12 @@ "domain_block_modal.block_account_instead": "Blockera @{name} istället", "domain_block_modal.they_can_interact_with_old_posts": "Personer från denna server kan interagera med dina gamla inlägg.", "domain_block_modal.they_cant_follow": "Ingen från denna server kan följa dig.", + "domain_block_modal.they_wont_know": "De kommer inte veta att de har blockerats.", "domain_block_modal.title": "Blockera domän?", "domain_block_modal.you_will_lose_followers": "Alla dina följare från denna server kommer att tas bort.", + "domain_block_modal.you_wont_see_posts": "Du kommer inte att se inlägg eller meddelanden från användare på den här servern.", + "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_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", @@ -415,6 +420,8 @@ "mute_modal.hide_options": "Dölj alternativ", "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.", + "mute_modal.title": "Tysta användare?", "mute_modal.you_wont_see_mentions": "Du kommer inte att se inlägg som nämner dem.", "mute_modal.you_wont_see_posts": "De kan fortfarande se dina inlägg, men du kan inte se deras.", "navigation_bar.about": "Om", @@ -454,12 +461,17 @@ "notification.reblog": "{name} boostade ditt inlägg", "notification.status": "{name} publicerade just ett inlägg", "notification.update": "{name} redigerade ett inlägg", + "notification_requests.accept": "Godkänn", + "notification_requests.dismiss": "Avfärda", + "notification_requests.notifications_from": "Aviseringar från {name}", + "notification_requests.title": "Filtrerade meddelanden", "notifications.clear": "Rensa aviseringar", "notifications.clear_confirmation": "Är du säker på att du vill rensa alla dina aviseringar permanent?", "notifications.column_settings.admin.report": "Nya rapporter:", "notifications.column_settings.admin.sign_up": "Nya registreringar:", "notifications.column_settings.alert": "Skrivbordsaviseringar", "notifications.column_settings.favourite": "Favoriter:", + "notifications.column_settings.filter_bar.advanced": "Visa alla kategorier", "notifications.column_settings.follow": "Nya följare:", "notifications.column_settings.follow_request": "Ny följ-förfrågan:", "notifications.column_settings.mention": "Omnämningar:", @@ -485,9 +497,12 @@ "notifications.permission_denied": "Skrivbordsaviseringar är otillgängliga på grund av tidigare nekade förfrågningar om behörighet i webbläsaren", "notifications.permission_denied_alert": "Skrivbordsaviseringar kan inte aktiveras, eftersom att webbläsarens behörighet har nekats innan", "notifications.permission_required": "Skrivbordsaviseringar är otillgängliga eftersom att rättigheten som krävs inte har godkänts.", + "notifications.policy.filter_new_accounts.hint": "Skapad inom de senaste {days, plural, one {dagen} other {# dagarna}}", "notifications.policy.filter_new_accounts_title": "Nya konton", "notifications.policy.filter_not_followers_title": "Personer som inte följer dig", "notifications.policy.filter_not_following_title": "Personer du inte följer", + "notifications.policy.filter_private_mentions_title": "Oombedda privata omnämnanden", + "notifications.policy.title": "Filtrera ut aviseringar från…", "notifications_permission_banner.enable": "Aktivera skrivbordsaviseringar", "notifications_permission_banner.how_to_control": "För att ta emot aviseringar när Mastodon inte är öppet, aktivera skrivbordsaviseringar. När de är aktiverade kan du styra exakt vilka typer av interaktioner som aviseras via {icon} -knappen ovan.", "notifications_permission_banner.title": "Missa aldrig något", @@ -558,6 +573,11 @@ "refresh": "Läs om", "regeneration_indicator.label": "Laddar…", "regeneration_indicator.sublabel": "Ditt hemmaflöde förbereds!", + "relationship_severance_notification.purged_data": "rensad av administratörer", + "relationship_severance_notification.types.account_suspension": "Ditt konto har blivit avstängt", + "relationship_severance_notification.types.domain_block": "Domänen har stängts av", + "relationship_severance_notification.types.user_domain_block": "Du blockerade denna domän", + "relationship_severance_notification.view": "Visa", "relative_time.days": "{number}d", "relative_time.full.days": "{number, plural, one {# dag} other {# dagar}} sedan", "relative_time.full.hours": "{number, plural, one {# timme} other {# timmar}} sedan", diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json index ce3b4eaa25..4490f038ca 100644 --- a/app/javascript/mastodon/locales/th.json +++ b/app/javascript/mastodon/locales/th.json @@ -471,6 +471,7 @@ "notification.own_poll": "การสำรวจความคิดเห็นของคุณได้สิ้นสุดแล้ว", "notification.poll": "การสำรวจความคิดเห็นที่คุณได้ลงคะแนนได้สิ้นสุดแล้ว", "notification.reblog": "{name} ได้ดันโพสต์ของคุณ", + "notification.severed_relationships": "ตัดขาดความสัมพันธ์กับ {name} แล้ว", "notification.status": "{name} เพิ่งโพสต์", "notification.update": "{name} ได้แก้ไขโพสต์", "notification_requests.accept": "ยอมรับ", @@ -483,6 +484,8 @@ "notifications.column_settings.admin.sign_up": "การลงทะเบียนใหม่:", "notifications.column_settings.alert": "การแจ้งเตือนบนเดสก์ท็อป", "notifications.column_settings.favourite": "รายการโปรด:", + "notifications.column_settings.filter_bar.advanced": "แสดงหมวดหมู่ทั้งหมด", + "notifications.column_settings.filter_bar.category": "แถบตัวกรองด่วน", "notifications.column_settings.follow": "ผู้ติดตามใหม่:", "notifications.column_settings.follow_request": "คำขอติดตามใหม่:", "notifications.column_settings.mention": "การกล่าวถึง:", @@ -587,6 +590,12 @@ "refresh": "รีเฟรช", "regeneration_indicator.label": "กำลังโหลด…", "regeneration_indicator.sublabel": "กำลังเตรียมฟีดหน้าแรกของคุณ!", + "relationship_severance_notification.purged_data": "ล้างข้อมูลโดยผู้ดูแล", + "relationship_severance_notification.relationships": "{count, plural, other {# ความสัมพันธ์}}", + "relationship_severance_notification.types.account_suspension": "ระงับบัญชีแล้ว", + "relationship_severance_notification.types.domain_block": "ระงับโดเมนแล้ว", + "relationship_severance_notification.types.user_domain_block": "คุณได้ปิดกั้นโดเมนนี้", + "relationship_severance_notification.view": "ดู", "relative_time.days": "{number} วัน", "relative_time.full.days": "{number, plural, other {# วัน}}ที่แล้ว", "relative_time.full.hours": "{number, plural, other {# ชั่วโมง}}ที่แล้ว", diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json index bf88e53c94..12d82c70ec 100644 --- a/app/javascript/mastodon/locales/tr.json +++ b/app/javascript/mastodon/locales/tr.json @@ -471,6 +471,7 @@ "notification.own_poll": "Anketiniz sona erdi", "notification.poll": "Oy verdiğiniz bir anket sona erdi", "notification.reblog": "{name} gönderini yeniden paylaştı", + "notification.severed_relationships": "{name} ile ilişkiler koptu", "notification.status": "{name} az önce gönderdi", "notification.update": "{name} bir gönderiyi düzenledi", "notification_requests.accept": "Onayla", @@ -483,6 +484,8 @@ "notifications.column_settings.admin.sign_up": "Yeni kayıtlar:", "notifications.column_settings.alert": "Masaüstü bildirimleri", "notifications.column_settings.favourite": "Favorilerin:", + "notifications.column_settings.filter_bar.advanced": "Tüm kategorileri görüntüle", + "notifications.column_settings.filter_bar.category": "Hızlı filtre çubuğu", "notifications.column_settings.follow": "Yeni takipçiler:", "notifications.column_settings.follow_request": "Yeni takip istekleri:", "notifications.column_settings.mention": "Değinmeler:", @@ -587,6 +590,12 @@ "refresh": "Yenile", "regeneration_indicator.label": "Yükleniyor…", "regeneration_indicator.sublabel": "Ana akışın hazırlanıyor!", + "relationship_severance_notification.purged_data": "yöneticiler tarafından temizlendi", + "relationship_severance_notification.relationships": "{count, plural, one {# ilişki} other {# ilişki}}", + "relationship_severance_notification.types.account_suspension": "Hesap askıya alındı", + "relationship_severance_notification.types.domain_block": "Alan adı askıya alındı", + "relationship_severance_notification.types.user_domain_block": "Bu alan adını engellediniz", + "relationship_severance_notification.view": "Görüntüle", "relative_time.days": "{number}d", "relative_time.full.days": "{number, plural, one {# gün} other {# gün}} önce", "relative_time.full.hours": "{number, plural, one {# saat} other {# saat}} önce", diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json index bb0d0b39e2..f2e58f0937 100644 --- a/app/javascript/mastodon/locales/uk.json +++ b/app/javascript/mastodon/locales/uk.json @@ -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,16 @@ "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.server": "Сервер", + "domain_pill.username": "Ім'я користувача", "embed.instructions": "Вбудуйте цей допис до вашого вебсайту, скопіювавши код нижче.", "embed.preview": "Ось який вигляд це матиме:", "emoji_button.activity": "Діяльність", @@ -397,6 +416,15 @@ "loading_indicator.label": "Завантаження…", "media_gallery.toggle_visible": "{number, plural, one {Приховати зображення} 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": "Заблоковані користувачі", @@ -432,6 +460,7 @@ "notification.own_poll": "Ваше опитування завершилося", "notification.poll": "Опитування, у якому ви голосували, скінчилося", "notification.reblog": "{name} поширює ваш допис", + "notification.severed_relationships": "Зв'язки з {name} розірвані", "notification.status": "{name} щойно дописує", "notification.update": "{name} змінює допис", "notification_requests.accept": "Прийняти", @@ -444,6 +473,8 @@ "notifications.column_settings.admin.sign_up": "Нові реєстрації:", "notifications.column_settings.alert": "Сповіщення стільниці", "notifications.column_settings.favourite": "Уподобане:", + "notifications.column_settings.filter_bar.advanced": "Показати всі категорії", + "notifications.column_settings.filter_bar.category": "Панель швидкого фільтру", "notifications.column_settings.follow": "Нові підписники:", "notifications.column_settings.follow_request": "Нові запити на підписку:", "notifications.column_settings.mention": "Згадки:", @@ -544,6 +575,12 @@ "refresh": "Оновити", "regeneration_indicator.label": "Завантаження…", "regeneration_indicator.sublabel": "Хвилинку, ми готуємо вашу стрічку!", + "relationship_severance_notification.purged_data": "очищено адміністраторами", + "relationship_severance_notification.relationships": "{count, plural, one {# зв'язок} few {# зв'язки} many {# зв'язків} other {# зв'язок}}", + "relationship_severance_notification.types.account_suspension": "Обліковий запис призупинено", + "relationship_severance_notification.types.domain_block": "Домен призупинено", + "relationship_severance_notification.types.user_domain_block": "Ви заблокували цей домен", + "relationship_severance_notification.view": "Вигляд", "relative_time.days": "{number}д", "relative_time.full.days": "{number, plural, one {# день} few {# дні} other {# днів}} тому", "relative_time.full.hours": "{number, plural, one {# година} few {# години} other {# годин}} тому", diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json index b51b832b2b..9b09d21450 100644 --- a/app/javascript/mastodon/locales/vi.json +++ b/app/javascript/mastodon/locales/vi.json @@ -471,6 +471,7 @@ "notification.own_poll": "Cuộc bình chọn của bạn đã kết thúc", "notification.poll": "Cuộc bình chọn đã kết thúc", "notification.reblog": "{name} đăng lại tút của bạn", + "notification.severed_relationships": "Mối quan hệ với {name} bị cắt đứt", "notification.status": "{name} đăng tút mới", "notification.update": "{name} đã sửa tút", "notification_requests.accept": "Chấp nhận", @@ -587,6 +588,12 @@ "refresh": "Làm mới", "regeneration_indicator.label": "Đang tải…", "regeneration_indicator.sublabel": "Trang chủ của bạn đang được cập nhật!", + "relationship_severance_notification.purged_data": "bị quản trị viên xóa", + "relationship_severance_notification.relationships": "{count, plural, other {# mối quan hệ}}", + "relationship_severance_notification.types.account_suspension": "Người này đã bị vô hiệu hóa", + "relationship_severance_notification.types.domain_block": "Máy chủ này đã bị vô hiệu hóa", + "relationship_severance_notification.types.user_domain_block": "Bạn đã chặn máy chủ này", + "relationship_severance_notification.view": "Chi tiết", "relative_time.days": "{number} ngày", "relative_time.full.days": "{number, plural, other {# ngày}}", "relative_time.full.hours": "{number, plural, other {# giờ}}", diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index 1a39dc235c..52a98d0005 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -471,6 +471,7 @@ "notification.own_poll": "你的投票已经结束", "notification.poll": "你参与的一个投票已经结束", "notification.reblog": "{name} 转发了你的嘟文", + "notification.severed_relationships": "与 {name} 的关系已被切断", "notification.status": "{name} 刚刚发布嘟文", "notification.update": "{name} 编辑了嘟文", "notification_requests.accept": "接受", @@ -483,6 +484,8 @@ "notifications.column_settings.admin.sign_up": "新注册：", "notifications.column_settings.alert": "桌面通知", "notifications.column_settings.favourite": "喜欢：", + "notifications.column_settings.filter_bar.advanced": "显示所有类别", + "notifications.column_settings.filter_bar.category": "快速筛选栏", "notifications.column_settings.follow": "新粉丝：", "notifications.column_settings.follow_request": "新关注请求：", "notifications.column_settings.mention": "提及：", @@ -587,6 +590,12 @@ "refresh": "刷新", "regeneration_indicator.label": "加载中…", "regeneration_indicator.sublabel": "你的主页动态正在准备中！", + "relationship_severance_notification.purged_data": "被管理员清除", + "relationship_severance_notification.relationships": "{count, plural, other {# 条关系}}", + "relationship_severance_notification.types.account_suspension": "账户已被封禁", + "relationship_severance_notification.types.domain_block": "域名已被封禁", + "relationship_severance_notification.types.user_domain_block": "你屏蔽了这个域名", + "relationship_severance_notification.view": "查看", "relative_time.days": "{number} 天前", "relative_time.full.days": "{number, plural, one {# 天} other {# 天}}前", "relative_time.full.hours": "{number, plural, one {# 小时} other {# 小时}}前", diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json index 44a1435b2f..68be293df9 100644 --- a/app/javascript/mastodon/locales/zh-HK.json +++ b/app/javascript/mastodon/locales/zh-HK.json @@ -471,6 +471,7 @@ "notification.own_poll": "你的投票已結束", "notification.poll": "你參與過的一個投票已經結束", "notification.reblog": "{name} 轉推你的文章", + "notification.severed_relationships": "已斷絕與 {name} 的關係", "notification.status": "{name} 剛發表了文章", "notification.update": "{name} 編輯了帖文", "notification_requests.accept": "接受", @@ -587,6 +588,12 @@ "refresh": "重新整理", "regeneration_indicator.label": "載入中……", "regeneration_indicator.sublabel": "你的主頁時間軸正在準備中！", + "relationship_severance_notification.purged_data": "已被管理員清除", + "relationship_severance_notification.relationships": "{count, plural, one {# 個關係} other {# 個關係}}", + "relationship_severance_notification.types.account_suspension": "帳號已被停權", + "relationship_severance_notification.types.domain_block": "網域已被停權", + "relationship_severance_notification.types.user_domain_block": "你封鎖了此網域", + "relationship_severance_notification.view": "查看", "relative_time.days": "{number}日前", "relative_time.full.days": "{number, plural, one {# 天} other {# 天}}前", "relative_time.full.hours": "{number, plural, one {# 小時} other {# 小時}}前", @@ -697,6 +704,7 @@ "status.edited_x_times": "Edited {count, plural, one {{count} 次} other {{count} 次}}", "status.embed": "嵌入", "status.favourite": "最愛", + "status.favourites": "{count, plural, one {則最愛} other {則最愛}}", "status.filter": "篩選此帖文", "status.filtered": "已過濾", "status.hide": "隱藏帖文", @@ -717,6 +725,7 @@ "status.reblog": "轉推", "status.reblog_private": "轉推到原讀者", "status.reblogged_by": "{name} 轉推", + "status.reblogs": "{count, plural, one {則轉推} other {則轉推}}", "status.reblogs.empty": "還未有人轉推。有的話會顯示在這裡。", "status.redraft": "刪除並編輯", "status.remove_bookmark": "移除書籤", diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json index 30313d92f4..d8e1e1e32b 100644 --- a/app/javascript/mastodon/locales/zh-TW.json +++ b/app/javascript/mastodon/locales/zh-TW.json @@ -471,6 +471,7 @@ "notification.own_poll": "您的投票已結束", "notification.poll": "您曾投過的投票已經結束", "notification.reblog": "{name} 已轉嘟您的嘟文", + "notification.severed_relationships": "已斷絕與 {name} 之服務關係", "notification.status": "{name} 剛剛嘟文", "notification.update": "{name} 已編輯嘟文", "notification_requests.accept": "接受", @@ -483,6 +484,8 @@ "notifications.column_settings.admin.sign_up": "新註冊帳號：", "notifications.column_settings.alert": "桌面通知", "notifications.column_settings.favourite": "最愛：", + "notifications.column_settings.filter_bar.advanced": "顯示所有分類", + "notifications.column_settings.filter_bar.category": "快速過濾器", "notifications.column_settings.follow": "新的跟隨者：", "notifications.column_settings.follow_request": "新的跟隨請求：", "notifications.column_settings.mention": "提及：", @@ -587,6 +590,12 @@ "refresh": "重新整理", "regeneration_indicator.label": "載入中…", "regeneration_indicator.sublabel": "您的首頁時間軸正在準備中！", + "relationship_severance_notification.purged_data": "已被管理員清除", + "relationship_severance_notification.relationships": "{count, plural, other {# 個服務關係}}", + "relationship_severance_notification.types.account_suspension": "該帳號已被停權", + "relationship_severance_notification.types.domain_block": "該網域已被停權", + "relationship_severance_notification.types.user_domain_block": "您已封鎖此網域", + "relationship_severance_notification.view": "檢視", "relative_time.days": "{number} 天", "relative_time.full.days": "{number, plural, other {# 天}}前", "relative_time.full.hours": "{number, plural, one {# 小時} other {# 小時}}前", diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js index 8dc2801857..97218e9f75 100644 --- a/app/javascript/mastodon/reducers/compose.js +++ b/app/javascript/mastodon/reducers/compose.js @@ -45,6 +45,7 @@ import { INIT_MEDIA_EDIT_MODAL, COMPOSE_CHANGE_MEDIA_DESCRIPTION, COMPOSE_CHANGE_MEDIA_FOCUS, + COMPOSE_CHANGE_MEDIA_ORDER, COMPOSE_SET_STATUS, COMPOSE_FOCUS, } from '../actions/compose'; @@ -536,6 +537,14 @@ export default function compose(state = initialState, action) { return state.set('language', action.language); case COMPOSE_FOCUS: return state.set('focusDate', new Date()).update('text', text => text.length > 0 ? text : action.defaultText); + case COMPOSE_CHANGE_MEDIA_ORDER: + return state.update('media_attachments', list => { + const indexA = list.findIndex(x => x.get('id') === action.a); + const moveItem = list.get(indexA); + const indexB = list.findIndex(x => x.get('id') === action.b); + + return list.splice(indexA, 1).splice(indexB, 0, moveItem); + }); default: return state; } diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js index b1c80b3d4f..bc85936439 100644 --- a/app/javascript/mastodon/reducers/notifications.js +++ b/app/javascript/mastodon/reducers/notifications.js @@ -55,6 +55,7 @@ export const notificationToMap = notification => ImmutableMap({ created_at: notification.created_at, status: notification.status ? notification.status.id : null, report: notification.report ? fromJS(notification.report) : null, + event: notification.event ? fromJS(notification.event) : null, }); const normalizeNotification = (state, notification, usePendingItems) => { diff --git a/app/javascript/material-icons/400-24px/heart_broken-fill.svg b/app/javascript/material-icons/400-24px/heart_broken-fill.svg new file mode 100644 index 0000000000..75ff3932cd --- /dev/null +++ b/app/javascript/material-icons/400-24px/heart_broken-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/heart_broken.svg b/app/javascript/material-icons/400-24px/heart_broken.svg new file mode 100644 index 0000000000..2ce7de57f1 --- /dev/null +++ b/app/javascript/material-icons/400-24px/heart_broken.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/link_off-fill.svg b/app/javascript/material-icons/400-24px/link_off-fill.svg new file mode 100644 index 0000000000..618e775347 --- /dev/null +++ b/app/javascript/material-icons/400-24px/link_off-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/link_off.svg b/app/javascript/material-icons/400-24px/link_off.svg new file mode 100644 index 0000000000..618e775347 --- /dev/null +++ b/app/javascript/material-icons/400-24px/link_off.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index ea67b8675c..b596d70c5b 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -2165,6 +2165,44 @@ a.account__display-name { } } +.notification__relationships-severance-event { + display: flex; + gap: 16px; + color: $secondary-text-color; + text-decoration: none; + align-items: flex-start; + padding: 16px 32px; + border-bottom: 1px solid var(--background-border-color); + + &:hover { + color: $primary-text-color; + } + + .icon { + padding: 2px; + color: $highlight-text-color; + } + + &__content { + display: flex; + flex-direction: column; + align-items: flex-start; + gap: 8px; + flex-grow: 1; + font-size: 16px; + line-height: 24px; + + strong { + font-weight: 700; + } + + .link-button { + font-size: inherit; + line-height: inherit; + } + } +} + .notification__message { padding: 16px; padding-bottom: 0; @@ -8823,8 +8861,9 @@ noscript { .safety-action-modal, .interaction-modal { - max-width: 90vw; + max-width: 100vw; width: 600px; + overflow-y: auto; } .interaction-modal { @@ -9733,18 +9772,24 @@ noscript { margin-top: 16px; display: flex; flex-wrap: wrap; - font-size: 14px; - line-height: 18px; - gap: 4px; + font-size: 12px; + line-height: 16px; + gap: 6px; color: $darker-text-color; a { display: inline-flex; color: inherit; text-decoration: none; + padding: 4px 12px; + background: $ui-base-color; + border-radius: 4px; + font-weight: 500; - &:hover span { - text-decoration: underline; + &:hover, + &:focus, + &:active { + background: lighten($ui-base-color, 4%); } } @@ -9960,10 +10005,10 @@ noscript { .filtered-notifications-banner { display: flex; align-items: center; - background: $ui-base-color; - border-bottom: 1px solid lighten($ui-base-color, 8%); - padding: 15px; - gap: 15px; + border: 1px solid var(--background-border-color); + border-top: 0; + padding: 24px 32px; + gap: 16px; color: $darker-text-color; text-decoration: none; @@ -9971,15 +10016,12 @@ noscript { &:active, &:focus { color: $secondary-text-color; - - .filtered-notifications-banner__badge { - background: $secondary-text-color; - } } .icon { width: 24px; height: 24px; + padding: 2px; } &__text { @@ -9995,13 +10037,24 @@ noscript { } &__badge { - background: $darker-text-color; - color: $ui-base-color; - border-radius: 100px; - padding: 2px 8px; + display: flex; + align-items: center; + border-radius: 999px; + background: var(--background-border-color); + color: $darker-text-color; + padding: 4px; + padding-inline-end: 8px; + gap: 6px; font-weight: 500; font-size: 11px; line-height: 16px; + + &__badge { + background: $ui-button-background-color; + color: $white; + border-radius: 100px; + padding: 2px 8px; + } } } @@ -10010,7 +10063,7 @@ noscript { align-items: center; gap: 16px; padding: 15px; - border-bottom: 1px solid lighten($ui-base-color, 8%); + border-bottom: 1px solid var(--background-border-color); &__link { display: flex; @@ -10058,7 +10111,7 @@ noscript { .icon-button { border-radius: 4px; - border: 1px solid lighten($ui-base-color, 8%); + border: 1px solid var(--background-border-color); padding: 5px; } } diff --git a/app/models/account_relationship_severance_event.rb b/app/models/account_relationship_severance_event.rb new file mode 100644 index 0000000000..c1269fad6d --- /dev/null +++ b/app/models/account_relationship_severance_event.rb @@ -0,0 +1,41 @@ +# frozen_string_literal: true + +# +# == Schema Information +# +# Table name: account_relationship_severance_events +# +# id :bigint(8) not null, primary key +# account_id :bigint(8) not null +# relationship_severance_event_id :bigint(8) not null +# created_at :datetime not null +# updated_at :datetime not null +# followers_count :integer default(0), not null +# following_count :integer default(0), not null +# +class AccountRelationshipSeveranceEvent < ApplicationRecord + self.ignored_columns += %w( + relationships_count + ) + + belongs_to :account + belongs_to :relationship_severance_event + + has_many :severed_relationships, through: :relationship_severance_event + + delegate :type, + :target_name, + :purged, + :purged?, + to: :relationship_severance_event, + prefix: false + + before_create :set_relationships_count! + + private + + def set_relationships_count! + self.followers_count = severed_relationships.about_local_account(account).passive.count + self.following_count = severed_relationships.about_local_account(account).active.count + end +end diff --git a/app/models/concerns/account/interactions.rb b/app/models/concerns/account/interactions.rb index 85363febfb..a32697b66e 100644 --- a/app/models/concerns/account/interactions.rb +++ b/app/models/concerns/account/interactions.rb @@ -83,6 +83,11 @@ module Account::Interactions has_many :following, -> { order('follows.id desc') }, through: :active_relationships, source: :target_account has_many :followers, -> { order('follows.id desc') }, through: :passive_relationships, source: :account + with_options class_name: 'SeveredRelationship', dependent: :destroy do + has_many :severed_relationships, foreign_key: 'local_account_id', inverse_of: :local_account + has_many :remote_severed_relationships, foreign_key: 'remote_account_id', inverse_of: :remote_account + end + # Account notes has_many :account_notes, dependent: :destroy diff --git a/app/models/concerns/account/merging.rb b/app/models/concerns/account/merging.rb index 960ee1819f..bd8b162238 100644 --- a/app/models/concerns/account/merging.rb +++ b/app/models/concerns/account/merging.rb @@ -27,6 +27,16 @@ module Account::Merging end end + [ + Notification, NotificationPermission, NotificationRequest + ].each do |klass| + klass.where(from_account_id: other_account.id).reorder(nil).find_each do |record| + record.update_attribute(:from_account_id, id) + rescue ActiveRecord::RecordNotUnique + next + end + end + target_classes = [ Follow, FollowRequest, Block, Mute, AccountModerationNote, AccountPin, AccountNote @@ -48,6 +58,18 @@ module Account::Merging record.update_attribute(:account_warning_id, id) end + SeveredRelationship.about_local_account(other_account).reorder(nil).find_each do |record| + record.update_attribute(:local_account_id, id) + rescue ActiveRecord::RecordNotUnique + next + end + + SeveredRelationship.about_remote_account(other_account).reorder(nil).find_each do |record| + record.update_attribute(:remote_account_id, id) + rescue ActiveRecord::RecordNotUnique + next + end + # Some follow relationships have moved, so the cache is stale Rails.cache.delete_matched("followers_hash:#{id}:*") Rails.cache.delete_matched("relationships:#{id}:*") diff --git a/app/models/concerns/user/has_settings.rb b/app/models/concerns/user/has_settings.rb index 8b599dbf96..53100cc097 100644 --- a/app/models/concerns/user/has_settings.rb +++ b/app/models/concerns/user/has_settings.rb @@ -27,10 +27,6 @@ module User::HasSettings settings['default_sensitive'] end - def setting_unfollow_modal - settings['web.unfollow_modal'] - end - def setting_boost_modal settings['web.reblog_modal'] end diff --git a/app/models/notification.rb b/app/models/notification.rb index 861a154369..b2376c78a3 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -54,6 +54,9 @@ class Notification < ApplicationRecord update: { filterable: false, }.freeze, + severed_relationships: { + filterable: false, + }.freeze, 'admin.sign_up': { filterable: false, }.freeze, @@ -86,6 +89,7 @@ class Notification < ApplicationRecord belongs_to :favourite, inverse_of: :notification belongs_to :poll, inverse_of: false belongs_to :report, inverse_of: false + belongs_to :account_relationship_severance_event, inverse_of: false end validates :type, inclusion: { in: TYPES } @@ -182,6 +186,11 @@ class Notification < ApplicationRecord self.from_account_id = activity&.status&.account_id when 'Account' self.from_account_id = activity&.id + when 'AccountRelationshipSeveranceEvent' + # These do not really have an originating account, but this is mandatory + # in the data model, and the recipient's account will by definition + # always exist + self.from_account_id = account_id end end diff --git a/app/models/relationship_severance_event.rb b/app/models/relationship_severance_event.rb new file mode 100644 index 0000000000..30ada25767 --- /dev/null +++ b/app/models/relationship_severance_event.rb @@ -0,0 +1,56 @@ +# frozen_string_literal: true + +# == Schema Information +# +# Table name: relationship_severance_events +# +# id :bigint(8) not null, primary key +# type :integer not null +# target_name :string not null +# purged :boolean default(FALSE), not null +# created_at :datetime not null +# updated_at :datetime not null +# +class RelationshipSeveranceEvent < ApplicationRecord + self.inheritance_column = nil + + has_many :severed_relationships, inverse_of: :relationship_severance_event, dependent: :delete_all + + enum :type, { + domain_block: 0, + user_domain_block: 1, + account_suspension: 2, + } + + scope :about_local_account, ->(account) { where(id: SeveredRelationship.about_local_account(account).select(:relationship_severance_event_id)) } + + def import_from_active_follows!(follows) + import_from_follows!(follows, true) + end + + def import_from_passive_follows!(follows) + import_from_follows!(follows, false) + end + + def affected_local_accounts + Account.where(id: severed_relationships.select(:local_account_id)) + end + + private + + def import_from_follows!(follows, active) + SeveredRelationship.insert_all( + follows.pluck(:account_id, :target_account_id, :show_reblogs, :notify, :languages).map do |account_id, target_account_id, show_reblogs, notify, languages| + { + local_account_id: active ? account_id : target_account_id, + remote_account_id: active ? target_account_id : account_id, + show_reblogs: show_reblogs, + notify: notify, + languages: languages, + relationship_severance_event_id: id, + direction: active ? :active : :passive, + } + end + ) + end +end diff --git a/app/models/severed_relationship.rb b/app/models/severed_relationship.rb new file mode 100644 index 0000000000..64b5b0001b --- /dev/null +++ b/app/models/severed_relationship.rb @@ -0,0 +1,41 @@ +# frozen_string_literal: true + +# == Schema Information +# +# Table name: severed_relationships +# +# id :bigint(8) not null, primary key +# relationship_severance_event_id :bigint(8) not null +# local_account_id :bigint(8) not null +# remote_account_id :bigint(8) not null +# direction :integer not null +# show_reblogs :boolean +# notify :boolean +# languages :string is an Array +# created_at :datetime not null +# updated_at :datetime not null +# +class SeveredRelationship < ApplicationRecord + belongs_to :relationship_severance_event + belongs_to :local_account, class_name: 'Account' + belongs_to :remote_account, class_name: 'Account' + + enum :direction, { + passive: 0, # analogous to `local_account.passive_relationships` + active: 1, # analogous to `local_account.active_relationships` + } + + scope :about_local_account, ->(account) { where(local_account: account) } + scope :about_remote_account, ->(account) { where(remote_account: account) } + + scope :active, -> { where(direction: :active) } + scope :passive, -> { where(direction: :passive) } + + def account + active? ? local_account : remote_account + end + + def target_account + active? ? remote_account : local_account + end +end diff --git a/app/models/user.rb b/app/models/user.rb index bf12d951d0..a082c178e2 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -14,7 +14,6 @@ # sign_in_count :integer default(0), not null # current_sign_in_at :datetime # last_sign_in_at :datetime -# admin :boolean default(FALSE), not null # confirmation_token :string # confirmed_at :datetime # confirmation_sent_at :datetime @@ -29,7 +28,6 @@ # otp_backup_codes :string is an Array # account_id :bigint(8) not null # disabled :boolean default(FALSE), not null -# moderator :boolean default(FALSE), not null # invite_id :bigint(8) # chosen_languages :string is an Array # created_by_application_id :bigint(8) diff --git a/app/models/user_settings.rb b/app/models/user_settings.rb index 9956b88513..886c5c9c4d 100644 --- a/app/models/user_settings.rb +++ b/app/models/user_settings.rb @@ -31,7 +31,6 @@ class UserSettings setting :disable_swiping, default: false setting :delete_modal, default: true setting :reblog_modal, default: false - setting :unfollow_modal, default: true setting :favourite_modal, default: false setting :reduce_motion, default: false setting :expand_content_warnings, default: false diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index 05c5df2cd3..fe6ab5e995 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -31,7 +31,6 @@ class InitialStateSerializer < ActiveModel::Serializer if object.current_account store[:me] = object.current_account.id.to_s - store[:unfollow_modal] = object_account_user.setting_unfollow_modal store[:boost_modal] = object_account_user.setting_boost_modal store[:favourite_modal] = object_account_user.setting_favourite_modal store[:delete_modal] = object_account_user.setting_delete_modal diff --git a/app/serializers/rest/account_relationship_severance_event_serializer.rb b/app/serializers/rest/account_relationship_severance_event_serializer.rb new file mode 100644 index 0000000000..751bc103c2 --- /dev/null +++ b/app/serializers/rest/account_relationship_severance_event_serializer.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class REST::AccountRelationshipSeveranceEventSerializer < ActiveModel::Serializer + attributes :id, :type, :purged, :target_name, :followers_count, :following_count, :created_at + + def id + object.id.to_s + end +end diff --git a/app/serializers/rest/notification_serializer.rb b/app/serializers/rest/notification_serializer.rb index 137fc53dda..36a0adfec4 100644 --- a/app/serializers/rest/notification_serializer.rb +++ b/app/serializers/rest/notification_serializer.rb @@ -6,6 +6,7 @@ class REST::NotificationSerializer < ActiveModel::Serializer belongs_to :from_account, key: :account, serializer: REST::AccountSerializer belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer belongs_to :report, if: :report_type?, serializer: REST::ReportSerializer + belongs_to :account_relationship_severance_event, key: :event, if: :relationship_severance_event?, serializer: REST::AccountRelationshipSeveranceEventSerializer def id object.id.to_s @@ -18,4 +19,8 @@ class REST::NotificationSerializer < ActiveModel::Serializer def report_type? object.type == :'admin.report' end + + def relationship_severance_event? + object.type == :severed_relationships + end end diff --git a/app/services/after_block_domain_from_account_service.rb b/app/services/after_block_domain_from_account_service.rb index 89d007c1cd..adb17845cc 100644 --- a/app/services/after_block_domain_from_account_service.rb +++ b/app/services/after_block_domain_from_account_service.rb @@ -9,18 +9,21 @@ class AfterBlockDomainFromAccountService < BaseService def call(account, domain) @account = account @domain = domain + @domain_block_event = nil clear_notifications! remove_follows! reject_existing_followers! reject_pending_follow_requests! + notify_of_severed_relationships! end private def remove_follows! - @account.active_relationships.where(target_account: Account.where(domain: @domain)).includes(:target_account).reorder(nil).find_each do |follow| - UnfollowService.new.call(@account, follow.target_account) + @account.active_relationships.where(target_account: Account.where(domain: @domain)).includes(:target_account).reorder(nil).in_batches do |follows| + domain_block_event.import_from_active_follows!(follows) + follows.each { |follow| UnfollowService.new.call(@account, follow.target_account) } end end @@ -29,8 +32,9 @@ class AfterBlockDomainFromAccountService < BaseService end def reject_existing_followers! - @account.passive_relationships.where(account: Account.where(domain: @domain)).includes(:account).reorder(nil).find_each do |follow| - reject_follow!(follow) + @account.passive_relationships.where(account: Account.where(domain: @domain)).includes(:account).reorder(nil).in_batches do |follows| + domain_block_event.import_from_passive_follows!(follows) + follows.each { |follow| reject_follow!(follow) } end end @@ -47,4 +51,15 @@ class AfterBlockDomainFromAccountService < BaseService ActivityPub::DeliveryWorker.perform_async(Oj.dump(serialize_payload(follow, ActivityPub::RejectFollowSerializer)), @account.id, follow.account.inbox_url) end + + def notify_of_severed_relationships! + return if @domain_block_event.nil? + + event = AccountRelationshipSeveranceEvent.create!(account: @account, relationship_severance_event: @domain_block_event) + LocalNotificationWorker.perform_async(@account.id, event.id, 'AccountRelationshipSeveranceEvent', 'severed_relationships') + end + + def domain_block_event + @domain_block_event ||= RelationshipSeveranceEvent.create!(type: :user_domain_block, target_name: @domain) + end end diff --git a/app/services/block_domain_service.rb b/app/services/block_domain_service.rb index 76cc36ff6b..00d020d2b3 100644 --- a/app/services/block_domain_service.rb +++ b/app/services/block_domain_service.rb @@ -5,8 +5,11 @@ class BlockDomainService < BaseService def call(domain_block, update = false) @domain_block = domain_block + @domain_block_event = nil + process_domain_block! process_retroactive_updates! if update + notify_of_severed_relationships! end private @@ -37,7 +40,17 @@ class BlockDomainService < BaseService blocked_domain_accounts.without_suspended.in_batches.update_all(suspended_at: @domain_block.created_at, suspension_origin: :local) blocked_domain_accounts.where(suspended_at: @domain_block.created_at).reorder(nil).find_each do |account| - DeleteAccountService.new.call(account, reserve_username: true, suspended_at: @domain_block.created_at) + DeleteAccountService.new.call(account, reserve_username: true, suspended_at: @domain_block.created_at, relationship_severance_event: domain_block_event) + end + end + + def notify_of_severed_relationships! + return if @domain_block_event.nil? + + # TODO: check how efficient that query is, also check `push_bulk`/`perform_bulk` + @domain_block_event.affected_local_accounts.reorder(nil).find_each do |account| + event = AccountRelationshipSeveranceEvent.create!(account: account, relationship_severance_event: @domain_block_event) + LocalNotificationWorker.perform_async(account.id, event.id, 'AccountRelationshipSeveranceEvent', 'severed_relationships') end end @@ -45,6 +58,10 @@ class BlockDomainService < BaseService domain_block.domain end + def domain_block_event + @domain_block_event ||= RelationshipSeveranceEvent.create!(type: :domain_block, target_name: blocked_domain) + end + def blocked_domain_accounts Account.by_domain_and_subdomains(blocked_domain) end diff --git a/app/services/delete_account_service.rb b/app/services/delete_account_service.rb index 7c7cb97df2..328d8ae8f8 100644 --- a/app/services/delete_account_service.rb +++ b/app/services/delete_account_service.rb @@ -58,6 +58,8 @@ class DeleteAccountService < BaseService reports targeted_moderation_notes targeted_reports + severed_relationships + remote_severed_relationships ).freeze # Suspend or remove an account and remove as much of its data @@ -72,6 +74,7 @@ class DeleteAccountService < BaseService # @option [Boolean] :skip_side_effects Side effects are ActivityPub and streaming API payloads # @option [Boolean] :skip_activitypub Skip sending ActivityPub payloads. Implied by :skip_side_effects # @option [Time] :suspended_at Only applicable when :reserve_username is true + # @option [RelationshipSeveranceEvent] :relationship_severance_event Event used to record severed relationships not initiated by the user def call(account, **options) @account = account @options = { reserve_username: true, reserve_email: true }.merge(options) @@ -84,6 +87,7 @@ class DeleteAccountService < BaseService @options[:skip_activitypub] = true if @options[:skip_side_effects] + record_severed_relationships! distribute_activities! purge_content! fulfill_deletion_request! @@ -181,6 +185,7 @@ class DeleteAccountService < BaseService # polymorphically associated notifications generated by this account Notification.where(from_account: @account).in_batches.delete_all + NotificationRequest.where(from_account: @account).in_batches.delete_all end def purge_favourites! @@ -266,6 +271,20 @@ class DeleteAccountService < BaseService end end + def record_severed_relationships! + return if relationship_severance_event.nil? + + @account.active_relationships.in_batches do |follows| + # NOTE: these follows are passive with regards to the local accounts + relationship_severance_event.import_from_passive_follows!(follows) + end + + @account.passive_relationships.in_batches do |follows| + # NOTE: these follows are active with regards to the local accounts + relationship_severance_event.import_from_active_follows!(follows) + end + end + def delete_actor_json @delete_actor_json ||= Oj.dump(serialize_payload(@account, ActivityPub::DeleteActorSerializer, signer: @account, always_sign: true)) end @@ -305,4 +324,8 @@ class DeleteAccountService < BaseService def skip_activitypub? @options[:skip_activitypub] end + + def relationship_severance_event + @options[:relationship_severance_event] + end end diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb index f3d16f1be7..c83e4c017f 100644 --- a/app/services/notify_service.rb +++ b/app/services/notify_service.rb @@ -9,6 +9,8 @@ class NotifyService < BaseService update poll status + # TODO: this probably warrants an email notification + severed_relationships ).freeze class DismissCondition @@ -20,7 +22,7 @@ class NotifyService < BaseService def dismiss? blocked = @recipient.unavailable? - blocked ||= from_self? && @notification.type != :poll + blocked ||= from_self? && @notification.type != :poll && @notification.type != :severed_relationships return blocked if message? && from_staff? diff --git a/app/services/purge_domain_service.rb b/app/services/purge_domain_service.rb index 9df81f13e6..ca0f0d441f 100644 --- a/app/services/purge_domain_service.rb +++ b/app/services/purge_domain_service.rb @@ -2,10 +2,26 @@ class PurgeDomainService < BaseService def call(domain) - Account.remote.where(domain: domain).reorder(nil).find_each do |account| - DeleteAccountService.new.call(account, reserve_username: false, skip_side_effects: true) - end - CustomEmoji.remote.where(domain: domain).reorder(nil).find_each(&:destroy) + @domain = domain + + purge_relationship_severance_events! + purge_accounts! + purge_emojis! + Instance.refresh end + + def purge_relationship_severance_events! + RelationshipSeveranceEvent.where(type: [:domain_block, :user_domain_block], target_name: @domain).in_batches.update_all(purged: true) + end + + def purge_accounts! + Account.remote.where(domain: @domain).reorder(nil).find_each do |account| + DeleteAccountService.new.call(account, reserve_username: false, skip_side_effects: true) + end + end + + def purge_emojis! + CustomEmoji.remote.where(domain: @domain).reorder(nil).find_each(&:destroy) + end end diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml index f7b244ca05..a5ad02a600 100644 --- a/app/views/settings/preferences/appearance/show.html.haml +++ b/app/views/settings/preferences/appearance/show.html.haml @@ -59,7 +59,6 @@ %h4= t 'appearance.confirmation_dialogs' .fields-group - = ff.input :'web.unfollow_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_unfollow_modal') = ff.input :'web.reblog_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_boost_modal') = ff.input :'web.favourite_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_favourite_modal'), glitch_only: true = ff.input :'web.delete_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_delete_modal') diff --git a/app/views/severed_relationships/index.html.haml b/app/views/severed_relationships/index.html.haml new file mode 100644 index 0000000000..7c599e9c0e --- /dev/null +++ b/app/views/severed_relationships/index.html.haml @@ -0,0 +1,34 @@ +- content_for :page_title do + = t('settings.severed_relationships') + +%p.muted-hint= t('severed_relationships.preamble') + +- unless @events.empty? + .table-wrapper + %table.table + %thead + %tr + %th= t('exports.archive_takeout.date') + %th= t('severed_relationships.type') + %th= t('severed_relationships.lost_follows') + %th= t('severed_relationships.lost_followers') + %tbody + - @events.each do |event| + %tr + %td= l event.created_at + %td= t("severed_relationships.event_type.#{event.type}", target_name: event.target_name) + - if event.purged? + %td{ rowspan: 2 }= t('severed_relationships.purged') + - else + %td + - count = event.following_count + - if count.zero? + = t('generic.none') + - else + = table_link_to 'download', t('severed_relationships.download', count: count), following_severed_relationship_path(event, format: :csv) + %td + - count = event.followers_count + - if count.zero? + = t('generic.none') + - else + = table_link_to 'download', t('severed_relationships.download', count: count), followers_severed_relationship_path(event, format: :csv) diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb index f4556db399..6d56e43900 100644 --- a/config/initializers/application_controller_renderer.rb +++ b/config/initializers/application_controller_renderer.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # Be sure to restart your server when you modify this file. # ActiveSupport::Reloader.to_prepare do diff --git a/config/locales/be.yml b/config/locales/be.yml index 0bdc3bb554..cdfc9cb39c 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -1704,6 +1704,7 @@ be: import: Імпарт import_and_export: Імпарт і экспарт migrate: Перамяшчэнне ўліковага запісу + notifications: Email апавяшчэнні preferences: Налады profile: Профіль relationships: Падпіскі і падпісчыкі @@ -1711,6 +1712,14 @@ be: strikes: Папярэджанні мадэратараў two_factor_authentication: Двухфактарная аўтэнтыфікацыя webauthn_authentication: Ключы бяспекі + severed_relationships: + download: Спампаваць (%{count}) + event_type: + user_domain_block: Вы заблакіравалі %{target_name} + lost_followers: Страчаныя падпісчыкі + lost_follows: Страчаныя падпіскі + preamble: Вы можаце страціць падпіскі і падпісчыкаў, калі заблакіруеце дамен або калі вашы мадэратары вырашаць прыпыніць зносіны з серверам. Калі гэта адбудзецца, вы зможаце загрузіць спіс страчаных зносін, каб праверыць іх і, магчыма, імпартаваць на іншы сервер. + type: Падзея statuses: attached: audio: diff --git a/config/locales/bg.yml b/config/locales/bg.yml index feb4e74533..e888c2ea93 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -1659,10 +1659,22 @@ bg: preferences: Предпочитания profile: Профил relationships: Последвания и последователи + severed_relationships: Прекъснати връзки statuses_cleanup: Автоматично изтриване на публикации strikes: Модериране на предупреждения two_factor_authentication: Двустепенно удостоверяване webauthn_authentication: Ключове за сигурност + severed_relationships: + download: Изтегляне (%{count}) + event_type: + account_suspension: Спиране на акаунта (%{target_name}) + domain_block: Спиране на сървъра (%{target_name}) + user_domain_block: Блокирахте %{target_name} + lost_followers: Загубени последователи + lost_follows: Загубени последвания + preamble: Може да загубите последванията и последователите, блокирайки домейн или когато модераторите ви решават да спрат отдалечен сървър. Случавайки се това, вие ще може да изтеглите списъците с прекъснати връзки, които да се проверят и възможно да се внесат на друг сървър. + purged: Сведенията за този сървър са били прочистени от администраторите на сървъра ви. + type: Събитие statuses: attached: audio: diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 2523db0eb0..f94abe265e 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -1659,10 +1659,22 @@ ca: preferences: Preferències profile: Perfil relationships: Seguits i seguidors + severed_relationships: Relacions eliminades statuses_cleanup: Esborrat automàtic de tuts strikes: Accions de mediació two_factor_authentication: Autenticació de dos factors webauthn_authentication: Claus de seguretat + severed_relationships: + download: Baixa (%{count}) + event_type: + account_suspension: Suspensió del compte (%{target_name}) + domain_block: Suspensió del servidor (%{target_name}) + user_domain_block: Heu blocat %{target_name} + lost_followers: Seguidors perduts + lost_follows: Seguiments perduts + preamble: Quan bloqueu un domini o els vostres moderadors decideixen suspendre un servidor remot, podeu perdre seguidors i seguiments. Si passa, podeu baixar la llista de relacions trencades per a revisar-la i, de cas, importar-la a un altre servidor. + purged: Els administradors del vostre servidor han purgat la informació relativa a aquest servidor. + type: Esdeveniment statuses: attached: audio: diff --git a/config/locales/da.yml b/config/locales/da.yml index eda22d5b9c..63762f740c 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -1659,10 +1659,21 @@ da: preferences: Præferencer profile: Offentlig profil relationships: Følger og følgere + severed_relationships: Afbrudte forhold statuses_cleanup: Auto-indlægssletning strikes: Moderationsadvarsler two_factor_authentication: Tofaktorgodkendelse webauthn_authentication: Sikkerhedsnøgler + severed_relationships: + download: Download (%{count}) + event_type: + account_suspension: Kontosuspendering (%{target_name}) + domain_block: Serversuspendering (%{target_name}) + user_domain_block: "%{target_name} blev blokeret" + lost_followers: Tabte følgere + preamble: Der kan mistes fulgte objekter og følgere, når et domæne blokeres eller moderatorerne beslutter at suspendere en ekstern server. Når det sker, kan der downloades lister over afbrudte relationer til inspektion og mulig import på anden server. + purged: Oplysninger om denne server er blevet renset af serveradministratoreren. + type: Begivenhed statuses: attached: audio: diff --git a/config/locales/de.yml b/config/locales/de.yml index 62e62c2c0b..620b571f9f 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1659,10 +1659,22 @@ de: preferences: Einstellungen profile: Öffentliches Profil relationships: Follower und Folge ich + severed_relationships: Getrennte Beziehungen statuses_cleanup: Automatische Löschung strikes: Maßnahmen two_factor_authentication: Zwei-Faktor-Authentisierung (2FA) webauthn_authentication: Sicherheitsschlüssel + severed_relationships: + download: Herunterladen (%{count}) + event_type: + account_suspension: Kontosperre (%{target_name}) + domain_block: Serversperre (%{target_name}) + user_domain_block: Du hast %{target_name} blockiert + lost_followers: Verlorene Follower + lost_follows: Konten entfolgt + preamble: Möglicherweise verlierst du Follower und entfolgst Konten, wenn du eine Domain blockierst oder Moderator*innen externe Server sperren. Sollte das der Fall sein, wirst du eine Liste mit den getrennten Beziehungen herunterladen können. Dadurch kannst du die Änderungen einsehen oder die Liste auf einen anderen Server importieren. + purged: Informationen über diesen Server wurden von deinen Server-Administrator*innen entfernt. + type: Ereignis statuses: attached: audio: diff --git a/config/locales/devise.hu.yml b/config/locales/devise.hu.yml index 8c9fdf6a50..459bd01d9d 100644 --- a/config/locales/devise.hu.yml +++ b/config/locales/devise.hu.yml @@ -54,7 +54,7 @@ hu: title: Kétlépcsős hitelesítés kikapcsolva two_factor_enabled: explanation: Egy párosított TOTP appal generált tokenre lesz szükség a bejelentkezéshez. - subject: 'Mastodon: Kétlépcsős azonosítás engedélyezve' + subject: 'Mastodon: kétlépcsős hitelesítés engedélyezve' subtitle: A kétlépcsős hitelesítés a fiókodhoz aktiválva lett. title: Kétlépcsős hitelesítés engedélyezve two_factor_recovery_codes_changed: diff --git a/config/locales/devise.lv.yml b/config/locales/devise.lv.yml index 6746e813d8..94b4774b60 100644 --- a/config/locales/devise.lv.yml +++ b/config/locales/devise.lv.yml @@ -6,7 +6,7 @@ lv: send_instructions: Pēc dažām minūtēm saņemsi e-pastu ar norādījumiem, kā apstiprināt savu e-pasta adresi. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu. send_paranoid_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm saņemsi e-pastu ar norādījumiem, kā apstiprināt savu e-pasta adresi. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu. failure: - already_authenticated: Jau esi pierakstījies. + already_authenticated: Tu jau esi pieteicies. inactive: Tavs konts vēl nav aktivizēts. invalid: Nederīga %{authentication_keys} vai parole. last_attempt: Tev ir vēl viens mēģinājums, pirms tavs konts tiks bloķēts. @@ -22,7 +22,7 @@ lv: action: Apstiprini savu e-pasta adresi action_with_app: Apstiprināt un atgriezties %{app} explanation: Ar šo e-pasta adresi esi izveidojis kontu vietnē %{host}. Tu esi viena klikšķa attālumā no tā aktivizēšanas. Ja tas nebiji tu, lūdzu, ignorē šo e-pasta ziņojumu. - explanation_when_pending: Tu pieteicies uzaicinājumam uz %{host} ar šo e-pasta adresi. Kad būsi apstiprinājis savu e-pasta adresi, mēs izskatīsim pieteikumu. Tu vari pierakstīties, lai mainītu savu informāciju vai dzēstu savu kontu, taču nevari piekļūt lielākajai daļai funkciju, kamēr tavs konts nav apstiprināts. Ja tavs pieteikums tiks noraidīts, tavi dati tiks noņemti, tāpēc tev nebūs jāveic nekādas darbības. Ja tas nebiji tu, lūdzu, ignorē šo e-pasta ziņojumu. + explanation_when_pending: Tu pieteicies uzaicinājumam uz %{host} ar šo e-pasta adresi. Kad būsi apstiprinājis savu e-pasta adresi, mēs izskatīsim pieteikumu. Tu vari pieteikties, lai mainītu savu informāciju vai izdzēstu savu kontu, taču Tu nevari piekļūt lielākajai daļai iespēju, kamēr Tavs konts nav apstiprināts. Ja Tavs pieteikums tiks noraidīts, Tavi dati tiks noņemti, tāpēc Tev nebūs jāveic nekādas darbības. Ja tas nebiji Tu, lūgums neņemt vērā šo e-pasta ziņojumu. extra_html: Lūdzu, pārskati arī servera noteikumus un mūsu pakalpojumu sniegšanas noteikumus. subject: 'Mastodon: Apstiprināšanas norādījumi %{instance}' title: Apstiprini savu e-pasta adresi @@ -90,7 +90,7 @@ lv: no_token: Tu nevari piekļūt šai lapai, ja neesi saņēmis paroles atiestatīšanas e-pasta ziņojumu. Ja ienāci no paroles atiestatīšanas e-pasta, lūdzu, pārliecinies, vai izmanto visu norādīto URL. send_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm uz savu e-pasta adresi saņemsi paroles atkopšanas saiti. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu. send_paranoid_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm uz savu e-pasta adresi saņemsi paroles atkopšanas saiti. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu. - updated: Tava parole ir veiksmīgi nomainīta. Tagad tu esi pierakstījies. + updated: Tava parole tika veiksmīgi nomainīta. Tu tagad esi pieteicies. updated_not_active: Tava parole ir veiksmīgi nomainīta. registrations: destroyed: Visu labu! Tavs konts ir veiksmīgi atcelts. Mēs ceram tevi drīz atkal redzēt. @@ -103,7 +103,7 @@ lv: updated: Tavs konts ir veiksmīgi atjaunināts. sessions: already_signed_out: Veiksmīgi izrakstījies. - signed_in: Veiksmīgi pierakstījies. + signed_in: Veiksmīgi pieteicies. signed_out: Veiksmīgi izrakstījies. unlocks: send_instructions: Pēc dažām minūtēm tu saņemsi e-pastu ar norādījumiem, kā atbloķēt savu kontu. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu. diff --git a/config/locales/devise.nn.yml b/config/locales/devise.nn.yml index 01d6e5a468..e9e8e1f6e0 100644 --- a/config/locales/devise.nn.yml +++ b/config/locales/devise.nn.yml @@ -66,11 +66,11 @@ nn: subject: 'Mastodon: Instruksjonar for å opne kontoen igjen' webauthn_credential: added: - explanation: Følgende sikkerhetsnøkkel har blitt lagt til i kontoen din + explanation: Denne tryggingsnykjelen er lagt til kontoen din subject: 'Mastodon: Ny sikkerheitsnøkkel' title: Ein ny sikkerheitsnøkkel har blitt lagt til deleted: - explanation: Den følgande sikkerheitsnøkkelen har blitt sletta frå kontoen din + explanation: Denne tryggingsnykjelen er sletta frå kontoen din subject: 'Mastodon: Sikkerheitsnøkkel sletta' title: Ein av sikkerheitsnøklane dine har blitt sletta webauthn_disabled: diff --git a/config/locales/doorkeeper.hu.yml b/config/locales/doorkeeper.hu.yml index 4559dcbd31..f03f6b58b4 100644 --- a/config/locales/doorkeeper.hu.yml +++ b/config/locales/doorkeeper.hu.yml @@ -38,7 +38,7 @@ hu: application: Alkalmazás callback_url: Visszahívási URL delete: Eltávolítás - empty: Nincsenek saját alkalmazások. + empty: Nincsenek saját alkalmazásaid. name: Név new: Új alkalmazás scopes: Hatókörök @@ -129,7 +129,7 @@ hu: crypto: Végpontok közti titkosítás favourites: Kedvencek filters: Szűrők - follow: Követések, Némítások és Letiltások + follow: Követések, némítások és letiltások follows: Követések lists: Listák media: Médiamellékletek diff --git a/config/locales/doorkeeper.nl.yml b/config/locales/doorkeeper.nl.yml index 65e2bfcb7a..b3e6e79a1a 100644 --- a/config/locales/doorkeeper.nl.yml +++ b/config/locales/doorkeeper.nl.yml @@ -164,7 +164,7 @@ nl: admin:write:ip_blocks: moderatieacties op geblokkeerde IP-adressen uitvoeren admin:write:reports: moderatieacties op rapportages uitvoeren crypto: end-to-end-encryptie gebruiken - follow: relaties tussen accounts bewerken + follow: volgrelaties tussen accounts bewerken push: jouw pushmeldingen ontvangen read: alle gegevens van jouw account lezen read:accounts: informatie accounts bekijken diff --git a/config/locales/doorkeeper.nn.yml b/config/locales/doorkeeper.nn.yml index 66dd0f9093..0e5d1ca455 100644 --- a/config/locales/doorkeeper.nn.yml +++ b/config/locales/doorkeeper.nn.yml @@ -92,9 +92,9 @@ nn: invalid_resource_owner: Ressurseigardetaljane er ikkje gyldige, eller så er det ikkje mogleg å finna eigaren invalid_scope: Det etterspurte omfanget er ugyldig, ukjent eller har feil struktur. invalid_token: - expired: Tilgangsbeviset har gått ut på dato - revoked: Tilgangsbeviset har blitt oppheva - unknown: Tilgangsbeviset er ugyldig + expired: Innloggingsnykelen har gått ut på dato + revoked: Innloggingsnykelen er oppheva + unknown: Innloggngsnykelen er ugyldig resource_owner_authenticator_not_configured: Ressurseigar kunne ikkje finnast fordi Doorkeeper.configure.resource_owner_authenticator ikkje er konfigurert. server_error: Autoriseringstenaren støtte på ei uventa hending som hindra han i å svara på førespurnaden. temporarily_unavailable: Autoriseringstenaren kan ikkje hansama førespurnaden grunna kortvarig overbelastning eller tenarvedlikehald. @@ -129,11 +129,11 @@ nn: crypto: Ende-til-ende-kryptering favourites: Favorittar filters: Filter - follow: Dei du fylgjer, målbind og blokkerer + follow: Dei du fylgjer, dempar og blokkerer follows: Fylgjer lists: Lister media: Mediavedlegg - mutes: Målbindingar + mutes: Dempingar notifications: Varsel push: Pushvarsel reports: Rapportar @@ -183,13 +183,13 @@ nn: write:accounts: redigera profilen din write:blocks: blokker kontoar og domene write:bookmarks: bokmerk innlegg - write:conversations: målbind og slett samtalar + write:conversations: demp og slett samtalar write:favourites: favorittmarker innlegg write:filters: lag filter write:follows: fylg folk write:lists: lag lister write:media: last opp mediefiler - write:mutes: målbind folk og samtalar + write:mutes: demp folk og samtalar write:notifications: tøm varsla dine write:reports: rapporter andre folk write:statuses: publiser innlegg diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml index f9813b1319..f2250b79cb 100644 --- a/config/locales/doorkeeper.zh-TW.yml +++ b/config/locales/doorkeeper.zh-TW.yml @@ -130,7 +130,7 @@ zh-TW: favourites: 最愛 filters: 過濾器 follow: 跟隨、靜音與封鎖 - follows: 跟隨的使用者 + follows: 正在跟隨 lists: 列表 media: 多媒體附加檔案 mutes: 靜音 diff --git a/config/locales/en.yml b/config/locales/en.yml index f45175e3fd..823e720ea7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1660,10 +1660,22 @@ en: preferences: Preferences profile: Public profile relationships: Follows and followers + severed_relationships: Severed relationships statuses_cleanup: Automated post deletion strikes: Moderation strikes two_factor_authentication: Two-factor Auth webauthn_authentication: Security keys + severed_relationships: + download: Download (%{count}) + event_type: + account_suspension: Account suspension (%{target_name}) + domain_block: Server suspension (%{target_name}) + user_domain_block: You blocked %{target_name} + lost_followers: Lost followers + lost_follows: Lost follows + preamble: You may lose follows and followers when you block a domain or when your moderators decide to suspend a remote server. When that happens, you will be able to download lists of severed relationships, to be inspected and possibly imported on another server. + purged: Information about this server has been purged by your server's administrators. + type: Event statuses: attached: audio: diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml index 6332911107..e10183be15 100644 --- a/config/locales/es-AR.yml +++ b/config/locales/es-AR.yml @@ -597,6 +597,9 @@ es-AR: actions_description_html: Decidí qué medidas tomar para resolver esta denuncia. Si tomás una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría Spam. actions_description_remote_html: Decidí qué medidas tomar para resolver esta denuncia. Esto sólo afectará la forma en que tu servidor se comunica con esta cuenta remota y maneja su contenido. add_to_report: Agregar más a la denuncia + already_suspended_badges: + local: Ya suspendido en este servidor + remote: Ya suspendido en su servidor are_you_sure: "¿Estás seguro?" assign_to_self: Asignármela a mí assigned: Moderador asignado @@ -1043,7 +1046,7 @@ es-AR: apply_for_account: Solicitar una cuenta captcha_confirmation: help_html: Si tenés problemas resolviendo la CAPTCHA, podés ponerte en contacto con nosotros a través de %{email} y te vamos a ayudar. - hint_html: ¡Sólo una cosa más! Necesitamos confirmar que sos humano (¡esto es para que podamos mantener el spam fuera!). Resuelvé la CAPTCHA abajo y hacé clic en "Continuar". + hint_html: ¡Solo una cosa más! Necesitamos confirmar que sos humano (¡esto es para que podamos mantener el spam fuera!). Resolvé la CAPTCHA abajo y hacé clic en "Continuar". title: Comprobación de seguridad confirmations: awaiting_review: "¡Tu dirección de correo electrónico fue confirmada! El equipo de %{domain} está revisando tu registro. ¡Recibirás un correo electrónico si aprueban tu cuenta!" @@ -1656,10 +1659,22 @@ es-AR: preferences: Configuración profile: Perfil público relationships: Seguimientos + severed_relationships: Relaciones cortadas statuses_cleanup: Eliminación auto. de mensajes strikes: Moderación de incumplimientos two_factor_authentication: Aut. de dos factores webauthn_authentication: Llaves de seguridad + severed_relationships: + download: Descargar (%{count}) + event_type: + account_suspension: Suspensión de cuenta (%{target_name}) + domain_block: Suspensión de cuenta (%{target_name}) + user_domain_block: Bloqueaste a %{target_name} + lost_followers: Seguidores perdidos + lost_follows: Cuentas seguidas perdidas + preamble: Podés perder seguidores y cuentas seguidas cuando bloqueás un dominio o cuando tus moderadores deciden suspender un servidor remoto. Cuando esto suceda, vas a poder descargar listas de relaciones cortadas, que serán inspectadas y posiblemente importadas en otro servidor. + purged: La información sobre este servidor fue purgada por los administradores de tu servidor. + type: Evento statuses: attached: audio: diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml index 24b4af7ecd..f497de5683 100644 --- a/config/locales/es-MX.yml +++ b/config/locales/es-MX.yml @@ -1659,10 +1659,22 @@ es-MX: preferences: Preferencias profile: Perfil relationships: Siguiendo y seguidores + severed_relationships: Relaciones cortadas statuses_cleanup: Eliminación automática de publicaciones strikes: Amonestaciones de moderación two_factor_authentication: Autenticación de dos factores webauthn_authentication: Claves de seguridad + severed_relationships: + download: Descargar (%{count}) + event_type: + account_suspension: Suspensión de cuenta (%{target_name}) + domain_block: Suspensión del servidor (%{target_name}) + user_domain_block: Bloqueaste %{target_name} + lost_followers: Seguidores perdidos + lost_follows: Cuentas seguidas perdidas + preamble: Puedes perder cuentas seguidas y seguidores cuando bloqueas un dominio o cuando tus moderadores deciden suspender un servidor remoto. Cuando esto suceda, podrás descargar listas de relaciones cortadas, para ser inspeccionadas y posiblemente importadas en otro servidor. + purged: La información sobre este servidor ha sido purgada por los administradores de tu servidor. + type: Suceso statuses: attached: audio: diff --git a/config/locales/es.yml b/config/locales/es.yml index 2f7877afed..b5b98bb88f 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -597,6 +597,9 @@ es: actions_description_html: Decide qué medidas tomar para resolver esta denuncia. Si tomas una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría Spam. actions_description_remote_html: Decide qué medidas tomar para resolver este informe. Esto solo afectará a la forma en que tu servidor se comunica con esta cuenta remota y gestiona su contenido. add_to_report: Añadir más al reporte + already_suspended_badges: + local: Ya suspendido en este servidor + remote: Ya suspendido en su servidor are_you_sure: "¿Estás seguro?" assign_to_self: Asignármela a mí assigned: Moderador asignado @@ -1656,10 +1659,22 @@ es: preferences: Preferencias profile: Perfil relationships: Siguiendo y seguidores + severed_relationships: Relaciones cortadas statuses_cleanup: Eliminación automática de publicaciones strikes: Amonestaciones de moderación two_factor_authentication: Autenticación de dos factores webauthn_authentication: Claves de seguridad + severed_relationships: + download: Descargar (%{count}) + event_type: + account_suspension: Suspensión de cuenta (%{target_name}) + domain_block: Suspensión del servidor (%{target_name}) + user_domain_block: Bloqueaste %{target_name} + lost_followers: Seguidores perdidos + lost_follows: Cuentas seguidas perdidas + preamble: Puedes perder cuentas seguidas y seguidores cuando bloqueas un dominio o cuando tus moderadores deciden suspender un servidor remoto. Cuando esto suceda, podrás descargar listas de relaciones cortadas, para ser inspeccionadas y posiblemente importadas en otro servidor. + purged: La información sobre este servidor ha sido purgada por los administradores de tu servidor. + type: Suceso statuses: attached: audio: diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 4238e71c84..3e770b85c9 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -1663,10 +1663,22 @@ eu: preferences: Hobespenak profile: Profila relationships: Jarraitutakoak eta jarraitzaileak + severed_relationships: Indartutako erlazioak statuses_cleanup: Bidalketak automatikoki ezabatzea strikes: Moderazio neurriak two_factor_authentication: Bi faktoreetako autentifikazioa webauthn_authentication: Segurtasun gakoak + severed_relationships: + download: Deskargatu (%{count}) + event_type: + account_suspension: Kontua bertan behera uztea (%{target_name}) + domain_block: Domeinua bertan behera uztea (%{target_name}) + user_domain_block: "%{target_name} blokeatu duzu" + lost_followers: Galdutako jarraitzaileak + lost_follows: Jarraitzeari utzi diozun jendea + preamble: Jarraitzaileak gal ditzakezu, baita jendea jarraitzeari utzi domeinu bat blokeatzen duzunean edo moderatzaileek urruneko zerbitzari bat bertan behera uztea erabakitzen badute. Hau gertatzean, galdutako erlazioen zerrendak deskargatu ahalko dituzu, aztertzeko eta agian, beste zerbitzari batean inportatzeko. + purged: Zerbitzari honen informazioa kendu du zerbitzariko administratzaileak. + type: Gertaera statuses: attached: audio: diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 0ba5931e5a..fe5956fd58 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -1659,10 +1659,22 @@ fi: preferences: Ominaisuudet profile: Julkinen profiili relationships: Seuratut ja seuraajat + severed_relationships: Katkenneet suhteet statuses_cleanup: Autom. julkaisujen poisto strikes: Valvontavaroitukset two_factor_authentication: Kaksivaiheinen todennus webauthn_authentication: Suojausavaimet + severed_relationships: + download: Lataa (%{count}) + event_type: + account_suspension: Tilin jäädytys (%{target_name}) + domain_block: Palvelimen jäädytys (%{target_name}) + user_domain_block: Estit käyttäjän %{target_name} + lost_followers: Menetetyt seuraajat + lost_follows: Menetetyt seuratut + preamble: Voit menettää seurattusi ja seuraajasi, kun estät verkkotunnuksen tai kun valvojasi päättävät jäädyttää etäpalvelimen. Kun näin tapahtuu, voit ladata luetteloita katkenneista suhteista, jotta voit tarkastella niitä ja mahdollisesti viedä ne toiselle palvelimelle. + purged: Palvelimesi ylläpitäjät ovat tyhjentäneet tämän palvelimen tiedot. + type: Tapahtuma statuses: attached: audio: diff --git a/config/locales/fo.yml b/config/locales/fo.yml index 49d206bbb9..1850c2a3b8 100644 --- a/config/locales/fo.yml +++ b/config/locales/fo.yml @@ -1659,10 +1659,22 @@ fo: preferences: Stillingar profile: Vangi relationships: Fylging og fylgjarar + severed_relationships: Avbrotin tilknýti statuses_cleanup: Sjálvvirkandi striking av postum strikes: Umsjónaratsóknir two_factor_authentication: Váttan í tveimum stigum webauthn_authentication: Trygdarlyklar + severed_relationships: + download: Niðurtøkur (%{count}) + event_type: + account_suspension: Kontuógilding (%{target_name}) + domain_block: Ambætara-ógilding (%{target_name}) + user_domain_block: Tú hevur forðað %{target_name} + lost_followers: Mistir fylgjarar + lost_follows: Mist fylgi + preamble: Tá ið tú forðar einum økisnavni, ella tínir umsitarar velja at avgilda ein fjarambætara, kanst tú missa fylgi og fylgjarar. Um tað hendir, kanst tú taka ein lista av avbrotnum tilknýtum niður, sum tú kanst eftirhyggja og møguliga innflyta á ein nýggjan ambætara. + purged: Umsitararnir fyri tín ambætara hava tømt upplýsingar um henda ambætara úr skipanini. + type: Tiltak statuses: attached: audio: diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml index fa69e36cc0..6e422455c3 100644 --- a/config/locales/fr-CA.yml +++ b/config/locales/fr-CA.yml @@ -597,6 +597,9 @@ fr-CA: actions_description_html: Décidez des mesures à prendre pour résoudre ce signalement. Si vous prenez des mesures punitives contre le compte signalé, une notification sera envoyée par e-mail, sauf si la catégorie Spam est sélectionnée. actions_description_remote_html: Décidez des mesures à prendre pour résoudre ce signalement. Cela n'affectera que la manière dont votre serveur communique avec ce compte distant et traite son contenu. add_to_report: Ajouter davantage au rapport + already_suspended_badges: + local: Déjà suspendu sur ce serveur + remote: Déjà suspendu sur le serveur distant are_you_sure: Voulez-vous vraiment faire ça ? assign_to_self: Me l’assigner assigned: Modérateur assigné @@ -1652,13 +1655,26 @@ fr-CA: import: Import de données import_and_export: Import et export migrate: Migration de compte + notifications: Notifications par mail preferences: Préférences profile: Profil relationships: Abonnements et abonné·e·s + severed_relationships: Relations rompues statuses_cleanup: Suppression automatique de messages strikes: Sanctions de modération two_factor_authentication: Identification à deux facteurs webauthn_authentication: Clés de sécurité + severed_relationships: + download: Téléchargement (%{count}) + event_type: + account_suspension: Suspension du compte (%{target_name}) + domain_block: Suspension du serveur (%{target_name}) + user_domain_block: Vous avez bloqué %{target_name} + lost_followers: Abonné·e·s perdu·e·s + lost_follows: Abonnements perdus + preamble: Vous pouvez perdre des abonnés et des abonnements lorsque vous bloquez un domaine ou lorsque vos modérateurs décident de suspendre un serveur distant. Lorsque cela arrive, vous êtes en mesure de télécharger une liste de vos relations rompues, afin de l'inspecter et d'éventuellement l'importer sur un autre serveur. + purged: Les informations sur ce serveur ont été purgées par les administrateurs du serveur. + type: Evènement statuses: attached: audio: @@ -1864,6 +1880,9 @@ fr-CA: follows_subtitle: Suivez des comptes populaires follows_title: Qui suivre follows_view_more: Voir plus de personnes à suivre + hashtags_recent_count: + one: "%{people} personne dans les deux derniers jours" + other: "%{people} personnes dans les deux derniers jours" hashtags_subtitle: Explorez les tendances depuis les 2 derniers jours hashtags_title: Hashtags populaires hashtags_view_more: Voir plus de hashtags populaires diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 2045760655..31f5bfa515 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -597,6 +597,9 @@ fr: actions_description_html: Décidez des mesures à prendre pour résoudre ce signalement. Si vous prenez des mesures punitives contre le compte signalé, une notification sera envoyée par e-mail, sauf si la catégorie Spam est sélectionnée. actions_description_remote_html: Décidez des mesures à prendre pour résoudre ce signalement. Cela n'affectera que la manière dont votre serveur communique avec ce compte distant et traite son contenu. add_to_report: Ajouter davantage au rapport + already_suspended_badges: + local: Déjà suspendu sur ce serveur + remote: Déjà suspendu sur le serveur distant are_you_sure: Voulez-vous vraiment faire ça ? assign_to_self: Me l’assigner assigned: Modérateur assigné @@ -1652,13 +1655,26 @@ fr: import: Import de données import_and_export: Import et export migrate: Migration de compte + notifications: Notifications par mail preferences: Préférences profile: Profil relationships: Abonnements et abonné·e·s + severed_relationships: Relations rompues statuses_cleanup: Suppression automatique de messages strikes: Sanctions de modération two_factor_authentication: Authentification à deux facteurs webauthn_authentication: Clés de sécurité + severed_relationships: + download: Téléchargement (%{count}) + event_type: + account_suspension: Suspension du compte (%{target_name}) + domain_block: Suspension du serveur (%{target_name}) + user_domain_block: Vous avez bloqué %{target_name} + lost_followers: Abonné·e·s perdu·e·s + lost_follows: Abonnements perdus + preamble: Vous pouvez perdre des abonnés et des abonnements lorsque vous bloquez un domaine ou lorsque vos modérateurs décident de suspendre un serveur distant. Lorsque cela arrive, vous êtes en mesure de télécharger une liste de vos relations rompues, afin de l'inspecter et d'éventuellement l'importer sur un autre serveur. + purged: Les informations sur ce serveur ont été purgées par les administrateurs du serveur. + type: Evènement statuses: attached: audio: @@ -1864,6 +1880,9 @@ fr: follows_subtitle: Suivez des comptes populaires follows_title: Qui suivre follows_view_more: Voir plus de personnes à suivre + hashtags_recent_count: + one: "%{people} personne dans les deux derniers jours" + other: "%{people} personnes dans les deux derniers jours" hashtags_subtitle: Explorez les tendances depuis les 2 derniers jours hashtags_title: Hashtags populaires hashtags_view_more: Voir plus de hashtags populaires diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 381a0a8b40..11402d3f56 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -621,6 +621,9 @@ gd: actions_description_html: Socraich dè a nì thu airson an gearan seo fhuasgladh. Ma chuireas tu peanas air a’ chunntas le gearan air, gheibh iad brath air a’ phost-d mura tagh thu an roinn-seòrsa Spama. actions_description_remote_html: Cuir romhad dè an gnìomh a ghabhas tu airson an gearan seo fhuasgladh. Cha bheir seo buaidh ach air mar a làimhsicheas am frithealaiche agadsa an cunntas cèin seo is mar a nì e conaltradh leis. add_to_report: Cuir barrachd ris a’ ghearan + already_suspended_badges: + local: Chaidh an cur à rèim air an fhrithealaiche seo mu thràth + remote: Chaidh an cur à rèim air an fhrithealaiche aca-san mu thràth are_you_sure: A bheil thu cinnteach? assign_to_self: Iomruin dhomh-sa assigned: Maor iomruinte @@ -1704,13 +1707,26 @@ gd: import: Ion-phortadh import_and_export: Ion-phortadh ⁊ às-phortadh migrate: Imrich cunntais + notifications: Brathan puist-d preferences: Roghainnean profile: Pròifil phoblach relationships: Dàimhean leantainn + severed_relationships: Dàimhean dealaichte statuses_cleanup: Sguabadh às phostaichean strikes: Rabhaidhean na maorsainneachd two_factor_authentication: Dearbhadh dà-cheumnach webauthn_authentication: Iuchraichean tèarainteachd + severed_relationships: + download: Luchdaich a-nuas (%{count}) + event_type: + account_suspension: Cunntas à rèim (%{target_name}) + domain_block: Frithealaiche à rèim (%{target_name}) + user_domain_block: Bhac thu %{target_name} + lost_followers: An luchd-leantainn a chaill thu + lost_follows: Daoine nach lean thu tuilleadh + preamble: Dh’fhaoidte gun chaill thu dàimhean leantainn nuair a bhacas tu àrainn no nuair a chuireas na maoir romhpa gun cuir iad frithealaiche cèin à rèim. Nuair a thachras sin, ’s urrainn dhut liosta de na dàimhean dealaichte a luchdadh a-nuas airson sùil a thoirt orra agus an ion-phortadh gu frithealaiche eile ’s dòcha. + purged: Chaidh am fiosrachadh mun fhrithealaiche seo a phurgaideachadh le rianairean an fhrithealaiche agad. + type: Tachartas statuses: attached: audio: diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 7fbba21b27..4b1c9f096b 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -1659,10 +1659,22 @@ gl: preferences: Preferencias profile: Perfil relationships: Seguindo e seguidoras + severed_relationships: Relacións cortadas statuses_cleanup: Borrado automático da publicación strikes: Avisos da moderación two_factor_authentication: Validar Dobre Factor webauthn_authentication: Chaves de seguridade + severed_relationships: + download: Descargar (%{count}) + event_type: + account_suspension: Suspensión da conta (%{target_name}) + domain_block: Suspensión do servidor (%{target_name}) + user_domain_block: Bloqueaches a %{target_name} + lost_followers: Seguidoras perdidas + lost_follows: Seguimentos perdidos + preamble: Pode acontecer que perdas seguidoras e seguimentos ao bloquear un dominio ou cando a Moderación do teu servidor decide suspender un servidor remoto. Se acontecese isto, podes descargar unha lista coas relacións cortadas para revisala e, se queres, importala noutro servidor. + purged: A administración do teu servidor purgou a información acerca deste servidor. + type: Evento statuses: attached: audio: diff --git a/config/locales/he.yml b/config/locales/he.yml index 2dfb98a2d8..da93925548 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -1707,13 +1707,26 @@ he: import: יבוא import_and_export: יבוא ויצוא migrate: הגירת חשבון + notifications: התראות בדואל preferences: העדפות profile: פרופיל relationships: נעקבים ועוקבים + severed_relationships: קשרים שנותקו statuses_cleanup: מחיקת הודעות אוטומטית strikes: עבירות מנהלתיות two_factor_authentication: אימות דו-שלבי webauthn_authentication: מפתחות אבטחה + severed_relationships: + download: הורדה (%{count}) + event_type: + account_suspension: השעיית חשבון (%{target_name}) + domain_block: השעיית שרת (%{target_name}) + user_domain_block: חסמת את %{target_name} + lost_followers: אובדן עוקבים + lost_follows: אובדן נעקבים + preamble: הנכם עשויים לאבד עוקבים ונעקבים כשתחסמו שרת או כשמנהליכם יחליטו להשעות שרת אחר. במקרה כזה, תוכלו להוריד רשימה של קשרי המעקב שנותקו, כדי לעבור עליהם ואם תרצו לייבא אותם לשרת אחר. + purged: מידע על שרת מרוחק זה נמחק על ידי מנהלי השרת שלך. + type: אירוע statuses: attached: audio: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 7b0e72cfcd..e29ce37523 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -139,7 +139,7 @@ hu: only_password: Csak jelszó password_and_2fa: Jelszó és kétlépcsős hitelesítés sensitive: Kényes - sensitized: kényesnek jelölve + sensitized: Kényesnek jelölve shared_inbox_url: Megosztott bejövő üzenetek URL show: created_reports: Létrehozott jelentések @@ -257,7 +257,7 @@ hu: destroy_status_html: "%{name} eltávolította %{target} felhasználó bejegyzését" destroy_unavailable_domain_html: "%{name} újraindította a kézbesítést a %{target} domainbe" destroy_user_role_html: "%{name} törölte a(z) %{target} szerepkört" - disable_2fa_user_html: "%{name} kikapcsolta a kétlépcsős azonosítást %{target} felhasználó fiókján" + disable_2fa_user_html: "%{name} kikapcsolta a kétlépcsős hitelesítést %{target} felhasználó fiókján" disable_custom_emoji_html: "%{name} letiltotta az emodzsit: %{target}" disable_sign_in_token_auth_user_html: "%{name} letiltotta a tokenes e-mail hitelesítést %{target} felhasználóra" disable_user_html: "%{name} letiltotta %{target} felhasználó bejelentkezését" @@ -716,7 +716,7 @@ hu: manage_taxonomies: Taxonómiák kezelése manage_taxonomies_description: Lehetővé teszi, hogy a felhasználó átnézze a felkapott tartalmakat és frissítse a hashtagek beállításait manage_user_access: Felhasználói hozzáférések kezelése - manage_user_access_description: Lehetővé teszi, hogy a felhasználó letiltsa mások kétlépcsős azonosítását, megváltoztassa az email címüket, és alaphelyzetbe állítsa a jelszavukat + manage_user_access_description: Lehetővé teszi, hogy a felhasználó letiltsa mások kétlépcsős hitelesítését, megváltoztassa az e-mail-címüket, és alaphelyzetbe állítsa a jelszavukat manage_users: Felhasználók kezelése manage_users_description: Lehetővé teszi, hogy a felhasználó megtekintse mások részletes adatait és moderálja őket manage_webhooks: Webhookok kezelése @@ -1057,7 +1057,7 @@ hu: redirect_to_app_html: Át kellett volna irányítsunk a %{app_name} alkalmazáshoz. Ha ez nem történt meg, próbálkozz a %{clicking_this_link} lehetőséggel vagy térj vissza manuálisan az alkalmazáshoz. registration_complete: A regisztrációd %{domain} domainen befejeződött! welcome_title: Üdvözlet, %{name}! - wrong_email_hint: Ha az emailcím nem helyes, a fiókbeállításokban megváltoztathatod. + wrong_email_hint: Ha az e-mail-cím nem helyes, a fiókbeállításokban megváltoztathatod. delete_account: Felhasználói fiók törlése delete_account_html: Felhasználói fiókod törléséhez kattints ide. A rendszer újbóli megerősítést fog kérni. description: @@ -1074,7 +1074,7 @@ hu: login: Bejelentkezés logout: Kijelentkezés migrate_account: Felhasználói fiók költöztetése - migrate_account_html: Ha szeretnéd átirányítani ezt a fiókodat egy másikra, a beállításokat itt találod meg. + migrate_account_html: Ha át szeretnéd irányítani ezt a fiókodat egy másikra, akkor itt állíthatod be. or_log_in_with: Vagy jelentkezz be ezzel privacy_policy_agreement_html: Elolvastam és egyetértek az adatvédemi nyilatkozattal progress: @@ -1133,7 +1133,7 @@ hu: invalid_signature: érvénytelen Ed25519 aláírás date: formats: - default: "%Y.%b.%d." + default: "%Y. %b %d." with_month_name: "%Y. %B %d" datetime: distance_in_words: @@ -1223,17 +1223,17 @@ hu: exports: archive_takeout: date: Dátum - download: Archív letöltése + download: Archívum letöltése hint_html: Itt kérhető egy archív az összes feltöltött bejegyzésedről és médiádról. Az exportált adatok ActivityPub formátumban lesznek, melyet bármilyen szabványos program tud olvasni. 7 naponként kérhetsz ilyen archívot. - in_progress: Archív összeállítása... - request: Archív kérése + in_progress: Archívum összeállítása… + request: Archívum kérése size: Méret - blocks: Tiltólistádon - bookmarks: Könyvjelzők + blocks: Tiltás + bookmarks: Könyvjelző csv: CSV - domain_blocks: Tiltott domainjeid - lists: Listáid - mutes: Némításaid + domain_blocks: Tiltott domain + lists: Lista + mutes: Némítás storage: Médiatároló featured_tags: add_new: Új hozzáadása @@ -1413,7 +1413,7 @@ hu: follow_request: követési kérelemről email értesítő mention: megemlítésről email értesítő reblog: megtolásról email értesítő - resubscribe_html: Ha tévedésből iratkoztál le, újra feliratkozhatsz az email értesítések beállításainál. + resubscribe_html: Ha tévedésből iratkoztál le, újra feliratkozhatsz az e-mail-értesítések beállításainál. success_html: 'Mostantól nem kapsz %{type} típusú üzeneket a(z) %{domain} Mastodon-kiszolgálón erre a címedre: %{email}.' title: Leiratkozás media_attachments: @@ -1496,7 +1496,7 @@ hu: subject: "%{name} szerkesztett egy bejegyzést" notifications: administration_emails: Adminisztrátori e-mail-értesítések - email_events: Események email értesítésekhez + email_events: Az e-mail-értesítések eseményei email_events_hint: 'Válaszd ki azokat az eseményeket, melyekről értesítést szeretnél:' number: human: @@ -1510,7 +1510,7 @@ hu: trillion: T otp_authentication: code_hint: Jóváhagyáshoz írd be a hitelesítő alkalmazás által generált kódot - description_html: Ha engedélyezed a kétlépcsős azonosítást, a bejelentkezéshez szükséged lesz a telefonodra és egy alkalmazásra, amely hozzáférési kódot generál számodra. + description_html: Ha engedélyezed a kétlépcsős hitelesítést, akkor a bejelentkezéshez szükséged lesz a telefonodra és egy alkalmazásra, amely hozzáférési kódokat állít elő a belépéshez. enable: Engedélyezés instructions_html: "Olvasd be ezt a QR-kódot a telefonodon futó Google Authenticator vagy egyéb TOTP alkalmazással. A jövőben ez az alkalmazás fog számodra hozzáférési kódot generálni a belépéshez." manual_instructions: 'Ha nem sikerült a QR-kód beolvasása, itt a szöveges kulcs, amelyet manuálisan kell begépelned:' @@ -1639,10 +1639,10 @@ hu: revoke: Visszavonás revoke_success: Munkamenet sikeresen visszavonva title: Munkamenetek - view_authentication_history: Fiókod hitelesítési történetének megtekintése + view_authentication_history: Fiók hitelesítési előzményeinek megtekintése settings: account: Fiók - account_settings: Fiók beállítások + account_settings: Fiókbeállítások aliases: Fiók aliasok appearance: Megjelenés authorized_apps: Jóváhagyott alkalmazások @@ -1655,14 +1655,26 @@ hu: import: Importálás import_and_export: Import és export migrate: Fiók átirányítása - notifications: E-mail értesítések + notifications: E-mail-értesítések preferences: Beállítások profile: Profil relationships: Követések és követők + severed_relationships: Megszakított kapcsolatok statuses_cleanup: Bejegyzések automatikus törlése strikes: Moderációs felrótt vétségek two_factor_authentication: Kétlépcsős hitelesítés webauthn_authentication: Biztonsági kulcsok + severed_relationships: + download: Letöltés (%{count}) + event_type: + account_suspension: Fiók felfüggesztése (%{target_name}) + domain_block: Kiszolgáló felfüggesztése (%{target_name}) + user_domain_block: 'Blokkoltad ezt: %{target_name}' + lost_followers: Elvesztett követők + lost_follows: Elvesztett követések + preamble: Ha blokkolsz egy domaint, vagy ha a moderátorok úgy döntenek, hogy blokkolnak egy távoli kiszolgálót, akkor követőket és követéseket veszíthetsz. Amikor ez megtörténik, akkor letöltheted a megszakadt kapcsolatokat, hogy átvizsgáld őket, és esetleg egy másik kiszolgálón importáld őket. + purged: A kiszolgáló információit a kiszolgálód rendszergazdái véglegesen eltávolították. + type: Esemény statuses: attached: audio: @@ -1728,7 +1740,7 @@ hu: keep_polls: Szavazások megtartása keep_polls_hint: Egyetlen szavazásodat sem törli keep_self_bookmark: Általad könyvjelzőzött bejegyzések megtartása - keep_self_bookmark_hint: Egyetlen olyan bejegyzésedet sem törli, melyet könyvjelzővel láttál el + keep_self_bookmark_hint: Egyetlen olyan bejegyzésedet sem törli, melyet könyvjelzőztél keep_self_fav: Kedvenc bejegyzések megtartása keep_self_fav_hint: Nem törli azon bejegyzéseidet, melyeket kedvencnek jelöltél min_age: @@ -1769,10 +1781,10 @@ hu: two_factor_authentication: add: Hozzáadás disable: Kikapcsolás - disabled_success: A kétlépcsős azonosítást sikeresen letiltottuk + disabled_success: A kétlépcsős hitelesítés sikeresen letiltva edit: Szerkesztés - enabled: Kétlépcsős azonosítás engedélyezve - enabled_success: A kétlépcsős azonosítást sikeresen engedélyezted + enabled: Kétlépcsős hitelesítés engedélyezve + enabled_success: A kétlépcsős hitelesítés sikeresen engedélyezve generate_recovery_codes: Visszaállítási kódok generálása lost_recovery_codes: A visszaállítási kódok segítségével tudsz belépni, ha elveszítenéd a telefonod. Ha a visszaállítási kódjaidat hagytad el, itt generálhatsz újakat. A régi kódokat ebben az esetben érvénytelenítjük. methods: Kétlépcsős eljárások @@ -1913,5 +1925,5 @@ hu: nickname_hint: Írd be az új biztonsági kulcsod becenevét not_enabled: Még nem engedélyezted a WebAuthn-t not_supported: Ez a böngésző nem támogatja a biztonsági kulcsokat - otp_required: A biztonsági kulcsok használatához először engedélyezd a kétlépcsős azonosítást. + otp_required: A biztonsági kulcsok használatához először engedélyezd a kétlépcsős hitelesítést. registered_on: 'Regisztráció ekkor: %{date}' diff --git a/config/locales/is.yml b/config/locales/is.yml index 710b35fce9..fdf54030a1 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -1666,6 +1666,9 @@ is: strikes: Umsýsla refsinga two_factor_authentication: Tveggja-þátta auðkenning webauthn_authentication: Öryggislyklar + severed_relationships: + download: Sækja (%{count}) + type: Atburður statuses: attached: audio: diff --git a/config/locales/it.yml b/config/locales/it.yml index 16a42b0760..c63d8ef285 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -1661,10 +1661,22 @@ it: preferences: Preferenze profile: Profilo relationships: Follows e followers + severed_relationships: Relazioni interrotte statuses_cleanup: Cancellazione automatica dei post strikes: Sanzioni di moderazione two_factor_authentication: Autenticazione a due fattori webauthn_authentication: Chiavi di sicurezza + severed_relationships: + download: Scarica (%{count}) + event_type: + account_suspension: Sospensione dell'account (%{target_name}) + domain_block: Sospensione del server (%{target_name}) + user_domain_block: Hai bloccato %{target_name} + lost_followers: Seguaci persi + lost_follows: Account seguiti persi + preamble: Potresti perdere account seguiti e seguaci quando blocchi un dominio o quando i tuoi moderatori decidono di sospendere un server remoto. Quando ciò accadrà, potrai scaricare liste di relazioni interrotte, da consultare ed eventualmente importare su un altro server. + purged: Le informazioni su questo server sono state eliminate dagli amministratori del tuo server. + type: Evento statuses: attached: audio: @@ -1870,6 +1882,9 @@ it: follows_subtitle: Segui account ben noti follows_title: Chi seguire follows_view_more: Visualizza più persone da seguire + hashtags_recent_count: + one: "%{people} persona negli ultimi 2 giorni" + other: "%{people} persone negli ultimi 2 giorni" hashtags_subtitle: Esplora le tendenze degli ultimi 2 giorni hashtags_title: Hashtag di tendenza hashtags_view_more: Visualizza altri hashtag di tendenza diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 19b2e94db0..b7c6813a74 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -585,6 +585,9 @@ ja: actions_description_html: このレポートを解決するために取るアクションを決定します。 報告されたアカウントに対して懲罰的な措置を取った場合、メール通知が送信されますがスパムカテゴリが選択されている場合を除きます。 actions_description_remote_html: この通報を解決するためのアクションを選択してください。これはあなたのサーバーがこのリモートアカウントと通信し、そのコンテンツを処理する時のみ影響します。 add_to_report: 通報にさらに追加 + already_suspended_badges: + local: このサーバーで停止済み + remote: リモートのサーバーで停止済み are_you_sure: 本当に実行しますか？ assign_to_self: 担当になる assigned: 担当者 diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 82472788dc..9548c4e449 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -14,7 +14,7 @@ ko: instance_actor_flash: 이 계정은 서버 자신을 나타내기 위한 가상의 계정이며 개인 사용자가 아닙니다. 이 계정은 연합을 위해 사용되며 정지되지 않아야 합니다. last_active: 최근 활동 link_verified_on: "%{date}에 이 링크의 소유가 확인되었습니다" - nothing_here: 텅 비어있네요! + nothing_here: 아무 것도 없습니다! pin_errors: following: 추천하려는 사람을 팔로우 하고 있어야 합니다 posts: @@ -1635,10 +1635,22 @@ ko: preferences: 환경설정 profile: 공개 프로필 relationships: 팔로잉과 팔로워 + severed_relationships: 단절된 관계들 statuses_cleanup: 게시물 자동 삭제 strikes: 중재 기록 two_factor_authentication: 2단계 인증 webauthn_authentication: 보안 키 + severed_relationships: + download: 다운로드 (%{count}) + event_type: + account_suspension: 계정 정지 (%{target_name}) + domain_block: 서버 정지 (%{target_name}) + user_domain_block: 내가 %{target_name}을 차단했습니다 + lost_followers: 잃은 팔로워 + lost_follows: 잃은 팔로우 + preamble: 내가 도메인을 차단하거나 중재진이 다른 서버를 정지하기로 결정했다면 내 팔로우와 팔로워를 잃게 됩니다. 그런 일이 일어났다면 그로 인해 단절된 관계들의 목록을 다운로드 받아 확인하고 다른 서버에서 불러올 수 있습니다. + purged: 이 서버에 대한 정보는 관리자에 의해 삭제되었습니다. + type: 이벤트 statuses: attached: audio: diff --git a/config/locales/lad.yml b/config/locales/lad.yml index 0f04ce8928..3aaac3ab5a 100644 --- a/config/locales/lad.yml +++ b/config/locales/lad.yml @@ -1655,6 +1655,7 @@ lad: import: Importo import_and_export: Importo i eksporto migrate: Migrasyon de kuento + notifications: Avizos por posta elektronika preferences: Preferensyas profile: Profil publiko relationships: Segidos i suivantes @@ -1662,6 +1663,9 @@ lad: strikes: Amonestamientos de moderasyon two_factor_authentication: Autentifikasyon en dos pasos webauthn_authentication: Yaves de sigurita + severed_relationships: + download: Abasha (%{count}) + type: Evenimiento statuses: attached: audio: @@ -1862,6 +1866,9 @@ lad: follows_subtitle: Sige kuentos konesidos follows_title: A ken segir follows_view_more: Ve mas personas para segir + hashtags_recent_count: + one: "%{people} persona en los ultimos 2 diyas" + other: "%{people} personas en los ultimos 2 diyas" hashtags_subtitle: Eksplora los trendes de los ultimos 2 diyas hashtags_title: Etiketas en trend hashtags_view_more: Ve mas etiketas en trend diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 44b5443fc8..832d9e9db4 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -509,7 +509,7 @@ lt: software_updates: description: Rekomenduojama nuolat atnaujinti Mastodon diegyklę, kad galėtum naudotis naujausiais pataisymais ir funkcijomis. Be to, kartais labai svarbu laiku naujinti Mastodon, kad būtų išvengta saugumo problemų. Dėl šių priežasčių Mastodon kas 30 minučių tikrina, ar yra atnaujinimų, ir praneša tau apie tai pagal tavo el. pašto pranešimų parinktis. statuses: - back_to_account: Atgal į paskyros puslapį + back_to_account: Grįžti į paskyros puslapį media: title: Medija no_status_selected: Jokie statusai nebuvo pakeisti, nes niekas nepasirinkta @@ -741,16 +741,24 @@ lt: browser: Naršyklė browsers: generic: Nežinoma naršyklė - current_session: Dabartinė sesija + current_session: Dabartinis seansas date: Data description: "%{browser} ant %{platform}" explanation: Čia rodomos web naršyklės prijungtos prie Jūsų Mastodon paskyros. + platforms: + android: Android + ios: iOS + kai_os: KaiOS + mac: macOS + windows: Windows + windows_mobile: Windows Mobile + windows_phone: Windows Phone revoke: Atšaukti - revoke_success: Sesija sėkmingai atšaukta - title: Sesijos + revoke_success: Seansas sėkmingai panaikintas. + title: Seansai settings: authorized_apps: Autorizuotos aplikacijos - back: Atgal į Mastodon + back: Grįžti į Mastodon delete: Paskyros trynimas development: Plėtojimas edit_profile: Keisti profilį @@ -758,6 +766,7 @@ lt: featured_tags: Rodomi saitažodžiai(#) import: Importuoti migrate: Paskyros migracija + notifications: El. laiško pranešimai preferences: Preferencijos two_factor_authentication: Dviejų veiksnių autentikacija statuses: diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 481cd94f78..ee83954007 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -16,9 +16,9 @@ lv: instance_actor_flash: Šis konts ir virtuāls aktieris, ko izmanto, lai pārstāvētu pašu serveri, nevis atsevišķu lietotāju. To izmanto federācijas nolūkos, un to nevajadzētu apturēt. last_active: pēdējā aktivitāte link_verified_on: Šīs saites piederība tika pārbaudīta %{date} - nothing_here: Te nekā nav! + nothing_here: Šeit nekā nav. pin_errors: - following: Tev jau ir jāseko personai, kuru vēlies apstiprināt + following: Tev ir jāseko personai, kuru vēlies atbalstīt posts: one: Ziņa other: Ziņas @@ -575,7 +575,7 @@ lv: relays: add_new: Pievienot jaunu releju delete: Dzēst - description_html: "Federācijas relejs ir starpniekserveris, kas apmainās ar lielu publisko ziņu apjomu starp serveriem, kas to abonē un publicē. Tas var palīdzēt maziem un vidējiem serveriem atklāt saturu no federācijas, pretējā gadījumā vietējiem lietotājiem manuāli jāseko citām personām attālos serveros." + description_html: "Federācijas pārraidītājs ir starpniekserveris, kas apmainās ar lielu publisko ierakstu apjomu starp serveriem, kas to abonē un publicē tajā. Tas var palīdzēt maziem un vidējiem serveriem atklāt saturu fediversā, pretējā gadījumā vietējiem lietotājiem būtu pasrocīgi jāseko citiem cilvēkiem attālos serveros." disable: Atspējot disabled: Atspējots enable: Iespējot @@ -659,7 +659,7 @@ lv: actions: delete_html: Noņemt aizskarošās ziņas mark_as_sensitive_html: Atzīmēt aizskarošo ziņu multivides saturu kā sensitīvu - silence_html: Ievērojami ierobežojiet @%{acct} sasniedzamību, padarot viņa profilu un saturu redzamu tikai personām, kas jau seko viņiem vai manuāli meklē profilu + silence_html: Ievērojami ierobežo @%{acct} sasniedzamību, padarot viņa profilu un saturu redzamu tikai cilvēkiem, kas jau seko tam vai pašrocīgi uzmeklē profilu suspend_html: Apturēt @%{acct}, padarot viņu profilu un saturu nepieejamu un neiespējamu mijiedarbību ar close_report: 'Atzīmēt ziņojumu #%{id} kā atrisinātu' close_reports_html: Atzīmējiet visus pārskatus par @%{acct} kā atrisinātus @@ -902,9 +902,9 @@ lv: publishers: no_publisher_selected: Neviens publicētājs netika mainīts, jo neviens netika atlasīts shared_by_over_week: - one: Pēdējās nedēļas laikā kopīgoja viena persona + one: Pēdējās nedēļas laikā kopīgoja viens cilvēks other: Pēdējās nedēļas laikā kopīgoja %{count} cilvēki - zero: Pēdējās nedēļas laikā kopīgoja %{count} personas + zero: Pēdējās nedēļas laikā kopīgoja %{count} cilvēku title: Populārākās saites usage_comparison: Šodien kopīgots %{today} reizes, salīdzinot ar %{yesterday} vakar not_allowed_to_trend: Popularizešana nav atļauta @@ -944,7 +944,7 @@ lv: not_trendable: Neparādīsies pie tendencēm not_usable: Nevar tikt lietots peaked_on_and_decaying: Sasniedza maksimumu %{date}, tagad samazinās - title: Populārākie tēmturi + title: Izplatīti tēmturi trendable: Var parādīsies pie tendencēm trending_rank: 'Populārākie #%{rank}' usable: Var tikt lietots @@ -952,7 +952,7 @@ lv: used_by_over_week: one: Pēdējās nedēļas laikā izmantoja viens cilvēks other: Pēdējās nedēļas laikā izmantoja %{count} cilvēki - zero: Pēdējās nedēļas laikā izmantoja %{count} personas + zero: Pēdējās nedēļas laikā izmantoja %{count} cilvēku title: Tendences trending: Populārākie warning_presets: @@ -1015,7 +1015,7 @@ lv: new_trending_statuses: title: Populārākās ziņas new_trending_tags: - title: Populārākie tēmturi + title: Izplatīti tēmturi subject: Tiek pārskatītas jaunas tendences %{instance} aliases: add_new: Izveidot aizstājvārdu @@ -1040,7 +1040,7 @@ lv: salutation: "%{name}," settings: 'Mainīt e-pasta uztādījumus: %{link}' unsubscribe: Atcelt abonēšanu - view: 'Skatījums:' + view: 'Skatīt:' view_profile: Skatīt profilu view_status: Skatīt ziņu applications: @@ -1119,7 +1119,7 @@ lv: title: Pierakstīties %{domain} sign_up: manual_review: Reģistrācijas domēnā %{domain} manuāli pārbauda mūsu moderatori. Lai palīdzētu mums apstrādāt tavu reģistrāciju, uzraksti mazliet par sevi un to, kāpēc vēlies kontu %{domain}. - preamble: Izmantojot kontu šajā Mastodon serverī, tu varēsi sekot jebkurai citai personai tīklā neatkarīgi no tā, kur tiek mitināts viņas konts. + preamble: Ar kontu šajā Mastodon serverī varēsi sekot jebkuram citam tīklā esošam cilvēkam neatkarīgi no tā, kur tiek mitināts viņa konts. title: Atļauj tevi iestatīt %{domain}. status: account_status: Konta statuss @@ -1351,7 +1351,7 @@ lv: following_html: Tu gatavojies sekot līdz pat %{total_items} kontiem no %{filename}. lists_html: Tu gatavojies pievienot līdz pat %{total_items} kontiem no %{filename} saviem sarakstiem. Jauni saraksti tiks izveidoti, ja nav saraksta, ko pievienot. muting_html: Tu gatavojies noklusināt līdz pat %{total_items} kontiem no %{filename}. - preface: Tu vari importēt datus, kurus esi eksportējis no cita servera, piemēram, to personu sarakstu, kurām tu seko vai kuras bloķē. + preface: Tu vari ievietot datus, kurus esi izguvis no cita servera, kā, piemēram, cilvēku sarakstu, kuriem Tu seko vai kurus bloķē. recent_imports: Nesen importēts states: finished: Pabeigts @@ -1481,7 +1481,7 @@ lv: report: subject: "%{name} iesniedza ziņojumu" sign_up: - subject: "%{name} ir pierakstījies" + subject: "%{name} pierakstījās" favourite: body: 'Tavu ziņu izlasei pievienoja %{name}:' subject: "%{name} pievienoja tavu ziņu izlasei" @@ -1708,9 +1708,9 @@ lv: reblog: Izceltu ierakstu nevar piespraust poll: total_people: - one: "%{count} persona" + one: "%{count} cilvēks" other: "%{count} cilvēki" - zero: "%{count} personu" + zero: "%{count} cilvēku" total_votes: one: "%{count} balss" other: "%{count} balsis" @@ -1826,7 +1826,7 @@ lv: explanation: delete_statuses: Tika konstatēts, ka dažas no tavām ziņām pārkāpj vienu vai vairākas kopienas vadlīnijas, un rezultātā %{instance} moderatori tās noņēma. disable: Tu vairs nevari izmantot savu kontu, taču tavs profils un citi dati paliek neskarti. Tu vari pieprasīt savu datu dublējumu, mainīt konta iestatījumus vai dzēst kontu. - mark_statuses_as_sensitive: "%{instance} moderatori dažas no tavām ziņām ir atzīmējušas kā sensitīvas. Tas nozīmē, ka cilvēkiem būs jāpieskaras ziņās esošajai multividei, pirms tiek parādīts priekšskatījums. Tu arī pats vari atzīmēt mediju kā sensitīvu, kad tādu publicēsi turpmāk." + mark_statuses_as_sensitive: "%{instance} moderatori dažus no Taviem ierakstiem ir atzīmējuši kā jutīgus. Tas nozīmē, ka cilvēkiem būs jāpiesit ierakstos esošajiem informāijas nesējiem, pirms tiek attēlots priekšskatījums. Tu arī pats vari atzīmēt informācijas nesēju kā jutīgu, kad nākotnē tādu ievietosi." sensitive: No šī brīža visi augšupielādētie multivides faili tiks atzīmēti kā sensitīvi un paslēpti aiz klikšķa brīdinājuma. silence: Tu joprojām vari izmantot savu kontu, taču tikai tie cilvēki, kuri jau tev seko, redzēs tavas ziņas šajā serverī, un tev var tikt liegtas dažādas atklāšanas funkcijas. Tomēr citi joprojām var tev manuāli sekot. suspend: Tu vairs nevari izmantot savu kontu, un tavs profils un citi dati vairs nav pieejami. Tu joprojām vari pieteikties, lai pieprasītu savu datu dublēšanu, līdz dati tiks pilnībā noņemti aptuveni 30 dienu laikā, taču mēs saglabāsim dažus pamata datus, lai neļautu tev izvairīties no apturēšanas. @@ -1849,8 +1849,15 @@ lv: silence: Konts ierobežots suspend: Konts apturēts welcome: + edit_profile_action: Pielāgot + edit_profile_title: Pielāgo savu profilu explanation: Šeit ir daži padomi, kā sākt darbu feature_creativity: Mastodon nodrošina skaņas, video un attēlu ierakstus, pieejamības aprakstus, aptaujas, satura brīdinājumus, animētus profila attēlus, pielāgotas emocijzīmes, sīktēlu apgriešanas vadīklas un vēl, lai palīdzētu Tev sevi izpaust tiešsaistē. Vai Tu izplati savu mākslu, mūziku vai aplādes, Mastodon ir šeit ar Tevi. + follow_title: Pielāgo savu mājas barotni + hashtags_recent_count: + one: "%{people} cilvēks pēdējās 2 dienās" + other: "%{people} cilvēki pēdējās 2 dienās" + zero: "%{people} cilvēku pēdējās divās dienās" subject: Laipni lūgts Mastodon title: Laipni lūgts uz borta, %{name}! users: @@ -1859,11 +1866,11 @@ lv: invalid_otp_token: Nederīgs divfaktora kods otp_lost_help_html: Ja esi zaudējis piekļuvi abiem, tu vari sazināties ar %{email} seamless_external_login: Tu esi pieteicies, izmantojot ārēju pakalpojumu, tāpēc paroles un e-pasta iestatījumi nav pieejami. - signed_in_as: 'Pierakstījies kā:' + signed_in_as: 'Pieteicies kā:' verification: - extra_instructions_html: Padoms. saite tavā vietnē var būt neredzama. Svarīga daļa ir rel="me", kas novērš uzdošanos vietnēs ar lietotāju ģenerētu saturu. Tu vari pat lapas galvenē izmantot tagu link, nevis a, taču HTML ir jābūt pieejamam, neizpildot JavaScript. + extra_instructions_html: Padoms: saite Tavā vietnē var būt neredzama. Svarīga daļa ir rel="me", kas novērš uzdošanos vietnēs ar lietotāju izveidotu saturu. Tu pat vari lapas galvenē izmantot tagu link, nevis a, taču HTML ir jābūt pieejamam bez JavaScript izpildīšanas. here_is_how: Lūk, kā - hint_html: "Ikviens var apliecināt savu identitāti Mastodon. Pamatojoties uz atvērtiem tīmekļa standartiem, tagad un uz visiem laikiem bez maksas. Viss, kas tev nepieciešams, ir personīga vietne, pēc kuras cilvēki tevi atpazīst. Kad no sava profila izveidosi saiti uz šo vietni, mēs pārbaudīsim, vai vietne novirza atpakaļ uz tavu profilu, un tajā tiks parādīts vizuāls indikators." + hint_html: "Ikviens var apliecināt savu identitāti Mastodon. Balstīts uz atvērtiem tīmekļa standartiem, tagad un uz visiem laikiem bez maksas. Viss, kas Tev nepieciešams, ir personīga vietne, pēc kuras cilvēki Tevi atpazīst. Kad savā profilu sasaistīsi ar šo tīmekļvietni, mēs pārbaudīsim, vai tīmekļvietnei ir saite uz Tavu profilu, un tajā tiks parādīts redzama norāde." instructions_html: Ievieto starpliktuvē un ielīmē tālāk norādīto kodu savas tīmekļvietnes HTML! Tad pievieno savas tīmekļvietnes adresi vienā no papildu laukiem savā profila cilnē "Labot profilu" un saglabā izmaiņas! verification: Pārbaude verified_links: Tavas verifikācijas saites diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 561a0f0af8..91aabb1fa5 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -560,7 +560,7 @@ nl: no_ip_block_selected: Er zijn geen IP-regels veranderd, omdat er geen een was geselecteerd title: IP-regels relationships: - title: Relaties van %{acct} + title: Volgrelaties van %{acct} relays: add_new: Nieuwe relayserver toevoegen delete: Verwijderen @@ -1572,7 +1572,7 @@ nl: moved: Verhuisd mutual: Wederzijds primary: Primair - relationship: Relatie + relationship: Volgrelatie remove_selected_domains: Alle volgers van de geselecteerde domeinen verwijderen remove_selected_followers: Geselecteerde volgers verwijderen remove_selected_follows: Geselecteerde gebruikers ontvolgen @@ -1659,10 +1659,22 @@ nl: preferences: Voorkeuren profile: Openbaar profiel relationships: Volgers en gevolgde accounts + severed_relationships: Verbroken volgrelaties statuses_cleanup: Automatisch berichten verwijderen strikes: Vastgestelde overtredingen two_factor_authentication: Tweestapsverificatie webauthn_authentication: Beveiligingssleutels + severed_relationships: + download: Downloaden (%{count}) + event_type: + account_suspension: Accountschorsing (%{target_name}) + domain_block: Serverschorsing (%{target_name}) + user_domain_block: Je hebt %{target_name} geblokkeerd + lost_followers: Verloren volgers + lost_follows: Verloren gevolgde accounts + preamble: Je kan gevolgde accounts en volgers verliezen wanneer je een domein blokkeert of wanneer de moderators van jouw server beslissen om een externe server op te schorten. Wanneer dat gebeurt, kun je lijsten van verbroken volgrelaties downloaden, deze inspecteren en mogelijk importeren op een andere server. + purged: Informatie over deze server is verwijderd door de beheerders van jouw server. + type: Gebeurtenis statuses: attached: audio: diff --git a/config/locales/nn.yml b/config/locales/nn.yml index 983dd01421..7145f30377 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -58,7 +58,7 @@ nn: demote: Degrader destroyed_msg: "%{username} sine data er no i slettekøa" disable: Slå av - disable_sign_in_token_auth: Slå av e-post token autentisering + disable_sign_in_token_auth: Slå av innlogging med epost-nykel disable_two_factor_authentication: Slå av 2FA disabled: Slege av display_name: Synleg namn @@ -67,7 +67,7 @@ nn: email: E-post email_status: E-poststatus enable: Slå på - enable_sign_in_token_auth: Slå på e-post token autentisering + enable_sign_in_token_auth: Slå på innlogging med epost-nykel enabled: Aktivert enabled_msg: Gjenaktiverte %{username} sin konto followers: Fylgjarar @@ -158,9 +158,9 @@ nn: unblocked_email_msg: Avblokkerte %{username} si e-postadresse unconfirmed_email: E-post utan stadfesting undo_sensitized: Angr tving ømtolig - undo_silenced: Angr målbinding + undo_silenced: Angre avgrensinga undo_suspension: Angr utvising - unsilenced_msg: Opphevde vellykket begrensningen av %{username} sin konto + unsilenced_msg: Oppheva avgrensinga av %{username} sin konto unsubscribe: Avmeld unsuspended_msg: Oppheving av utvisinga av %{username} sin konto var vellykka username: Brukarnamn @@ -200,10 +200,10 @@ nn: destroy_user_role: Øydelegg rolle disable_2fa_user: Skruv av 2FA disable_custom_emoji: Skruv av tilpassa emoji - disable_sign_in_token_auth_user: Slå av e-post tokenautentisering for brukar + disable_sign_in_token_auth_user: Slå av innlogging med epost-nykel for brukaren disable_user: Skruv av brukar enable_custom_emoji: Skruv på tilpassa emoji - enable_sign_in_token_auth_user: Slå på e-post tokenautentisering for brukar + enable_sign_in_token_auth_user: Slå på innlogging med epost-nykel for brukaren enable_user: Skruv på brukar memorialize_account: Opprett minnekonto promote_user: Forfrem brukar @@ -259,10 +259,10 @@ nn: destroy_user_role_html: "%{name} sletta rolla %{target}" disable_2fa_user_html: "%{name} tok vekk krav om tofaktorautentisering for brukaren %{target}" disable_custom_emoji_html: "%{name} deaktiverte emojien %{target}" - disable_sign_in_token_auth_user_html: "%{name} deaktivert e-post token for godkjenning for %{target}" + disable_sign_in_token_auth_user_html: "%{name} skrudde av innlogging med epost-nykel for %{target}" disable_user_html: "%{name} slo av innlogging for brukaren %{target}" enable_custom_emoji_html: "%{name} aktiverte emojien %{target}" - enable_sign_in_token_auth_user_html: "%{name} aktiverte e-post token autentisering for %{target}" + enable_sign_in_token_auth_user_html: "%{name} skrudde på innlogging med epost-nykel for %{target}" enable_user_html: "%{name} aktiverte innlogging for brukaren %{target}" memorialize_account_html: "%{name} endret %{target}s konto til en minneside" promote_user_html: "%{name} fremja brukaren %{target}" @@ -274,7 +274,7 @@ nn: reset_password_user_html: "%{name} tilbakestilte passordet for brukaren %{target}" resolve_report_html: "%{name} løyste ein rapport %{target}" sensitive_account_html: "%{name} markerte %{target} sitt media som ømtolig" - silence_account_html: "%{name} begrensa %{target} sin konto" + silence_account_html: "%{name} avgrensa %{target} sin konto" suspend_account_html: "%{name} utviste %{target} sin konto" unassigned_report_html: "%{name} løyste ein rapport %{target}" unblock_email_account_html: "%{name} avblokkerte %{target} si e-postadresse" @@ -391,32 +391,32 @@ nn: remove_all_data: Dette vil fjerna alt innhald, media og profildata for kontoar som tilhøyrer dette domenet frå din tenar. stop_communication: Tenaren din vil slutta å kommunisera med desse tenarane. title: Stadfest domeneblokkering for %{domain} - undo_relationships: Dette vil oppheve alle følgar-relasjonar mellom kontoane dine og kontoar på desse tenerane. + undo_relationships: Dette vil oppheve alle fylgjar-relasjonar mellom kontoane dine og kontoar på desse tenerane. created_msg: Domeneblokkering blir nå behandlet destroyed_msg: Domeneblokkering har nå blitt angret domain: Domene edit: Rediger domeneblokkering - existing_domain_block: Du har allerede pålagt strengere begrensninger på %{name}. - existing_domain_block_html: Du har allerede pålagt strengere begrensninger på %{name}, du kan være nødt til oppheve blokkeringen av den først. + existing_domain_block: Du har allereie gjort strengare avgrensingar av %{name}. + existing_domain_block_html: Du har allereie avgrensa kontoen til %{name} kraftig, det kan henda du må oppheva blokkeringa fyrst. export: Eksporter import: Importer new: create: Lag blokkering hint: Domeneblokkeringen vil ikke hindre opprettelse av kontooppføringer i databasen, men vil retroaktivt og automatisk benytte spesifikke moderasjonsmetoder på de kontoene. severity: - desc_html: "Målbind gjer kontoen sine postear usynlege for alle som ikkje følger den. Utvis fjernar alt innhald, media og profildata frå kontoen. Bruk Ingen viss du berre vil fjerne mediafiler." + desc_html: "Avgrens gjer innlegg frå kontoar på dette domenet usynlege for alle som ikkje fylgjer dei. Utvis fjernar alt innhald, media og profildata frå kontoar på dette domenet frå tenaren din. Bruk Ingen viss du berre vil avvisa mediafiler." noop: Ingen - silence: Målbind + silence: Avgrens suspend: Utvis title: Ny domeneblokkering no_domain_block_selected: Ingen domeneblokkeringar vart endra sidan ingen var valde not_permitted: Du har ikkje løyve til å utføra denne handlinga obfuscate: Obfuskere domenenavn - obfuscate_hint: Skjul deler av domenenavnet i listen hvis annonsering av listen over domenebegrensninger er slått på + obfuscate_hint: Gøym delar av domenenamnet i lista viss kunngjering av lista over domeneavgrensingar er påskrudd private_comment: Privat kommentar - private_comment_hint: Kommenter angående denne domenebegrensningen for internt bruk av moderatorene. + private_comment_hint: Kommentar om denne domeneavgrensinga til intern bruk for administratorane. public_comment: Offentleg kommentar - public_comment_hint: Kommenter angående denne domenebegrensningen for offentligheten, hvis publisering av domenebegrensningslisten er slått på. + public_comment_hint: Kommentar om denne domeneavgrensinga for publikum, viss kunngjering av lista over avgrensa domene er påskrudd. reject_media: Avvis mediefiler reject_media_hint: Fjernar mediefiler som er lagra lokalt og nektar å lasta ned andre i framtida. Har ikkje noko å seia for utvisingar reject_reports: Avvis rapportar @@ -480,7 +480,7 @@ nn: title: Tilgjenge warning: Det siste forsøket på å koble til denne serveren lyktes ikke back_to_all: Alle - back_to_limited: Begrenset + back_to_limited: Avgrensa back_to_warning: Advarsel by_domain: Domene confirm_purge: Er du sikker på at du vil slette data permanent fra dette domenet? @@ -491,7 +491,7 @@ nn: policies: reject_media: Avvis media reject_reports: Avvis rapporter - silence: Begrens + silence: Avgrens suspend: Utvis policy: Vilkår reason: Offentlig årsak @@ -499,8 +499,8 @@ nn: dashboard: instance_accounts_dimension: Mest fylgde kontoar instance_accounts_measure: lagrede kontoer - instance_followers_measure: våre følgere der - instance_follows_measure: deres følgere her + instance_followers_measure: fylgjarane våre der + instance_follows_measure: fylgjarane deira her instance_languages_dimension: Mest brukte språk instance_media_attachments_measure: lagrede mediavedlegg instance_reports_measure: rapporter om dem @@ -651,7 +651,7 @@ nn: actions: delete_html: Fjerna dei påtala innlegga mark_as_sensitive_html: Markera dei påtala mediefilene som sensitive - silence_html: Sterkt avgrensa korleis @%{acct} kan samhandla ved å gjera brukarprofilen og innhaldet synleg berre for folk som allereie fylgjer brukarkontoen eller søkjer han opp manuelt + silence_html: Avgrens kraftig korleis @%{acct} kan samhandla med andre ved å gjera brukarprofilen og innhaldet synleg berre for folk som allereie fylgjer brukarkontoen eller søkjer opp profilen manuelt suspend_html: Stengja brukarkontoen til @%{acct}, slik at brukarprofilen og innhaldet blir utilgjengeleg og umogleg å samhandla med close_report: Marker rapport nr. %{id} som løyst close_reports_html: Marker alle rapportane om @%{acct} som løyste @@ -832,9 +832,9 @@ nn: mark_statuses_as_sensitive: "%{name} markerte %{target} sine innlegg som ømtålige" none: "%{name} sendte en advarsel til %{target}" sensitive: "%{name} markerte %{target} sin konto som ømtolig" - silence: "%{name} begrenset %{target}s konto" + silence: "%{name} avgrensa kontoen til %{target}" suspend: "%{name} utviste %{target} sin konto" - appeal_approved: Klage tatt til følge + appeal_approved: Anka appeal_pending: Klage behandles appeal_rejected: Anken er avvist system_checks: @@ -981,7 +981,7 @@ nn: mark_statuses_as_sensitive: å merke innleggene sine som følsomme none: en advarsel sensitive: å merke kontoen sin som følsom - silence: for å begrense deres konto + silence: for å avgrensa kontoen deira suspend: for å stenga kontoen deira body: "%{target} ankar på ei modereringsavgjerd av %{action_taken_by} den %{date}, som var %{type}. Dei skreiv:" next_steps: Du kan godkjenna anken for å endra modereringsavgjerda, eller du kan oversjå anken. @@ -1013,7 +1013,7 @@ nn: created_msg: Laga eit nytt kallenamn. No kan du setja i gang med flyttinga frå den gamle kontoen. deleted_msg: Fjerna kallenamnet. No vert det ikkje lenger mogeleg å flytta frå den andre kontoen til denne. empty: Du har inkje alias. - hint_html: Dersom du vil flytte fra en annen konto til den, kan du lage et alias her, som er påkrevd før du kan gå videre med å flytte følgere fra den gamle kontoen til den nye. Handlingen i seg selv er harmløs og reversibel. Kontoflyttingen har blitt satt i gang fra den gamle kontoen. + hint_html: Viss du vil flytta frå ein annan konto til denne, kan du laga eit alias her. Det treng du før du kan halda fram med å flytta fylgjarar frå den gamle kontoen til dnene. Denne handlinga er i seg sjølv harmlaus og kan angrast. Du har starta overføringa frå den gamle kontoen. remove: Fjern aliaslenking appearance: advanced_web_interface: Avansert nettgrensesnitt @@ -1067,7 +1067,7 @@ nn: didnt_get_confirmation: Fekk du ikkje stadfestingslenka? dont_have_your_security_key: Har du ikke sikkerhetsnøkkelen din? forgot_password: Har du gløymt passordet ditt? - invalid_reset_password_token: Tilgangsnykelen er ugyldig eller utgått. Ver venleg å beda om ein ny ein. + invalid_reset_password_token: Tilgangsnykelen er ugyldig eller utgått. Ver venleg å be om ein ny ein. link_to_otp: Skriv inn en 2-trinnskode fra din 2-trinnspåloggingsenhet eller en gjenopprettingskode link_to_webauth: Bruk sikkerhetsnøkkel-enheten din log_in_with: Logg inn med @@ -1110,7 +1110,7 @@ nn: title: Logg inn på %{domain} sign_up: manual_review: Når du lagar ein konto på %{domain}, vil moderatorane våre gå gjennom påmeldinga di manuelt. For å hjelpa oss med påmeldinga di, er det fint om du skriv litt om deg sjølv og kvifor du vil ha ein konto på %{domain}. - preamble: Med en konto på denne Mastodon-tjeneren vil du kunne følge andre personer på nettverket, uansett hvor kontoen deres holder til. + preamble: Med ein konto på denne Mastodon-tenaren kan du fylgja andre folk på nettverket, uansett kvar dei har brukarkontoen sin. title: La oss få deg satt i gang på %{domain}. status: account_status: Kontostatus @@ -1170,7 +1170,7 @@ nn: strikes: action_taken: Handling utført appeal: Klage - appeal_approved: Denne advarselens klage ble tatt til følge og er ikke lenger gyldig + appeal_approved: Denne handlinga er anka og er ikkje lenger gyldig appeal_rejected: Klagen ble avvist appeal_submitted_at: Klage levert appealed_msg: Din klage har blitt levert. Du får beskjed om den blir godkjent. @@ -1191,7 +1191,7 @@ nn: mark_statuses_as_sensitive: Markering av innlegg som ømtolige none: Advarsel sensitive: Markering av konto som ømtolig - silence: Begrensning av konto + silence: Avgrensing av konto suspend: Utestenging av konto your_appeal_approved: Din klage har blitt godkjent your_appeal_pending: Du har levert en klage @@ -1424,7 +1424,7 @@ nn: migrations: acct: Flytta til cancel: Avbryt omdirigeringen - cancel_explanation: Å avbryte omdirigeringen vil reaktivere din nåværende konto, men vil ikke bringe tilbake følgere som har blitt flyttet til den kontoen. + cancel_explanation: Viss du avbryt omdirigeringa, vil det ta i bruk at den noverande kontoen din, men det vil ikkje få tilbake fylgjarar som er flytte til den andre kontoen. cancelled_msg: Avbrøt omdirigeringen med suksess. errors: already_moved: er den same kontoen som du allereie har flytta til @@ -1435,7 +1435,7 @@ nn: followers_count: Fylgjarar då kontoen vart flytta incoming_migrations: Flyttar frå ein annan konto incoming_migrations_html: For å flytta frå ein annnan konto til denne må du fyrst laga eit kallenamn til kontoen. - moved_msg: Kontoen din omdirigeres nå til %{acct}, og følgerne dine blir flyttet over. + moved_msg: Kontoen din vidaresender no til %{acct}, og fylgjarane dine blir flytte over dit. not_redirecting: Kontoen din omdirigeres ikke til noen andre kontoer for øyeblikket. on_cooldown: Du har nylig overført kontoen din. Denne funksjonen blir tilgjengelig igjen om %{count} dager. past_migrations: Tidlegare vandringar @@ -1448,7 +1448,7 @@ nn: before: 'Før du fortsetter, vennligst les disse notisene nøye:' cooldown: Etter flytting er det en nedkjølingsperiode der du ikke vil kunne flytte igjen disabled_account: Din nåværende konto vil ikke være fullt brukbar etterpå. Men du vil ha tilgang til dataeksportering såvel som reaktivering. - followers: Denne handlingen vil flytte alle følgere fra den nåværende kontoen til den nye kontoen + followers: Denne handlinga flyttar alle fylgjarar frå denne kontoen til den nye only_redirect_html: Alternativt kan du velge å bare legge ut en omdirigering på profilen din. other_data: Inkje anna data flyttast av seg sjølve redirect: Profilen til din nåværende konto vil bli oppdatert med en omdirigeringsnotis og bli fjernet fra søk @@ -1510,9 +1510,9 @@ nn: trillion: Bil otp_authentication: code_hint: Skriv inn koden generert av autentiseringsappen din for å bekrefte - description_html: Hvis du skrur på 2-trinnsautentisering ved hjelp av en autentiseringsapp, vil pålogging kreve at du er i besittelse av autentiseringsenheten din, som genererer sjetonger som du skal skrive inn. + description_html: Viss du skrur på tofaktorinnlogging med ein innloggingsapp, må du ha telefonen din klar når du loggar inn. Telefonen lagar innloggingsnyklar du må skriva inn. enable: Aktiver - instructions_html: "Skann denne QR-koden i Authy, Google Autentisering, eller en lignende TOTP-app på en av dine enheter. Fra nå av, vil den appen generere sjetonger som du vil måtte skrive inn når du logger på." + instructions_html: "Skann denne QR-koden i Google authenticator eller annan tofaktor-app på telefonen din. Frå no vil den appen laga tilgangsnyklar som du skriv inn når du vil logga inn." manual_instructions: 'Hvis du ikke kan skanne QR-koden og må skrive den inn manuelt, her er tekstkoden i ren tekst:' setup: Sett opp wrong_code: Den innskrevne koden var ugyldig! Er tjenertiden og enhetstiden riktige? @@ -1564,7 +1564,7 @@ nn: dormant: I dvale follow_failure: Greidde ikkje fylgja alle kontoane du valde. follow_selected_followers: Følg valgte tilhengere - followers: Følgere + followers: Fylgjarar following: Følginger invited: Innboden last_active: Sist aktiv @@ -1659,10 +1659,22 @@ nn: preferences: Innstillingar profile: Profil relationships: Fylgjar og fylgjarar + severed_relationships: Brotne forhold statuses_cleanup: Automatisert sletting av innlegg strikes: Modereringsadvarsler two_factor_authentication: Tostegsautorisering webauthn_authentication: Sikkerhetsnøkler + severed_relationships: + download: Last ned (%{count}) + event_type: + account_suspension: Utestenging av konto (%{target_name}) + domain_block: Tenarutestenging (%{target_name}) + user_domain_block: Du blokkerte %{target_name} + lost_followers: Mista fylgjarar + lost_follows: Mista fylgjer + preamble: Du kan mista fylgjarar og folk du fylgjer når du blokkerer eit domene eller når moderatorar avgjer å utestenga ein annan tenar. Når det skjer, vil du kunne lasta ned ei liste over brotne forhold, slik at du kan sjå gjennom ho og kanskje importera ho på ein annan tenar. + purged: Informasjonen om denne tenaren er sletta av administratorane på tenaren din. + type: Hending statuses: attached: audio: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 1dc1482e20..89eec685d8 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -1711,10 +1711,22 @@ pl: preferences: Preferencje profile: Profil relationships: Obserwowani i obserwujący + severed_relationships: Zerwane związki statuses_cleanup: Automatyczne usuwanie wpisów strikes: Ostrzeżenia moderacyjne two_factor_authentication: Uwierzytelnianie dwuetapowe webauthn_authentication: Klucze bezpieczeństwa + severed_relationships: + download: Pobierz (%{count}) + event_type: + account_suspension: Zawieszenie konta (%{target_name}) + domain_block: Zawieszenie serwera (%{target_name}) + user_domain_block: Zablokowano %{target_name} + lost_followers: Utraceni obserwujący + lost_follows: Utracone obserwowania + preamble: Możesz stracić obserwowania i obserwujących kiedy zablokujesz domenę albo kiedy twoi moderatorzy postanowią zawiesić obcy serwer. W tym wypadku będziesz móc pobrać listę zerwanych związków do przejrzenia i potencjalnego importu na innym serwerze. + purged: Informacje o tym serwerze zostały wyczyszczone przez administratora twojego serwera. + type: Zdarzenie statuses: attached: audio: diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index 9dde61ff06..666eb0bdd7 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -1659,10 +1659,22 @@ pt-PT: preferences: Preferências profile: Perfil relationships: Seguindo e seguidores + severed_relationships: Relações cessadas statuses_cleanup: Remoção automática da publicação strikes: Punições de moderação two_factor_authentication: Autenticação em duas etapas webauthn_authentication: Chaves de segurança + severed_relationships: + download: Transferir (%{count}) + event_type: + account_suspension: Suspensão de conta (%{target_name}) + domain_block: Suspensão de servidor (%{target_name}) + user_domain_block: Bloqueou %{target_name} + lost_followers: Seguidores perdidos + lost_follows: Pessoas que segue perdidas + preamble: Pode perder seguidores e pessoas que segue quando bloqueia um domínio ou quando os seus moderadores decidem suspender um servidor remoto. Quando isso acontecer, poderá descarregar listas de relações cessadas, para serem inspeccionadas e possivelmente importadas para outro servidor. + purged: Informações sobre este servidor foram purgadas pelos administradores do seu servidor. + type: Evento statuses: attached: audio: diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml index a4e57841e6..823929c550 100644 --- a/config/locales/simple_form.fr-CA.yml +++ b/config/locales/simple_form.fr-CA.yml @@ -116,6 +116,7 @@ fr-CA: sign_up_requires_approval: Les nouvelles inscriptions nécessiteront votre approbation severity: Choisir ce qui se passera avec les requêtes de cette adresse IP rule: + hint: Optionnel. Fournissez plus de détails sur la règle text: Décrivez une règle ou une exigence pour les utilisateurs sur ce serveur. Essayez de la garder courte et simple sessions: otp: 'Entrez le code d’authentification à deux facteurs généré par l’application de votre téléphone ou utilisez un de vos codes de récupération :' @@ -299,6 +300,7 @@ fr-CA: patch: Notifier pour des mises à jour de corrections de bug trending_tag: Nouvelle tendance nécessitant supervision rule: + hint: Information supplémentaire text: Règle settings: indexable: Inclure la page de profil dans les moteurs de recherches diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml index bd1dc6885f..4c8de1b20d 100644 --- a/config/locales/simple_form.fr.yml +++ b/config/locales/simple_form.fr.yml @@ -116,6 +116,7 @@ fr: sign_up_requires_approval: Les nouvelles inscriptions nécessiteront votre approbation severity: Choisir ce qui se passera avec les requêtes de cette adresse IP rule: + hint: Optionnel. Fournissez plus de détails sur la règle text: Décrivez une règle ou une exigence pour les utilisateurs sur ce serveur. Essayez de la garder courte et simple sessions: otp: 'Entrez le code d’authentification à deux facteurs généré par l’application de votre téléphone ou utilisez un de vos codes de récupération :' @@ -299,6 +300,7 @@ fr: patch: Notifier pour des mises à jour de corrections de bug trending_tag: Nouvelle tendance nécessitant supervision rule: + hint: Information supplémentaire text: Règle settings: indexable: Inclure la page de profil dans les moteurs de recherches diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml index 1d5e149339..242c863274 100644 --- a/config/locales/simple_form.hu.yml +++ b/config/locales/simple_form.hu.yml @@ -54,11 +54,11 @@ hu: phrase: Illeszkedni fog kis/nagybetű függetlenül, és tartalmi figyelmeztetések mögött is scopes: Mely API-kat érheti el az alkalmazás. Ha felső szintű hatáskört választasz, nem kell egyesével kiválasztanod az alatta lévőeket. setting_aggregate_reblogs: Ne mutassunk megtolásokat olyan bejegyzésekhez, melyeket nemrég toltak meg (csak új megtolásokra lép életbe) - setting_always_send_emails: Alapesetben nem küldünk e-mail értesítéseket, ha aktívan használod a Mastodont + setting_always_send_emails: Alapesetben nem küldünk e-mail-értesítéseket, ha aktívan használod a Mastodont setting_default_sensitive: A kényes médiatartalmat alapesetben elrejtjük, de egyetlen kattintással előhozható setting_display_media_default: Kényes tartalomnak jelölt média elrejtése - setting_display_media_hide_all: Mindig minden média elrejtése - setting_display_media_show_all: Mindig mutasd a szenzitív tartalomként jelölt médiát + setting_display_media_hide_all: Média elrejtése mindig + setting_display_media_show_all: Média megjelenítése mindig setting_use_blurhash: A kihomályosítás az eredeti képből történik, de minden részletet elrejt setting_use_pending_items: Idővonal frissítése csak kattintásra automatikus görgetés helyett username: Betűk, számok és alávonások használhatók @@ -146,7 +146,7 @@ hu: name: Címke value: Tartalom indexable: Nyilvános bejegyzések szerepeltetése a keresési eredményekben - show_collections: Követők és követettek megjelnítése a profilban + show_collections: Követők és követettek megjelenítése a profilban unlocked: Új követők automatikus elfogadása account_alias: acct: A régi fiók fiókneve @@ -187,7 +187,7 @@ hu: data: Adatok display_name: Megjelenített név email: E-mail cím - expires_in: Elévül + expires_in: Elévülés dátuma fields: Profil metaadatai header: Fejléc honeypot: "%{label} (ne töltsd ki)" @@ -202,7 +202,7 @@ hu: phrase: Kulcsszó vagy kifejezés setting_advanced_layout: Speciális webes felület engedélyezése setting_aggregate_reblogs: Megtolások csoportosítása az idővonalakon - setting_always_send_emails: E-mail értesítések küldése mindig + setting_always_send_emails: E-mail-értesítések küldése mindig setting_auto_play_gif: GIF-ek automatikus lejátszása setting_boost_modal: Megerősítés kérése megtolás előtt setting_default_language: Bejegyzések nyelve diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml index d948a88ed1..627d96df02 100644 --- a/config/locales/simple_form.ko.yml +++ b/config/locales/simple_form.ko.yml @@ -303,7 +303,7 @@ ko: hint: 추가 정보 text: 규칙 settings: - indexable: 검색 엔진에 프로필 페이지 기재하기 + indexable: 검색엔진에 프로필 페이지 포함하기 show_application: 어떤 앱으로 게시물을 보냈는지 표시 tag: listable: 이 해시태그가 검색과 추천에 보여지도록 허용 diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml index 596fbe3e34..002761065d 100644 --- a/config/locales/simple_form.lv.yml +++ b/config/locales/simple_form.lv.yml @@ -6,7 +6,7 @@ lv: discoverable: Tavas publiskās ziņas un profils var tikt piedāvāti vai ieteikti dažādās Mastodon vietās, un tavs profils var tikt ieteikts citiem lietotājiem. display_name: Tavs pilnais vārds vai tavs joku vārds. fields: Tava mājas lapa, vietniekvārdi, vecums, viss, ko vēlies. - indexable: Tavas publiskās ziņas var tikt parādītas Mastodon meklēšanas rezultātos. Personas, kuras ir mijiedarbojušās ar tavām ziņām, var tās meklēt neatkarīgi no tā. + indexable: Tavi publiskie ieraksti var tikt parādīti Mastodon meklēšanas iznākumā. Cilvēki, kuri ir mijiedarbojušies ar Taviem ierakstiem, var tos meklēt neatkarīgi no tā. note: 'Tu vari @minēt citus cilvēkus vai #mirkļbirkas.' show_collections: Cilvēki varēs pārlūkot Tavus sekotājus un sekojamos. Cilvēki, kuriem Tu seko, redzēs, ka Tu seko viņiem neatkarīgi no tā. unlocked: Cilvēki varēs tev sekot, neprasot apstiprinājumu. Noņem atzīmi, ja vēlies pārskatīt sekošanas pieprasījumus un izvēlēties, pieņemt vai noraidīt jaunus sekotājus. @@ -44,7 +44,7 @@ lv: context: Viens vai vairāki konteksti, kur jāpiemēro filtrs current_password: Drošības nolūkos, lūdzu, ievadi pašreizējā konta paroli current_username: Lai apstiprinātu, lūdzu, ievadi pašreizējā konta paroli - digest: Sūta tikai pēc ilgstošas neaktivitātes un tikai tad, ja savas prombūtnes laikā neesi saņēmis personiskas ziņas + digest: Tiek nosūtīts tikai pēc ilgstošas bezdarbības un tikai tad, ja savas prombūtnes laikā esi saņēmis jebkādas personīgas ziņas email: Tev tiks nosūtīts apstiprinājuma e-pasts header: WEBP, PNG, GIF vai JPG. Ne vairāk kā %{size}. Tiks samazināts līdz %{dimensions}px inbox_url: Nokopē URL no tā releja sākumlapas, kuru vēlies izmantot diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml index df108a2fec..2f2107b13c 100644 --- a/config/locales/simple_form.nl.yml +++ b/config/locales/simple_form.nl.yml @@ -149,9 +149,9 @@ nl: show_collections: Accounts die jij volgt en die jou volgen op je profiel tonen unlocked: Automatisch nieuwe volgers accepteren account_alias: - acct: Mastodon-adres van het oude account + acct: Fediverse-adres van het oude account account_migration: - acct: Mastodon-adres van het nieuwe account + acct: Fediverse-adres van het nieuwe account account_warning_preset: text: Tekst van preset title: Titel diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml index 1edf185c0a..a9f5f609fa 100644 --- a/config/locales/simple_form.nn.yml +++ b/config/locales/simple_form.nn.yml @@ -224,7 +224,7 @@ nn: setting_use_blurhash: Vis fargerike overgangar for gøymde medium setting_use_pending_items: Saktemodus severity: Alvorsgrad - sign_in_token_attempt: Trygdenykel + sign_in_token_attempt: Innloggingsnykel title: Tittel type: Importtype username: Brukarnamn @@ -280,7 +280,7 @@ nn: severities: no_access: Blokker tilgang sign_up_block: Blokker registrering - sign_up_requires_approval: Begrens påmeldinger + sign_up_requires_approval: Avgrens påmeldingar severity: Oppføring notification_emails: appeal: Nokon klagar på ei moderatoravgjerd diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml index c3b8625c8e..37372cac27 100644 --- a/config/locales/simple_form.sv.yml +++ b/config/locales/simple_form.sv.yml @@ -116,6 +116,7 @@ sv: sign_up_requires_approval: Nya registreringar kräver ditt godkännande severity: Välj vad som ska hända med förfrågningar från denna IP rule: + hint: Valfritt. Ange mer information om regeln text: Beskriv en regel eller ett krav för användare av denna server. Försök hålla det kort och koncist sessions: otp: 'Ange tvåfaktorskoden som genererades av din telefonapp, eller använd någon av dina återställningskoder:' diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 6b59677910..8c613e9589 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -1199,6 +1199,9 @@ sk: profile: Profil relationships: Sledovania a následovatelia two_factor_authentication: Dvojfázové overenie + severed_relationships: + lost_followers: Stratení nasledovatelia + lost_follows: Stratené sledovania statuses: attached: description: 'Priložené: %{attached}' diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 9498ca7898..adb3a041ca 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -1259,17 +1259,17 @@ sl: exports: archive_takeout: date: Datum - download: Prenesi svoj arhiv - hint_html: Zahtevate lahko arhiv vaših objav in naloženih medijev. Izvoženi podatki bodo v zapisu ActivityPub, ki ga bo mogoče brati s poljubno skladno programsko opremo. Arhiv lahko zahtevate vsakih 7 dni. - in_progress: Prevajanje arhiva... + download: Prenesite svoj arhiv + hint_html: Zahtevate lahko arhiv svojih objav in naloženih medijev. Izvoženi podatki bodo v zapisu ActivityPub, ki ga bo mogoče brati s poljubno skladno programsko opremo. Arhiv lahko zahtevate vsakih 7 dni. + in_progress: Pripravljanje vašega arhiva … request: Zahtevajte svoj arhiv size: Velikost - blocks: Blokirate + blocks: Blokirani bookmarks: Zaznamki csv: CSV - domain_blocks: Bloki domene + domain_blocks: Blokirane domene lists: Seznami - mutes: Utišate + mutes: Utišani storage: Shranjeni mediji featured_tags: add_new: Dodaj novo @@ -1613,17 +1613,17 @@ sl: confirm_follow_selected_followers: Ali ste prepričani, da želite slediti izbranim sledilcem? confirm_remove_selected_followers: Ali ste prepričani, da želite odstraniti izbrane sledilce? confirm_remove_selected_follows: Ali ste prepričani, da želite odstraniti izbrana sledenja? - dormant: Skrit + dormant: Nedejavno follow_failure: Nekaterim od izbranih računov ni bilo mogoče slediti. follow_selected_followers: Sledi izbranim sledilcem followers: Sledilci - following: Sledi + following: Sledeni invited: Vabljeni last_active: Zadnja dejavnost - most_recent: Najnovejša + most_recent: Najnovejše moved: Prestavljeno - mutual: Vzajemna - primary: Primarna + mutual: Vzajemno + primary: Primarno relationship: Razmerje remove_selected_domains: Odstrani vse sledilce iz izbranih domen remove_selected_followers: Odstrani izbrane sledilce @@ -1711,10 +1711,22 @@ sl: preferences: Nastavitve profile: Profil relationships: Sledenja in sledilci + severed_relationships: Prekinjene veze statuses_cleanup: Samodejno brisanje objav strikes: Ukrepi morediranja two_factor_authentication: Dvofaktorsko overjanje webauthn_authentication: Varnostni ključi + severed_relationships: + download: Prejmi (%{count}) + event_type: + account_suspension: Suspendiranje računa (%{target_name}) + domain_block: Suspendiranje strežnika (%{target_name}) + user_domain_block: Blokirali ste %{target_name} + lost_followers: Izgubljeni sledilci + lost_follows: Izgubljena sledeni + preamble: Če blokirate domeno ali če se vaši moderatorji odločijo suspendirati oddaljen strežnik, lahko izgubite sledene in sledilce. Ko se to zgodi, boste lahko prejeli sezname prekinjenih vez za pregled in morebitno uvažanje na drugem strežniku. + purged: Podatke o tem strežniku so očistili skrbniki vašega strežnika. + type: Dogodek statuses: attached: audio: diff --git a/config/locales/sq.yml b/config/locales/sq.yml index ce2c8b0f99..3742b61427 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -1655,10 +1655,20 @@ sq: preferences: Parapëlqime profile: Profil relationships: Ndjekje dhe ndjekës + severed_relationships: Marrëdhënie të ndërprera statuses_cleanup: Fshirje e automatizuar postimesh strikes: Paralajmërime nga moderimi two_factor_authentication: Mirëfilltësim Dyfaktorësh webauthn_authentication: Kyçe sigurie + severed_relationships: + download: Shkarkim (%{count}) + event_type: + account_suspension: Pezullim llogarie (%{target_name}) + domain_block: Pezullim shërbyesi (%{target_name}) + user_domain_block: Bllokuat %{target_name} + preamble: Mund të humbni ndjekje dhe ndjekës, kur bllokoni një përkatësi, ose kur moderatorët tuaj vendosin të pezullojnë një shërbyes të largët. Kur kjo ndodh, do të jeni në gjendje të shkarkoni lista marrëdhëniesh të dëmtuara, për t’i shqyrtuar dhe mundet për t’i importuar në një shërbyes tjetër. + purged: Hollësitë rreth këtij shërbyesi janë spastuar nga përgjegjësit e shërbyesit tuaj. + type: Akt statuses: attached: audio: diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 855fa765f5..8ffb3c1e29 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -1660,6 +1660,9 @@ sv: strikes: Modereringsprickar two_factor_authentication: Tvåfaktorsautentisering webauthn_authentication: Säkerhetsnycklar + severed_relationships: + lost_follows: Förlorade följare + type: Händelse statuses: attached: audio: diff --git a/config/locales/th.yml b/config/locales/th.yml index 558552362f..69bae8767f 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -1633,10 +1633,21 @@ th: preferences: การกำหนดลักษณะ profile: โปรไฟล์สาธารณะ relationships: การติดตามและผู้ติดตาม + severed_relationships: ความสัมพันธ์ที่ตัดขาด statuses_cleanup: การลบโพสต์แบบอัตโนมัติ strikes: การดำเนินการการกลั่นกรอง two_factor_authentication: การรับรองความถูกต้องด้วยสองปัจจัย webauthn_authentication: กุญแจความปลอดภัย + severed_relationships: + download: ดาวน์โหลด (%{count}) + event_type: + account_suspension: การระงับบัญชี (%{target_name}) + domain_block: การระงับเซิร์ฟเวอร์ (%{target_name}) + user_domain_block: คุณได้ปิดกั้น %{target_name} + lost_followers: ผู้ติดตามที่หายไป + lost_follows: การติดตามที่หายไป + purged: มีการล้างข้อมูลเกี่ยวกับเซิร์ฟเวอร์นี้โดยผู้ดูแลของเซิร์ฟเวอร์ของคุณ + type: เหตุการณ์ statuses: attached: audio: diff --git a/config/locales/tr.yml b/config/locales/tr.yml index bdf002333d..692b3d281f 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -1659,10 +1659,22 @@ tr: preferences: Tercihler profile: Profil relationships: Takip edilenler ve takipçiler + severed_relationships: Kopmuş ilişkiler statuses_cleanup: Otomatik gönderi silme strikes: Moderasyon eylemleri two_factor_authentication: İki adımlı doğrulama webauthn_authentication: Güvenlik anahtarları + severed_relationships: + download: İndir (%{count}) + event_type: + account_suspension: Hesap askıya alma (%{target_name}) + domain_block: Sunucu askıya alma (%{target_name}) + user_domain_block: 'Engellediniz: %{target_name}' + lost_followers: Kaybedilen takipçiler + lost_follows: Kaybedilen takipler + preamble: Bir alan adını engellediğinizde veya denetleyicileriniz uzak bir sunucuyu askıya almaya karar verdiğinde takipçilerinizi ve takiplerinizi kaybedebilirsiniz. Bu olduğunda, kopan ilişkilerin bir listesini, incelemek ve başka bir sunucuya aktarmak için indirebileceksiniz. + purged: Bu sunucu hakkındaki bilgiler, sunucunun yöneticileri tarafından temizlenmiş. + type: Olay statuses: attached: audio: diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 21ddeb5117..b02e9c5562 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -1711,10 +1711,22 @@ uk: preferences: Налаштування profile: Загальнодоступний профіль relationships: Підписки та підписники + severed_relationships: Розірвані зв'язки statuses_cleanup: Автовидалення допису strikes: Попередження модераторів two_factor_authentication: Двофакторна автентифікація webauthn_authentication: Ключі безпеки + severed_relationships: + download: Завантажити (%{count}) + event_type: + account_suspension: Призупинення облікового запису (%{target_name}) + domain_block: Призупинення сервера (%{target_name}) + user_domain_block: Ви заблокували %{target_name} + lost_followers: Втрачені підписники + lost_follows: Втрачені підписки + preamble: Ви можете втратити підписки та підписників, коли ви блокуєте домен або коли модератори вирішують призупинити віддалений сервер. Коли це станеться, ви зможете завантажити списки розірваних зв'язків, які мають бути перевірені та, можливо, імпортовані на іншому сервері. + purged: Інформацію про цей сервер очищені адміністраторами вашого сервера. + type: Подія statuses: attached: audio: @@ -1911,8 +1923,41 @@ uk: apps_ios_action: Завантажити з App Store apps_step: Завантажити наші офіційні застосунки. apps_title: Застосунки Mastodon + checklist_subtitle: 'Розпочнімо у цій новій соціальній межі:' + checklist_title: Контрольний список привітання + edit_profile_action: Персоналізувати + edit_profile_step: Інші, ймовірно, швидше взаємодіятимуть з вами, якщо ви заповните профіль. + edit_profile_title: Персоналізуйте свій профіль explanation: Ось кілька порад для початку feature_action: Докладніше + feature_audience: Mastodon надає унікальну можливість керувати своєю аудиторією без посередників. Маючи сервер Mastodon, розгорнутий на власній інфраструктурі, його користувачі можуть взаємодіяти з будь-яким іншим сервером Mastodon, не віддаючи контроль у чужі руки. + feature_audience_title: Формуйте свою аудиторію з впевненістю + feature_control: Тільки ви знаєте, що саме хочете бачити на своєму сервері. Немає алгоритмів або реклами, що марнують ваш час. Слідкуйте за будь-яким сервером Mastodon з одного облікового запису та отримуйте повідомлення в хронологічному порядку, і зробіть ваш куточок інтернету трохи схожим на вас. + feature_control_title: Керуйте своєю стрічкою + feature_creativity: Mastodon підтримує дописи з аудіо, відео та зображеннями, опис для доступності, опитування, попередження про вміст, анімовані аватари, користувацькі емодзі, мініатюри, керування кадруванням мініатюр та багато іншого. Чи викладаєте ви своє мистецтво, чи музику або подкаст, Mastodon тут для вас. + feature_creativity_title: Необмежена творчість + feature_moderation: Mastodon повертає прийняття рішень у ваші руки. На відміну від соціальних мереж, що належать корпораціям, які спускають свої правила згори, кожен сервер Mastodon встановлює свої правила і норми, яких дотримуються на місцевому рівні, що робить їх найгнучкішими для задовільнення потреб різних груп людей. Приєднуйтесь до сервера з правилами, з якими ви згодні, або створіть свій власний. + feature_moderation_title: Модерація, якою вона має бути + follow_action: Підписатися + follow_step: Ви керуєте головною стрічкою. Заповнюйте її цікавими людьми. + follow_title: Персоналізуйте домашню стрічку + follows_subtitle: Стежте за відомими обліковими записами + follows_title: На кого підписатися + follows_view_more: Переглянути більше людей, щоб підписатися + hashtags_recent_count: + few: "%{people} особи за останні 2 дні" + many: "%{people} осіб за останні 2 дні" + one: "%{people} особа за останні 2 дні" + other: "%{people} особа за останні 2 дні" + hashtags_subtitle: Дізнавайтеся, що було популярним минулі 2 дні + hashtags_title: Популярні хештеги + hashtags_view_more: Переглянути більше популярних хештеґів + post_action: Створити + post_step: Привітайтеся зі світом, з текстом, світлинами, відео та опитуваннями. + post_title: Напишіть свій перший допис + share_action: Поділитися + share_step: Розкажіть друзям, як знайти вас на Mastodon. + share_title: Поділіться своїм профілем Mastodon sign_in_action: Увійти subject: Ласкаво просимо до Mastodon title: Ласкаво просимо, %{name}! diff --git a/config/locales/vi.yml b/config/locales/vi.yml index fc4ec80482..f71ff741dc 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -585,6 +585,9 @@ vi: actions_description_html: Nếu áp đặt trừng phạt, một email thông báo sẽ được gửi cho người này, ngoại trừ Spam. actions_description_remote_html: Chọn hành động cần thực hiện để xử lý báo cáo này. Điều này sẽ chỉ ảnh hưởng đến cách máy chủ của bạn giao tiếp với tài khoản này và xử lý nội dung của nó. add_to_report: Bổ sung báo cáo + already_suspended_badges: + local: Đã vô hiệu hóa trên máy chủ này + remote: Đã vô hiệu hóa trên máy chủ khác are_you_sure: Bạn có chắc không? assign_to_self: Giao cho tôi assigned: Người xử lý @@ -1626,13 +1629,26 @@ vi: import: Nhập dữ liệu import_and_export: Dữ liệu migrate: Chuyển tài khoản sang máy chủ khác + notifications: Thông báo email preferences: Chung profile: Hồ sơ relationships: Quan hệ + severed_relationships: Mối quan hệ bị cắt đứt statuses_cleanup: Tự động xóa tút cũ strikes: Lần cảnh cáo two_factor_authentication: Xác minh 2 bước webauthn_authentication: Khóa bảo mật + severed_relationships: + download: Tải xuống (%{count}) + event_type: + account_suspension: Người bị vô hiệu hóa (%{target_name}) + domain_block: Máy chủ bị vô hiệu hóa (%{target_name}) + user_domain_block: Bạn đã chặn %{target_name} + lost_followers: Mất người theo dõi + lost_follows: Mất người đang theo dõi + preamble: Bạn có thể mất số lượt theo dõi và người theo dõi khi chặn một máy chủ hoặc khi kiểm duyệt viên của bạn quyết định tạm dừng máy chủ từ xa. Khi điều đó xảy ra, bạn sẽ có thể tải xuống danh sách các mối quan hệ đã bị cắt đứt, để kiểm tra và nhập vào máy chủ khác. + purged: Thông tin về máy chủ này đã bị quản trị viên máy chủ của bạn xóa sạch. + type: Sự kiện statuses: attached: audio: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 29f9badb80..dcc99d7a91 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -1633,10 +1633,22 @@ zh-CN: preferences: 首选项 profile: 个人资料 relationships: 关注管理 + severed_relationships: 已断开的关系 statuses_cleanup: 自动删除嘟文 strikes: 操作记录 two_factor_authentication: 双因素认证 webauthn_authentication: 安全密钥 + severed_relationships: + download: 下载 (%{count}) + event_type: + account_suspension: 账户被封禁 (%{target_name}) + domain_block: 服务器被封禁 (%{target_name}) + user_domain_block: 你屏蔽了 %{target_name} + lost_followers: 失去的关注者 + lost_follows: 失去的关注 + preamble: 当你屏蔽一个域名或你的管理员决定封禁一个外站服务器时，你可能会失去关注和粉丝。在这种情况下，你可以下载被切断的关系的列表，进行检查以便导入另一个服务器。 + purged: 关于此服务器的信息已被你所在服务器的管理员清除。 + type: 事件 statuses: attached: audio: diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index 2a0f802a1f..af2b3b8698 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -1626,13 +1626,26 @@ zh-HK: import: 匯入 import_and_export: 匯入及匯出 migrate: 帳戶遷移 + notifications: 電郵通知 preferences: 偏好設定 profile: 個人資料 relationships: 關注及追隨者 + severed_relationships: 已切斷關係 statuses_cleanup: 自動嘟文刪除 strikes: 審核警告 two_factor_authentication: 雙重認證 webauthn_authentication: 安全鑰匙 + severed_relationships: + download: 下載 (%{count}) + event_type: + account_suspension: 停權帳號 (%{target_name}) + domain_block: 停權伺服器 (%{target_name}) + user_domain_block: 你封鎖了 %{target_name} + lost_followers: 已流失追蹤者 + lost_follows: 已流失追蹤 + preamble: 當你封鎖網域或你的管理員決定暫停遠端伺服器，可能會令你失去追蹤中的對象和追蹤者。屆時你可以下載紀錄了被切斷關係的對象的清單進行檢查，或將其匯入到另一台伺服器上。 + purged: 有關此伺服器的資訊已被你伺服器的管理員清除。 + type: 事件 statuses: attached: audio: diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index b78c7d3319..e83001e7db 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1331,7 +1331,7 @@ zh-TW: muting: 正在匯入已靜音帳號 type: 匯入類型 type_groups: - constructive: 跟隨者與書籤 + constructive: 跟隨中與書籤 destructive: 封鎖與靜音 types: blocking: 您封鎖的使用者列表 @@ -1635,10 +1635,22 @@ zh-TW: preferences: 偏好設定 profile: 個人檔案 relationships: 跟隨中與跟隨者 + severed_relationships: 已斷絕服務關係 statuses_cleanup: 自動嘟文刪除 strikes: 管理警告 two_factor_authentication: 兩階段驗證 webauthn_authentication: 安全金鑰 + severed_relationships: + download: 下載 (%{count} 份) + event_type: + account_suspension: 停權帳號 (%{target_name}) + domain_block: 停權伺服器 (%{target_name}) + user_domain_block: 您已封鎖 %{target_name} + lost_followers: 失去之跟隨者 + lost_follows: 失去之跟隨中 + preamble: 當您封鎖網域或您的管理員決定停權遠端伺服器時，您可能失去跟隨中或跟隨者。當此發生時，您能下載斷絕服務關係之列表並於其他伺服器中檢視或匯入資料。 + purged: 關於此伺服器已被您的伺服器管理員清除之資訊 + type: 事件 statuses: attached: audio: diff --git a/config/navigation.rb b/config/navigation.rb index 30593b3ab9..de5f28ce96 100644 --- a/config/navigation.rb +++ b/config/navigation.rb @@ -22,7 +22,11 @@ SimpleNavigation::Configuration.run do |navigation| end end - n.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_path, if: -> { current_user.functional? && !self_destruct } + n.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_path, if: -> { current_user.functional? && !self_destruct } do |s| + s.item :current, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_path + s.item :severed_relationships, safe_join([fa_icon('unlink fw'), t('settings.severed_relationships')]), severed_relationships_path + end + n.item :filters, safe_join([fa_icon('filter fw'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters}, if: -> { current_user.functional? && !self_destruct } n.item :statuses_cleanup, safe_join([fa_icon('history fw'), t('settings.statuses_cleanup')]), statuses_cleanup_path, if: -> { current_user.functional_or_moved? && !self_destruct } diff --git a/config/routes.rb b/config/routes.rb index 35580e4182..e198a527d1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -190,6 +190,14 @@ Rails.application.routes.draw do end resource :relationships, only: [:show, :update] + resources :severed_relationships, only: [:index] do + member do + constraints(format: :csv) do + get :followers + get :following + end + end + end resource :statuses_cleanup, controller: :statuses_cleanup, only: [:show, :update] get '/media_proxy/:id/(*any)', to: 'media_proxy#show', as: :media_proxy, format: false diff --git a/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb b/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb index 0e9a42f8df..a0ce0a6638 100644 --- a/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb +++ b/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb @@ -36,8 +36,8 @@ class MigrateInteractionSettingsToPolicy < ActiveRecord::Migration[7.1] requires_new_policy = true end - if deserialized_settings['interactions.must_be_following_dm'] - policy.filter_private_mentions = true + unless deserialized_settings['interactions.must_be_following_dm'] + policy.filter_private_mentions = false requires_new_policy = true end diff --git a/db/migrate/20240312100644_create_relationship_severance_events.rb b/db/migrate/20240312100644_create_relationship_severance_events.rb new file mode 100644 index 0000000000..8c55fe330f --- /dev/null +++ b/db/migrate/20240312100644_create_relationship_severance_events.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class CreateRelationshipSeveranceEvents < ActiveRecord::Migration[7.0] + def change + create_table :relationship_severance_events do |t| + t.integer :type, null: false + t.string :target_name, null: false + t.boolean :purged, null: false, default: false + + t.timestamps + + t.index [:type, :target_name] + end + end +end diff --git a/db/migrate/20240312105620_create_severed_relationships.rb b/db/migrate/20240312105620_create_severed_relationships.rb new file mode 100644 index 0000000000..1ed911cd55 --- /dev/null +++ b/db/migrate/20240312105620_create_severed_relationships.rb @@ -0,0 +1,27 @@ +# frozen_string_literal: true + +class CreateSeveredRelationships < ActiveRecord::Migration[7.0] + def change + create_table :severed_relationships do |t| + # No need to have an index on this foreign key as it is covered by `index_severed_relationships_on_unique_tuples` + t.references :relationship_severance_event, null: false, foreign_key: { on_delete: :cascade }, index: false + + # No need to have an index on this foregin key as it is covered by `index_severed_relationships_on_local_account_and_event` + t.references :local_account, null: false, foreign_key: { to_table: :accounts, on_delete: :cascade }, index: false + t.references :remote_account, null: false, foreign_key: { to_table: :accounts, on_delete: :cascade } + + # Used to describe whether `local_account` is the active (follower) or passive (followed) part of the relationship + t.integer :direction, null: false + + # Those attributes are carried over from the `follows` table + t.boolean :show_reblogs + t.boolean :notify + t.string :languages, array: true + + t.timestamps + + t.index [:relationship_severance_event_id, :local_account_id, :direction, :remote_account_id], name: 'index_severed_relationships_on_unique_tuples', unique: true + t.index [:local_account_id, :relationship_severance_event_id], name: 'index_severed_relationships_on_local_account_and_event' + end + end +end diff --git a/db/migrate/20240320140159_create_account_relationship_severance_events.rb b/db/migrate/20240320140159_create_account_relationship_severance_events.rb new file mode 100644 index 0000000000..5262c508fe --- /dev/null +++ b/db/migrate/20240320140159_create_account_relationship_severance_events.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +class CreateAccountRelationshipSeveranceEvents < ActiveRecord::Migration[7.1] + def change + create_table :account_relationship_severance_events do |t| + t.belongs_to :account, foreign_key: { on_delete: :cascade }, null: false + t.belongs_to :relationship_severance_event, foreign_key: { on_delete: :cascade }, null: false + + t.integer :relationships_count, default: 0, null: false + + t.index [:account_id, :relationship_severance_event_id], unique: true + + t.timestamps + end + end +end diff --git a/db/migrate/20240322125607_add_followers_and_following_counts_to_account_relationship_severance_events.rb b/db/migrate/20240322125607_add_followers_and_following_counts_to_account_relationship_severance_events.rb new file mode 100644 index 0000000000..ab5752b7a5 --- /dev/null +++ b/db/migrate/20240322125607_add_followers_and_following_counts_to_account_relationship_severance_events.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +class AddFollowersAndFollowingCountsToAccountRelationshipSeveranceEvents < ActiveRecord::Migration[7.1] + def change + add_column :account_relationship_severance_events, :followers_count, :integer, default: 0, null: false + add_column :account_relationship_severance_events, :following_count, :integer, default: 0, null: false + end +end diff --git a/db/post_migrate/20240321160706_migrate_interaction_settings_to_policy_again.rb b/db/post_migrate/20240321160706_migrate_interaction_settings_to_policy_again.rb new file mode 100644 index 0000000000..9baefa6775 --- /dev/null +++ b/db/post_migrate/20240321160706_migrate_interaction_settings_to_policy_again.rb @@ -0,0 +1,54 @@ +# frozen_string_literal: true + +class MigrateInteractionSettingsToPolicyAgain < ActiveRecord::Migration[7.1] + disable_ddl_transaction! + + # Dummy classes, to make migration possible across version changes + class Account < ApplicationRecord + has_one :user, inverse_of: :account + has_one :notification_policy, inverse_of: :account + end + + class User < ApplicationRecord + belongs_to :account + end + + class NotificationPolicy < ApplicationRecord + belongs_to :account + end + + def up + User.includes(account: :notification_policy).find_each do |user| + deserialized_settings = Oj.load(user.attributes_before_type_cast['settings']) + + next if deserialized_settings.nil? + + # If the user has configured a notification policy, don't override it + next if user.account.notification_policy.present? + + policy = user.account.build_notification_policy + requires_new_policy = false + + if deserialized_settings['interactions.must_be_follower'] + policy.filter_not_followers = true + requires_new_policy = true + end + + if deserialized_settings['interactions.must_be_following'] + policy.filter_not_following = true + requires_new_policy = true + end + + unless deserialized_settings['interactions.must_be_following_dm'] + policy.filter_private_mentions = false + requires_new_policy = true + end + + policy.save if requires_new_policy && policy.changed? + rescue ActiveRecord::RecordNotUnique + next + end + end + + def down; end +end diff --git a/db/post_migrate/20240322130318_remove_relationships_count_from_account_relationship_severance_events.rb b/db/post_migrate/20240322130318_remove_relationships_count_from_account_relationship_severance_events.rb new file mode 100644 index 0000000000..76f2d325fe --- /dev/null +++ b/db/post_migrate/20240322130318_remove_relationships_count_from_account_relationship_severance_events.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class RemoveRelationshipsCountFromAccountRelationshipSeveranceEvents < ActiveRecord::Migration[7.1] + def change + safety_assured { remove_column :account_relationship_severance_events, :relationships_count, :integer, default: 0, null: false } + end +end diff --git a/db/post_migrate/20240322161611_remove_obsolete_roles_from_users.rb b/db/post_migrate/20240322161611_remove_obsolete_roles_from_users.rb new file mode 100644 index 0000000000..8a46a1d7d3 --- /dev/null +++ b/db/post_migrate/20240322161611_remove_obsolete_roles_from_users.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +class RemoveObsoleteRolesFromUsers < ActiveRecord::Migration[7.1] + def change + safety_assured { remove_column :users, :admin, :boolean, default: false, null: false } + safety_assured { remove_column :users, :moderator, :boolean, default: false, null: false } + end +end diff --git a/db/schema.rb b/db/schema.rb index 795a81c5ce..f262cd21c9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -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_03_20_163441) do +ActiveRecord::Schema[7.1].define(version: 2024_03_22_161611) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -90,6 +90,18 @@ ActiveRecord::Schema[7.1].define(version: 2024_03_20_163441) do t.index ["target_account_id"], name: "index_account_pins_on_target_account_id" end + create_table "account_relationship_severance_events", force: :cascade do |t| + t.bigint "account_id", null: false + t.bigint "relationship_severance_event_id", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "followers_count", default: 0, null: false + t.integer "following_count", default: 0, null: false + t.index ["account_id", "relationship_severance_event_id"], name: "idx_on_account_id_relationship_severance_event_id_7bd82bf20e", unique: true + t.index ["account_id"], name: "index_account_relationship_severance_events_on_account_id" + t.index ["relationship_severance_event_id"], name: "idx_on_relationship_severance_event_id_403f53e707" + end + create_table "account_stats", force: :cascade do |t| t.bigint "account_id", null: false t.bigint "statuses_count", default: 0, null: false @@ -871,6 +883,15 @@ ActiveRecord::Schema[7.1].define(version: 2024_03_20_163441) do t.string "url" end + create_table "relationship_severance_events", force: :cascade do |t| + t.integer "type", null: false + t.string "target_name", null: false + t.boolean "purged", default: false, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["type", "target_name"], name: "index_relationship_severance_events_on_type_and_target_name" + end + create_table "relays", force: :cascade do |t| t.string "inbox_url", default: "", null: false t.string "follow_activity_id" @@ -950,6 +971,21 @@ ActiveRecord::Schema[7.1].define(version: 2024_03_20_163441) do t.index ["thing_type", "thing_id", "var"], name: "index_settings_on_thing_type_and_thing_id_and_var", unique: true end + create_table "severed_relationships", force: :cascade do |t| + t.bigint "relationship_severance_event_id", null: false + t.bigint "local_account_id", null: false + t.bigint "remote_account_id", null: false + t.integer "direction", null: false + t.boolean "show_reblogs" + t.boolean "notify" + t.string "languages", array: true + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["local_account_id", "relationship_severance_event_id"], name: "index_severed_relationships_on_local_account_and_event" + t.index ["relationship_severance_event_id", "local_account_id", "direction", "remote_account_id"], name: "index_severed_relationships_on_unique_tuples", unique: true + t.index ["remote_account_id"], name: "index_severed_relationships_on_remote_account_id" + end + create_table "site_uploads", force: :cascade do |t| t.string "var", default: "", null: false t.string "file_file_name" @@ -1137,7 +1173,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_03_20_163441) do t.integer "sign_in_count", default: 0, null: false t.datetime "current_sign_in_at", precision: nil t.datetime "last_sign_in_at", precision: nil - t.boolean "admin", default: false, null: false t.string "confirmation_token" t.datetime "confirmed_at", precision: nil t.datetime "confirmation_sent_at", precision: nil @@ -1152,7 +1187,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_03_20_163441) do t.string "otp_backup_codes", array: true t.bigint "account_id", null: false t.boolean "disabled", default: false, null: false - t.boolean "moderator", default: false, null: false t.bigint "invite_id" t.string "chosen_languages", array: true t.bigint "created_by_application_id" @@ -1231,6 +1265,8 @@ ActiveRecord::Schema[7.1].define(version: 2024_03_20_163441) do add_foreign_key "account_notes", "accounts", on_delete: :cascade add_foreign_key "account_pins", "accounts", column: "target_account_id", on_delete: :cascade add_foreign_key "account_pins", "accounts", on_delete: :cascade + add_foreign_key "account_relationship_severance_events", "accounts", on_delete: :cascade + add_foreign_key "account_relationship_severance_events", "relationship_severance_events", on_delete: :cascade add_foreign_key "account_stats", "accounts", on_delete: :cascade add_foreign_key "account_statuses_cleanup_policies", "accounts", on_delete: :cascade add_foreign_key "account_warnings", "accounts", column: "target_account_id", on_delete: :cascade @@ -1323,6 +1359,9 @@ ActiveRecord::Schema[7.1].define(version: 2024_03_20_163441) do 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 + add_foreign_key "severed_relationships", "accounts", column: "local_account_id", on_delete: :cascade + add_foreign_key "severed_relationships", "accounts", column: "remote_account_id", on_delete: :cascade + add_foreign_key "severed_relationships", "relationship_severance_events", on_delete: :cascade add_foreign_key "status_edits", "accounts", on_delete: :nullify add_foreign_key "status_edits", "statuses", on_delete: :cascade add_foreign_key "status_pins", "accounts", name: "fk_d4cb435b62", on_delete: :cascade diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb index 9f234e3860..d16d55eae1 100644 --- a/lib/mastodon/cli/maintenance.rb +++ b/lib/mastodon/cli/maintenance.rb @@ -5,7 +5,7 @@ require_relative 'base' module Mastodon::CLI class Maintenance < Base MIN_SUPPORTED_VERSION = 2019_10_01_213028 - MAX_SUPPORTED_VERSION = 2023_09_07_150100 + MAX_SUPPORTED_VERSION = 2023_10_23_105620 # Stubs to enjoy ActiveRecord queries while not depending on a particular # version of the code/database @@ -26,6 +26,9 @@ module Mastodon::CLI class ListAccount < ApplicationRecord; end class PollVote < ApplicationRecord; end class Mention < ApplicationRecord; end + class Notification < ApplicationRecord; end + class NotificationPermission < ApplicationRecord; end + class NotificationRequest < ApplicationRecord; end class AccountDomainBlock < ApplicationRecord; end class AnnouncementReaction < ApplicationRecord; end class FeaturedTag < ApplicationRecord; end @@ -39,9 +42,10 @@ module Mastodon::CLI class Webhook < ApplicationRecord; end class BulkImport < ApplicationRecord; end class SoftwareUpdate < ApplicationRecord; end + class SeveredRelationship < ApplicationRecord; end class DomainBlock < ApplicationRecord - enum severity: { silence: 0, suspend: 1, noop: 2 } + enum :severity, { silence: 0, suspend: 1, noop: 2 } scope :by_severity, -> { in_order_of(:severity, %w(noop silence suspend)).order(:domain) } end @@ -107,6 +111,18 @@ module Mastodon::CLI end end + from_classes = [Notification] + from_classes << NotificationPermission if db_table_exists?(:notification_permissions) + from_classes << NotificationRequest if db_table_exists?(:notification_requests) + + from_classes.each do |klass| + klass.where(from_account_id: other_account.id).find_each do |record| + record.update_attribute(:from_account_id, id) + rescue ActiveRecord::RecordNotUnique + next + end + end + target_classes = [Follow, FollowRequest, Block, Mute, AccountModerationNote, AccountPin] target_classes << AccountNote if db_table_exists?(:account_notes) @@ -129,6 +145,20 @@ module Mastodon::CLI record.update_attribute(:account_warning_id, id) end end + + if db_table_exists?(:severed_relationships) + SeveredRelationship.where(local_account_id: other_account.id).reorder(nil).find_each do |record| + record.update_attribute(:local_account_id, id) + rescue ActiveRecord::RecordNotUnique + next + end + + SeveredRelationship.where(remote_account_id: other_account.id).reorder(nil).find_each do |record| + record.update_attribute(:remote_account_id, id) + rescue ActiveRecord::RecordNotUnique + next + end + end end end diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake index 935f6d24a3..6afc013ede 100644 --- a/lib/tasks/tests.rake +++ b/lib/tasks/tests.rake @@ -105,6 +105,12 @@ namespace :tests do exit(1) end + policy = NotificationPolicy.find_by(account: User.find(1).account) + unless policy.filter_private_mentions == false && policy.filter_not_following == true + puts 'Notification policy not migrated as expected' + exit(1) + end + puts 'No errors found. Database state is consistent with a successful migration process.' end @@ -181,7 +187,8 @@ namespace :tests do INSERT INTO "settings" (id, thing_type, thing_id, var, value, created_at, updated_at) VALUES - (5, 'User', 4, 'default_language', E'--- kmr\n', now(), now()); + (5, 'User', 4, 'default_language', E'--- kmr\n', now(), now()), + (6, 'User', 1, 'interactions', E'--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess\nmust_be_follower: false\nmust_be_following: true\nmust_be_following_dm: false\n', now(), now()); SQL end diff --git a/spec/fabricators/account_relationship_severance_event_fabricator.rb b/spec/fabricators/account_relationship_severance_event_fabricator.rb new file mode 100644 index 0000000000..5580d52092 --- /dev/null +++ b/spec/fabricators/account_relationship_severance_event_fabricator.rb @@ -0,0 +1,6 @@ +# frozen_string_literal: true + +Fabricator(:account_relationship_severance_event) do + account + relationship_severance_event +end diff --git a/spec/fabricators/featured_tag_fabricator.rb b/spec/fabricators/featured_tag_fabricator.rb index 0803dc43a7..6003099dbd 100644 --- a/spec/fabricators/featured_tag_fabricator.rb +++ b/spec/fabricators/featured_tag_fabricator.rb @@ -2,6 +2,6 @@ Fabricator(:featured_tag) do account { Fabricate.build(:account) } - tag { Fabricate.build(:tag) } + tag { nil } name { sequence(:name) { |i| "Tag#{i}" } } end diff --git a/spec/fabricators/relationship_severance_event_fabricator.rb b/spec/fabricators/relationship_severance_event_fabricator.rb new file mode 100644 index 0000000000..7fec14e9f2 --- /dev/null +++ b/spec/fabricators/relationship_severance_event_fabricator.rb @@ -0,0 +1,6 @@ +# frozen_string_literal: true + +Fabricator(:relationship_severance_event) do + type { :domain_block } + target_name { 'example.com' } +end diff --git a/spec/fabricators/severed_relationship_fabricator.rb b/spec/fabricators/severed_relationship_fabricator.rb new file mode 100644 index 0000000000..6600b72cdf --- /dev/null +++ b/spec/fabricators/severed_relationship_fabricator.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +Fabricator(:severed_relationship) do + local_account { Fabricate.build(:account) } + remote_account { Fabricate.build(:account) } + relationship_severance_event { Fabricate.build(:relationship_severance_event) } + direction { :active } +end diff --git a/spec/features/severed_relationships_spec.rb b/spec/features/severed_relationships_spec.rb new file mode 100644 index 0000000000..b933398a08 --- /dev/null +++ b/spec/features/severed_relationships_spec.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'Severed relationships page' do + include ProfileStories + + describe 'GET severed_relationships#index' do + before do + as_a_logged_in_user + + event = Fabricate(:relationship_severance_event) + Fabricate.times(3, :severed_relationship, local_account: bob.account, relationship_severance_event: event) + Fabricate(:account_relationship_severance_event, account: bob.account, relationship_severance_event: event) + end + + it 'returns http success' do + visit severed_relationships_path + + expect(page).to have_title(I18n.t('settings.severed_relationships')) + expect(page).to have_link(href: following_severed_relationship_path(AccountRelationshipSeveranceEvent.first, format: :csv)) + end + end +end diff --git a/spec/models/relationship_severance_event_spec.rb b/spec/models/relationship_severance_event_spec.rb new file mode 100644 index 0000000000..93c0f1a26d --- /dev/null +++ b/spec/models/relationship_severance_event_spec.rb @@ -0,0 +1,49 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe RelationshipSeveranceEvent do + let(:local_account) { Fabricate(:account) } + let(:remote_account) { Fabricate(:account, domain: 'example.com') } + let(:event) { Fabricate(:relationship_severance_event) } + + describe '#import_from_active_follows!' do + before do + local_account.follow!(remote_account) + end + + it 'imports the follow relationships with the expected direction' do + event.import_from_active_follows!(local_account.active_relationships) + + relationships = event.severed_relationships.to_a + expect(relationships.size).to eq 1 + expect(relationships[0].account).to eq local_account + expect(relationships[0].target_account).to eq remote_account + end + end + + describe '#import_from_passive_follows!' do + before do + remote_account.follow!(local_account) + end + + it 'imports the follow relationships with the expected direction' do + event.import_from_passive_follows!(local_account.passive_relationships) + + relationships = event.severed_relationships.to_a + expect(relationships.size).to eq 1 + expect(relationships[0].account).to eq remote_account + expect(relationships[0].target_account).to eq local_account + end + end + + describe '#affected_local_accounts' do + before do + event.severed_relationships.create!(local_account: local_account, remote_account: remote_account, direction: :active) + end + + it 'correctly lists local accounts' do + expect(event.affected_local_accounts.to_a).to contain_exactly(local_account) + end + end +end diff --git a/spec/models/severed_relationship_spec.rb b/spec/models/severed_relationship_spec.rb new file mode 100644 index 0000000000..0f922d7983 --- /dev/null +++ b/spec/models/severed_relationship_spec.rb @@ -0,0 +1,45 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe SeveredRelationship do + let(:local_account) { Fabricate(:account) } + let(:remote_account) { Fabricate(:account, domain: 'example.com') } + let(:event) { Fabricate(:relationship_severance_event) } + + describe '#account' do + context 'when the local account is the follower' do + let(:severed_relationship) { Fabricate(:severed_relationship, relationship_severance_event: event, local_account: local_account, remote_account: remote_account, direction: :active) } + + it 'returns the local account' do + expect(severed_relationship.account).to eq local_account + end + end + + context 'when the local account is being followed' do + let(:severed_relationship) { Fabricate(:severed_relationship, relationship_severance_event: event, local_account: local_account, remote_account: remote_account, direction: :passive) } + + it 'returns the remote account' do + expect(severed_relationship.account).to eq remote_account + end + end + end + + describe '#target_account' do + context 'when the local account is the follower' do + let(:severed_relationship) { Fabricate(:severed_relationship, relationship_severance_event: event, local_account: local_account, remote_account: remote_account, direction: :active) } + + it 'returns the remote account' do + expect(severed_relationship.target_account).to eq remote_account + end + end + + context 'when the local account is being followed' do + let(:severed_relationship) { Fabricate(:severed_relationship, relationship_severance_event: event, local_account: local_account, remote_account: remote_account, direction: :passive) } + + it 'returns the local account' do + expect(severed_relationship.target_account).to eq local_account + end + end + end +end diff --git a/spec/requests/api/v1/featured_tags/suggestions_spec.rb b/spec/requests/api/v1/featured_tags/suggestions_spec.rb index f7b453b740..00451540ca 100644 --- a/spec/requests/api/v1/featured_tags/suggestions_spec.rb +++ b/spec/requests/api/v1/featured_tags/suggestions_spec.rb @@ -7,13 +7,35 @@ describe 'Featured Tags Suggestions API' do let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) } let(:scopes) { 'read:accounts' } let(:headers) { { 'Authorization' => "Bearer #{token.token}" } } - let(:account) { Fabricate(:account) } + let(:account) { Fabricate(:account, user: user) } describe 'GET /api/v1/featured_tags/suggestions' do - it 'returns http success' do - get '/api/v1/featured_tags/suggestions', params: { account_id: account.id, limit: 2 }, headers: headers + let!(:unused_featured_tag) { Fabricate(:tag, name: 'unused_featured_tag') } + let!(:used_tag) { Fabricate(:tag, name: 'used_tag') } + let!(:used_featured_tag) { Fabricate(:tag, name: 'used_featured_tag') } - expect(response).to have_http_status(200) + before do + _unused_tag = Fabricate(:tag, name: 'unused_tag') + + # Make relevant tags used by account + status = Fabricate(:status, account: account) + status.tags << used_tag + status.tags << used_featured_tag + + # Feature the relevant tags + Fabricate :featured_tag, account: account, name: unused_featured_tag.name + Fabricate :featured_tag, account: account, name: used_featured_tag.name + end + + it 'returns http success and recently used but not featured tags' do + get '/api/v1/featured_tags/suggestions', params: { limit: 2 }, headers: headers + + expect(response) + .to have_http_status(200) + expect(body_as_json) + .to contain_exactly( + include(name: used_tag.name) + ) end end end diff --git a/spec/requests/api/v1/notifications/policies_spec.rb b/spec/requests/api/v1/notifications/policies_spec.rb index fe6bdbd973..9acd47a7b4 100644 --- a/spec/requests/api/v1/notifications/policies_spec.rb +++ b/spec/requests/api/v1/notifications/policies_spec.rb @@ -22,10 +22,20 @@ RSpec.describe 'Policies' do it_behaves_like 'forbidden for wrong scope', 'write write:notifications' context 'with no options' do - it 'returns http success', :aggregate_failures do + it 'returns json with expected attributes', :aggregate_failures do subject expect(response).to have_http_status(200) + expect(body_as_json).to include( + filter_not_following: false, + filter_not_followers: false, + filter_new_accounts: false, + filter_private_mentions: true, + summary: a_hash_including( + pending_requests_count: '1', + pending_notifications_count: '0' + ) + ) end end end @@ -35,14 +45,25 @@ RSpec.describe 'Policies' do put '/api/v1/notifications/policy', headers: headers, params: params end - let(:params) { {} } + let(:params) { { filter_not_following: true } } it_behaves_like 'forbidden for wrong scope', 'read read:notifications' - it 'returns http success' do - subject + it 'changes notification policy and returns an updated json object', :aggregate_failures do + expect { subject } + .to change { NotificationPolicy.find_or_initialize_by(account: user.account).filter_not_following }.from(false).to(true) expect(response).to have_http_status(200) + expect(body_as_json).to include( + filter_not_following: true, + filter_not_followers: false, + filter_new_accounts: false, + filter_private_mentions: true, + summary: a_hash_including( + pending_requests_count: '0', + pending_notifications_count: '0' + ) + ) end end end diff --git a/spec/requests/api/v1/notifications/requests_spec.rb b/spec/requests/api/v1/notifications/requests_spec.rb index 64675d562c..772402a6b5 100644 --- a/spec/requests/api/v1/notifications/requests_spec.rb +++ b/spec/requests/api/v1/notifications/requests_spec.rb @@ -82,15 +82,10 @@ RSpec.describe 'Requests' do it_behaves_like 'forbidden for wrong scope', 'read read:notifications' - it 'returns http success' do + it 'returns http success and dismisses the notification request', :aggregate_failures do subject expect(response).to have_http_status(200) - end - - it 'dismisses the notification request' do - subject - expect(notification_request.reload.dismissed?).to be true end diff --git a/spec/services/after_block_domain_from_account_service_spec.rb b/spec/services/after_block_domain_from_account_service_spec.rb index 2fce424b1a..12e780357d 100644 --- a/spec/services/after_block_domain_from_account_service_spec.rb +++ b/spec/services/after_block_domain_from_account_service_spec.rb @@ -5,22 +5,33 @@ require 'rails_helper' RSpec.describe AfterBlockDomainFromAccountService do subject { described_class.new } - let!(:wolf) { Fabricate(:account, username: 'wolf', domain: 'evil.org', inbox_url: 'https://evil.org/inbox', protocol: :activitypub) } - let!(:alice) { Fabricate(:account, username: 'alice') } + let(:wolf) { Fabricate(:account, username: 'wolf', domain: 'evil.org', inbox_url: 'https://evil.org/wolf/inbox', protocol: :activitypub) } + let(:dog) { Fabricate(:account, username: 'dog', domain: 'evil.org', inbox_url: 'https://evil.org/dog/inbox', protocol: :activitypub) } + let(:alice) { Fabricate(:account, username: 'alice') } before do - allow(ActivityPub::DeliveryWorker).to receive(:perform_async) + wolf.follow!(alice) + alice.follow!(dog) end - it 'purge followers from blocked domain' do - wolf.follow!(alice) + around do |example| + Sidekiq::Testing.fake! do + example.run + end + end + + it 'purges followers from blocked domain, sends them Reject->Follow, and records severed relationships', :aggregate_failures do subject.call(alice, 'evil.org') + expect(wolf.following?(alice)).to be false - end + expect(ActivityPub::DeliveryWorker.jobs.pluck('args')).to contain_exactly( + [a_string_including('"type":"Reject"'), alice.id, wolf.inbox_url], + [a_string_including('"type":"Undo"'), alice.id, dog.inbox_url] + ) - it 'sends Reject->Follow to followers from blocked domain' do - wolf.follow!(alice) - subject.call(alice, 'evil.org') - expect(ActivityPub::DeliveryWorker).to have_received(:perform_async).once + severed_relationships = alice.severed_relationships.to_a + expect(severed_relationships.count).to eq 2 + expect(severed_relationships[0].relationship_severance_event).to eq severed_relationships[1].relationship_severance_event + expect(severed_relationships.map { |rel| [rel.account, rel.target_account] }).to contain_exactly([wolf, alice], [alice, dog]) end end diff --git a/spec/services/block_domain_service_spec.rb b/spec/services/block_domain_service_spec.rb index 0f278293a8..d4f0c042d4 100644 --- a/spec/services/block_domain_service_spec.rb +++ b/spec/services/block_domain_service_spec.rb @@ -5,6 +5,8 @@ require 'rails_helper' RSpec.describe BlockDomainService do subject { described_class.new } + let(:local_account) { Fabricate(:account) } + let(:bystander) { Fabricate(:account, domain: 'evil.org') } let!(:bad_account) { Fabricate(:account, username: 'badguy666', domain: 'evil.org') } let!(:bad_status_plain) { Fabricate(:status, account: bad_account, text: 'You suck') } let!(:bad_status_with_attachment) { Fabricate(:status, account: bad_account, text: 'Hahaha') } @@ -13,62 +15,54 @@ RSpec.describe BlockDomainService do describe 'for a suspension' do before do + local_account.follow!(bad_account) + bystander.follow!(local_account) + end + + it 'creates a domain block, suspends remote accounts with appropriate suspension date, records severed relationships and sends notification', :aggregate_failures do subject.call(DomainBlock.create!(domain: 'evil.org', severity: :suspend)) - end - it 'creates a domain block' do expect(DomainBlock.blocked?('evil.org')).to be true - end - it 'removes remote accounts from that domain' do + # Suspends account with appropriate suspension date expect(bad_account.reload.suspended?).to be true - end - - it 'records suspension date appropriately' do expect(bad_account.reload.suspended_at).to eq DomainBlock.find_by(domain: 'evil.org').created_at - end - it 'keeps already-banned accounts banned' do + # Keep already-suspended account without updating the suspension date expect(already_banned_account.reload.suspended?).to be true - end - - it 'does not overwrite suspension date of already-banned accounts' do expect(already_banned_account.reload.suspended_at).to_not eq DomainBlock.find_by(domain: 'evil.org').created_at - end - it 'removes the remote accounts\'s statuses and media attachments' do + # Removes content expect { bad_status_plain.reload }.to raise_exception ActiveRecord::RecordNotFound expect { bad_status_with_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound expect { bad_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound + + # Records severed relationships + severed_relationships = local_account.severed_relationships.to_a + expect(severed_relationships.count).to eq 2 + expect(severed_relationships[0].relationship_severance_event).to eq severed_relationships[1].relationship_severance_event + expect(severed_relationships.map { |rel| [rel.account, rel.target_account] }).to contain_exactly([bystander, local_account], [local_account, bad_account]) + + # Sends severed relationships notification + expect(LocalNotificationWorker).to have_enqueued_sidekiq_job(local_account.id, anything, 'AccountRelationshipSeveranceEvent', 'severed_relationships') end end describe 'for a silence with reject media' do - before do + it 'does not mark the domain as blocked, but silences accounts with an appropriate silencing date, clears media', :aggregate_failures, :sidekiq_inline do subject.call(DomainBlock.create!(domain: 'evil.org', severity: :silence, reject_media: true)) - end - it 'does not create a domain block' do expect(DomainBlock.blocked?('evil.org')).to be false - end - it 'silences remote accounts from that domain' do + # Silences account with appropriate silecing date expect(bad_account.reload.silenced?).to be true - end - - it 'records suspension date appropriately' do expect(bad_account.reload.silenced_at).to eq DomainBlock.find_by(domain: 'evil.org').created_at - end - it 'keeps already-banned accounts banned' do + # Keeps already-silenced accounts without updating the silecing date expect(already_banned_account.reload.silenced?).to be true - end - - it 'does not overwrite suspension date of already-banned accounts' do expect(already_banned_account.reload.silenced_at).to_not eq DomainBlock.find_by(domain: 'evil.org').created_at - end - it 'leaves the domains status and attachments, but clears media', :sidekiq_inline do + # Leaves posts but clears media expect { bad_status_plain.reload }.to_not raise_error expect { bad_status_with_attachment.reload }.to_not raise_error expect { bad_attachment.reload }.to_not raise_error diff --git a/spec/services/suspend_account_service_spec.rb b/spec/services/suspend_account_service_spec.rb index d62f7ef0d6..7c72a4776b 100644 --- a/spec/services/suspend_account_service_spec.rb +++ b/spec/services/suspend_account_service_spec.rb @@ -59,7 +59,7 @@ RSpec.describe SuspendAccountService, :sidekiq_inline do remote_follower.follow!(account) end - it 'sends an update actor to followers and reporters' do + it 'sends an Update actor activity to followers and reporters' do subject expect(a_request(:post, remote_follower.inbox_url).with { |req| match_update_actor_request(req, account) }).to have_been_made.once expect(a_request(:post, remote_reporter.inbox_url).with { |req| match_update_actor_request(req, account) }).to have_been_made.once @@ -85,8 +85,9 @@ RSpec.describe SuspendAccountService, :sidekiq_inline do account.follow!(local_followee) end - it 'sends a reject follow' do + it 'sends a Reject Follow activity', :aggregate_failures do subject + expect(a_request(:post, account.inbox_url).with { |req| match_reject_follow_request(req, account, local_followee) }).to have_been_made.once end end diff --git a/streaming/package.json b/streaming/package.json index 6e183a181c..f90a1e4404 100644 --- a/streaming/package.json +++ b/streaming/package.json @@ -37,7 +37,7 @@ "@types/uuid": "^9.0.0", "@types/ws": "^8.5.9", "eslint-define-config": "^2.0.0", - "pino-pretty": "^10.3.1", + "pino-pretty": "^11.0.0", "typescript": "^5.0.4" }, "optionalDependencies": { diff --git a/yarn.lock b/yarn.lock index 700c3f3e8d..2dacec0468 100644 --- a/yarn.lock +++ b/yarn.lock @@ -42,13 +42,13 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.1": - version: 7.24.1 - resolution: "@babel/code-frame@npm:7.24.1" +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.1, @babel/code-frame@npm:^7.24.2": + version: 7.24.2 + resolution: "@babel/code-frame@npm:7.24.2" dependencies: - "@babel/highlight": "npm:^7.24.1" + "@babel/highlight": "npm:^7.24.2" picocolors: "npm:^1.0.0" - checksum: 10c0/c92f4244538089c95f0322c5e8f6c2287529a576ae9ab254366a073c8720ecb537e7009d5d79a6a5698d3b658b298fc77691c05608cafbe4957cab03033ada15 + checksum: 10c0/d1d4cba89475ab6aab7a88242e1fd73b15ecb9f30c109b69752956434d10a26a52cbd37727c4eca104b6d45227bd1dfce39a6a6f4a14c9b2f07f871e968cf406 languageName: node linkType: hard @@ -60,11 +60,11 @@ __metadata: linkType: hard "@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1": - version: 7.24.1 - resolution: "@babel/core@npm:7.24.1" + version: 7.24.3 + resolution: "@babel/core@npm:7.24.3" dependencies: "@ampproject/remapping": "npm:^2.2.0" - "@babel/code-frame": "npm:^7.24.1" + "@babel/code-frame": "npm:^7.24.2" "@babel/generator": "npm:^7.24.1" "@babel/helper-compilation-targets": "npm:^7.23.6" "@babel/helper-module-transforms": "npm:^7.23.3" @@ -78,7 +78,7 @@ __metadata: gensync: "npm:^1.0.0-beta.2" json5: "npm:^2.2.3" semver: "npm:^6.3.1" - checksum: 10c0/b085b0bc65c225f20b9d5f7b05c8b127c005a73c355d4a7480f099de5d6757abafa7f60786eb95e6d098a6b5c34618e7b0950d60ef55139db04d8767d410e0a9 + checksum: 10c0/e6e756b6de27d0312514a005688fa1915c521ad4269a388913eff2120a546538078f8488d6d16e86f851872f263cb45a6bbae08738297afb9382600d2ac342a9 languageName: node linkType: hard @@ -217,12 +217,12 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-imports@npm:^7.0.0-beta.49, @babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.15, @babel/helper-module-imports@npm:^7.24.1": - version: 7.24.1 - resolution: "@babel/helper-module-imports@npm:7.24.1" +"@babel/helper-module-imports@npm:^7.0.0-beta.49, @babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.15, @babel/helper-module-imports@npm:^7.24.1, @babel/helper-module-imports@npm:^7.24.3": + version: 7.24.3 + resolution: "@babel/helper-module-imports@npm:7.24.3" dependencies: "@babel/types": "npm:^7.24.0" - checksum: 10c0/9242a9af73e7eb3fe106d7e55c157149f7f38df6494980744e99fc608103c2ee20726df9596fae722c57ae89c9c304200673b733c3c1c5312385ff26ebd2a4fa + checksum: 10c0/052c188adcd100f5e8b6ff0c9643ddaabc58b6700d3bbbc26804141ad68375a9f97d9d173658d373d31853019e65f62610239e3295cdd58e573bdcb2fded188d languageName: node linkType: hard @@ -353,15 +353,15 @@ __metadata: languageName: node linkType: hard -"@babel/highlight@npm:^7.24.1": - version: 7.24.1 - resolution: "@babel/highlight@npm:7.24.1" +"@babel/highlight@npm:^7.24.2": + version: 7.24.2 + resolution: "@babel/highlight@npm:7.24.2" dependencies: "@babel/helper-validator-identifier": "npm:^7.22.20" chalk: "npm:^2.4.2" js-tokens: "npm:^4.0.0" picocolors: "npm:^1.0.0" - checksum: 10c0/39520f655101245efd44a6e5997e73e2b977f8e2011897022ec81fa5b0366dbfef5313bdebadbd08186f52b7e9c21b38ba265cc78caa0c6a8c894461e7a70430 + checksum: 10c0/98ce00321daedeed33a4ed9362dc089a70375ff1b3b91228b9f05e6591d387a81a8cba68886e207861b8871efa0bc997ceabdd9c90f6cce3ee1b2f7f941b42db languageName: node linkType: hard @@ -662,9 +662,9 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-async-generator-functions@npm:^7.24.1": - version: 7.24.1 - resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.1" +"@babel/plugin-transform-async-generator-functions@npm:^7.24.3": + version: 7.24.3 + resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.3" dependencies: "@babel/helper-environment-visitor": "npm:^7.22.20" "@babel/helper-plugin-utils": "npm:^7.24.0" @@ -672,7 +672,7 @@ __metadata: "@babel/plugin-syntax-async-generators": "npm:^7.8.4" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/c207cb6b3b7dcb5cd9b22ce5a063493ec7534a21375cb987ad079eee6cc5cae573bd3c97af91fbf0ee47cae1d3f8632c4387885aeab0eedece5652dc4e6b9f1c + checksum: 10c0/55ceed059f819dcccbfe69600bfa1c055ada466bd54eda117cfdd2cf773dd85799e2f6556e4a559b076e93b9704abcca2aef9d72aad7dc8a5d3d17886052f1d3 languageName: node linkType: hard @@ -1200,10 +1200,10 @@ __metadata: linkType: hard "@babel/plugin-transform-runtime@npm:^7.22.4": - version: 7.24.1 - resolution: "@babel/plugin-transform-runtime@npm:7.24.1" + version: 7.24.3 + resolution: "@babel/plugin-transform-runtime@npm:7.24.3" dependencies: - "@babel/helper-module-imports": "npm:^7.24.1" + "@babel/helper-module-imports": "npm:^7.24.3" "@babel/helper-plugin-utils": "npm:^7.24.0" babel-plugin-polyfill-corejs2: "npm:^0.4.10" babel-plugin-polyfill-corejs3: "npm:^0.10.1" @@ -1211,7 +1211,7 @@ __metadata: semver: "npm:^6.3.1" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/54e4dbc7aa6fd6c338c657108418f10301e88bbc4c00675f901d529d3bbf578e6a438076bc57c1efdb433853dea1d7c1a6ebaa18f936debc1fd9e25f7553c33a + checksum: 10c0/ee01967bf405d84bd95ca4089166a18fb23fe9851a6da53dcf712a7f8ba003319996f21f320d568ec76126e18adfaee978206ccda86eef7652d47cc9a052e75e languageName: node linkType: hard @@ -1333,8 +1333,8 @@ __metadata: linkType: hard "@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.22.4": - version: 7.24.1 - resolution: "@babel/preset-env@npm:7.24.1" + version: 7.24.3 + resolution: "@babel/preset-env@npm:7.24.3" dependencies: "@babel/compat-data": "npm:^7.24.1" "@babel/helper-compilation-targets": "npm:^7.23.6" @@ -1363,7 +1363,7 @@ __metadata: "@babel/plugin-syntax-top-level-await": "npm:^7.14.5" "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6" "@babel/plugin-transform-arrow-functions": "npm:^7.24.1" - "@babel/plugin-transform-async-generator-functions": "npm:^7.24.1" + "@babel/plugin-transform-async-generator-functions": "npm:^7.24.3" "@babel/plugin-transform-async-to-generator": "npm:^7.24.1" "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.1" "@babel/plugin-transform-block-scoping": "npm:^7.24.1" @@ -1412,13 +1412,13 @@ __metadata: "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.1" "@babel/preset-modules": "npm:0.1.6-no-external-plugins" babel-plugin-polyfill-corejs2: "npm:^0.4.10" - babel-plugin-polyfill-corejs3: "npm:^0.10.1" + babel-plugin-polyfill-corejs3: "npm:^0.10.4" babel-plugin-polyfill-regenerator: "npm:^0.6.1" core-js-compat: "npm:^3.31.0" semver: "npm:^6.3.1" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/c9fd96ed8561ac3f8d2e490face5b763ea05a7908770a52fe2ffa0e72581c5cd8ea5c016a85f47775fc3584c6d748eea62044c19ae3f4edf11ffc1e1e9c8bffd + checksum: 10c0/abd6f3b6c6a71d4ff766cda5b51467677a811240d022492e651065e26ce1a8eb2067eabe5653fce80dda9c5c204fb7b89b419578d7e86eaaf7970929ee7b4885 languageName: node linkType: hard @@ -1578,15 +1578,6 @@ __metadata: languageName: node linkType: hard -"@csstools/css-parser-algorithms@npm:^2.5.0": - version: 2.5.0 - resolution: "@csstools/css-parser-algorithms@npm:2.5.0" - peerDependencies: - "@csstools/css-tokenizer": ^2.2.3 - checksum: 10c0/31b4a523d956e204af9842183678cca5a88ad76551d54dcb6083f8a6f2dfd8fdec6c09bca5410842af54b90997308bebee7593c17dbc1a4e951453b54bd3f024 - languageName: node - linkType: hard - "@csstools/css-parser-algorithms@npm:^2.6.1": version: 2.6.1 resolution: "@csstools/css-parser-algorithms@npm:2.6.1" @@ -1596,13 +1587,6 @@ __metadata: languageName: node linkType: hard -"@csstools/css-tokenizer@npm:^2.2.3": - version: 2.2.3 - resolution: "@csstools/css-tokenizer@npm:2.2.3" - checksum: 10c0/557266ec52e8b36c19008a5bbd7151effba085cdd6d68270c01afebf914981caac698eda754b2a530a8a9947a3dd70e3f3a39a5e037c4170bb2a055a92754acb - languageName: node - linkType: hard - "@csstools/css-tokenizer@npm:^2.2.4": version: 2.2.4 resolution: "@csstools/css-tokenizer@npm:2.2.4" @@ -1610,16 +1594,6 @@ __metadata: languageName: node linkType: hard -"@csstools/media-query-list-parser@npm:^2.1.7": - version: 2.1.7 - resolution: "@csstools/media-query-list-parser@npm:2.1.7" - peerDependencies: - "@csstools/css-parser-algorithms": ^2.5.0 - "@csstools/css-tokenizer": ^2.2.3 - checksum: 10c0/433aef06b00f1d402fd24074a1919b8e2de94245a3b780da6466c8cc9e0f3cc93d2db930f0fce36c7d6908cd50b626cd61e803d3f62dddad79eeb742858028ef - languageName: node - linkType: hard - "@csstools/media-query-list-parser@npm:^2.1.9": version: 2.1.9 resolution: "@csstools/media-query-list-parser@npm:2.1.9" @@ -1996,15 +1970,6 @@ __metadata: languageName: node linkType: hard -"@csstools/selector-specificity@npm:^3.0.1": - version: 3.0.1 - resolution: "@csstools/selector-specificity@npm:3.0.1" - peerDependencies: - postcss-selector-parser: ^6.0.13 - checksum: 10c0/4280f494726d5e38de74e28dee2ff74ec86244560dff4edeec3ddff3ac73c774c19535bd1bb70cad77949bfb359cf87e977d0ec3264591e3b7260342a20dd84f - languageName: node - linkType: hard - "@csstools/selector-specificity@npm:^3.0.2": version: 3.0.2 resolution: "@csstools/selector-specificity@npm:3.0.2" @@ -2030,6 +1995,13 @@ __metadata: languageName: node linkType: hard +"@dual-bundle/import-meta-resolve@npm:^4.0.0": + version: 4.0.0 + resolution: "@dual-bundle/import-meta-resolve@npm:4.0.0" + checksum: 10c0/868b8314fc753b7767887108535afe3288de941d92bc8453164dbcb1abe886b171e338f6f7d02ff556256dee69c90e4ac6360e0c6a856a5ad7190274ab52de2e + languageName: node + linkType: hard + "@emotion/babel-plugin@npm:^11.11.0": version: 11.11.0 resolution: "@emotion/babel-plugin@npm:11.11.0" @@ -2227,8 +2199,8 @@ __metadata: linkType: hard "@formatjs/cli@npm:^6.1.1": - version: 6.2.7 - resolution: "@formatjs/cli@npm:6.2.7" + version: 6.2.8 + resolution: "@formatjs/cli@npm:6.2.8" peerDependencies: vue: ^3.3.4 peerDependenciesMeta: @@ -2236,7 +2208,7 @@ __metadata: optional: true bin: formatjs: bin/formatjs - checksum: 10c0/ee7b0873a734e02721ce1ee107ee60845bb30855f4ca686bfb6c5e9862353249d5d20748b18db93200aabc7a59875ff062f485c64d41cb8e61f1d43e2bb5eceb + checksum: 10c0/5d8f95434f4522eee7dd3acf54e5265289ec7e72812448cd7c7547bdedaba8927719800dfa2fc92fb82c609f34255367a80d18bf6c064540d5e11ec6b9d4603e languageName: node linkType: hard @@ -2322,9 +2294,9 @@ __metadata: languageName: node linkType: hard -"@formatjs/intl@npm:2.10.0": - version: 2.10.0 - resolution: "@formatjs/intl@npm:2.10.0" +"@formatjs/intl@npm:2.10.1": + version: 2.10.1 + resolution: "@formatjs/intl@npm:2.10.1" dependencies: "@formatjs/ecma402-abstract": "npm:1.18.2" "@formatjs/fast-memoize": "npm:2.2.0" @@ -2338,7 +2310,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10c0/7566038b011116cee7069165a25836b3fb687948e61b041809a9d978ac6c0882ae8d81a624a415cfb8e43852d097cd1cbc3c6707e717928e39b75c252491a712 + checksum: 10c0/24eee77382d1efd226aee7590228d3ae80f66a8547a65295f8028986b15b6abbfea3e380f4a338ece0e841e1db6f36554ca48124d84c0830382e3a9d395b5d75 languageName: node linkType: hard @@ -2924,7 +2896,7 @@ __metadata: pg-connection-string: "npm:^2.6.0" pino: "npm:^8.17.2" pino-http: "npm:^9.0.0" - pino-pretty: "npm:^10.3.1" + pino-pretty: "npm:^11.0.0" prom-client: "npm:^15.0.0" typescript: "npm:^5.0.4" utf-8-validate: "npm:^6.0.3" @@ -3043,8 +3015,8 @@ __metadata: linkType: hard "@reduxjs/toolkit@npm:^2.0.1": - version: 2.2.1 - resolution: "@reduxjs/toolkit@npm:2.2.1" + version: 2.2.2 + resolution: "@reduxjs/toolkit@npm:2.2.2" dependencies: immer: "npm:^10.0.3" redux: "npm:^5.0.1" @@ -3058,7 +3030,7 @@ __metadata: optional: true react-redux: optional: true - checksum: 10c0/675f816b311d6d703259e00c73977c9c5968e41b039d6d149e34e9084d5e6718aff3b692d2b7697974fb57a056687932117da1dd5202d392811d8d4e91d09322 + checksum: 10c0/d749181b1bc071698517cba7ce05c42ddfe99363019249722b4dfa3afc71b3a6e4cb9885af574cf81c5d6515f68201ebfedddb5c14b262c941a45112fdc66ce3 languageName: node linkType: hard @@ -3349,8 +3321,8 @@ __metadata: linkType: hard "@testing-library/react@npm:^14.0.0": - version: 14.2.1 - resolution: "@testing-library/react@npm:14.2.1" + version: 14.2.2 + resolution: "@testing-library/react@npm:14.2.2" dependencies: "@babel/runtime": "npm:^7.12.5" "@testing-library/dom": "npm:^9.0.0" @@ -3358,7 +3330,7 @@ __metadata: peerDependencies: react: ^18.0.0 react-dom: ^18.0.0 - checksum: 10c0/83b35cf8bf5640f1b63b32223ebc75799dc1a8e034d819120b26838fba0b0ab10bdbe6ad07dd8ae8287365f2b0c52dc9892a6fa11bb24d3e63ad97dfb7f2f296 + checksum: 10c0/ab36707f6701a4a56dd217e16e00d6326e0f760bb2e716245422c7500a0b94efcd351d0aa89c4fab2916e6ebc68c983cec6b3ae0804de813cafc913a612668f6 languageName: node linkType: hard @@ -3717,13 +3689,13 @@ __metadata: linkType: hard "@types/pg@npm:^8.6.6": - version: 8.11.2 - resolution: "@types/pg@npm:8.11.2" + version: 8.11.4 + resolution: "@types/pg@npm:8.11.4" dependencies: "@types/node": "npm:*" pg-protocol: "npm:*" pg-types: "npm:^4.0.1" - checksum: 10c0/6d873af7f71785d5d4db49311c5c73628918b2b1ece83f17073c4470b2fce6bd24a37de23a42ea0221df4e1c7dc43ea035bb9d0b6274f86ec692b21503a9a55c + checksum: 10c0/81158ffa9d2f9b2b299a1650756b90fc418e0040e654d7d9ee46734a3c874d07b638af86d765e22e9c8246054c30a0274ee4dea58a0a7ed5c0c4aa01964a09ef languageName: node linkType: hard @@ -3735,9 +3707,9 @@ __metadata: linkType: hard "@types/prop-types@npm:*, @types/prop-types@npm:^15.7.5": - version: 15.7.11 - resolution: "@types/prop-types@npm:15.7.11" - checksum: 10c0/e53423cf9d510515ef8b47ff42f4f1b65a7b7b37c8704e2dbfcb9a60defe0c0e1f3cb1acfdeb466bad44ca938d7c79bffdd51b48ffb659df2432169d0b27a132 + version: 15.7.12 + resolution: "@types/prop-types@npm:15.7.12" + checksum: 10c0/1babcc7db6a1177779f8fde0ccc78d64d459906e6ef69a4ed4dd6339c920c2e05b074ee5a92120fe4e9d9f1a01c952f843ebd550bee2332fc2ef81d1706878f8 languageName: node linkType: hard @@ -3880,13 +3852,13 @@ __metadata: linkType: hard "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7": - version: 18.2.66 - resolution: "@types/react@npm:18.2.66" + version: 18.2.70 + resolution: "@types/react@npm:18.2.70" dependencies: "@types/prop-types": "npm:*" "@types/scheduler": "npm:*" csstype: "npm:^3.0.2" - checksum: 10c0/56e4b841f2daf03a0b3268d4f2bcf5841167fe56742b9f1c076fad66587fb59191bdaba4d5727dbfbcff750d5e8797fdd4e57d8d9704b0bfc6ad31ee1e268a70 + checksum: 10c0/2107b1fa8963cabe33d981cf1c0e3b7534c9d12b98c1046cd9f7975851690a0780db011f6a1d637ae4e612ef00c94ebdbe76a9e2f9e0f3baa6aad3213932af41 languageName: node linkType: hard @@ -5084,11 +5056,11 @@ __metadata: linkType: hard "autoprefixer@npm:^10.4.14, autoprefixer@npm:^10.4.18": - version: 10.4.18 - resolution: "autoprefixer@npm:10.4.18" + version: 10.4.19 + resolution: "autoprefixer@npm:10.4.19" dependencies: browserslist: "npm:^4.23.0" - caniuse-lite: "npm:^1.0.30001591" + caniuse-lite: "npm:^1.0.30001599" fraction.js: "npm:^4.3.7" normalize-range: "npm:^0.1.2" picocolors: "npm:^1.0.0" @@ -5097,7 +5069,7 @@ __metadata: postcss: ^8.1.0 bin: autoprefixer: bin/autoprefixer - checksum: 10c0/b6e1c1ba2fc6c09360cdcd75b00ce809c5dbe1ad4c30f0186764609a982aa5563d45965cb9e6a9d195c639a9fb1dcac2594484fc41624050195f626e9add666e + checksum: 10c0/fe0178eb8b1da4f15c6535cd329926609b22d1811e047371dccce50563623f8075dd06fb167daff059e4228da651b0bdff6d9b44281541eaf0ce0b79125bfd19 languageName: node linkType: hard @@ -5170,8 +5142,8 @@ __metadata: linkType: hard "babel-plugin-formatjs@npm:^10.5.1": - version: 10.5.13 - resolution: "babel-plugin-formatjs@npm:10.5.13" + version: 10.5.14 + resolution: "babel-plugin-formatjs@npm:10.5.14" dependencies: "@babel/core": "npm:^7.10.4" "@babel/helper-plugin-utils": "npm:^7.10.4" @@ -5184,7 +5156,7 @@ __metadata: "@types/babel__helper-plugin-utils": "npm:^7.10.0" "@types/babel__traverse": "npm:^7.1.7" tslib: "npm:^2.4.0" - checksum: 10c0/1ce0b69478dd3c92126a7e3440f1fad46feebebc9318e8bbb102dea91a60448da4a8511b3c8ffbf2c3675995fca6c8ce7f097c08907455b33a5f9185e39fb94e + checksum: 10c0/78d33f0304c7b6e36334b2f32bacd144cbbe08cb22318ff994e7adc7705b7f8208354c9af9f87b4390d11aee1ea81cfee9f224a57fe5265173b92ee7de921359 languageName: node linkType: hard @@ -5263,15 +5235,15 @@ __metadata: languageName: node linkType: hard -"babel-plugin-polyfill-corejs3@npm:^0.10.1": - version: 0.10.1 - resolution: "babel-plugin-polyfill-corejs3@npm:0.10.1" +"babel-plugin-polyfill-corejs3@npm:^0.10.1, babel-plugin-polyfill-corejs3@npm:^0.10.4": + version: 0.10.4 + resolution: "babel-plugin-polyfill-corejs3@npm:0.10.4" dependencies: "@babel/helper-define-polyfill-provider": "npm:^0.6.1" - core-js-compat: "npm:^3.36.0" + core-js-compat: "npm:^3.36.1" peerDependencies: "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 - checksum: 10c0/54ad0b2d2eb44ae8cc20485ef3be6097e262e02ee76003f39734af5e421743dcff478bfc3cc8fef7cda298e1b507c618ff161c47672fd1ae598df0a2ca48b4e1 + checksum: 10c0/31b92cd3dfb5b417da8dfcf0deaa4b8b032b476d7bb31ca51c66127cf25d41e89260e89d17bc004b2520faa38aa9515fafabf81d89f9d4976e9dc1163e4a7c41 languageName: node linkType: hard @@ -5840,10 +5812,10 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001587, caniuse-lite@npm:^1.0.30001591": - version: 1.0.30001591 - resolution: "caniuse-lite@npm:1.0.30001591" - checksum: 10c0/21937d341c3d75994504db21340f65573a1e847a8ab33ee4964ed493994d6552864c494ba144485459abd9c711c75c0708bc9fa19f2bff525bff75ffb0a42c3b +"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001587, caniuse-lite@npm:^1.0.30001599": + version: 1.0.30001599 + resolution: "caniuse-lite@npm:1.0.30001599" + checksum: 10c0/8b3b9610b5be88533a3c8d0770d6896f7b1a9fee3dbeb7339e4ee119a514c81e5e07a628a5a289a6541ca291ac78a9402f5a99cf6012139e91f379083488a8eb languageName: node linkType: hard @@ -6330,10 +6302,10 @@ __metadata: languageName: node linkType: hard -"cookie@npm:0.5.0": - version: 0.5.0 - resolution: "cookie@npm:0.5.0" - checksum: 10c0/c01ca3ef8d7b8187bae434434582288681273b5a9ed27521d4d7f9f7928fe0c920df0decd9f9d3bbd2d14ac432b8c8cf42b98b3bdd5bfe0e6edddeebebe8b61d +"cookie@npm:0.6.0": + version: 0.6.0 + resolution: "cookie@npm:0.6.0" + checksum: 10c0/f2318b31af7a31b4ddb4a678d024514df5e705f9be5909a192d7f116cfb6d45cbacf96a473fa733faa95050e7cff26e7832bb3ef94751592f1387b71c8956686 languageName: node linkType: hard @@ -6344,7 +6316,7 @@ __metadata: languageName: node linkType: hard -"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.36.0": +"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.36.1": version: 3.36.1 resolution: "core-js-compat@npm:3.36.1" dependencies: @@ -6708,9 +6680,9 @@ __metadata: languageName: node linkType: hard -"cssnano-preset-default@npm:^6.1.0": - version: 6.1.0 - resolution: "cssnano-preset-default@npm:6.1.0" +"cssnano-preset-default@npm:^6.1.1": + version: 6.1.1 + resolution: "cssnano-preset-default@npm:6.1.1" dependencies: browserslist: "npm:^4.23.0" css-declaration-sorter: "npm:^7.1.1" @@ -6722,12 +6694,12 @@ __metadata: postcss-discard-duplicates: "npm:^6.0.3" postcss-discard-empty: "npm:^6.0.3" postcss-discard-overridden: "npm:^6.0.2" - postcss-merge-longhand: "npm:^6.0.4" - postcss-merge-rules: "npm:^6.1.0" - postcss-minify-font-values: "npm:^6.0.3" + postcss-merge-longhand: "npm:^6.0.5" + postcss-merge-rules: "npm:^6.1.1" + postcss-minify-font-values: "npm:^6.1.0" postcss-minify-gradients: "npm:^6.0.3" postcss-minify-params: "npm:^6.1.0" - postcss-minify-selectors: "npm:^6.0.3" + postcss-minify-selectors: "npm:^6.0.4" postcss-normalize-charset: "npm:^6.0.2" postcss-normalize-display-values: "npm:^6.0.2" postcss-normalize-positions: "npm:^6.0.2" @@ -6741,10 +6713,10 @@ __metadata: postcss-reduce-initial: "npm:^6.1.0" postcss-reduce-transforms: "npm:^6.0.2" postcss-svgo: "npm:^6.0.3" - postcss-unique-selectors: "npm:^6.0.3" + postcss-unique-selectors: "npm:^6.0.4" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/47b7026b66b80a03f043929f825f48a13ed3a4086a6f335f25312c77fe73977a74cf718a486f91d9513b652e7d34312394380141c3bf6b8c8027ebc96710b6f6 + checksum: 10c0/dc5927c8538778f859b781dc1fb10f0082cd7b3afdba30e835e472dbf51724d4f18e5170587761150142284a371d6c9d2c3b51d29826c08d2b9dd86a929597ee languageName: node linkType: hard @@ -6758,14 +6730,14 @@ __metadata: linkType: hard "cssnano@npm:^6.0.1": - version: 6.1.0 - resolution: "cssnano@npm:6.1.0" + version: 6.1.1 + resolution: "cssnano@npm:6.1.1" dependencies: - cssnano-preset-default: "npm:^6.1.0" + cssnano-preset-default: "npm:^6.1.1" lilconfig: "npm:^3.1.1" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/ffe0d8c9110cce01692f51d21ae2fe6d319f2329989d28ef0dddb67a6fba2780c525f00682f0788bdbba380f37893d27ee870b3e99fb97c1fb8edccbd68a1d92 + checksum: 10c0/2db52c2f5e314f05efec8977de392886ef0e7e08568ac45446f2303218180e317cee64c6c0c6d2c1d70a7f339fcead75384e09e187b88ccacd7f9fd51919fdf1 languageName: node linkType: hard @@ -8239,15 +8211,15 @@ __metadata: linkType: hard "express@npm:^4.17.1, express@npm:^4.18.2": - version: 4.18.3 - resolution: "express@npm:4.18.3" + version: 4.19.1 + resolution: "express@npm:4.19.1" dependencies: accepts: "npm:~1.3.8" array-flatten: "npm:1.1.1" body-parser: "npm:1.20.2" content-disposition: "npm:0.5.4" content-type: "npm:~1.0.4" - cookie: "npm:0.5.0" + cookie: "npm:0.6.0" cookie-signature: "npm:1.0.6" debug: "npm:2.6.9" depd: "npm:2.0.0" @@ -8273,7 +8245,7 @@ __metadata: type-is: "npm:~1.6.18" utils-merge: "npm:1.0.1" vary: "npm:~1.1.2" - checksum: 10c0/0b9eeafbac549e3c67d92d083bf1773e358359f41ad142b92121935c6348d29079b75054555b3f62de39263fffc8ba06898b09fdd3e213e28e714c03c5d9f44c + checksum: 10c0/1cf6d3c095131f0d730105fac23a713083604d4f3ad9364df53cade50662abcfee2f6f8a955fdf164a5ee63f09f457da0b70cbed435ad302fa6f14162a9757f9 languageName: node linkType: hard @@ -9503,10 +9475,10 @@ __metadata: languageName: node linkType: hard -"ignore@npm:^5.2.0, ignore@npm:^5.2.4, ignore@npm:^5.3.0": - version: 5.3.0 - resolution: "ignore@npm:5.3.0" - checksum: 10c0/dc06bea5c23aae65d0725a957a0638b57e235ae4568dda51ca142053ed2c352de7e3bc93a69b2b32ac31966a1952e9a93c5ef2e2ab7c6b06aef9808f6b55b571 +"ignore@npm:^5.2.0, ignore@npm:^5.2.4, ignore@npm:^5.3.1": + version: 5.3.1 + resolution: "ignore@npm:5.3.1" + checksum: 10c0/703f7f45ffb2a27fb2c5a8db0c32e7dee66b33a225d28e8db4e1be6474795f606686a6e3bcc50e1aa12f2042db4c9d4a7d60af3250511de74620fbed052ea4cd languageName: node linkType: hard @@ -11209,6 +11181,13 @@ __metadata: languageName: node linkType: hard +"known-css-properties@npm:^0.30.0": + version: 0.30.0 + resolution: "known-css-properties@npm:0.30.0" + checksum: 10c0/8b487a6b33487affcec41eb392ceb77acf4d093558dde5c88b5ea06b9a3c81781876d7cb09872e0518b9602f27c8f4112c9ac333e02c90a91c8fbd12e202ed48 + languageName: node + linkType: hard + "language-subtag-registry@npm:^0.3.20": version: 0.3.22 resolution: "language-subtag-registry@npm:0.3.22" @@ -11700,10 +11679,10 @@ __metadata: languageName: node linkType: hard -"meow@npm:^13.1.0": - version: 13.1.0 - resolution: "meow@npm:13.1.0" - checksum: 10c0/2dac9dbf99a17ce29618fe5919072a9b28e2aedb9547f9b1f15d046d5501dd6c14fe1f35f7a5665d0ee7111c98c4d359fcf3f985463ec5896dd50177363f442d +"meow@npm:^13.2.0": + version: 13.2.0 + resolution: "meow@npm:13.2.0" + checksum: 10c0/d5b339ae314715bcd0b619dd2f8a266891928e21526b4800d49b4fba1cc3fff7e2c1ff5edd3344149fac841bc2306157f858e8c4d5eaee4d52ce52ad925664ce languageName: node linkType: hard @@ -13041,9 +13020,9 @@ __metadata: languageName: node linkType: hard -"pino-pretty@npm:^10.3.1": - version: 10.3.1 - resolution: "pino-pretty@npm:10.3.1" +"pino-pretty@npm:^11.0.0": + version: 11.0.0 + resolution: "pino-pretty@npm:11.0.0" dependencies: colorette: "npm:^2.0.7" dateformat: "npm:^4.6.3" @@ -13061,7 +13040,7 @@ __metadata: strip-json-comments: "npm:^3.1.1" bin: pino-pretty: bin.js - checksum: 10c0/6964fba5acc7a9f112e4c6738d602e123daf16cb5f6ddc56ab4b6bb05059f28876d51da8f72358cf1172e95fa12496b70465431a0836df693c462986d050686b + checksum: 10c0/d42213f3fdf19d92152b0a14683b2bb8443423739c81ab7c1181a5dac0e0ca7621d232c8264ece81edc01106ca2a8e165783daca0a902f0fde480027075d5540 languageName: node linkType: hard @@ -13446,40 +13425,40 @@ __metadata: languageName: node linkType: hard -"postcss-merge-longhand@npm:^6.0.4": - version: 6.0.4 - resolution: "postcss-merge-longhand@npm:6.0.4" +"postcss-merge-longhand@npm:^6.0.5": + version: 6.0.5 + resolution: "postcss-merge-longhand@npm:6.0.5" dependencies: postcss-value-parser: "npm:^4.2.0" - stylehacks: "npm:^6.1.0" + stylehacks: "npm:^6.1.1" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/6c05cfe60d86cb0b6f40abe4649e1c0c21cf416fbf17aa15f04c315fcef4887827db5ef2593eca27b2b14127f5338ab179b147940c22315b5a9bcb0bdbbfa768 + checksum: 10c0/5a223a7f698c05ab42e9997108a7ff27ea1e0c33a11a353d65a04fc89c3b5b750b9e749550d76b6406329117a055adfc79dde7fee48dca5c8e167a2854ae3fea languageName: node linkType: hard -"postcss-merge-rules@npm:^6.1.0": - version: 6.1.0 - resolution: "postcss-merge-rules@npm:6.1.0" +"postcss-merge-rules@npm:^6.1.1": + version: 6.1.1 + resolution: "postcss-merge-rules@npm:6.1.1" dependencies: browserslist: "npm:^4.23.0" caniuse-api: "npm:^3.0.0" cssnano-utils: "npm:^4.0.2" - postcss-selector-parser: "npm:^6.0.15" + postcss-selector-parser: "npm:^6.0.16" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/3ce76c87e29003fe46fbeba64348ed61d50d8966cfd56ec59b70b6fbf2e2ea8866b8399eec09e036fc636c84207ba12037a1dbc1374fd313a885511947699cad + checksum: 10c0/6d8952dbb19b1e59bf5affe0871fa1be6515103466857cff5af879d6cf619659f8642ec7a931cabb7cdbd393d8c1e91748bf70bee70fa3edea010d4e25786d04 languageName: node linkType: hard -"postcss-minify-font-values@npm:^6.0.3": - version: 6.0.3 - resolution: "postcss-minify-font-values@npm:6.0.3" +"postcss-minify-font-values@npm:^6.1.0": + version: 6.1.0 + resolution: "postcss-minify-font-values@npm:6.1.0" dependencies: postcss-value-parser: "npm:^4.2.0" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/c1ae31099e3ae79169405d3d46cd49cff35c70c63d1f36f24b16fcce43999c130db396e1fde071a375bd5b4853b14058111034a8da278a3a31f9ca12e091116e + checksum: 10c0/0d6567170c22a7db42096b5eac298f041614890fbe01759a9fa5ccda432f2bb09efd399d92c11bf6675ae13ccd259db4602fad3c358317dee421df5f7ab0a003 languageName: node linkType: hard @@ -13509,14 +13488,14 @@ __metadata: languageName: node linkType: hard -"postcss-minify-selectors@npm:^6.0.3": - version: 6.0.3 - resolution: "postcss-minify-selectors@npm:6.0.3" +"postcss-minify-selectors@npm:^6.0.4": + version: 6.0.4 + resolution: "postcss-minify-selectors@npm:6.0.4" dependencies: - postcss-selector-parser: "npm:^6.0.15" + postcss-selector-parser: "npm:^6.0.16" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/6abc83edf3fd746979ef709182fd613a764c5c2f68ae20aaa1b38940153a1078c0b270d657fe3bcfe6cda44b61f5af762fe9b31b8b62f63b897bfc2d2bc02b88 + checksum: 10c0/695ec2e1e3a7812b0cabe1105d0ed491760be3d8e9433914fb5af1fc30a84e6dc24089cd31b7e300de620b8e7adf806526c1acf8dd14077a7d1d2820c60a327c languageName: node linkType: hard @@ -13876,13 +13855,13 @@ __metadata: languageName: node linkType: hard -"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.15, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4": - version: 6.0.15 - resolution: "postcss-selector-parser@npm:6.0.15" +"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4": + version: 6.0.16 + resolution: "postcss-selector-parser@npm:6.0.16" dependencies: cssesc: "npm:^3.0.0" util-deprecate: "npm:^1.0.2" - checksum: 10c0/48b425d6cef497bcf6b7d136f6fd95cfca43026955e07ec9290d3c15457de3a862dbf251dd36f42c07a0d5b5ab6f31e41acefeff02528995a989b955505e440b + checksum: 10c0/0e11657cb3181aaf9ff67c2e59427c4df496b4a1b6a17063fae579813f80af79d444bf38f82eeb8b15b4679653fd3089e66ef0283f9aab01874d885e6cf1d2cf languageName: node linkType: hard @@ -13898,14 +13877,14 @@ __metadata: languageName: node linkType: hard -"postcss-unique-selectors@npm:^6.0.3": - version: 6.0.3 - resolution: "postcss-unique-selectors@npm:6.0.3" +"postcss-unique-selectors@npm:^6.0.4": + version: 6.0.4 + resolution: "postcss-unique-selectors@npm:6.0.4" dependencies: - postcss-selector-parser: "npm:^6.0.15" + postcss-selector-parser: "npm:^6.0.16" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/884c5da4c3bfdacf6a61bb3bd23d212e61d2b3e99ba5099d4d646d18970d2c72d8f6bd8f2ab244ee68d7214e576dc3fd9004fc946ff872e745a965da29f7b18b + checksum: 10c0/bfb99d8a7c675c93f2e65c9d9d563477bfd46fdce9e2727d42d57982b31ccbaaf944e8034bfbefe48b3119e77fba7eb1b181c19b91cb3a5448058fa66a7c9ae9 languageName: node linkType: hard @@ -13916,14 +13895,14 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.33": - version: 8.4.37 - resolution: "postcss@npm:8.4.37" +"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.38": + version: 8.4.38 + resolution: "postcss@npm:8.4.38" dependencies: nanoid: "npm:^3.3.7" picocolors: "npm:^1.0.0" source-map-js: "npm:^1.2.0" - checksum: 10c0/0b5730ad0ccbceaf0faaa4a283a144adefd23254f17dbdd63be5e0b37193c7df58003f88742c04c3ae6fd60d1a5158b331a4ce926797fb21e94833ae83c6bf69 + checksum: 10c0/955407b8f70cf0c14acf35dab3615899a2a60a26718a63c848cf3c29f2467b0533991b985a2b994430d890bd7ec2b1963e36352b0774a19143b5f591540f7c06 languageName: node linkType: hard @@ -14376,12 +14355,12 @@ __metadata: linkType: hard "react-intl@npm:^6.4.2": - version: 6.6.2 - resolution: "react-intl@npm:6.6.2" + version: 6.6.3 + resolution: "react-intl@npm:6.6.3" dependencies: "@formatjs/ecma402-abstract": "npm:1.18.2" "@formatjs/icu-messageformat-parser": "npm:2.7.6" - "@formatjs/intl": "npm:2.10.0" + "@formatjs/intl": "npm:2.10.1" "@formatjs/intl-displaynames": "npm:6.6.6" "@formatjs/intl-listformat": "npm:7.5.5" "@types/hoist-non-react-statics": "npm:^3.3.1" @@ -14395,7 +14374,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10c0/78288a0fded816735812dca6dcfee3eaa8bb3af7e963ba47639b51cc700a102a526859ff647ca79a5ebcdc69d6d78da90daeeed15cc0b819c7a20a74b2e1469c + checksum: 10c0/8a924931668f1bf6364bb41c09fdb54972b8e3372f0768a31478dc3f8a846920caa4dc04ab3950195baa6dbf58a148f43a6a221d5795be2cbb6f4f374a5921d6 languageName: node linkType: hard @@ -16406,15 +16385,15 @@ __metadata: languageName: node linkType: hard -"stylehacks@npm:^6.1.0": - version: 6.1.0 - resolution: "stylehacks@npm:6.1.0" +"stylehacks@npm:^6.1.1": + version: 6.1.1 + resolution: "stylehacks@npm:6.1.1" dependencies: browserslist: "npm:^4.23.0" - postcss-selector-parser: "npm:^6.0.15" + postcss-selector-parser: "npm:^6.0.16" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/0e9624d2b12d00d5593e3ef9ef8ed1f4c2029087b4862567cfab9ea3d3fc21efeb9aa00251c13defdfff4481abff8d6e0c48e3e27fac967c959acc7dcb0d5b67 + checksum: 10c0/2dd2bccfd8311ff71492e63a7b8b86c3d7b1fff55d4ba5a2357aff97743e633d351cdc2f5ae3c0057637d00dab4ef5fc5b218a1b370e4585a41df22b5a5128be languageName: node linkType: hard @@ -16487,13 +16466,14 @@ __metadata: linkType: hard "stylelint@npm:^16.0.2": - version: 16.2.1 - resolution: "stylelint@npm:16.2.1" + version: 16.3.0 + resolution: "stylelint@npm:16.3.0" dependencies: - "@csstools/css-parser-algorithms": "npm:^2.5.0" - "@csstools/css-tokenizer": "npm:^2.2.3" - "@csstools/media-query-list-parser": "npm:^2.1.7" - "@csstools/selector-specificity": "npm:^3.0.1" + "@csstools/css-parser-algorithms": "npm:^2.6.1" + "@csstools/css-tokenizer": "npm:^2.2.4" + "@csstools/media-query-list-parser": "npm:^2.1.9" + "@csstools/selector-specificity": "npm:^3.0.2" + "@dual-bundle/import-meta-resolve": "npm:^4.0.0" balanced-match: "npm:^2.0.0" colord: "npm:^2.9.3" cosmiconfig: "npm:^9.0.0" @@ -16507,19 +16487,19 @@ __metadata: globby: "npm:^11.1.0" globjoin: "npm:^0.1.4" html-tags: "npm:^3.3.1" - ignore: "npm:^5.3.0" + ignore: "npm:^5.3.1" imurmurhash: "npm:^0.1.4" is-plain-object: "npm:^5.0.0" - known-css-properties: "npm:^0.29.0" + known-css-properties: "npm:^0.30.0" mathml-tag-names: "npm:^2.1.3" - meow: "npm:^13.1.0" + meow: "npm:^13.2.0" micromatch: "npm:^4.0.5" normalize-path: "npm:^3.0.0" picocolors: "npm:^1.0.0" - postcss: "npm:^8.4.33" + postcss: "npm:^8.4.38" postcss-resolve-nested-selector: "npm:^0.1.1" postcss-safe-parser: "npm:^7.0.0" - postcss-selector-parser: "npm:^6.0.15" + postcss-selector-parser: "npm:^6.0.16" postcss-value-parser: "npm:^4.2.0" resolve-from: "npm:^5.0.0" string-width: "npm:^4.2.3" @@ -16530,7 +16510,7 @@ __metadata: write-file-atomic: "npm:^5.0.1" bin: stylelint: bin/stylelint.mjs - checksum: 10c0/eeaba06885e542c832e5cffc07b2d0dabdc5a72e6ad4d6cb3d01dcc260c29a712b0b935cbd40e059abd68a100e0563fbc617fc4c9bef3b14ecaf6eea651d9d9d + checksum: 10c0/98bf770078d727eb7c3ec0932b09c9486481f2d086ea1f4232e00bd1bf58b6b5d3a8d6fc9802df05380cdb06b3d97c5a7c4f27adb221b2a5707ea9829c0ee350 languageName: node linkType: hard @@ -17138,22 +17118,22 @@ __metadata: linkType: hard "typescript@npm:5, typescript@npm:^5.0.4": - version: 5.4.2 - resolution: "typescript@npm:5.4.2" + version: 5.4.3 + resolution: "typescript@npm:5.4.3" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/583ff68cafb0c076695f72d61df6feee71689568179fb0d3a4834dac343df6b6ed7cf7b6f6c801fa52d43cd1d324e2f2d8ae4497b09f9e6cfe3d80a6d6c9ca52 + checksum: 10c0/22443a8760c3668e256c0b34b6b45c359ef6cecc10c42558806177a7d500ab1a7d7aac1f976d712e26989ddf6731d2fbdd3212b7c73290a45127c1c43ba2005a languageName: node linkType: hard "typescript@patch:typescript@npm%3A5#optional!builtin, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin": - version: 5.4.2 - resolution: "typescript@patch:typescript@npm%3A5.4.2#optional!builtin::version=5.4.2&hash=5adc0c" + version: 5.4.3 + resolution: "typescript@patch:typescript@npm%3A5.4.3#optional!builtin::version=5.4.3&hash=5adc0c" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/fcf6658073d07283910d9a0e04b1d5d0ebc822c04dbb7abdd74c3151c7aa92fcddbac7d799404e358197222006ccdc4c0db219d223d2ee4ccd9e2b01333b49be + checksum: 10c0/6e51f8b7e6ec55b897b9e56b67e864fe8f44e30f4a14357aad5dc0f7432db2f01efc0522df0b6c36d361c51f2dc3dcac5c832efd96a404cfabf884e915d38828 languageName: node linkType: hard